diff options
Diffstat (limited to 'pkgs')
234 files changed, 2715 insertions, 2283 deletions
diff --git a/pkgs/applications/altcoins/parity-ui/default.nix b/pkgs/applications/altcoins/parity-ui/default.nix index 33e72125c6bd..b22302d0d39a 100644 --- a/pkgs/applications/altcoins/parity-ui/default.nix +++ b/pkgs/applications/altcoins/parity-ui/default.nix @@ -6,11 +6,11 @@ uiEnv = pkgs.callPackage ./env.nix { }; in stdenv.mkDerivation rec { name = "parity-ui-${version}"; - version = "0.2.5"; + version = "0.2.8"; src = fetchurl { url = "https://github.com/parity-js/shell/releases/download/v${version}/parity-ui_${version}_amd64.deb"; - sha256 = "1jk7ac6qqxs47hf16vhr94ix4wf51qzpm55q8h6wsx1lrgy1y3g6"; + sha256 = "1nyarq73jdknhax68cq2i868sznghzj70kvk4ixypxnjb1q6a53a"; name = "${name}.deb"; }; diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 4ee13665d1be..a41488c48b50 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "1.10.8"; - sha256 = "0q6blsbxn48afqf3cmxvmdlyzvf0cpqcymsjbsk8nyx0zxzf1dpk"; + version = "1.10.9"; + sha256 = "1irfksx887vvvdf97q26qacn22kmyj8fgb3ghh9wv5qnzrn3564g"; cargoSha256 = "0rzhabyhprmcg0cdmibbb8zgqf6z4izsdq8m060mppkkv675x0lf"; patches = [ ./patches/vendored-sources-1.10.patch ]; in diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 7ff762aa8a0d..94b43fc544ac 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib +{ stdenv, fetchurl, fetchpatch, cairo, expat, fftwSinglePrec, fluidsynth, glib , gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { sha256 = "0dijv2j7vlp76l10s4v8gbav26ibaqk8s24ci74vrc398xy00cib"; }; + patches = [ + # Fix memory leak in limiter + # https://github.com/flathub/com.github.wwmm.pulseeffects/issues/12 + (fetchpatch { + url = https://github.com/calf-studio-gear/calf/commit/7afdefc0d0489a6227fd10f15843d81dc82afd62.patch; + sha256 = "056662iw6hp4ykwk4jyrzg5yarcn17ni97yc060y5kcnzy29ddg6"; + }) + ]; + buildInputs = [ cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix index 4f2ec36152ae..90ea4c58ea4a 100644 --- a/pkgs/applications/audio/elisa/default.nix +++ b/pkgs/applications/audio/elisa/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { name = "elisa-${version}"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "KDE"; repo = "elisa"; rev = "v${version}"; - sha256 = "0lpzn55b8gf3byzwv9909x40p98aqlh35vidkrwnnbwgygsa85bw"; + sha256 = "0b3rx3gh6adlrbmgj75dicqv6qzzn4fyfxbf1nwh3zd2hi0ca89w"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 14610faff0af..a5c38a477415 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "musescore-${version}"; - version = "2.3"; + version = "2.3.1"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; rev = "v${version}"; - sha256 = "1rmnqblh4irrwdszh0glpnf3q6f8xk8gxfmmjk8swxr59bmqk3gz"; + sha256 = "00inrw9g8g34g74bhg5gp0rr5nydhjraiyn7vpl7kaqi5yzmhawd"; }; cmakeFlags = [ diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index a62612a6e0fd..6a1237dd9b36 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -18,8 +18,12 @@ , sord , sratom , libbs2b +, libsamplerate +, libsndfile , boost +, fftwFloat , calf +, zita-convolver , zam-plugins , rubberband , mda_lv2 @@ -36,13 +40,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.1.3"; + version = "4.1.7"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1f89msg8hzaf1pa9w3gaifb88dm0ca2wd81jlz3vr98hm7kxd85k"; + sha256 = "13yj1958jsz76zxi3ag133i4337cicvm5b58l22g2xvbqa5vraq9"; }; nativeBuildInputs = [ @@ -61,11 +65,16 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 gst_all_1.gstreamer + gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad lilv lv2 serd sord sratom libbs2b + libsamplerate + libsndfile boost + fftwFloat + zita-convolver ]; postPatch = '' @@ -74,6 +83,8 @@ in stdenv.mkDerivation rec { ''; preFixup = '' + addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 $out/lib/gstreamer-1.0 + gappsWrapperArgs+=( --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}" --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}" diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 2ce82eb6a0a0..9efd7bb386fb 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -40,13 +40,13 @@ let in stdenv.mkDerivation rec { name = "radiotray-ng-${version}"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "ebruck"; repo = "radiotray-ng"; rev = "v${version}"; - sha256 = "0q8k7nsjm6m0r0zs1br60niaqlwvd3myqalb5sqijzanx41aq2l6"; + sha256 = "1sq7bc0dswv3vv56w527z268ib0pyhdxyf25388vnj1fv0c146wc"; }; nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook makeWrapper ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ed18d34e4a9c..60566a0fcf89 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; }; latestVersion = { - version = "3.3.0.1"; # "Android Studio 3.3 Canary 2" - build = "181.4869471"; - sha256Hash = "1v2v09gd5vxh4nzbnrjfh0blpzz71i3i7lq5bkjsfl0g82r8j512"; + version = "3.3.0.2"; # "Android Studio 3.3 Canary 3" + build = "181.4884283"; + sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh"; }; in rec { # Old alias @@ -43,9 +43,9 @@ in rec { beta = mkStudio (latestVersion // { pname = "android-studio-preview"; #pname = "android-studio-beta"; # TODO: Rename and provide symlink - version = "3.2.0.19"; # "Android Studio 3.2 Beta 2" - build = "181.4860949"; - sha256Hash = "1v1h42xp2fxj8366q9l9b0shk0y1vz9kny0rf7y48kyr5h9glnwr"; + version = "3.2.0.20"; # "Android Studio 3.2 Beta 3" + build = "181.4868252"; + sha256Hash = "17r7gvy317vh2r56yvhnn7dym0q6gs8r04fdr7hx53s9rb79sd1j"; meta = stable.meta // { description = "The Official IDE for Android (beta channel)"; diff --git a/pkgs/applications/editors/emacs-modes/cask/default.nix b/pkgs/applications/editors/emacs-modes/cask/default.nix index 673b590f56eb..aed976051f20 100644 --- a/pkgs/applications/editors/emacs-modes/cask/default.nix +++ b/pkgs/applications/editors/emacs-modes/cask/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, emacs, python }: stdenv.mkDerivation rec { - version = "0.8.1"; + version = "0.8.4"; name = "cask-${version}"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; rev = "v${version}"; - sha256 = "1sl094adnchjvf189c3l1njawrj5ww1sv5vvjr9hb1ng2rw20z7b"; + sha256 = "1p37lq8xpyq0rc7phxgsw3b73h8vf9rkpa5959rb5k46w6ps9686"; }; buildInputs = [ emacs python ]; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index d8c11f33439a..63cf950f02a4 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.8-2"; - sha256 = "06cpvvv8xikw5jm1pa2xxxlnsy743ham67yshpndn2x3fyf48267"; + version = "7.0.8-6"; + sha256 = "1v7m1g9a7fqc8nravvv3dy54nzd3ip75hcnkdrpb5wbiz9pqgzi3"; patches = []; }; in diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index e698fb8f2341..34e7b1f23088 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: -assert fltk.glSupport; - stdenv.mkDerivation { name ="openexr_viewers-2.2.1"; @@ -14,14 +12,14 @@ stdenv.mkDerivation { ./configure --prefix=$out --with-fltk-config=${fltk}/bin/fltk-config ''; - buildPahse = '' + buildPhase = '' make LDFLAGS="`fltk-config --ldflags` -lGL -lfltk_gl" ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; - meta = { + meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; homepage = http://openexr.com; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/renderdoc/custom_swig.patch b/pkgs/applications/graphics/renderdoc/custom_swig.patch deleted file mode 100644 index e6ed05ea97a5..000000000000 --- a/pkgs/applications/graphics/renderdoc/custom_swig.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/qrenderdoc/CMakeLists.txt b/qrenderdoc/CMakeLists.txt -index 2df9ffa5..66bafaba 100644 ---- a/qrenderdoc/CMakeLists.txt -+++ b/qrenderdoc/CMakeLists.txt -@@ -65,16 +65,6 @@ include(ExternalProject) - # Need bison for swig - find_package(BISON) - --# Compile our custom SWIG that will do scoped/strong enum classes --ExternalProject_Add(custom_swig -- # using an URL to a zip directly so we don't clone the history etc -- URL ${RENDERDOC_SWIG_PACKAGE} -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ./autogen.sh > /dev/null 2>&1 -- COMMAND CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ./configure --with-pcre=yes --prefix=${CMAKE_BINARY_DIR} > /dev/null -- BUILD_COMMAND $(MAKE) > /dev/null 2>&1 -- INSTALL_COMMAND $(MAKE) install > /dev/null 2>&1) -- - # Lastly find PySide 2, optionally, for Qt5 Python bindings - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") - -@@ -186,9 +176,8 @@ foreach(in ${swig_interfaces}) - get_filename_component(swig_file ${in} NAME_WE) - - add_custom_command(OUTPUT ${swig_file}_python.cxx ${swig_file}.py -- COMMAND ${CMAKE_BINARY_DIR}/bin/swig -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} -+ COMMAND $ENV{NIXOS_CUSTOM_SWIG} -v -Wextra -Werror -O -c++ -python -modern -modernargs -enumclass -fastunpack -py3 -builtin -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_SOURCE_DIR}/renderdoc/api/replay -outdir ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/${swig_file}_python.cxx ${CMAKE_CURRENT_SOURCE_DIR}/${in} - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${in} -- DEPENDS custom_swig - DEPENDS ${RDOC_REPLAY_FILES} - DEPENDS ${QRD_INTERFACE_FILES}) - diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 2bd3ab89161f..9a21d457a83f 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,74 +1,62 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, qtbase, qtx11extras, qtsvg, makeWrapper, python3, bison -, pcre, vulkan-loader, xorg, autoreconfHook +, qtbase, qtx11extras, qtsvg, makeWrapper +, vulkan-loader, xorg +, python36, bison, pcre, automake, autoconf }: - let - custom_swig = stdenv.mkDerivation { - name = "renderdoc-custom-swig"; - src = fetchFromGitHub { - owner = "baldurk"; - repo = "swig"; - rev = "renderdoc-modified-1"; - sha256 = "1whymd3vamwnp4jqfc9asls3dw9wsdi21xhm1d2a4vx9nql8if1x"; - }; - - nativeBuildInputs = [ autoreconfHook pcre ]; - - autoreconfPhase = '' - patchShebangs autogen.sh - ./autogen.sh - ''; + custom_swig = fetchFromGitHub { + owner = "baldurk"; + repo = "swig"; + rev = "renderdoc-modified-5"; + sha256 = "0ihrxbx56p5wn589fbbsns93fp91sypqdzfxdy7l7v9sf69a41mw"; }; in stdenv.mkDerivation rec { + version = "1.0"; name = "renderdoc-${version}"; - version = "0.91"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; - rev = "2d8b2cf818746b6a2add54e2fef449398816a40c"; - sha256 = "07yc3fk7j2nqmrhc4dm3v2pgbc37scd7d28nlzk6v0hw99zck8k0"; + rev = "v${version}"; + sha256 = "0l7pjxfrly4llryjnwk42dzx65n78wc98h56qm4yh04ja8fdbx2y"; }; buildInputs = [ - qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader + qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python36 ]; - nativeBuildInputs = [ cmake makeWrapper pkgconfig python3 bison ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ]; + + postUnpack = '' + cp -r ${custom_swig} swig + chmod -R +w swig + patchShebangs swig/autogen.sh + ''; cmakeFlags = [ "-DBUILD_VERSION_HASH=${src.rev}" "-DBUILD_VERSION_DIST_NAME=NixOS" - "-DBUILD_VERSION_DIST_VER=0.91" + "-DBUILD_VERSION_DIST_VER=${version}" "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" - "-DBUILD_VERSION_DIST_STABLE=ON" - # TODO: use this instead of preConfigure once placeholders land - #"-DVULKAN_LAYER_FOLDER=${placeholder out}/share/vulkan/implicit_layer.d/" + "-DBUILD_VERSION_STABLE=ON" + # TODO: add once pyside2 is in nixpkgs + #"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}" ]; + # Future work: define these in the above array via placeholders preConfigure = '' cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" + cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" ''; preFixup = '' - mkdir $out/bin/.bin - mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc - ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib - mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd - ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib ''; - # Set path to custom swig binary - NIXOS_CUSTOM_SWIG = "${custom_swig}/bin/swig"; - enableParallelBuilding = true; - patches = [ ./custom_swig.patch ]; - meta = with stdenv.lib; { description = "A single-frame graphics debugger"; homepage = https://renderdoc.org/; diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 7a04bd7194f2..8ab840221815 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.3.1"; + version = "0.3.4"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "03zhbwxp4dbqydiydx0hpp3vpg769zzn5i95h2sl868mpfia8gyd"; + sha256 = "1v26q1m3bx7mdmmwgd6p601ncf13rr4rrx9s06fiy8vnd0ar1vlf"; }; - cargoSha256 = "0441lbmxx16aar6fn651ihk3psrx0lk3qdbbyih05xjlkkbk1qxs"; + cargoSha256 = "0cdy0wvibkpnmlqwxvn02a2k2vqy6zdqzflj2dh6g1cjbz1j8qh5"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "An opinionated static site generator with everything built-in"; homepage = https://www.getgutenberg.io; license = licenses.mit; - maintainers = []; + maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index fdb236194f9c..d6153d2268b6 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre }: +{ stdenv, fetchFromGitHub, gradle_3_5, perl, makeWrapper, jre, gsettings-desktop-schemas }: let version = "0.9.2"; @@ -10,7 +10,7 @@ let rev = version; sha256 = "1fvij0yjjz56hsyddznx7mdgq1zm25fkng3axl03iyrij976z7b8"; }; - + postPatch = '' # there is no .git anyway substituteInPlace build.gradle \ @@ -69,7 +69,9 @@ in stdenv.mkDerivation { installPhase = '' mkdir $out tar xvf build/distributions/mucommander-${version}.tar --directory=$out --strip=1 - wrapProgram $out/bin/mucommander --set JAVA_HOME ${jre} + wrapProgram $out/bin/mucommander \ + --prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name} \ + --set JAVA_HOME ${jre} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/termite/add_errno_header.patch b/pkgs/applications/misc/termite/add_errno_header.patch new file mode 100644 index 000000000000..81283f86a21d --- /dev/null +++ b/pkgs/applications/misc/termite/add_errno_header.patch @@ -0,0 +1,24 @@ +From 95c90f302c384f410dc92e64468ac7061b57fe2d Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Fri, 13 Jul 2018 19:03:09 +1000 +Subject: [PATCH] Add errno.h header which isn't always included automatically. + +--- + termite.cc | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/termite.cc b/termite.cc +index 160fe82..13e2572 100644 +--- a/termite.cc ++++ b/termite.cc +@@ -21,6 +21,7 @@ + #include <cstdlib> + #include <cstring> + #include <cmath> ++#include <errno.h> + #include <functional> + #include <limits> + #include <map> +-- +2.17.1 + diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 46276bbb03fb..560dff594275 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin +{ stdenv, fetchFromGitHub, lib, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin , configFile ? null }: @@ -7,16 +7,17 @@ let termite = stdenv.mkDerivation { name = "termite-${version}"; - src = fetchgit { - url = "https://github.com/thestinger/termite"; - rev = "refs/tags/v${version}"; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "termite"; + rev = "v${version}"; sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; + fetchSubmodules = true; }; # https://github.com/thestinger/termite/pull/516 - patches = [ ./url_regexp_trailing.patch ]; - - postPatch = "sed '1i#include <math.h>' -i termite.cc"; + patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch + ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; diff --git a/pkgs/applications/misc/termite/remove_ldflags_macos.patch b/pkgs/applications/misc/termite/remove_ldflags_macos.patch new file mode 100644 index 000000000000..f8c68518bb4d --- /dev/null +++ b/pkgs/applications/misc/termite/remove_ldflags_macos.patch @@ -0,0 +1,25 @@ +From 1b5a6934635c55472eb7949bd87ab3f45fa1b2f3 Mon Sep 17 00:00:00 2001 +From: Michael Hoang <enzime@users.noreply.github.com> +Date: Fri, 13 Jul 2018 19:01:51 +1000 +Subject: [PATCH] Remove --as-needed flag from ld to fix compilation on macOS. + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b115f42..ab301ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -29,7 +29,7 @@ ifeq (${CXX}, clang++) + CXXFLAGS += -Wimplicit-fallthrough + endif + +-LDFLAGS := -s -Wl,--as-needed ${LDFLAGS} ++LDFLAGS := -s -Wl ${LDFLAGS} + LDLIBS := ${shell pkg-config --libs ${GTK} ${VTE}} + + termite: termite.cc url_regex.hh util/clamp.hh util/maybe.hh util/memory.hh +-- +2.17.1 + diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index 84f7d4fd2913..d8628b794d71 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "1.3"; + version = "1.4"; name = "wikicurses-${version}"; - src = fetchurl { - url = "http://github.com/ids1024/wikicurses/archive/v${version}.tar.gz"; - sha256 = "1yxgafk1sczg1xi2p6nhrvr3hchp7ydw98n48lp3qzwnryn1kxv8"; + src = fetchFromGitHub { + owner = "ids1024"; + repo = "wikicurses"; + rev = "v${version}"; + sha256 = "0f14s4qx3q5pr5vn460c34b5mbz2xs62d8ljs3kic8gmdn8x2knm"; }; - patches = [ - # This is necessary to build without a config file. - # It can be safely removed after updating to wikicurses to 1.4 - # or when commit 4b944ac339312b642c6dc5d6b5a2f7be7503218f is included - (fetchurl { - url = "https://github.com/ids1024/wikicurses/commit/4b944ac339312b642c6dc5d6b5a2f7be7503218f.patch"; - sha256 = "0ii4b0c4hb1zdhcpp4ij908mfy5b8khpm1l7xr7lp314lfhsg9as"; - }) - ]; - propagatedBuildInputs = with pythonPackages; [ urwid beautifulsoup4 lxml ]; meta = { @@ -26,6 +18,7 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/ids1024/wikicurses/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ pSub ]; }; } diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 340d84fd2aaf..f61cbf397597 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "1ssiq2yv8b3xg4kfp2cfzl41m5apjw2r2k74lh3fz0g0ix3cq55b"; + sha256 = "1c68qg7433chri6q1yhyggy4mbq2vnn3p2fxs8gqmgij9vpqn3m2"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xmrig/proxy.nix b/pkgs/applications/misc/xmrig/proxy.nix index aacf71e17b6c..c013a9cc44ec 100644 --- a/pkgs/applications/misc/xmrig/proxy.nix +++ b/pkgs/applications/misc/xmrig/proxy.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "xmrig-proxy-${version}"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig-proxy"; rev = "v${version}"; - sha256 = "1f573shf0qv1kh0sb9sljagpb2q1rn8h7qc1hxlb5nlchs9qcnnn"; + sha256 = "0h6ihrrkgwi8k642iqq13qx3zlxl9r8q7wm417hb7j35rnmwn8lq"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix new file mode 100644 index 000000000000..28ce4a0d500d --- /dev/null +++ b/pkgs/applications/misc/xscope/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, libXt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xscope"; + version = "1.4.1"; + + src = fetchurl { + url = "mirror://xorg/individual/app/${name}.tar.bz2"; + sha256 = "08zl3zghvbcqy0r5dn54dim84lp52s0ygrr87jr3a942a6ypz01k"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libXt ]; + + meta = with stdenv.lib; { + description = "program to monitor X11/Client conversations"; + homepage = https://cgit.freedesktop.org/xorg/app/xscope/; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ]; + platforms = with platforms; unix; + }; +} + diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 70d457028292..775ae960eb7d 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,12 +98,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "30.0.0.113"; + version = "30.0.0.134"; src = fetchzip { - url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" - + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0bcsrsz2dd12xs9vn2977k4s6hag1cknkrsgxz3c9pxk4jz99f3k"; + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "1g6695w1ijqs8jbkbrb403ca1vvrf298ayvxslrvk70x6l7lp2ys"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 5bd0884a2960..838cdc315199 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b7"; + version = "62.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ach/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ach/firefox-62.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "163788dbe3058283a1212beb8dc9a5003b738eabac31972c2cceb55f37d7c264facc6148a176b5f44b03ec70824a58fb66581be42960b6a225d53ae6d96f3d62"; + sha512 = "976419f6a9e05ce99eea023bb4b3b14f8777aaebb4c18e8ec798d59f0abf9ce0e9470c552cc0aa1f90e53afaa5691b5b8ecac446eac39ec95b7146cfa0f76f7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/af/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/af/firefox-62.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "908c4e95c73ccd3d57c519f3d97701ae65b0a29c1f7789b93be93a0ec1f28f6b728b147fba1cb56718f5903cc2e5406227c6270d8d3e7a1684a8e220a283de86"; + sha512 = "d6af9ccab5ba0e1de78ca080cdc636928394319da8f0c04d5cbb23e248494264fcf8f0024e02d3c739771e2556c24db791ca93da0c9b7c629244fb43ae43cf43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/an/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/an/firefox-62.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "6cf6f5476a9ec179cb43e4d4590dbcf9a2fb8c321712ab2b73ae417e08b8d345da19571595dd62b3514b455e16bfd2cd25a60df50538186487985f090cf5a6a3"; + sha512 = "a384bfb40654d2e2c2600b45dfb11abb0d6c1d09e99a988a7f8f515b4b40691315b3960116f05292321a40977f8774403ba9c53c299caabac17f911e7de41914"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ar/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ar/firefox-62.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "95e7fd5827b1788c9a6ee8a4aa74affa6f02bab7347b42a3346907569af650a0a7675099067c1a135f8682c2107604802c0ed7e09f7901985296a63f546a5f86"; + sha512 = "3613cf6b7223bac23e46dbe6be92e64c6018957c739d192d485b97d8c1f77062aa385015add4b4e28bc7a3786391fd5711d5f432f86d90264516c57be841f7c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/as/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/as/firefox-62.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "dbf0a12922b0c9ef719a1639394fa45bae0efcd7d83e62698b31cee4f3ac1e07991ab73a11f70ae3998e86451013aae3573f0b962f7d30084e896e07fcc00f75"; + sha512 = "df38f019e4968e48ce56228f2d3d10a347da252ba3f09bc04c587af55fe669ea6cecf0d5f8b85e911abee074bde7f3ff5fd68780f958619c417af279ac53cc00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ast/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ast/firefox-62.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e73ef5e7c8845bde672bc57a02e2a39fe9114f773e62a6eb6b5d1bc25e6b34195f58d2622d58e72760f8846338ce7596c3e6b4e5b6632cea93b259701ac6d92c"; + sha512 = "d7e29f7c6ef5ae6761a306db95e237cb35c7a4dadb76d648f7b6b655df13ddbb5eb57aa9377dbdb60696784c5c27b06c8f5b3f0032f2fe0e3f3d89732ba61e90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/az/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/az/firefox-62.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b09318a9680625eb2ff5e2cc78db800e7864b1fdd590243aabdfd666e63e2286b52a7fccc7e8b4c725a97932525cd41ee177d467e22f11eaa35699e2675c1397"; + sha512 = "8da765b4bda4746682206a4d759de0233a16b2e940023a42aff9d23e6e0590803d737c0a38fb5f69f60a217a66776200211ebfc1276d4417691788e4d4b31257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/be/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/be/firefox-62.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d23236403a839244d5a7f858b361904ffecf054c3b72a3412f6b9c93e501a553099d15832ede79f4bbab2a4a1e83357d32739c766b4d45f3fd7628f2febbf859"; + sha512 = "772bcae7cc6a329bf1e5f5fbd9634f96fb74dd45326e4e3af8a4819d08711cd3d5a74af6b319cc8876461d8c6c2658917b12e5ecbbebc12ab3fcc0bdcb5cf90c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bg/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bg/firefox-62.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "46d8bb69487b784d73ee4f2932506790bee6176c0f733e3e6c256305616f2ca063dcc1188eed7d832d0d8d7759bb77d3195fc40e27b8776cbdbcd2b8d6b77dd5"; + sha512 = "f7764fba619b64e86a35e0b420c1bb8b2f2db1a3cfb33811e68faee7fda579a5d6d136b989e43fff802ebbc3d8c3977ca97e3e09986abbcd956920bfc595ef89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bn-BD/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bn-BD/firefox-62.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f3cfc19e285ff3c1a529c6326d9f75e2aace9ba90630b7f677db0ce2cb35a73041860391ae8df0b3fe4c70e1e43db0b846cbea0faa8ae98ca82cab2640bf9ed2"; + sha512 = "a5e74480d539b07dbb08ac008135c78d844e55c9554ac8628eb4604be7e5d3c1c0096d4058591fadca9d3c453a5c57f63767fef601d76f815e9094742d092d7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bn-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bn-IN/firefox-62.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "4de293fb2432ac8b482e5a1f35c40f3338ed234fe241f12273e01877232ea6a9e1519a77325114fa1b7f65f6cc03f7fea1216774c258c07708d1046dd637875b"; + sha512 = "911e516fd105a7a306f9f9fe022cc88f235175693622f217f604a5bbfc4a031a676dc15f56178d1465e531d5062818815f4e7d59653875538fa61403fa5c96db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/br/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/br/firefox-62.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e26030c4844e1b8948f1ce67743be895ae5f95ff02bacc6867f8c18bb9ca550d53d4db60eccb57f7e0edab2173d3982d8b04c7ee562fd0f6da1cfb8cbe444393"; + sha512 = "d2e6d5064691a7a1c8dbbbd87df415674bdf3565c2b70e09c986462a776d96fcb56ede5935893fb7aefa9ce79edbc8ea4c35f4ddac10a5a18c47384bb0d9e8b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/bs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/bs/firefox-62.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "cf21fe405062db8440531d8d2f2a0b4d59a570306e31206f364a73bc45ed5cb0f20fc795b337283c0422ae0c85f18052d26f446bf2804296afa40afa8f092d94"; + sha512 = "d15cd4604cca0339b7db9721910178d9f309a8ca30dafe1af291f2c4f7fc9747882f6d1a25023e35481fb4dcb46c41f9e4a450caf8ab4b5eddef39e4dec5ac60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ca/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ca/firefox-62.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8d53d833069f5fdddcc07a2530acd5466c9957da1f9891824aa379d1e519083c4dae5774ae6624369101d7ca80384bc7db1d2686c0d2d8ed5b4a005d7c0a1a84"; + sha512 = "5a95eb672c15affddd475777a70e82442df6fee9113c26d668aadedea9f30cbdf3e7d69906885f504439f17d04534713bd217d01a5c417ec0a0e425b858ccf03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/cak/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cak/firefox-62.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "4b21030ba573735a370049fc97a20a857ea9b2fa26047403d00a13ec05f511584bda5553e4a7205b0147d86b09eba9cb74599005918fd85a77f06ed4cbe5db1e"; + sha512 = "76e4c7dea27e93728dd001dcdc9237a9063adf3b9464237f516af93e0a05a79d15c1998ec07e16bc198418bf2658d27438df06e76c9a750cd5ec0cad41290390"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/cs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cs/firefox-62.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "e91ac0cfdd8c1e63496b26b03d11695ca983b9da148dea1bea64e3069b43fd9b06fb35e09ddcf51ea296d86854eb5c7982d64134c489f75afce9738055ad1e72"; + sha512 = "cd9353d268a04cb860a40febadf20bdfb20282cf141fec1e4da8fedc344e9bf7afd2476d5af41c413f732a5648c80d961a55749166d135925890310ddbfa2989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/cy/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/cy/firefox-62.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0133d4d259ed60ec44d5cc8e8e97b7dd984af1dc303232435a0df4968b6a437bcd0bbdd15c7affa69a82374ca803ed913cf1105fd1008b13564de4fcaacefa59"; + sha512 = "edc5016503aadf1edbc1c9dd630d68a6053f90f11bf8854d270b2748c63d4104e69b824dc4c4f39378b533ea91e7ef235dc3b9bfb57573fe481e60743178e5c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/da/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/da/firefox-62.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "c63d00b7526fa981ac59fef73ebb237c205e6b47a8f7fa55790914e65f1893ffa4be3833fe94a83b1a372943bdcd1aa7a6f88dac5fe0c99e28eeac4c9af6eff8"; + sha512 = "ad642cf2dfc2f4167549a8800ab34acf4e328eded52f56a456d1fd9dc868f37a583ca04175863e11ed302d82aecd1187654d8fc70808d5b6a1080db0f35b4b0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/de/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/de/firefox-62.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "03237e7837e2796a74e2789372ebcf10ffcbbc86a183741db65d361d705a6f39d351555a2c05496143b507fdd1dc7c48606bad45111303eccf07e12cb501970d"; + sha512 = "c15586f6bdcd7b2148254e3f7adbbc034efb6f981df0f320bab265fb198e87ad37f1ce530d08f8e6996ce8777e2f42f94904ead72cc4041f11210b8172261127"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/dsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/dsb/firefox-62.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "64a484ab889d07fb58eb017f2bcf59d553d113cdf5657ed92ce5730b137edd71f333a80adeaaee01381701648e30b59fc04d4827ebb25d67c763284fa698e54a"; + sha512 = "b5815b2e683532de669eb4889d965447fce265bf50139f28637d1a7b2871b071fd6b01118c9c3214b50cdc7d2c761fb6c4b8c2d5be0b3cd53c89fbbc4ba4d426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/el/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/el/firefox-62.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4272c946e86d7d68f901ca9c8650f43bff176b77cf8cf29aba044e0d74e69285bf7546fdffb67636e91104d694d201eb4806807348799ca5a4d3248083251a31"; + sha512 = "e942fa992b0590b617ce69b603807780561277a2f36ac1817ee85ffc1382675b69f2cbf4ada3fe9c796698fa8f25487752d5f290b195941461149526e76026f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-CA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-CA/firefox-62.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "df82764a4c1ace4e6b7e03c0afb27ee63f4cbfb3c487c15ff62f7d2d9ecbe9b7b4cdb92d84e59da3b2bd937fbcc2487fc3e34f12ab97af2a1f701c9db796500e"; + sha512 = "1afdb58288c58a1cf9849f1066b2644b2e1fb1b20322a2b97fac89bd90a3fe7e8f8a159407b3f8a7009307fea1e32ab2ac2638ab522e210e12a67a5a970bd14b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-GB/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-GB/firefox-62.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "2f23366dda0a8dfd4e24e1f1fe8bd503d1d77fc2a8a2d289c87b020b7154fe5fa5a2348b6df2bd2bc204ff5281d0537ac7a41f96b60abcfc3bd24cf6c24704e2"; + sha512 = "c61a221a852ef309ccb04a03a60141d322bd895c5cd82a3b5a3c03e8cc5b2846111e9a0dc8f390be8663a9c992d46d1608f32bc6f2478519ebb0310531b96467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-US/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-US/firefox-62.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "56da10764e0da764bb69c790bb98b2f7d12e9dcd4d6eaf37ae876c9b360a8a64136cdc0fb3cefadec225ff6d32cb138cc5c0e4d8b50a4bff9944feeb268504d3"; + sha512 = "f659791fa08b9f93e3d33fb7ae783a51ce6c6d3cb99a1ce044d3b81408166e69c596125b7e977ea12a49feaeacec6c4b2cc49a196016bb61b3c7eb8699b0b64a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/en-ZA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/en-ZA/firefox-62.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "477d0b2a9841094791338b52e735f02f5c57321caa0ab7f263c69b55e36be1d75c2ddcc58e3d698eb3a62ff62f5d6d3f1ccb89b07c54ecd43381634a13ee084e"; + sha512 = "ac051d88ce3d514533017e48d87d84310c110137afd53360988557e7660eed4953f77d2b3e4fab8685f53644f84a075004f90c117b01f23dda6f790a5fb4845b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/eo/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/eo/firefox-62.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "66e0c1af22d23aa1f5a1b7a85ecaa454a5108e9f5b6efa74ed665d8cee16461a202905d245edbd634cc264694b8ac7a72a4bff3bf328e4b6a5920e6a200492fd"; + sha512 = "38dbafef566b20ea488a172319bdca879043d50bac583ad5351a74202ba4caf24f0f804b8d53ee974323c0a9c05814145b8e497a92121599d1432b8203559ec8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-AR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-AR/firefox-62.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "a70b475a1bc355ed327603244ff3712ca5861d4ea02fe5656790dddf150675cd93dc75c3b6d8313827f4387c1bc77e51658dd5bc4c05937714ecc89563e57b2c"; + sha512 = "f0b76ead6b1bc72832cfe0b33edfc944f3bcde24d7d2c8461fb2f7e5a5964c3eec9506481302c9fccd00d61b25ebad29675dc1e5c8fb6a627ed665da1ceb9fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-CL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-CL/firefox-62.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "1f084de18558cc48c3132b92bf9f965f046f22be3b372abbecc8c66fcbca76353e9ca6c6a129d2cfb33d2e1c992d0c84d0c6bd675e563866209f8d7b62f51743"; + sha512 = "83079739bec75c386c14086e5d20248520f1805df20293ff7b9a1c984994338c370472bd1c21163006a1b49ef40b6ebe396cd9c5f1fc70c9beabd5e350f87ca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-ES/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-ES/firefox-62.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3cfb98b9da207c38fc9cf5a2a137dd16c061563fb6d1c753c07806844327833051f873a68dca556a7b4c34177f91b8a68c2816dc90d59ee5124f234eb619f6e2"; + sha512 = "ab7ef032be8e75b2b329a4ad25904eb25af6499ddd971d4aed758cf1d32599cfac2f6fbd4f6e311b0bf8b501a6c3edc28a9f6bffe96d784a7fcde5dbbf58e9aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/es-MX/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/es-MX/firefox-62.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "52c1bb0a2e0c14ca0181e9686a32cefd618cc0b3e5e03220debf62786902309190168616278864d15709232ec72ba71f6e35b84009ee654fda7655879fea064c"; + sha512 = "7a40b322693338b4efedc8518d2bbc88d8ec131fc390690655eca3472160577c3d43bc13dc289afd8d7b8a4eab834a2ef7241e88afa92215060f747972b4c3db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/et/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/et/firefox-62.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "80a5f0b7cb361c624a8e2f78ce57cd44162bfed649812cabb63f1730ce8127903a02969e8ef9ed5216c7e715cdd5163c25d4963b4c339c86bf13449d1079a4e8"; + sha512 = "8a38e2a7d97a1b789fe8e775b3ede56d65d2110752599ce38c25b688dd91a5286ac4b8fb29f89e478e9386e8f7a76fe3269f2315d2d24b1bd723d0fd0ab3dedd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/eu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/eu/firefox-62.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "e82abfa642497881fbb6607ae36ce6e5bac8dfae6ab83a4af375fbfe8182f6d1c67e42eee07e3c9e8c447a6949b9cb68e76189c8f15d0726b28cd902db92c62b"; + sha512 = "040b07e88803a935e6c4d5ecc568c6911626ab8eb180706aec87982474e638cbca6e16e0dc10b95cdc2da11b3ca385aadf906bfc05525b86993157e617d79c71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fa/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fa/firefox-62.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "597293fdbca22da077653bd3c8a010840d93ac9945b416958010e6db04c81b1b77a1ed75e10fee5eafa192011333f4e4a8f00e81ad67a56536c61dd0eca65d4c"; + sha512 = "4886bf3e199238fc454d5a27292f2f245522a2e6cedeb7510ee57af19927f28ee89633cf052079e1740f86ac3172c63b34de8bf98a113f780db44dfd2c7c651b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ff/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ff/firefox-62.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5b6cdbfd0abaf7c869f254dba4243d74fca2539fbc6c84346951b3bd48178b40a11f6358c586540906f441e34d73f3f5e959fef13ac6f608291969baf75326c5"; + sha512 = "081cbb13005cd2885cd37d8a8134f6852df4f5da78bf14f2752814d707ac7cb7f9cf717a893cb3b6035b1236eff38656d95645055327c7cf20e0ecfa45d52219"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fi/firefox-62.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "018648237dbda5f882be57991a26e5752b6696de0b4a1b588e4a09323bf8924917a92c409ebc89f2c0ca3b847ab9f41bf5c86c51a4274a0d70f17d40d005b678"; + sha512 = "223e0559b85a0f1e49d34f9d4a3308854d21f9960c294758edc2412b9022a6f055a8e592578a2125345b51564976350b2c0c8a3271b7f8c75311827f27424908"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fr/firefox-62.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "5abfb4c2c7bbad0cad44cbb48070da1ceb1bb66b6bc455b09ef1041fd3654172f0913854e22fe387c012cd13d2cf531acebfeac7ec1cf710eca0597cdfc55d9d"; + sha512 = "460edac7f75697ca04966cae37177511d50d8bc68200735f19f789b81319fd35ae2ad4243c642c6d135d90994e838709c3c893440569f0438af10bb00e2dbdd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/fy-NL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/fy-NL/firefox-62.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "275673916496df06f99368db20c5d0ec6d5ad0e53471581c371b7a10fb34860d97a183db480150c07bc3ba09e46f17cd07656e170379e8e54b583d0009654fdf"; + sha512 = "caec2f49d1d399feaccfae6dfe6ee665959a63b8a858eccca7ea1067d81bc70f9355dbaaba3ec218e7b743bf3dda4f1a139feebd5f6e50e3e7ffce9deb1a2791"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ga-IE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ga-IE/firefox-62.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "1b30e2ca70c40b20875314a7c76556609e9b575f79dfdd50dc6214d6857d5df9f1db35056b5e861abd7a073bed346b5c00aa45d619b582e0616914265e88708c"; + sha512 = "23585d379311b0226f999953ae7ed4446b2b4a270695e64bf2e4a7ce4b5ffbb7d08f9a349f3d64ce0305f7be01cae4e86a16d148b02dc0cf1fbd57c7c131208a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gd/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gd/firefox-62.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "11a13ca82caf8c2310747e2fa11c9433be2eed5fb98978dc64b4603df4198e6bac8e0e6588b0c4d67d7b93ae76e62c6354fc69abc08fc5fcc9f58c90a18402a7"; + sha512 = "ea5495010b53da693b4d1a62a85db5faa30fffb791e92554e88129706e8b47560e18df8ee8b45036e7c41b3fc2c5e01ae3641a4ce3d3923882845d6e154469af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gl/firefox-62.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "855cb09b641c7bc2a91fbc92907033a2fd9d4bf8d3ddf8984d9f5f1f3a92941b3608383fcc29134d13cc2a29b7e3bbfe5c3afc278713b98c21df9e5e6e1c76f4"; + sha512 = "19458201c72009c8ace9b5d0d2de5f0c3d091ba36dc4394b47fefe053958a55adc2db6301b822fe0ed36ab2eb59bd5acd6816891578ac1870f32555347f806fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gn/firefox-62.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "dcd36acf88daf14d1426aa87cd3e41d69de08485bd28a88634c774a287f82ff297876045e9446d95da355d195a64c4efb7071a1338de8fe61c281ba5b65067c5"; + sha512 = "d88e0685f0db8d05ba9ff6ac2b35196d869ed2ca54eff95c8aee35169f223c97a1956919bf2efdf15d3faa3a6d48819b6d0a42cda2aedcf357bfffef71dee053"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/gu-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/gu-IN/firefox-62.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "3f9f4bb9d0a290f3ead61c2653451a0837c85a5defafdb0cc659366d4eeb49eaaca4dff7ad7422451eec4a4226ce41123b4a2cfbc94470c50d90b25206c8c8a2"; + sha512 = "a510d5ec4dcc1c4524e42698ad5b231dbef5bb70538a4694d1fded06dd108218ed3a2a154fe245682ff8c71c306fdad7f0e6a91e4c177c7b16dce82eef57f6ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/he/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/he/firefox-62.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "793a7eb7e8e51c3d9156a18e65cb3edaf1fc63137cd586400796b57ae8b94051dfd5efaa52ddc21b54f210afb5b5fe876f9085700f272e320306ad10b524c9b5"; + sha512 = "f1cf8a66a9a3d91b225a54ed8082ba5a73e0a1342537c25e43a1233c333acb8660d037522bfad024c86e387f3fd411456b4d3148591ebd33303d8534837b6a3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hi-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hi-IN/firefox-62.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5163b07c25fe96d871091b52d39f98f72251e3fae54befebf378a40bb0e85c41ed60ce75949e6cda2c54fb5c9769bb3bb6cebf36b5f37fd59f0f0af0232fc398"; + sha512 = "f1275ba2ae78178bb04ea794d29839aabbda623f8af69b5a6a10b3aa820b4f986d7c0fe5ef4f436057ab9e418fc8f4ba2f076e09a5b92064f835142664736ab5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hr/firefox-62.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "86f988f062f11dfa3f8f4af3eb759d9cd5ef646a638bea05d21a6f1f7f4bda2a12f21ed9fb7e6e999e473cfb77c4d3cca40f56700c450b8f041537e1998008d0"; + sha512 = "b42b7b165007d76ac30296162588dce0d54742243e9447ffd8d1916da6144e0cd4ae386db8e1c5adb0685fbd550d96a7d44cc6562811621898523f01d2651c19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hsb/firefox-62.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "836e8eea11d92d6ea6589b6f0834b37e20eb8a8d443a69a084ae3b76b83d520ff1466774f31ad5ad25b9372246021dff76915c64b2d54c43fb934fa88da0cd2d"; + sha512 = "98f350628372e0ea3e6e55b55d583dde4d1c54483b53d15c3ec01ce2e42fc12a35cb3248c11019d10589938cfcb64e1b4fb4a9cf84b6b660ed0e06e1671cafed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hu/firefox-62.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d92e72d360e527f061bfd140c1a59e8c3dfea20d5f2b8f4441f89cef56191f5b9191d7699750c0eb8d712b51be16afcc077970a2440f3c8875edeea7fb9f9800"; + sha512 = "a7c567bf0243e3bea872cf5cbd492432578a5c293b416cf9683be59b5fde31edf668f661d0a98bfac56764f7eb8cdfc63d7571e4451bb5d3ba9a06caa3e66fd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/hy-AM/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/hy-AM/firefox-62.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "2ad12f07f43ff4d472a8bb035a30a78e9a1dc03ac51d10a945b65bcf73f19c65c343ebf95128a3071b257ba84c516b15eb7f52196be87aa49c264606a3df7086"; + sha512 = "16ba64cc577f0b5592a76ac930c818838c505c0d2042a954ab50e3deb64dd38ab4b4be46683dbcd5e5de863b6da0ce296e5539b4baf73126a57aa390ec0a3c2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ia/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ia/firefox-62.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "655799696c3f6ffefbc9cff612daa94b2472c1c648525b5b60a07964bbeb626d5e388e816b45dddb8c9df580333faef3d8164d5ee73ac83fc6fd07c9147b14d4"; + sha512 = "f4c028e35a81bbf806c02ddeca3d97ad7673c0fd5e6b410dc14d53defc485f3825130c0e1f609e5623b5af7a670e61b3a5038c6373b6f862b729e3c6a1ad9acc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/id/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/id/firefox-62.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f68898442d24eed9018d504b913e7e22bc6c94dc7ab3668ef90fbd47a9854701b33d17b5620e4ccbacaf5937019c3be4a81a07b29a45e36be91c086551c5987e"; + sha512 = "7fb001cecd52399a65ca87ffbea3ec8411f223756c72e8451f20c43bcfa11f66cfd59412a284edac232c12c952516d27cf7d620dc5026101ae2abc798504e561"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/is/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/is/firefox-62.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "63ae3c3130241be36c10d4e7684b075263b85bab6e8086366210d9f4fef1a5f6fbb3b89689b5e6aaf38b1e18daa52e91726788cedc08c94800439c1c2f5e5e30"; + sha512 = "dd71ded6761be477276b9ef79965e141f688c0311690b41f7e4f777d8fbd8b47510e2142b26c9e70710bd479e8fb840c295df5083ae8ddec955c8d9e40b2977a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/it/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/it/firefox-62.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0815588cf40f9b9f86f032172d8dfa65a37441fd976b3409c5081587fdc8e04d5010575ae2452e93330dec9fb8feb198deeee2f5c40c0df008c98bf46799850d"; + sha512 = "d93690c9abc4808b2ede8afa2ef6b6f537ab368261ed81fc9e45f0632ff3d53974faf7f2a5202ca2d2da14a1b7b610f865e18cebee9cc609a36a3789e4cb70e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ja/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ja/firefox-62.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "456b9433aa48a84a02c1a381b33b2304854d4adaf240d920a9166134d61e1e44112a9901c1a5f3470bcad959dcf6c2a244f2c2ff312536e35b1baa84d47d7f5a"; + sha512 = "5b3ff686d066d93c1db1a727bccece4033f69d5c1c322e0fffb94b9df182977a40addbad1bd75cf5865117caf1f4b77e1ad3c5ff7b5880811dc2842052e00dfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ka/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ka/firefox-62.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "f1d5edf66a327aff637df686d98c375646af0a0d81932f4a213fb256c3e1abfa28fe9dc3fd00d7d0b035976383b3d31a2f29afd2535947fbf119275daa9b979d"; + sha512 = "9700df084080f237ad4fba49efc9309083edb735d924842243ebe6958d048596f9d09724e69f33ba2706af9ade3fec699d8862c19fa74c8021d2ab36e55c1559"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/kab/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kab/firefox-62.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ef93cd462d40bdb0443933f646248c21bd975bce81488f3a3d7cde05d437127382631c426ffaa0d258eaa3597a5f825c58a7b4910c09d0187c6e1aff64aaad3e"; + sha512 = "bd1f0a14933ccb350bded8d268b4077fa627ea5fb9421d911a9088e5e69a66802d4904203258b7ea1f738bdc6836c8b6bbcffdc3896278aaab5011facbcdefa4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/kk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kk/firefox-62.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "e878a95e358a570094fee5a737b3bbc7e21e7070d21fac8d1749ae18ef68b9d3e78cf945c66be20625346d72a915adb62e2983fac27e0d615b603fbfe65c8e26"; + sha512 = "469891b6d7236ba10890dcf63e5b1a5e67a70c7974a176d059568aac47b2bbafcd7592f84ff525e644bfcfeca78474ac0677d35e0126ec3d065ebd4f2d279e48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/km/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/km/firefox-62.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "036ed97658e1cc1db16f25053f5b21b8767d34f570132fa00061059f4d9cedfbd620ddedab98b1dc452f340b4769724c30297c5d823f0963855a4f0063d3df2e"; + sha512 = "4ca404c9a92b0c9de1a8314c4ef0b6072021761efc42055ef7c6ff3696fa23edeb04a0aaf982e9908c81c4ca54508e37052dff3a4599ed9b8955163a43a8eb82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/kn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/kn/firefox-62.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "293ae3048231261a13e988fafc9f9ed0d830065fb90c54a9a4a9bcf493fb7e63229baeb1a9902374ac18eec2376aad028645b5a9efe449f99b24f38e7c2f7460"; + sha512 = "2869abf3173e3fc1e2b4cd7effb65953ba08ffc0c8a485e1892a71e351902f303617520d4434d9181606c1dd3a86321eed2039a21d610923a3817f0541d78eb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ko/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ko/firefox-62.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e8ffe4b2d34a5d62a6d102d316bf4976922b283812a73168309b4446da76dad68232ed6435e84f3c33eb142af69750baa0c8e567457041407a05e604284240d3"; + sha512 = "0edf7c720ae7ea1f932ee91f5f3f24a0c71b640d3e85bd1a896423623a64501dc6066a155c430b88acd02edca882aa660f213fbef7b2040a02b91316e4b099d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/lij/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lij/firefox-62.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "51b9fd1bc3b5a0b5649dfe07799b3360026fb5fd7b1757c1d5f70287d669d81ae1d867eefb1feb2b160f572b5edbfb5531e8872b5fbbcf23d80ef81225730136"; + sha512 = "0a6aa980cdd8eb371f9909b57f9d1b4958983ae9ba471e7396054f3e22665565ed4f24a0920411cba48237ca283069a4de6b706cdac20d9fb53208d145932a33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/lt/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lt/firefox-62.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "17e43a5bcab3a544f2316648dbd18340654ba6ea4c46d465524c7434ddaa21693d6888ccea202c00f110876bd8b55c1f005b1e8a2e3a19bcdfac6ef1b225a1b4"; + sha512 = "57b9fd1bf501ce887a31de05d82e39245b803d017f0a2707bcbe467e4885b7b95dba60ce3c38233f718b84190d8c77598c1f9f5bcea548e4741d55cbda056435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/lv/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/lv/firefox-62.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "8546833a6d639ab4645bb19c0c0345401757249a4d56e8b65e842627b3df6bcc3a69c71ebc36d1ae34c07383c84f8ad0354b206a4c9bbfba37683d1c562a671c"; + sha512 = "d98284b722936b8f60cce73632bb79c6cdd8d04e29f4bdbc1ef8020c477158c3da9e8b02fa48e3bda5104671082349e9c436d2860425c7ddfe36393590eb13d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/mai/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mai/firefox-62.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "4dd992c044b26ed2b30d633c57c10e4a48778b8a2f4998552d14ea795264f2ac8011a3b0485ee8f4beb5681dc150fc65c39457c2b126a755dae0c3bae86f3a8c"; + sha512 = "ed95750250e19614a62f6c1c2ce66e87981d964218ae2fbcf429081e2dd4a88a59b28bbea36b21305bcb9d53f7e8c7542ce26c669abf0567664eeb85264c0139"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/mk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mk/firefox-62.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "a4354772e0bcf5e6fda455ac7a0a61d7d0e3de4a8786da1c8d2c0fa16539cfeb19b44abef2df6b06cfae3637fa2886a40f1a6909fb882f35fd72e26e0863a56d"; + sha512 = "b6e3f4d266c9c9c8c9da1f515c8e80b4d35a7d0e39a0891398656f9f714a67c974c2f6f120c76c2cd322902db03a4673baeb84b82f43116bf357da1ceba33729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ml/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ml/firefox-62.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "df0f4575acf0c454b6040f4bd94cef0eec36abe493f6895e34b18b04c22469b2d2b4a38ac17b110a03cca5ee7da1de655487adc897f6844e26f4e7a3aa4ecf4f"; + sha512 = "3961315032c0ac95a2d0c995be494c24aedff7dbfc65b33f92d19e2123f77f7851e36970d0e023e299d64e1ecd20c1e68da5af2fce87cdb9fdb75e322d5568ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/mr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/mr/firefox-62.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "62452e83264def43c2e539081b56a2d56b5f9f99f8d737ed04eca42fe3c52c7cf91dbe47afcee88388b1dd39cac7ed90d0f8dc95c0cb72a8b1f6a80859a35710"; + sha512 = "a09405c21427153710ad3ae2e83b04381c101dce14c3b99d7ef17a8bdb4fe7dcb7f7f59d916a9520ba96652dacfe9bfbd374b3c569e420e1a5b43c763e002491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ms/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ms/firefox-62.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "3c08cfb8da1e4d363f4cd7475fc987e0baacc0886e546c4010b4fc96dc54c205acaa3fd4ee1a784183c646e27cf946a397ca43c734c1515455ddfd8916ffc9c2"; + sha512 = "bb95adf7cae84a4e5c37d33fd25efae472035d816c37cb4d6e2d94b99c260045fca9ebf68d71bd9fa096caa2a0f9c13d828eafef3a1b9ba7c2cd81e9cd6e6bd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/my/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/my/firefox-62.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "ce231b8697330902a556d0db7bd5e004e4ec646ecce26db21e8b3e64c2d0a474c8bbb3c09cb6331d964269c602285b84f09c0f67e5a6eb6c752b8d55b6d700f9"; + sha512 = "948fbb58ef850dc1c2f0c3b4a55c7077000c3697ddc63b524ad5890715a72c4d1bdbc6e48f901128a43251141aaa61a4b93bb655385185d3ceecec0114c55f91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/nb-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nb-NO/firefox-62.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "027c1baeb1ccc1dfcfa886a5b6e5a9b27859b0d0cef877aef88ec2b0ed2d17e47adb403e4851813ad019482af9f0f116e7741fe650d63fe559281ed14f03aae0"; + sha512 = "472348038fa02afc5deda78a17d5b1d43a7b572925daf76720c9a18eccdc285ed4c7a46589f71764a338b0367b3d64f5ab18a57eef54dbafc2dd10e69cb60515"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ne-NP/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ne-NP/firefox-62.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "0599f7d04dcab8e42f24b2e5c898d8fb5d2e4f0a160c6cafb211d49200f85149b4726504e981ecde345ce19889933c5a4340f6739b4db8a1b000a02417168134"; + sha512 = "783a40742f33d6546bb6f0fa832531faa0681fefb5c0a60c151fb5b52ca6201e94995948743442cf7fcba475bbf901330d842f4e40f948fa9afbc1f4da0efb33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/nl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nl/firefox-62.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "71d9bfa62eb9a3ec4edeac28d57e7e027668fe120ca85b88590b3c1ba063b1247ccba8a0a5ec8fb759bf313b61e2bfebee60dc74716f0ae28650e4bba2410e1b"; + sha512 = "4a6c15e0467baa49f7d71812749a77b0c0d40727db1a24ed06ee25bd21f0abc904d1c2a101c1d1e2002c181e6eb17fcf42e5bdb4d592a41a10b4a49552f49061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/nn-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/nn-NO/firefox-62.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "2b459865097cf722a0a504e6c0bc8cfd6bfe2c6782e90d199695f786b380f1aa6f0758092ec25158d0db9297c96900938231c3d029d45c3ee1b19f3d999c2791"; + sha512 = "a0c4ca38a35688947de35578f101676c174e441f5788c2c1b0538b818daba01c7a79bbe19b953d8b503e540edc6bc3a435ca0afa75fdfd6c8dc15b6e728854de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/oc/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/oc/firefox-62.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f410848f048c5916a16e1d93f06856a4223f39622d85499ecdf1b3ffbeff18454fe249d28d8de29e18127b7e5608d68f200b2fe7cf0707040da126fb1c495c0d"; + sha512 = "48bb5fa2aac87aabe50534a519e2d65c5aa0fd38e9b8f2d3193df1a94d38d02faaf40e2ae21105fa30b5b2e980d44276c274d0b60dd8a06142d3652a321d2ee1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/or/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/or/firefox-62.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "5caac24b1a0aec7198c141f30568c9273181092d14fc53b729dcd85ec3d1585f1cf4751eef4d8f28a15dfc96912c40ffc7e80c4c499432b23276956a3955b515"; + sha512 = "50a7f6338277f08ae3aec1642c4db5a55118f0058f8ced336fcd934d111439083982cd72885420273f398cbcfa82f5e3190f0d8d91571cef5b3053959df021d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pa-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pa-IN/firefox-62.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "26a47c5d699a02707b0210b840f780463d01b4ae421e0e0041430a6c34209a530f0b0f1e569ded6b9f623e2229259729ef63342744a2546f177f532f661274c6"; + sha512 = "aa7b1e86d620b695954d4901f2bf95316dced89f5d7f42de13d45a81cdb198b2098508978798e561c0d3d3c347d66b7784136af0cb0a10e55426cccdc162b35f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pl/firefox-62.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "caa98ffae028c7d8da9411593383ed98e733a41cd57a5bfa79f01a4b489222b7e0dfa741bf7d9bc272a69b0168c8c70a91b82c411880c7e179335b62915cdf89"; + sha512 = "1f7f603c1fdbca385ac164c3cec42bb628aaf83a7d67edc0ceaf07c3d172912d43d47490e826dc37bf0e3b0cce5d80d193b4046eabb1019e233487f4bcad21b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pt-BR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pt-BR/firefox-62.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "612bf06ab00b00f1bff3494a8a312e1d828c9e8f01bbda02afced2d113357a463f2156e89437fda59edd32ccbd87e057d020a538178f72a73522cdcb004ca3fe"; + sha512 = "26d0e2419a179f9feffdf6e08c55c5b0f1b39167be40db54fae171ca438f781f5c353016747c20b39188033e2aef5c556a505f8a296f62bdf69574aa11c80b9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/pt-PT/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/pt-PT/firefox-62.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "01c7e07d373007efd05601e2f97ba3b23fe9f48654609021f65147dfe374681bd7c5e1aef2dc29308a1eb2ae97063f6bdf703b1ae277f6c004587d7023511d7b"; + sha512 = "a070992b30b159ffbbabb98d9b97afa55db237d806a7619dbcd65dbcda2db202fe3be0b43a0408e0c3b34dda3343decd69d9a3cb1b24f89ff60c422826e96438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/rm/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/rm/firefox-62.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cfede8ffbbb1984a2c16a1a03a08b869c54e53c8aa439d2922acbea443c917721ebbe3f18e4f7b7e209a728e32d5ba6525a72e193be63347bf72196fe5b74b0b"; + sha512 = "0728f7379104d89fb25c3a983366deff16cdd32f5f38e4396ca58e3be2c8d987bc0de95c24c123bfb2802fa5b4308bc10702cd0917294c1a6b7c2b6acf666d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ro/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ro/firefox-62.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "45a38b086ca46d6b0736f45db6dd7c53100b600792f2d41a4ca1ae01774670402cfc8085b4a2e2c3b98b6856b57774d40784f84f5c94093496937d6f88b8e6c5"; + sha512 = "d3cd1b3bdc282c7061db9f17b6e0ae22ed61968dc0e59df0ed2f408dfed7b348dcb0f770f61a6e95839ba99d7d3e133d3c3cbb88dfdd40d84e3d92b5f5231a3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ru/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ru/firefox-62.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "380962c6ad9803a0b13a8eb3ad56bc3ff771f877a9956b08f83852d78fe0a1bb3eee629502396a3276c270bc7d5aba366d78973e8e69024bb02a75c8747c6a49"; + sha512 = "f06c3202aae74ce01665616ba13eabdf364872f107611829e7d774e55df00519e8a2ad1aff3cb61d5acc10640844fb036a5e4aa8ab74388b649cc03f2cfea3e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/si/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/si/firefox-62.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "9e128c2055ed6a86e657277cb0483baab49db309b249372866db1c2752aae2586061d2e7deedcae33b3cb466bf6ee4c84c28dc0f29d3dae843cd78758ef7ede8"; + sha512 = "0335f6e6cbdba13dd59cd04252de746e44a3e0200962d3d406ac5047850b0d2ef784bbcf5da6f1ed4f52b1dd82a4061329b49f368c9567301166270f7f5d61d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sk/firefox-62.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "81382843684963c89d75c68e585d111ca1b46884e0e0ebc057803beb76009517844685204d7165add0c77a64c57d2be011cda4add3408269dfdc3aa01e82975a"; + sha512 = "81f35be8df524689bbfd076509f40cac4cc8a2fad56726698f72d1aa41492daee190863d6e23fa9f94aafb9474c04069e90f331dbc40eb518428f8873edd8bce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sl/firefox-62.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "919f74cbc696074dca88fcd9b1c60eaf462d7224d7eabdbc7572630f57f7c88b3ff286b9dd183138c5f1b028ed722ff53fb21cf353c3a4f05af6dc9b94947319"; + sha512 = "15a1d6a3efb209c9413a604d8ba7df8a7084e0908ee7cda4ba41fc8e4ee516af6e12ec3e0543796fbe99fa329650e3538d3ab261faa36c645a942104c57ebef0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/son/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/son/firefox-62.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "3d6d9ab8ff6dd01b7491bd975b825de2c0286c1f46708afbf546107566b588149a65b9a3335e9f25b25ecb2538392bd3fc2eec10c70fe5763cf06c2eb93f8c99"; + sha512 = "278716fece719a9c8114ab7b328b0ed03cb698a2bd5cf437529353cd4c5f911fdd12598e093c81c2b59c25fdbf5ad1f2d36cf0ee04bb640343976337090a11fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sq/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sq/firefox-62.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "e05cc50f50c62dc74b09e10a5453947b2aae02100211ab7b21b23deaf8a1db1c8dc49ada3bf4899e6a11c2d88a5bbf61f7a0bbb33073f101a5c479490a032fd6"; + sha512 = "bda588ac74b9f6809fbfabd260de4a4dbdbb3e6f5e9c4c08a24a5432c530822b4804fe0dcc5b813e44911b61619e9a924c2c738d72685707c271a92552be2dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sr/firefox-62.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "66e0fb2fc46da6c02d883cfc93cf29d0a3fcb2b4a5e679c617f22e36f60e1ce15d24aa5ab333620567e82de86e02723b350a15fda32075092fa0f952962d1656"; + sha512 = "1b63cc64d6ea72677f6e574a9ef4ad90c231edcad73d1050409f6df6b1702aac2af0b9326b9577c38f58ac9dc5ce234d6ef547f5a50815772bc6753f0e1b72c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/sv-SE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/sv-SE/firefox-62.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "54a18095bca5eb55c34c1083654e25ddd97d7a612555542d3d233db3e85f0abca2c5b61813ffdceeb5c2c984657f75fcf72be2bf47a7fd2d45b6d52a5afd1165"; + sha512 = "1b600fdf772e0cbff440778321b8c380939ecda502f1c5653c97c772794815236cd2a0906de4c34bc26f6154ac9dcfd8c4a90e3166121be6e288e73c26b0f1e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ta/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ta/firefox-62.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "e7b604cf9da3f08348bf61868ba9562d149a88c9fad8c878072b78cd901b5a123a16ccbca9868e97a42f6babdca0c29f2844ed68d2d60782a6a7ac773f6f973b"; + sha512 = "e606f4dbe7fe659e9011676fe1245aa8d6b1b6f814f22c1c2b71c9e6ededd4492516535e8ecb31787b4c8708cadb2d4e5d2cf09d78b4c576a01baba74b62313a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/te/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/te/firefox-62.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "52434cd13b171b4079befc68467d348d9451069d43e86cf8d7dc0386aa93278edf27dbf4685e28c86053fa8acbfb02eb1bff6c22ebb9833976e38e11543610e1"; + sha512 = "78fefa776126ca7cb60f11dbffad735569bd6b76debe68208ec1386ecdeee7d49dc58482ff73c06835834270adbb8316b725ca16b3f2da8d1c790b3649b1e51f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/th/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/th/firefox-62.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "502cc0c08064999005783df87bb046fac32a1112e2968fade51ea36cd9a61289b60f731d3a755516a3207b414d9fbf4c05a4310518bd2081a1458babfc8ea9ab"; + sha512 = "e2ac47ba49e9567755351c47d945ea7b2c0da3c06cda05ab3c8c5e8932fd1e2a36b6251ce0e9acc31b3555bff8ea5143e3e8811e0ee5fe03a926b7d121384afb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/tr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/tr/firefox-62.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "57b2e478b6fd4193e57cecd97effa6b57867618de33aad7222ba62cbfd5dbb60fd900ce749792bcf2dead854e7a65b5a34f2d739014c374451d4d29713bad857"; + sha512 = "9d8f9fe40bf3e30caa3b4383954de68d279769faa57e54f0db2f40b102410a5ca3b4edc07caa3ef1b07cd0a3146d74133a87e89cddb6608c0e394ebc840a29dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/uk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/uk/firefox-62.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "e50e5a4b98e8fe6730c2c74352a47ba233407ba86ec179c6e4160c521c045dd84111671b0a69fd410804053267e8a83df50d3784132d80a33ebbf9d3bbf8aff6"; + sha512 = "707c17313359e6a50263e73d3f66a551010333c3c1b7e01ffdb42eca47bbd8f9252f167f0298dc6c2d82abf8ff9cc0898aa87c644ee157869a5aaea29708a185"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/ur/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/ur/firefox-62.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "2244233176d738724129cb456996708a19c35dc3997b0cdd1bf12bf3986fe05475b78fbd631c06d65177ca93210a48e83006c3f0836a71e225828464b954d94f"; + sha512 = "258f10e7034221e7160a3d57e63572a178c6f01ad1d8cc5f7a1c6a7166f779fe423d13095d12f2aab87e99021d16f2fd961a58acd1d0398b6f9e61ff5b9bc168"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/uz/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/uz/firefox-62.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4c209e7ae412ba56e1caeff1147f71e81f87c8de1cc1e2267d40d186a3cf5a3c76d4162564031b4d6576b695f92875056b884ebef3c4cd56442f0813fa9e87c9"; + sha512 = "39043e62b42d559a5bc799cdeba2b7b7e7b5aadfd523d076c3b208218b4a385c831fb27edb6aa6d13f6a95e9de9cad82abe59a95e14987e8b68de367c364c91a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/vi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/vi/firefox-62.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "cc4acf1841516e4cf9b55e19aec82c48afc458c195615f8671f32dcb43463e7779080f2c22baa7a7d0f3c03e01aada1ea905b328abc21f89383e04fe51f00d34"; + sha512 = "06767d09bcfad7380b948789f0fcb282e13a35c86b3e8ac81228042dee7b63b5e61e5bf5e048294ac0b9daa7e2a55f09c5900701ef98bcae2c7cd32cc1c6dbda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/xh/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/xh/firefox-62.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "9179e06a009d7ac684ffe97de4886206671201248fef26065ee20a99aa426cdaa9e5b435666d9b27b74553e9ccffff2a3cb883a77069cd2c2a92adeae361d134"; + sha512 = "85713120830065c4e9a58dcb63acccc5fa8259456a3ec43b280eaf5060104594d0fb7dce063fdc77be572aadcbe136d85614661a6cb2a1c0f32c6e9df1cd0850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/zh-CN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/zh-CN/firefox-62.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "bae813c2f99909bcfd6919c0dc7c882ad55258718464f0ae5e4ba3e7ee407e860787f64b2963fd1a5c65a799ab2e3ba3ddf1f89bb08c87e0f7b168394e0ea3d8"; + sha512 = "61bef062b4ae86514ec68736ccbce16527c73fdc24cd05544edb4fd47e32e360a565a3e23bc2a7b1b4ac18718810dc9be28fa1576329aa5e0f084af9ad1062a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-x86_64/zh-TW/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-x86_64/zh-TW/firefox-62.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "2ef30a38cb1f6e798d111bbfe5193802870a612eb0ad4b0bfa9a5d019d52d26153d67ce251ee8d0171b9d814f1887cc26d94c4fdb9d8715045414a605cca9ffc"; + sha512 = "ffd9d1c5586ee6c228c655a47a5dda8d8c8ece0a30471044083bc59ef6b407fe8d29b9d1ae90cce856924eafe40785df2b9808418deadf06b4d0ade5a2bb2793"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ach/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ach/firefox-62.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "0c69502fe5199f0c6beac78d68cc1c6ff6e76e770d7f578edfa2d59feb34ee6c8218843d5f436b8a8b24a928254289cc700e66af2a1ae80419acee0d59006b08"; + sha512 = "11fc8aff860e2d9f6c9f733fc815d8b531a874aee9c755b5ccea842b1a5e43c7038d060542503b924f7b7da2ee115f766914401a953a97490bdcce9e95b03e3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/af/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/af/firefox-62.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "87ab03305050be2925ce5feb7e642923ca7d49d5db69f91f32ab0e8f56be650c9b4cbc9076e5c3133daee97303fc41080bf1efde6ab9d67868d2709026798216"; + sha512 = "c30736a5929601a4925a457f5e112b26c9f15db5a55182f3ab402ab64ffac18dd2a6b97f13a43504f3c97b05c6ae71ec515f70b67b8ca7d1b3eb404bb5f12574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/an/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/an/firefox-62.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "01d3ab7fae3e3ea7491dc185a00fea377705b7f449d139a3f41ab1797f1af3d8f089be8354fbc325d599c8331474ec49e07f35dd691fe05367b04148cc84022a"; + sha512 = "299e30b41252737f807cfbdc00d6c92022be5c956fe7d1b2bff7c02a627b3b9f4465fcc2bdfab7703f21af2a824366878903d8eba2de3511ef739ff75c31c48b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ar/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ar/firefox-62.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e82c0506fdd1d3861923e40237b90b4ff255849e28b97a197bfb34db41b6d207eac472ad465b2198b1746d3cc7a71c4632a9a7dc0435be15ef05450254f1ca50"; + sha512 = "7145a29912cab6a8f75de7a11a5a1dc456b1f83b061bd499894c75e656a858d49c4bfa7c32256ebe895f8f294bdc3ea227b7a6fbe33d594034a4d42834aeaa7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/as/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/as/firefox-62.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "af8e5e8f282b59133f6d931cce5204e5c8f20bb445c31e9eb9bc9ed69bb0e174ba98a765aadd00939099f39c17c9bfa103a50900a26cb13436aad0ec3aaf65fb"; + sha512 = "ab55e7fc54dd024561d7d6fd4bb3a514ec95b5dc2475999406c809923a2447ae0dbcbd77fc07757a79b81e84417cfa53fb6d3073abe5e9752889c6abdebd4f41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ast/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ast/firefox-62.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "9937e0691041619a96ceb5ecb025ed018daec3a66a66face1c19f689b5ae30a9a6d0072857d1a13ae1df6513bcbe9eb930a85f255dc73ad427a81e5a3f4c2be9"; + sha512 = "73751e61014762150208f5d6d1cab78b6728dccadfa86e08f5a6fb135e55400fc8d0cdbae7213b00ed4875f808e6d1dfec3b271fd7110c7bcd6907d35b40b69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/az/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/az/firefox-62.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "9f5458b871325283aeb6fe7ed1c9ffd24c271a2d984d839fb9d032ae7c309bdc30e67f6fb94b6b57a9c628adec208f4a03c773b9a58ebb2b1507d029a9e029ce"; + sha512 = "15cdf76c30c2009fed8c821c127a02a48479b5104744ccc10d684aba31fb540fa8ea034c03eb1c78aa0f4ad7c64d82682d3e113fe8ad1a98be8c78890d8a9553"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/be/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/be/firefox-62.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f3868fc238baea1ec7a082123f319d056848189825f217ef6a32330a0d206801221c4f7c404acbd99140fae2348ec0fe16a8a3649bbdce2a40258ed9ecce8ec9"; + sha512 = "3c499063b5ebd8886ffe6b606362a93637cece1817bf74029cbb52ff52b9cc4158f3103823840c2fc091435d2280f0543cdad43e18aae663c632b166a66134e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bg/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bg/firefox-62.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "29e6bb0cfd54ce0abc2fa41c0d502662eada03b2b060361e78c98ea7cb0c8a934256ed97e506c62730e97cdd13ba1488bc2ca3f442ddf52587377d2524eef409"; + sha512 = "86cdd766893f861996615be611eb46e5548d3eec849ea49fbeeb19969213dba5b941160b9359aa68ab99bb9d11e3c2a775e2ce57e0a737fb936f5dd8d51095aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bn-BD/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bn-BD/firefox-62.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "7ae3291923ed221e385c7ddbab8cf7dbb5869bf56ca9ca974e58776b5c74a1e35d308194587f1c5c2b03aea862522c4f4e11825b59b361a672e94757694f8b88"; + sha512 = "514f490eda4ef7e48fbcfcceb66c12b05b1ae42b2d902d952be03b36042b8219e9f6d652b8b59caa574829fd0a78ec98facd5170ce07c7dd93cda60d940c3dcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bn-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bn-IN/firefox-62.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "6edbf653375f379e8afdc928adee95c2200fba35e0dc24fceefe5bc949750e225bf651b3f7e07542c4fb8972b07be2cd5f4da01eb5f2e15a1f486bd9662b2d92"; + sha512 = "a70bc94560f08257d5d5f8eeca705a2c9bf1e2185ab8a60c52464a2e02dcc49e4661ad9c8ffd92b6cae4482bdbd1a764220cf718b67d4763ec6a8b23259e72fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/br/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/br/firefox-62.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "48e08fa086b1dca15016ee717e64d54b595e0c0f45d0b74cb2c721da05eeb1af4265999d27f9e944ebb11a8a3f083903e6e4ee1ce4af4fcfe4f5c888d56dadaf"; + sha512 = "a102200f33fc71ff3a26fc0b9bb9d02d63c677d0d9ad25dd9aec5da26e654c8853cd892393bd9b8e8ec777241e946f9a74cfd7b17d8795c38224ebf8421cfabd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/bs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/bs/firefox-62.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "0f843499695a9e9c6b99e3cf4395b2100c6936346fc4e850b9f044cb3830c91c2f335ae1539bc3c1c81e74942e28b115f250fb29c321dba641962573adaa66cc"; + sha512 = "f026cfaf289d7341f70f2f17a8ecc8b2cacf7a2e71004c29419cc7b7478bece21c77fa83a6a6fddc357617b1f01759ceebd60133e0581f5bdf9adb4e76cd54d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ca/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ca/firefox-62.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "7ea3d66cf9b7054999fa2c3d0752e17becd3c27815cd9eef5ba41f4c2d390faacdded76f19f96b1e74c8c46c13bb47baa9f2a978fda3ea3d0592e41bb2e739ae"; + sha512 = "2a03327b2019276ac598edc2b9bc9b7d88a8b9d3bdec29b986260420fe9b0081d11e1f4b93132edb17b537870de91dcb78cfb338e1446df97932b6764f4d432b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/cak/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cak/firefox-62.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "41e779e39432fd0c2a379b7283fcd45a08f27620217dccfba89c1c20659c89655485d6c610c21f18d609203bc3ba63b7c8618011ce6092d7420a5f3b96464685"; + sha512 = "f7ce71395347756e2b19eb3596d45d34d05c4ee8df30b69455e8ac5d5b1a4b16efd8bf8c6ce573f98bf46079671e3ec9aadd252015f279f6d9449aaab396db72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/cs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cs/firefox-62.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "76a6a981fde70608d3c4b91539a964b1e8ee6eed5c48d1d308a0d43dd908b717311b817e791925f3ba5ac39253096d83bd8ebb058f52a96c4c82798af8167b5d"; + sha512 = "5c86128042b6da5cbb54f374c2d76833ae1eb99cea48140f3c1aaf86c0333ee51f4cd9b33d1fd37815dbf1cf1ee779bad3bde13dac0c16db99a90df67258e481"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/cy/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/cy/firefox-62.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "dcd83b0d842add07977478986d575a386e5014f7cc448d58cf542d2a281f367180fc40b9ab4f6147a080aa498afee70bbc18186117ac9e4d7d1450858a7bf8b3"; + sha512 = "15b54a0d8114477239234833524c2a0161264b9caa6b2ff9f9b31656a2fefd3a48c3b251026b462ef6a8adbac6998076ad7e040cff592d7da23d6651473b379c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/da/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/da/firefox-62.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9f7f78cbfc160b478bb00091741a5799154ccd1579a49b1f1fe569214d1af36edbdcaf78348e6e335fea5b1c8300fff81f966bcddf6aeb15b7da18760a25fe67"; + sha512 = "647e62b45aea1a171fdae38a3010cd33c39ab1baa5553247723bbbc33d7058f4bd1189418b8f7e45147abd5f21c7556f2f101ac7d64011991ddc55df3d24a925"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/de/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/de/firefox-62.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "701017008775320fb15df0cc1aaf4a41b924c8c83c253876f41a3ceb292434681bb5d872184186ca98cbc81fe2b4fbb10a51533a7bf3e46d29a93464711f9a67"; + sha512 = "af858031e0c29ea9ca498aa28994e2115775de73222700ca24ac728c9efb50f19211a7387419cd034b900034ab718dc76ceaa84bdcb9ab19f167f952904ae6bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/dsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/dsb/firefox-62.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "28807b8e968dcb4c22d91b034fc5dc7b68200a381b2075925ecbc408c74fd52a18620ea8396f468b423babb4d3cf97ae429d2c2cf250de4818487bdae315cc52"; + sha512 = "7b72a34a86da439c7d36defce600ceeb09110e89aa00bed3969e4ea3bff1acef8015bd045c2382061f6646b8c1bed5a929e5e746d770e79a316222ebe67b43e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/el/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/el/firefox-62.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e8afdd33444ac87c4f606906e8b754874495919be5225c1e40ac214cea1fec8079e725baa8663bc56026a9fb5a1634f7c4bb6e2478ee70b6ac0a29ef42bc219a"; + sha512 = "6654a20fcad60fe82c9c50492bd3c72bacb537fea0ccaf56adc5654cf4d7db457317a39fe5240df663b102e04c97b8457cd99461be4820e0cc97d70a2bb50263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-CA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-CA/firefox-62.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "3c29cc564cfb2aa0bee5c37f68d21adda0f9ded69548490171c9819e084925aea36c545082db650296d8ec18801b249068239855fce58889278337e80242cd8b"; + sha512 = "2cdee47248b65a82882070b02c9b51b8ff2d496a92781a9053c986ad5aca22fede9bd967a2602a0475aeb14561bae6d1446c5301e999aad163054d6ac935dded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-GB/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-GB/firefox-62.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "18edb463f860511a12751513277f5c3cbcb06871af3f99fe264c4472848ce41b9cfd5048d36530536e838c5b7f8cca8e65485e84621ea84dfac2e40d949fd726"; + sha512 = "0b0fb41768b0a317608a23e200528c9ec5855423960c6e79d75c37bf0edecd1b5145c0d7d499645ed6faf0b927738eb33a25bbcc10e9302826a3ee79b39daf2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-US/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-US/firefox-62.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "5874ba5b1fd079cc7f3a29da85d120658ed3490f834f84c876df814ee8fbee5f17ede54df5e9305ed5290abe6fdd62f664deb41cbdcf8e91b4a4f8e569af5c88"; + sha512 = "a824ef6e7f3ef1da11b158e94b6c2308ce199f1db4a1ad8598a5376824edd785280775cd26c31be3eb2d7be870f54180186ae8c2fd1fbc2a2d2b196e3e2e564b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/en-ZA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/en-ZA/firefox-62.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "449f6ebae62c4d7c3a86fdc057dfb2ba1285ae4e0e44cb66ac63d063e26821b573d8f5b65f1d16b45cfc52e34ce485d189bcda6fb41887db881af8b5a56c77d4"; + sha512 = "86af05dab09f2fe192658e7676a035deedc2104118aae427a0f6baf29c3cd04c56940090c9918860742cd63d9efba280bb8757403d6bf22f35b8d977e0b53199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/eo/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/eo/firefox-62.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "7ec1e94bcf6029754c8d0824d93014a6577c1b9984d82c4a63ffefddf90423caa0d6958032588039e745861a86bb00da8edcfc935598024ef4c90119ce3a6679"; + sha512 = "1be7f111093d519bd06a97ef31c96b44f4ae0beba32cc06c9bf636540a48d27191cbab1d8849bf11556328f9a4127715e28136220f5029013e423c1e469c0b37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-AR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-AR/firefox-62.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "512ec359f4bef01780aa70ffa22d81dbc57173b7bf01865ab3efa0725c86f25c87182fd868d87125627bdadcf38c4f90f30bacaca2d6f9b8d52324586a1d8854"; + sha512 = "47ed1061146f7d07b132b805066e8c02ba3cd91b2d278cf2574a9d1ca61a9454ab7dcb2b05c231437fe0da34a5efb5f8e013d27a7351383d093cace38b197bfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-CL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-CL/firefox-62.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "4c6f844390f7172415d14108ff58f1b132336b9bfba080230f386dcf3dd3ae580db97eadd32b53b5c619b8fd9f1cd783059bfb4b5a0e17e7e596b2c81fed0f23"; + sha512 = "1f020cbfadaa52326b677d72cd83d77e783b0de10a78a845ee8ae3c65b88962a416cf0396a483885db64b6574ebf77130a3ca538dccceaa94ee0c6cf23f79f56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-ES/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-ES/firefox-62.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "368ad1d3d6608e24feffb15b0bc4f6d7ed68f5e18d8abc0a3e6918c2ff87cb7080e3bcdd9d6fdbc756dfda66bfc5ac1a61e54df4dfc63b32669ee8cfbf8d72fa"; + sha512 = "9fb64b729c84ce7fe66cd7949edea48d83c34214ea78028057302fe2aaf0dfdb736b7329168a30fdfa8885aae08d07d51b00e9355b450b8fdf0fb670e778f54e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/es-MX/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/es-MX/firefox-62.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "688e68979a560a0c4821582e609904b71973dd752598739a0c6f4906dd09e7d060549feb4da98879b1d4367b3774c80d464751827ee5821af43810d1d5d9c461"; + sha512 = "74fe673825524dcd6c0f86ec5af895b8b4053cd3be413d4ac6cc5dc6a04975e47f0fad300f7df128aea082bb5348de400322af554eaf007be6340ee2000775d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/et/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/et/firefox-62.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "f905eb22aef1af6cac00d1275c63dc59265cf2695ac3903e78d70d2614d2234fe7cb46638338d82afdad952187741a7bd44936f84dbfa8b9abb792493f401fd5"; + sha512 = "c2b695c0d50ffcd0a796799a230e18c221d26c078f268fceb2439cb02006d6e41f537591d81726f3f26205bf4e6018b70635b701584849c015a59cb62e84210f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/eu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/eu/firefox-62.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "6d48654cf112beaa9efe871d8ea3a82bd5adc8a965c1ea9a0ebb79411328fc721ccdaee0a162db48d0e470aa3cd268243dc5a3caa81f71534cd13ea75e36a99d"; + sha512 = "f997f0437792320039dfc99298bdbac3156a085a1e2393ab2766a8d2c761cd3e646a25348712e2a2220ffcce8191adbac0ec568a7441c66e447bdc1b1bd600ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fa/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fa/firefox-62.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "648c3c9303c04db0d0f948f7d437ce257565527dcec281a1afa199e337ed8256a56be77a801cdca61beb4a2df07167a7f2cb8518759380d9598b0b3a01c47130"; + sha512 = "a876169ec8f6f88bcb156652206b88dcb46c85b1cbbfdfd363d13f7e6a315ca4cbac598b3834833f5507bcbff2eb6851781900a24e6bf56597812e29b546dfc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ff/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ff/firefox-62.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "9daf695063773d0be8cf1af9217d0b11a611efa177ef5a9ecef7c4559a02fe744e4589f73df9af292669dab93ae30278ce4eb400ba66383545beee1fdb0fe7de"; + sha512 = "6a7dbf71ef0ecb1fce9a680f404e56814004e0e83fef5ed02ad3f7570cdc63ca3ef39a30543ba5bd915ef078c0704629034fa46dd4a853937ee5bf3e096dc205"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fi/firefox-62.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4a364b4a63f61612c47a181aeaf52cf540c8d96b0d8ff0553f45d57f6d7f4360e7cca61e7b0c1c4e3dbf8b3bce9846f8cafa72124e917fe061c9b30a34ac1463"; + sha512 = "4974af183667222f0868500979447742e520f5a52feb1c688c321553b4622855b18c622b7010868db9e30f62de7efbdf0164eaad032ed000e6502c4fa7e4edda"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fr/firefox-62.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "306b5d318e48ffeb1007be64c2ec6d057b77ce1d4045f9d1474c7169ab5a6ea1baadf77605b643bf77cf33b70fad2c6391fa59e415800ac3f9ca23bbb0031d50"; + sha512 = "7e82b2a8f43459e3a11501a81b205503e2cd98ef003079bfd869c81f6c4156666bde1b8d566f2988bd7407da566573b2046e08f7595c8e52907be915aa379e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/fy-NL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/fy-NL/firefox-62.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "29bb659cd53d8e7cdaca387ceb680fdf528068fda2ac96f759fff1680d3aced7d7665655e1887be2509648446048682d64fba97bad15ac4a9d97a53ff24cd9d5"; + sha512 = "48a82ef0e49669f9f3a0bf41edcdfc126ce0ddf805caa10942366b9c0a26e016a938157de7bff898c852b7a263aa9e4f5c8e916de33cd276914244582165ef91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ga-IE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ga-IE/firefox-62.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "e57e956edf7d7cd13cb240c3548cba0d1057a08eeda40e52fd74a8434ba4290d6b1512a7f5a857968ec48d7d08f713c0a948c25de729b1c2e47e64871a59f981"; + sha512 = "3ea47df66ef87ff581a187d7b6b1f3fbc917e6acc7a9bb2a66433477c92da15b92117214f8c6e9cb401e1a7f3b7ee7251229f13e2a3030445bcffd3c8b18159f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gd/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gd/firefox-62.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b8c3a0ec09377de865b31e18c0e6a102e95dace7f59dfb69c0628021e42589732d8d1295fd7a1cab249a8625a387d74c8f3bfb5d4e7f7372e32696d745e93be6"; + sha512 = "43a0133a655ba59b72ef5d8fe3e3fb9f38de541c3b9f91a1ca259292f53839d95d4990b09411289b9d7ba718b02e0c58fd5de33db2f0e6a7c7cd39aa8b263a6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gl/firefox-62.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "29d236318df1c79e54492d127508b5334ca3d2de7b268cb66112506a1839179681fd4148d3cad8542a61e3e10cf6d0d8a7b065e4124056b7fe01cc7b7b13bbad"; + sha512 = "08c1e4375806aac5ad26704db8d76f89a380c53a1d0218b6f5a17a4a538293360d3e600c20f6be219f39049d9c049cbbd2294e3bce71d42efd0269697d1b049c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gn/firefox-62.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "59121c75f7cebc7334f122fc8c416ff028773baccdae567eec765e0dfc1e1b68a855a32c62044dd75fff8a9970e1637a650f734e0e815cb0909a9f932f5709bf"; + sha512 = "773e8b3876f6256f4c3404a019b9c2b852143ca5b55d13afe61e6f915d8aaad45c665f8fe683bddff9ba6680483a8eb79662f7f9261ee162d8fd291d725fdab6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/gu-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/gu-IN/firefox-62.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "4b47a09596c358cfd3acad6f465cdf256d4704aec7960abaaeda60616328047d9baae87d8d85d325021c927af2023a3b18c86f3cf20be03f1ef7253d1e25b4a8"; + sha512 = "95a4c05781e6813be233ab7a6dc91ce90751ea07d6b7f565d2b1580e4d18000341822a3dcb1fb4fa2656badd3f1c24dba4af094b25251d7050204c63ff87e74e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/he/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/he/firefox-62.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "603b4ca7fb645f5f4ad398ea22003c7629a8e56852bc72f016439c82a76d9af8892f192987ef325cd674bb7748893f41284ce330aa036f2a0bd4ad8e67404429"; + sha512 = "cc60d8d8bc145a719f81d8d09cf8959a0f86275074583c2c0bc742df020d0c43e28e4e5476d49309584795a2273006b37a04b82c1615a0f203b32ddefdca21d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hi-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hi-IN/firefox-62.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "cc18ba05a3728ed8a7d223684c9a173523e7b5ffb13d415ddcd27c20af6c01b04cee3a4f7f7404e13b07a7bda17726fb6b8469ab856320e89f37d87a6348e48a"; + sha512 = "9645d08f6fba1fd60ed32e20c4adbb509b068edde2ee827814e979e0c0d5b06c92b2fa102a41b2da7d386772f0fee43804faee24a2bc4e29452b814d6ebd3066"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hr/firefox-62.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7e8e66323cc0163f4f6618cf23736c8334e58bf6ca3c1facbadbf1ba1c8d305932cc8852fb3923194e03b9584db55748592ef835a78781f7ea6a97fdb5616b3f"; + sha512 = "292103b10479f6d2f570d8ebf10df1b98668f8a3b416b4385035839bd750bcb254b40055df57fdebbd22387744cd9e5cbf1ac484d4f507d5fdaed346d300fcd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hsb/firefox-62.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "be35075667c5399bed80e20c6a48ba6dae1765780587d506e33725ea7d1c27a440791f02b4a309e3b10f8d8e6c3dc6914f16ef1014c021112f0ad0c1594d3f88"; + sha512 = "70f9d2062220edb81c28f4d9a75435eccc82b9c771384fe8ef9f3b4f7e1a13d78a5e311a9f6ab165e03b8092d151c9a43ed43c19e00a1f62b43727008ebcf725"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hu/firefox-62.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "864e3fac4a609e7737a3a6b7562166878097156384336df50bf7434d9c0b62d2f18806adccac32239e71128ca0d04f55937c53835e81793b4ba9032bfed77568"; + sha512 = "91a1d540ee0ac0faedd9254c6336462ecd74779116f88f9954df8a06cc49236dbc343a97ca2d971d43a83b3b560e18a72c123b730aea474bd26ed4a3932da113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/hy-AM/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/hy-AM/firefox-62.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4e36a70a53750b8f968c6d5cd3bcca2cb76e1d7973ac21a9baa8ebe2beba66855770849c3a5b047a05a6c34f7e4d386f83ac15d9e850681fe50224dd4c27c1ec"; + sha512 = "701744a3c2244d22d5a3b13a909bd4aa8870103d9fcd1ae6f5201c9575a815968991a9caf1ce25f2cb2b5b1005ec0dd0185f519eb13793b3ddbdf0cf1bf5ab77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ia/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ia/firefox-62.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f015d4615f2d874cb9f6b7813c8155df7f84c35054ef5725aa3d2516be02597c942ef93b768717fde47012af165ec68c0be88d1232deedea1b1ebe4e2ef7b274"; + sha512 = "05cf372b240ec992afbf0671cd4885ac36ccc37b10f68c9e49c75b5fdaa9de72ccbdf9d33cd8c37db34e971ebbca2a4516dc9e5bea3985edd89e1a07eae006a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/id/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/id/firefox-62.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "bd5bf8e4a222ba9f9c732b9a1a591d15f6a0613c133398d0346618a5f111d94ab6023bd1aaac4a965466c5b69eed5754b46e1bae99ab07a9890dc48d06b5b6a7"; + sha512 = "d87fcc3eb4b1fcb35faf144073799386c36b923512c269fc820ad3fbb8a513f80a9ac4a1bde88f5a82f2d5bb51b69e9fb8a833b0c585f2e9ab43d803c19bab82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/is/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/is/firefox-62.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "1647df57a3c3314540554994a41871818c69f1387c3edf3581d7da0ab622557fc414bb4ae196b11bd85450eb15a7491b35f5b9c5991c3165e5ab1260b1392aae"; + sha512 = "fca8b0ec89124fa23d9aeb2902f6007ab671ceb916e63fdc285ec2cbcfbd10449d9f1aad10c8d8ec98bc61a4c01d96ea5875ec84ada60f43359abe1254930a1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/it/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/it/firefox-62.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ac016422261329c6ba649a5422d494058e017f56917d0fd900792d2288f36e80d9683ba76a0a1c374591528752ded5ed12ff187e20c7f9bdf4e1af1f288b54b5"; + sha512 = "7062e6b55615e365537e57d4bae648cf5ae16fc9cf675dcddba928308935ee36c71b90f5e5b13108d20cf370fd7306f33667fd3e8a670281787d958269011b1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ja/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ja/firefox-62.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b2f0a079d4d5131799bf84261cccc9315d28aa2ebe87df4de71adb6eac5fcb6e617f9719d6931503a8140d2a388981f5bb7d03e5e5cb0e7dadd9550e3b683012"; + sha512 = "04326831442d26752ce5ae4b853606259a7af2da1b548a4fe4fa287af06460b6231f753ff4daa8e1e57e5d4c86d1c877f4319a441870dbf02ae2f47b2d0b9f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ka/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ka/firefox-62.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "3eda5516aff464f99b773acb0b1f0926196826893d89c6b4b03826579b5bdbc3d74cafb6eb5959b396aadba36f86a0479f1b2e38243387f363d1683db9fd8d82"; + sha512 = "9553f112008640c188fd524bda7566d9fcb3d3f34d8c1ec5636c783ca4aab5e899ede66b8ca2d0058e53d6da791a7ca329ff5e8dce29565528486a2043807d22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/kab/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kab/firefox-62.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "f8308c1c406983b7fac046d41650b39daeeaaad36107b08b7ea4893ee22c52a5bbe6cd461494bec9d68c94bdbc66b4bfca7e80bc1f85079835f8d725df90c5f2"; + sha512 = "cc7964535193e6dc3047b2c644050909e131b5f95db88f2b288a555314e6a4addde51aaa98789be7d4dd8207fb5cbb97a263728ba5405875ad450ac216b86e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/kk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kk/firefox-62.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "5ecc64545b5940115259ad8f28e3e4165cb9e1e652f9a290da3445856eb2f177f48b8a4199e01287e301f4e5b989e6e53aea82cbbd788bf98ce7416070fda1c2"; + sha512 = "283f4fd6ebdcccbb4bf9a4bd7db7e8fb2a5946deb8b4e742cf29ccfa652b46fc436576eb7f7955a2edd1eb9cc788841369b0bcce491b7b1ec0c3d353d58f5267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/km/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/km/firefox-62.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "785dfd23e7c7c150d4eaeb3611e4b32b224bba4d71e39358eeebb231f7ad7563c62c13f342eb6fae9d7177cfece868034c91aec7f1f7ffb195249a7e1e16b9e6"; + sha512 = "ee81f13e790025a12ac7c98c063f448722ee7178fccbbe4edc83788333d3eac50f9e7da95ccb2173b5708c22e96cfe3a8c297b251d2077eeec11212ba0dd9c17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/kn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/kn/firefox-62.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0c676d8a44583d84c8decdf4d9488e1502c50fe7799ba9e06be43418eb29fe5671019ca0c4c464905dc96272d23fb4c1787cd09568077dbfddade03be7ede7de"; + sha512 = "6d66df340b9d43065ed3ceb67b74a59b80cb341ee3ade9028affeaad513a14ee81de245d8dba04cf86b2323d32e797613d8c20ce338d5ee0866893d21729d997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ko/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ko/firefox-62.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a34f030e0319a461e598423c1bce67cc4d0b9cc1ff9dca824fd18d979607310334501bc253e1e0f31a507e5cb87b5859cd7b8fbd28931f529b31faf013a15856"; + sha512 = "2b391c7e59cc051dc5c3cc2ca98dd0b9085a22a69aee57afffabe3dfb640a132a8c9a79097b58934931ab72e856300b00a9f7261e0eeab9eab483fb9d8b9bb7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/lij/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lij/firefox-62.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "79e61163226b80ae38a3a9a5afb9fbfa3b726416a4beb75fe82250d7d4a6928d18635168aa931a2038d2e22dfaef4952ae2698fc9a1ec4b87892057e5671b988"; + sha512 = "33bd48973ebb1299a02248dcbdf31bd070e0c8eab0d1bf43b512cafc3b4f9267bc3d687dd4d2dd0c4154415f06ec34a07e17e85d96a908b9675ad4087ce0cbf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/lt/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lt/firefox-62.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "2a389b77faffd515603bd1645d92f8667f55093ec9b15d0a941e895de171c6f58b57e502ce2a9ea2e046eed6cecbd28faa6d3cefc262307ab4f3a52917966eb9"; + sha512 = "ed75d79135390ebfdfc698d5df6292f4d2cf4ea3b99078373fb94ba95042ddda174191fd6c9f8a092a853e54658eb001256e8a49cceef038c4367ea5ad8b06b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/lv/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/lv/firefox-62.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6c3ab29a647dc774c122d9970ad57f6d3d910f57d8a6dc280f37c2f0a1db1f7be00f04f97fd669b59dc5170abad29fda7132d847cbddaa18f493edbc1df69c62"; + sha512 = "2e82f2c0d76678deb54e984f2c46858824d23d47b854f0e5087466bca71dab61acbe2c2fd3ec6cf9788bcbf2959abb45b132763619a2ff14dfaf802a1f0e46fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/mai/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mai/firefox-62.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "a839d0a30cd1910bcaa50b2e058a24ab1fb9c3463337d6532b6563e3596bd6009c38e67ab41be3d8928e8bc9a4d5f1e303b281a86de0528846d38877b2edcbc6"; + sha512 = "189add8fa9e65ed80b8c858225eeb6e0a9583f3cdc17ad9a61aa226a49ebcd63a634b0c335703a112a898ceaf73206ac0c8c7ca43fc28487dd657491bd601e5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/mk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mk/firefox-62.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6af410fdb5afb807806c2660fd819b386fe16d465e83923cd2c3a9c42ad6a8e9c235d4083fe8cd45684cf15a9b0e194e6231d8ea847005c3e241c542ee785d9f"; + sha512 = "6981a2ff3a06eeb70f95dbc662c91695c590650887082b77b634de09d454f3ffab44e9bc11794f2d24e6f71eb77922f4c0c8c2fc0bb529900dea78b2f8630664"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ml/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ml/firefox-62.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "2da0ef0ea4897b84f8c3bb5c62b318b59006ad261cc6d77b7e3f7d3ddbcbf855b61906a608f94f6ceb868ffe1d8b20e476427aca53e785ea2e58b410d3bddf30"; + sha512 = "239b650c9f4a8b12ae604211bae3ba80aa5a9de4a3d0847945f82b359feaccb1bf41a786f43411137b1b15e6f732dee62920c929724241b8d93c5d4a6fe7eb02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/mr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/mr/firefox-62.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "517c2ca0b2e2e498a835ce830fe58771264221bd443a4934ed501f68cb4b55a6ffc9077a3ea3f0b85ed69df17a4b2bc7c9ae626a2d044985aaaa005e5b804e76"; + sha512 = "25d012726f7e7237002d1831f50b7a954f56771954b165a11b76ae49be1f3a685889570dbe905a4a1c1243220468c20e84fb59d898b04c3ec200c70ab0c60a34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ms/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ms/firefox-62.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ef61b1bf5c6f6dbbbc745d9569140c5881e1052a87126ea56a8a16c368039aad33b06886a3fe984cccdac9770a472d4a6be9deb7ecd0aa1c08313cf749d11d68"; + sha512 = "b4b9daa4ba7bd38dae2340f14348b325ebb4942ab0417d507a63b2c82577a12315b0208de17d5bce41a28ca352384cb1b411295f5a39d3094b7165e043498586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/my/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/my/firefox-62.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "83abaa558342df903d6b09870a452d3d89ad1be8bd41dde90830c0f035f9ccaba15e48385369bce8f2ddf77715d51d17e152baea8ce2b99e3c439ffd732ad1f8"; + sha512 = "3625d7417e7d13c5af1eb3e706316b209c1d09f90679de5c110dd5c7f1d400f325c12ad5c8ff0aa50ac11bd05b4998ce574880994297b27bd0168f45f74ab7ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/nb-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nb-NO/firefox-62.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "33c4f6551b1f418820b6b72d06506494e578c9f370e196662370c58ead866edcec5e5d07d1fe41eb5b9be886bbf56bdba0f6bc690909f45a4f4e938a460f2260"; + sha512 = "69412d0cd51ad26fb18c27e669bf07907a9d544bfd64edb3075040dd33cb3f950909ea78487d8ff4593c9cbcf818db24480fb12edf0dc483eb4da4f2b92228b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ne-NP/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ne-NP/firefox-62.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "4eaf3b386482132c346da954d94b99036e4a743a1d2fb9a745f5ba6ff2d337ab58935493d99f9cddd189730a273be310f4d477afe7f578c53f4b4a7afd61a576"; + sha512 = "5ed247fe6707d4f9f0d0bc9814b7e620b01960c291ba959ba4928b72752b97b2f7645b822a4fd5a1512d7b9a93e2c94f673569593a3c9edae342cf18343d5240"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/nl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nl/firefox-62.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b6263343512af71fe04bdef3254f6370cf30c2a5e262c8b262017ca00708271f539a7acfa9eec2fb360b5606811fa07db69212676c10dcc492e75337322f29de"; + sha512 = "f2fd813cea42feea6a82df0c9501282930db6482374a3dc3cf09f4d99e59179e13646df2419428ff7c0823971cd003f1b2440a8295eb6900f43c42674e1419e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/nn-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/nn-NO/firefox-62.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "afa0c1eb1348b1fdf2139668e07ea83b2459ff81a34204dca3e592ea5f4e91893b1dcd9177e5fa94b1521269ca0a02de81c87d22e076d90249704a3ead229b82"; + sha512 = "c4fc42825650e69a925755f8bc1280e873f4cecfd9ab8121331daac51b7f445f9f3645d3898e73b81ce5d38c5162d396437f922817d5cf7f504c394da420bb71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/oc/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/oc/firefox-62.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d61133d5762d0cafb16a1db8c5c38455f9788287eabb1285ec081b9343de9a4e2637f6496c929cba4f6f870d78af5bd85f9905fe6d2d2e5824b1b75a7b29caf0"; + sha512 = "f914083206611d88b7dda7dcdd8fe1ef5058f6818a56ddd3e035a75a7ebab0144110238defa53b07e250369be923c6f91decc3b2877e3e1a07f3c0c4e1b98491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/or/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/or/firefox-62.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "3a4d65a1599c16942c2b6254a29c3a05a7112a65b107ffcc5eb02b48f3b4f94b2b3ea788608d5d0dc8a9dd6c0fb7d1dd66217e6e2efc378bc8031bd66404abdf"; + sha512 = "a38905bd3bbdb6f7bf8113c5be14159548505176c84a336da9839b589f1ceba46aacc70cbd3337e740e15ab63076bdb10a3f163b45e62d97a33eb66d5243b4a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pa-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pa-IN/firefox-62.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "0bf8ae429521d36b16e9ce7540a07e8c576085504747b0408f85ebf66b8572b9179e66ce29061f02bb117fc26548e1ad3b7594799d681ea4ab0f571decf5f606"; + sha512 = "1086f3a59e2be3c612b6262e2bc0ecbe9db409d08659bc8c92d0ce487ed77c94d1dfc6fa9f17f48ddeffe7e1403d6ba4abc098f35a28431f43443ac3cd8ad565"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pl/firefox-62.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "371ec75eb47ed9192a9bceb22633e0437bc910097dd77b45f4812ffd63412d1dee931a6f6d379ee916a9d17a0e0802632539de78958293108194a4f5ad08b432"; + sha512 = "374f288d0317c4fcb65e7ddb7bc2489d1ab0eb6b79d5240ce27d7db44b9ec7f2184588a148ca1fb6029e273e863fdcae126f76f2f9625f278cb9e89c37b5075a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pt-BR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pt-BR/firefox-62.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3a8f75f5206ae4608c3632e9afb11d287613e0bcb10d3407e464b89a0c4349602aaab1a1f9fb061148baffd82aa3a6ff18eacb9e97ca9ce423893ebf0c4b5245"; + sha512 = "9d5ce4842e13887c0a7e4c44d641cd96a6801f41d4d5af1c2bb292aaa1fe4799099d832abcfb7e4dffd3e1c40e96f4dfa063bc4090de63e8a1e4266a6343531a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/pt-PT/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/pt-PT/firefox-62.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fe2fed370b11767dcef0e13ef06cb28aaf09ebf9e52cb1e00d4faf384a109d45f377307d945c66eebe9f22ae53b66a89e3ed32520b0d7caf2612cd724a77252d"; + sha512 = "997550771ee09dd150b7e5ce97d7a1db90e2d3bf258a23fb0df089460fce17157159bfd5648c2095315b3a383b0bcecf7506744c84c27f8e1912f34a11293330"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/rm/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/rm/firefox-62.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "4fe958da772641202de6093988062ef1419fea721f42955c8702d8a170080238066c6a1fa13fbe154d2e4318acb357e9095c36e95bf5c09797af3461178dd41e"; + sha512 = "2bda72985ca5619da9f63b760c994e3a25a1512ac586f8692a0ec27c3e1be63e315376860ad5d8be96ab82de2ec4439effd164411eb567f4f23c7a31398907a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ro/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ro/firefox-62.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "c2486c813acaba9c1143ec33165a6c90d1b9743235f71df77d89b38ad4c8081331b3c7c117bf34adf1f92855b152f16be5155731ae378e3f309a28b94909b730"; + sha512 = "4da0289b1b5461d51dd0f426d03203aefa7997116a760776f81ac10eb4bcc4565755ce0c6b3fe39dc6681642526b06473172901f50096fd61dd096ab377b96ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ru/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ru/firefox-62.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6ce925552d6ea223e8876697c868b806e5e63fc8f2926f351304b056a58fab61c31ec7b983056e016af17fc5fd33b095473ca8ca50f175a1202dd9e51a20a517"; + sha512 = "58ddd47f9af79f474d4bbd757b28dd6d602f42217782891dfb62c8947fbe82270f6e6b1c3ab738847ddbe41b8b3b9c17892c47f8034f3764794e20700d4d5228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/si/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/si/firefox-62.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "33f7a39cfbc581a5b39b7a3f4cb3ac156603cabc8938e69331db44932f5079061348ad1546498ffec36c27c06247ee91d238d7bbcd1e5ce76057cae41a1dc3d2"; + sha512 = "8fa680b3e2603c51ff081e196be395e88d134e02bc8496f58dae077003b26ca3251f1d3eb629ba6073fcc3a4dcfc883fe36156a3e3cb4ca70675d6f038be13eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sk/firefox-62.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "531cb610457a317e4d4a16221d1fa8d87e01cba34076e1e4834fc9ef695b57d2655e8239c86f41513a150bb80bd17e9362bfbd3cd8874f3dfc9ee2c3dd0b1d69"; + sha512 = "5ced28dda01e9fbc96cd430fd299f4af72f08bbbe084ba4b845ad05158475de173b4383b96a237f02136c6685e3501b3bc7898f7309f7e014691c777c496ad8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sl/firefox-62.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "fd8f29cc2139c19d6bfacf06e0548b0bb051bd77f069f19d1a322cd33d2888f1c11ef490ac27f9de19581619a79cce2cfb661c5782e13baa9276226918940c0a"; + sha512 = "137da2206a0147542a3a47977b308578474d0bb75d295d224bc5e563f7208b4e80f63489538e7eca9892d88b7c768488c1f12f2fb2579303d8fdec2f076e765a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/son/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/son/firefox-62.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "1a747d748dc9cb0207425cb95f3543b7e9815f5a9d3b273dda9cef5c113aa1f2d7fcd1a509a2dd0349a3245b82d8e52f427806c79131d0db12076ab23b672e8f"; + sha512 = "06f601898a4efb59c1d9310e0bf3be0e84dc1d05ab61af99f6b8e1871aeab16ace40ea8828e3e39ab7a294b0de6a24e83a0e9e3ecb383e097c87f6abe50795b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sq/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sq/firefox-62.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "4ac46e81b383374597983336d50432f47220983d90bda3c1613dd558ba7e8c07b76cff2b1f8a5697858c3a13ec7f12295b7216208fb9188eedc72016b4613733"; + sha512 = "16fd044a2cc66da7d6c15725bad01fc5ed0f6b050fa7bb5e143d6f7fb92a0fc39efe42c1b5f65c829e6f5ed774c3a717168e17d11634cfb74e1be036d39902ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sr/firefox-62.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "052b28335957b0ba25681d05b4c659b976986c5557c700314fdc9fbafc84ce54a768221e16f0e0bf8bd5f7f7930188adcea25740c810627fe3807db7661b2136"; + sha512 = "b443d6e775fed18a1b32906f9b9b3f75989d24febdbbcc5430b4c58edeaab7a89aba04cf6393cad440c345d0c4eda3d2ff17aa36c84c7be64afa8911907dc116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/sv-SE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/sv-SE/firefox-62.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "9bd541cb07e177674933d3175616e90661d647f66f0dc93823f8bbabe1ff16954eaa84c8ff35b1ed6f42b258523b67cc32159574aecf927d8c6b9df75778b66b"; + sha512 = "8b1652740bfc5eda8cc7b5e4de0cdc696f9ee98a5ab3b7a6479c8eba86158f3d78d28521bee112fb7a765fcf52a10b6e0291df8214df83c5ac9ddb80d72e2560"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ta/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ta/firefox-62.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "fdd312d62ac37159cce489a18929e6a93663fb1621de76df984da6ea32f560a39a876706224ab1589b3c18837eeb5ce921e3ac63eab7fb217af7b99423c2c5e4"; + sha512 = "3f4defe35e81d56e16fe86a6786ad6f0ed666f5cfc74ab54927f51ba1556a3434792284e076051d6004929fe31c7f1f7e1b3e740e89abe49307c9bbef1f16000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/te/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/te/firefox-62.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "7c3b5997955da39dfe33def93641cae1c4d5657fda4acc1fcf5fa153f8c7c7031303b05c5a38350acab61fe66f23b083f601464b45d31859834fc86fecbac78d"; + sha512 = "3aaceb787cba83678dd331576a5cf6b426a62a5cbd136bc94e83afe01d5075f64ad25e5306e3f795bb3a691e9286dc352b8318529b90e83db3d074d33c2eedc9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/th/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/th/firefox-62.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6eec3ebc39d6937326b13e667518e94259e0b69c3298e5f416fcff6d53562fd952af37aa42698ed8e2197afc1c2706f1a8e7e687982aaa5a2bf82012feec2c36"; + sha512 = "f90f63ea681b34d340a93895bd8e3859020ec8773106d4b814389bc1cf0e12f1c79f177d2946f2e221caf548fb97b2de893e3715691ab757f5c67882600f61b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/tr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/tr/firefox-62.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "febc45bb79ba34ca0cccd17da4e43ae9b6cc584e4ab4d3b2f409706b05218720203b924fe37563ab97f4b73ad36a395c7787347a418f5d333740cafa94d89ef1"; + sha512 = "16bcb13802e99368bc4b96516175a06150031bcfbff27c50cfdf1676565aec60a43ef79416c189f1e8c8eed4c62d3adf00bd1054b8a10b6ca0c9b2988d782aef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/uk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/uk/firefox-62.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "a46452a63ca19715b5cb192b8e97849b2411ea6e388532b943e5e4d201b62322ff3a709a17dc5809065ddd8cfc03089dfd3e9a2fc18d96635eadda4f4edce44e"; + sha512 = "ad4a29bee7871ba8e8cfcc60e3801d402f527bfa00082a1413892b812091bbf80ac05b7ff754aa233cf5d5bf60c629c3c5ae5e2c3c0e43767a80763e96f8c380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/ur/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/ur/firefox-62.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "8d5b350ce61c5fbc399cb5e90af69ffe7c3f91f3f37557afb7910a717a2b971d73cdd6863c248f6f75176253ec161729991b64aa15e3fe9b0a47797b7e5ba3d2"; + sha512 = "ac8f1de37d413f5fcc03dfb32d441632d33000960f89bbb487d9b1cd1129e0bb6f51a3fc89f0cd2e353b123471ba5b7bc7e900f03c3c982f0f492c811132d36c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/uz/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/uz/firefox-62.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "bfadf3b66e2f7519c36b3802cd7d4f6fce570efa686d8e1d5289cb4137bb239c47f2dbbf5fd805eb066a0991b934a4efc86dcaf54afde532cf81f792169f9c0f"; + sha512 = "04decbb2c4491bcd12f4c256a81eb23fe54ebc45acb286ff6dbf3d3b9c2e52d332fb8ccba52432e34a78de90234438295d1f55d512598b35e557c11e53068a14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/vi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/vi/firefox-62.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "32563147947fd1b125ad23181c4238053e5d54fcea673810e273adc6ff5ce1d0b264d94bb25ee22c0912d76d3e4481752b76e1db8d8bbc5fa8eae99668b86fff"; + sha512 = "728dd66cefffa12fc651bedde83aba4387cb38f06798514dbd5713158da8141b26fe6e8f5192729ac45215ed203480de4ee3a533b4bf305eba17776a7660554e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/xh/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/xh/firefox-62.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "e7faa6b585c6a93d09ed19ce53bdc287c1573289d3778755d0f9556c087793b39e8121fbc57e89e3a5403392cfd1af59c09c8cfaac203c61ec239cba185586fe"; + sha512 = "c8f7696e85d6fbf8e457c90a40f155f03e06a1c15958d8288f543df21576d433900277c39790cc122d90e424f94eb1dcfb4926a6b3fd5937192dd9d4bf054115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/zh-CN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/zh-CN/firefox-62.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "5a5aac639dd8a16a1731918032402aa6165ec345cba6864588284df936ccd4888d11a9232e0ecbae461731eef16af1ae7a3c9d8cc024af5502851c765a625aa6"; + sha512 = "e6c60f2cc1ef0f8dccbfd2d455cb2ed032e0c0d16c1f271b7e8d371478f3c607e55710bbed1c12957fb123e6692d251da726d25ae14bae514083d47950cb1a51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b7/linux-i686/zh-TW/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b8/linux-i686/zh-TW/firefox-62.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c796452d028cf22a1386f1a0c650452fcc2d1b74fb4c23358a906bb790a5dfb54ef3d591451a199a8b78767f0280970a90b48ab7e444093df20e5d0578b3cc26"; + sha512 = "c1efbceb88d89fdc17429db4f8761e7a93f283360d31c8e0fbd3bb56065c78c1b71aa47f1a6bee3ceb6104e62357515defc0ab564e25666c6a1a6b13dda5c1a3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6a9cd8b7b472..6a5c9d67470c 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -19,9 +19,11 @@ , libXScrnSaver , libxcb , libXcomposite +, libXcursor , libXdamage , libXext , libXfixes +, libXi , libXinerama , libXrender , libXt @@ -104,10 +106,12 @@ stdenv.mkDerivation { libX11 libXScrnSaver libXcomposite + libXcursor libxcb libXdamage libXext libXfixes + libXi libXinerama libXrender libXt diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 3e8210fb2cf3..7bc14c3a8fdc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b7"; + version = "62.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ach/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ach/firefox-62.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "ad08810db2d54a91f3c27de8c488f2fab9af74b82734e8ee50e54d9d07831059445c498763196ce74aa064c35122c6f18e95287e4368b8c2e92607b6d50e58a7"; + sha512 = "d897f44172fc411d9632eb5e94a69cd02fdaa7e19cba50ca036135b3fd7feec97f718d86adbf6124ca5fcdb63c9532d709a8ad5b514626d22826d18ba0e3eb1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/af/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/af/firefox-62.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "578a8f111932e5326805a15a2a3130c8203ad4c2db2bac20ebc5c7bef73c570b1f9f19f150ce1ed54a0dfd8eab9d7c1d08b20a8466a3ec7bc75c19e058824553"; + sha512 = "8b544de908dc4dc76e8c48c22a8819082e7e6828957b8cea2ac6534d237ecec19846b8e9e23c73c157a9d55b7122bce2a6094dacdef61718d02485243bbf04b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/an/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/an/firefox-62.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ef79cc04ab8d40e08dab5c1685722cf7bc22c5b71c6f60a81d9aaa0016fa455034256ddf5a8e08d870905023a2e97c5cd02ce9e38cb7e82d06dac6a9d1d5a7df"; + sha512 = "ee464edc47530c994196b461c738ac2e67e3c0e660d1bed7aefb4ddbba301bc2aa36aa810ea3d37cccb9b9eb042f8abce4f97fd5a8903b2559caccbba1f2d4ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ar/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ar/firefox-62.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "4cc1ac41c460f28078b4c20257ff3a698b6241b88e1f9b39e97c6a3ee963b7daebaed0a4e96527d5360b7e9e987bb3c50f6ab92bf23427ec04409c3342d6c0d4"; + sha512 = "b518c82f49efd368f0a0b9605a63e89f50b796906fec1c3a107945fb17c7ed8b902c3c38c2497fe094c9bb8fac019af41f4e2cad95bc47a2aee6d1e7e7777d3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/as/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/as/firefox-62.0b8.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "82ee25270097990f786d2d83e107eddaa9a8ec7f349c8b5ea4c1d5da914086354bbde4674d0742f5080b8793165366bce907496e98405f20759fcb040723d824"; + sha512 = "d758d992d3ad90e437f7762a23683387cacf04621bbd11c4d4ee18a1acfe9760094416dd374216817dd493b4d1a0da65a74037b7742c14e2bbf8ad566a988fb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ast/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ast/firefox-62.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "420f2d7fdd8a2e8a91a595577e7f74be2329e1b82691ab6ba1f27d667a7f7814f0594f3fbf31853ed85f2b748c105e7f929c9ae4b474460f107ff0321e458c04"; + sha512 = "47dabd688b4b2dc3469f1de471be0214db874c5a82545938555bb2c9c92249fb3aec99b7c8a231772a51d5b3456bd67954db8195b7bd4fa1343ea0a1d96ad27c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/az/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/az/firefox-62.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "2498ce2c40640895e22fee41c64cadd32d808e723acecd918edd8e066d677d456cefb41743ea3f0777b1e564c7bb8d9418dc06e2979bad48e0174ab97dfe5665"; + sha512 = "5c0cc8aa893703db2c8d081bd4705dbba18954f785d4974da5dcc2f8038cd48d46bb4906cd5afff66c01982d3d70f0bcbed61fb862c3091f51aed1c7519c9a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/be/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/be/firefox-62.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c8bbcfa2bbd1e32163c5df7d45c47102134be3c05398e3d201f6fe79a9cd37e636b75b381601b67fb9f582edac05aa09818746ecbaa83dc1697d0c720721a374"; + sha512 = "9f7dc862d2df0698a1b6bc32bffb59abf1cd3c86447c0914215a55eb9ebf91da51cfd5d0f9a06bb6c59e1e8ef787677dad1928db4bebadc1cdbb49c8137da5c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bg/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bg/firefox-62.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "600c6cd53275a2082dbc545c6d9aff3863f1fd206c857868702c79313ced4ecb6f337145cb82b8afe53f33218f7ccf8b99c83ac2c4037c5567551ebe3d4062da"; + sha512 = "80de85a8ac235ed50d0baab05302cf7d272f4c0f2015dab7e3b4bc4a3393a441c7e2386ed6f75f1d40ed16e370587afd45dd8fab67084ce66885cf4aaea36849"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bn-BD/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bn-BD/firefox-62.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "d42868cbe252001da5137588d364005ffb69c0619035a607aae110e70074012cac87ad5256f46955f5c74e45ee3fd314928be42edc85db738ebe0f3763eb0dd5"; + sha512 = "e9753f0690325d8542d26bba71cad4c43645a51074d482aecfdc40b09c9e3622fb0d288cf82a7777fc70b625d36d24771aec768348ab212fcd85bb5387fe1909"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bn-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bn-IN/firefox-62.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "3597895f922e63bd7ac1d80fa1317949d187cf415b5b872a8a97d38a06a2a73b93aff77d6b1d0bdc5a8269fc88f2582aa5b5228a9adb68bcd6bd98b13e3b74f1"; + sha512 = "9768864bc59ac9803995b4ee446611ce1c90bca61126e91a824cd007e3e16e8939ea76e1fd8bfab0b733f2ef4530819adccaf86b34f7078717e732a5dc56fa64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/br/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/br/firefox-62.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "e9f8298513422cec45f96af7334a1948012cc697bf867825159a44f7593f5da5995b1ae82fbf4bf1f419bd0633bd3ef9861e929f6a49598c82ad39b2edaa6a58"; + sha512 = "3d32ad8e5f037b50d6ced03d1747314a88fa52a30347adfd81a3c7070b93c4c3793b71490bba2a839ff188f8b1b674d6fad66cd0e21e42efd2f2e3e202f8f4fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/bs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/bs/firefox-62.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "098678b5fed12858f7f20de039bb460560ba531065b60ce2f052fb344a775feaacfa6811a34c389759ab936c2c82661aaffd997b7897ee5d31d5207e5f50873c"; + sha512 = "30789dc56f2c09f29b9fa22315144df142034993e0751a7b60b958c55de2f1364b484714304c0204dd190685ed4645ac4fc22d83d05ce25a5957afed9a0eb465"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ca/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ca/firefox-62.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "46a8f99ab04b98462dd468af8b34fb0d34d52c364434f12e44f147402981e3bc26bef6d2bc696463282be7f705507c7ee21e05e8ad668906c9dcdc59614a36ad"; + sha512 = "13409ba2cc807b2559de2b6d76d2b40b4b4b412d1ec656c3aff4d78ebd7ade63317c14a76e407b164f4fdd7f992aaf51905e366f4d0d494a5fef3330d378067b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/cak/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cak/firefox-62.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "417c12a94576f5dc860deb9aa1c9e57c8604e9c0d3ff7f5be2a2860b3a690bbc02b7f84817f7a7c3f617cfe935c90f04078c40e1ba8b300518f01ec4ee6cd291"; + sha512 = "eda46414dee9605c4a4cd6ac73ea9cb2f4810880aa0eab08239c46de1f39e4689fe7ef19cc560be42d6733745b7445af4e3be65f65ae99a388d3349437b1b4ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/cs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cs/firefox-62.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1ee2c7e1561d37e7f6f126cd417e8ca9ed09c6bc1c24483bf3e2241cfb37bd2c3094490d953c2be707f8d77898be3eb3e58fe399c58ec8b0b00e3752ef8e7e1c"; + sha512 = "7962a823bee7db362bb3d61a78500f52b145e801440caa29382f756352e0131c7907fbc835455c0d01bcd10eac08c4e4edee42f5764097249295d3fc55419a0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/cy/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/cy/firefox-62.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "287cb14d43214d7ab33971d31b223ab0adc3bab6f3ce6f1d359f5e118a6c43f287dcb52f702ca6a60effd2dddb953fac935374349981d0af04532fcc39e38649"; + sha512 = "36e4824e32dc9054286575879dc581e941f0c9e38e6b4964977dacfabf7743bf2cb383e04b80ad057c58b522d0ad8792145b9276f69b4b1a8d360b97080be943"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/da/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/da/firefox-62.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "91f9f393ef74d59ea786a32b69182355297fbc002b60bf2cf791272f07d0637f3603b5133b8c81f4cf50c83a9feb15b95c56a8e8c1351d77f6d58fbd3c7d1fce"; + sha512 = "127ed822b2b90c8727770864cbde078980b93a7d1730e9525822c231c9ee7554b5087e325d61467c2d9bba2d96d45dc359f54fbcc522bc70dde2a18c9d1237d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/de/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/de/firefox-62.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "db29303b902e89ef4c3de68c8f19ddfcfdcdd8487140e9ad3304746bee745359bab170171c84776c1fc9b331d1e19bd8442926b61c91f1c0da33adaca1276803"; + sha512 = "12f422e904a4f357a93bc0c093cb04f35c3f95a9a98f4658e10c6f3e292b4be3858217f4fd9a2b7c27db307f1bb20e1810868c1af5b04d21bb847843d1df96a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/dsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/dsb/firefox-62.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "68c0dc705c7c48455555a7491dfa6b6b283115818a3101089941a63fabd24ce6645b0ab7a21bd022ec4917adab2341ac24806d8f40c000f19b56d6b30b000936"; + sha512 = "91d5846862482c7f93bee5ed748e9dd2705242a3f7513987257a8a71093436bc4c24004ff3dc6f5c5e78786ae412e978105732e5aa2abe267bbe7953e2b5d3b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/el/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/el/firefox-62.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "5982b479db0152aa8c117489648677c4ed9d7e7471d6d202decb1e7e70200a4fc072ad936428ba97efc2b122a922affb5b549241e9cdccd12b656d2161bd3ab8"; + sha512 = "74f7bc52dca092867aae77350ed2384e6986869b227e4da9c539170dcdb4319b5f1a79b16c4ce1db50489b4b2dbd2082c9f9038314821dc2193d94f8678b678a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-CA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-CA/firefox-62.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "d15d881d2e0a415f686bc211a1edb4eba628d4eddb9b670f745aedff4b480b949624851bc086fe49e0509eed782284ccaa5b112106ff1dcb413ce1678f6bb47f"; + sha512 = "e7b0cb6bf77280a5f971af0c639fc539d873e50fe30436498d4282b118bdc75ffd3b3a2c982b7eba8085634578f04bfba3a4542c79ada19f449d99bd26598fd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-GB/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-GB/firefox-62.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "33f1e7674e8463bd746debb0689264cb6ee4214d7fa32a5bf5a9ef316f9761ee5b9329cfb20c466e530ea25a5ffc3850c6245f3d10c2f7c657c453cefbde9b66"; + sha512 = "de701a52d04528458e7fc090289729d58335402d410640147261f006c1fa3053eee286288ecdd6c75c9344dfdd25305bfd2216386c2c5c36e325b4afe6f6ac51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-US/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-US/firefox-62.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "12162030c68d469f02286e4e785590123a342ce815093440126b2cafbdd1336bea40faa4801920444a88b92292554414fbd6457a29d6d3127cdb9833be8c648d"; + sha512 = "6329ab408c0766581b688815e1e03aa8dd5d0675b428145265bf768f51d93e39a37c9e18a224670ae8a44e2adc18fe8373f5e65d2ad26492de06de3ad8fa2bfd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/en-ZA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/en-ZA/firefox-62.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "be168558fb81c84e81c9eb2394da118f8beda3fc358fa6969928d62f381723b8299cea16f9994075aab5b97c30fd2829d9dd3f9dc1111e4457e9073cb64f580b"; + sha512 = "76dca81d11ffc48c54425c48d3dbc88e1256f50b411411c018b816557d855160e09c19be0f313e441b9870848bf69eab4b550d9659e5e118f5ecec1ad1de95d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/eo/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/eo/firefox-62.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "817bcb0b76ddbc8bf5b3f0a6cf2cdcdce0cf9f43656b335fc7c09dff745ff9119d639c153f0167fd08aad357b4738edb54dce363b2652580dc369b21f4284357"; + sha512 = "656d5c21d6bac867bd9dfacf782b740f8fe0d320ab480bbecdbc105114bdc3d072b4c2606ca014012a939bf0825c83f4d4b83486a2ab47f681a21b5cf939e44b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-AR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-AR/firefox-62.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f83e704dba692049b8a32c08e9fbaf7a44bcdf2aec2df29dfc04e98979d8c7b8226e742428b2849e9513dceb49b2e4aef789d9fd82a035fcb00cad511ba7c524"; + sha512 = "26dc9285989a78ad8f3365ede1350c6a88c377d44db107ae20fdd75c5f52a00d42c008e8dadd216cd4c64d512f1f380d5e55d5fde74787983ab305bc042af0ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-CL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-CL/firefox-62.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "da14922c4bb5ac06e9b90611c5f5ccaf9e9594bf2c4b0b081bb6d744a278c619294cfe38df4b6e87719626ba90c9d1c54b2bb467fca7361ce64297c6c5073dc3"; + sha512 = "cf0c96ea3d43c5e40dd10711b122e59e898cabf21082783dde8878e643240adaac6b1ef8904cccaecd5d5638d5a0624f09b94eb4357699dd8d0df2b2e45e6b53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-ES/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-ES/firefox-62.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3b37cbca21858a1dc64e0cab2fcc0cf8243a06a3946c9bb45be63f9b4cb6eee8d07625f427e48b5564770cd35572712bedb40110c49a974cf550487e85e3dae7"; + sha512 = "a1e95129fa0b4de9dbfee8fae3adac5255a99ab77036b323c9c99892be8f5599160c0416efd4139230701a1e57ca6afb3fc69b162b32c5b8add8cf9d7c37a91e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/es-MX/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/es-MX/firefox-62.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "bf6061739b353f85d9c6d1d2c69cfc9a1544a7a09389d58d7ce9cde70c31da7512e8c341e248395b9b77b94c73682536af922e49f400512e4cd231caeb314b96"; + sha512 = "2d0821a5a2ce8b48bb37ccdb3c49d8094ff071aff6ec6dd21d780d633486daa3761a47c24a3fb67f8e70077a560b980e86f454fcc5ab8136f1c8c13e71e849fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/et/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/et/firefox-62.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "07ac73f1870373fa00f0226ac3bb84096647702e37382be5025a0d8fed6c2dc06f0329972ab380579db6903a418d8f20866723973159c856d340e70e3fde738d"; + sha512 = "58c96be64e4c8fdfc24a2489593c475bac52cad49c7f533da0315b7ca6462cabf703c74dbd029e5b82c9c902a8793b9d7d11882aa4511aa055817599f35b425f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/eu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/eu/firefox-62.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "2b27fcc174fe1959685c143610ad8b03b419bc58fc7e0780b1957a1d9865b9249e6e906ac651453b8745b7a4204fc7e80c95af1da83be189c61c6d45681d1311"; + sha512 = "f3c063f4233bfcc26c1d78d6b63a85e6f967789a950ddf3507181a7ccfef75e128a674b1896ca3d44977cb4803216fd283c35894ef9a9ec22dffc7c9e6b9c54d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fa/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fa/firefox-62.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "af9e4ddf5b67646a66c6733584b2fb1277fdfa2a151e0c26975c8bfe871226c8670884ebaeadb7410f269ae770a1b9ae53484db50dad4d2bbdfb7b24ed497722"; + sha512 = "a928c716a4e82e197589c883a0e262346cd4c10bc1853f28c8fd39316dff83ce80a4a64f43d8041d7e6b9039656372dd61bb0d07bbae1d8c51cd40b5043d7ed0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ff/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ff/firefox-62.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "2e834669103ad3475e2177f6d00e882bca0dac6387110e28b75d3c172fad519e1867884464de2fee463a87c673da9db1c586640f976560d9f182db878381e3fb"; + sha512 = "ba22c9d687c6001abf5bcbea99964fc0e427803a88cdf11d2bbcfee7b340aabda82460910a3bff0779fba689df573e4b45a82ea168d969b10b2958c12731ec60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fi/firefox-62.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e76dd7f036ddb276a990e6c4f0369c485fd976fc33f1440ef2eccb8418889cbc9eb0bcd857900efc091f0423dcb14fc585b96c7712976f358edb7de53ee5f538"; + sha512 = "1b1e90240d6e6d2d9fff7852097d64ef10ae719f9a0d9355972be492fefa37417722d8dd0e5e4a1c0bdedce4ce75daa8085991df1a83d05e9bf84a1d8e8ae142"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fr/firefox-62.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2eec8e3724110e49fa089055e5debd4c20468acf2ac259c5ccf5b2f693982ad66ff223e03549804d15f63ba6c90ec90e241a411ed79301475c1a768d004aa306"; + sha512 = "d4c3e745da4ded8a79910c66872147e15bb33be7920171ec44ad1f380884c28f9832fcfa386212e5d4c32cafa58243e0cca31f29844f8fe57417075b9107994e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/fy-NL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/fy-NL/firefox-62.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "a2a0e518b368c283fefd13fd130d2bcb287e8ffa8a2610d0d29ed1438ea8dfedaa49f86f86996754409cd9e146c98af195a351b5bae1b5fe1bc2b1e6d1412d3a"; + sha512 = "8b861015dd3f869e55a70001245a2acdd68a97932431dc48ef685882d5b1ed890ae6ef758f880c85de37661f770d3b776b71f8ec07c37c7ea60e3c615a9bf308"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ga-IE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ga-IE/firefox-62.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "ee9af54ba0fe2780955ba536f4a8d1c565630650a8e8b94cf9ac84b6ea433e324f408dd664fb06c07aeb1b6774a1b20a915bad4b51824b14e734ff9abe029009"; + sha512 = "704952c178446c95cee66508d09d1f73409c1eef6fa333bf46996ca7f2ec8ebf33e2a0305e29f65f493defb43751ec4a7d563f85aa24c56f37368586ea8ede03"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gd/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gd/firefox-62.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "acf1d362349402b83f0cc169801ac05a7583a65883cc7c0a20ce3d867cf37bb72715ea106d20340db6a319c4f62d14f30b1b9144fc191ce35ccc1e58b1ba9b38"; + sha512 = "069477569c7e439ad4d3677a7e919a9cd63db35e3f081c6e5af295886983ce63e0b2407e017314bbf30478459da4faef28c3b6a4dae8e65262bedea032e21a15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gl/firefox-62.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "be133df9db001c96eb9689ad56c16b353a3e93b6fc94d89bc02ff4c02d6847c396379673242bdc129b968d10e02425785ac01c220bbc25c9ffe328abccc84f02"; + sha512 = "70056d4370b16fc1990e5a3e65259efcc9c4b25fb9d4732904b622f4f331ea30a3d2e495f27e9e1647cb2f40c5914a2cdddb42fb9275bbb94ae66b69deb42534"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gn/firefox-62.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "921b320fe4287dbb12ecdc7bd1a47bbf2994116c33be412fb5af5f2a3c873897f6beba74805f0bab91eafed05406d7be2f704dfd6bfd7d0a27991f5afb1d1fda"; + sha512 = "6d86d3bee8bafa88652258cf46351b79d85f66b675ddc6196b251c2f65f9ff2438880fc1760a7d51a847a017c67cb9a2e9fb4c9d1be08dec212bbd8c8d46d7bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/gu-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/gu-IN/firefox-62.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "5a2b3e65bff11aee6db10fa04bcee43af95efb94f45667e447af8a3ab764f09d41c0f19c976b3b4a0c6996f6bdca83cb0f4b23b0600d5d9c4cbdf7282f92f920"; + sha512 = "fa97cd30fc4aca26a16969336473b01786b0989e5d946df8151d403761edb49e6c7a818a2522f9e30f5a233b0ed5cdd7c862fb7542d576d80a167bd05d1b9aa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/he/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/he/firefox-62.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b6e9c2c8024099a672f13a5fbd319a6723bd187d7282c2597c388d19b4a997471534004386ac3a48e48f0e56e7731753257cddbb34ed4842c117e77500118fbe"; + sha512 = "bceaffb1db978ddfcbd167450d43a43252dd3301a41f964ed4ca7eae0dd4a8e44e7bc67d0ab5dd3a8d19be1f1e108d839631e3efd1c1c8342227fac3ddd8d588"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hi-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hi-IN/firefox-62.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "cfdfb7713ef6e1be40fb8db91ad94cd04624d52c689cb0b1906ae27102865c20af62d08fd59cd137c6e1cbe55278733267266777c439c9d3d340de887e6f520f"; + sha512 = "37f5ead0e532ae44db2b9c3cff2fbf9001d9aa7a9f3d7d49c50b0db5cb9c272888d883bc0fcdd81e80d5dcddbf32847317948c13a501539a2a802d93110401a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hr/firefox-62.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d8ba79a9c4c591c7df13813a35a512d417db81032f37eda50995dd7d56cffee337cb9e90f806ad2f2104f20b9a41f4e54876483c8a1d05ad21096b634096d572"; + sha512 = "4a4579786c2727684c4e960465c3e5a478d1af52a829588900bdd6ff093b8cd58d9d5e9cc705f49be2dfbde50fc2576fa5cd197663bfa3f390f9a1697187b865"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hsb/firefox-62.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "68d3cfd92fcd272aef7c45e51e2ffdd33c257f34ba2b0534643506d15a6d5b4393c31600e8675c8d93409497569b3673f5c99102109327ecf7e24817986d5207"; + sha512 = "c9a0ebf132e2fedf887801d7e061c4a3b77f550936464ce4d232e7872781a9922bffa235bf4bc65679aa9a528d562df911be6bb817498cb1ffe3019e84f8bc33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hu/firefox-62.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "509c1e1e550b4a4a874955b7b9f3ce2953dc75d5fd261d41d3dd483c69e0bf914361eb9e6b516592d86e2a03adee70ab065efb2f23988be350089460c82d22f4"; + sha512 = "a52a84cd2b2b63400c0dc4e32ada00f4181efb899d35fd6e7a369de5a7699c5c46a6c892b0ee558db2f59519c169868a44772b948e04bdbfedbc31252aa5817a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/hy-AM/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/hy-AM/firefox-62.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "a6ac32775b9a59d3ed44703ac3826f4cc4c57b85b4b173924c4265bb4228c32f297f682a00eda662df010cb36ed1d2b3c612e90a78a3bb7a394c78588398832f"; + sha512 = "9cbff1936b03c19c9cc8112f5aa380ec5d783702d8de98c9cead3bcc9576b9ea5f2e8381ee7b6dd57822727922e7af04680005a2d394470baf1ea13a036b0cb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ia/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ia/firefox-62.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "36ca419e8dbf4bd6e3da793a52bc42005ee0df7dbf5e24dbe55dee7f3336c28699c944166301ec7b2a39f1a80aa5ad5cd0d3bc49ac096efa857db235a669221d"; + sha512 = "c83baa1785779e8e5c89aa1f5b177b737bc1d785cfb3d08e967f2203ad4694a595cec039fe844f285d68cdbfd7de887668df106a2e9f9da7417bd4013bdb7d17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/id/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/id/firefox-62.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8a2130ee6657e39c3f7d32bd705c639789faea541b2ddcb192c9bc9322507f631642465ca24ee2e814ffad41ce1d6316a3a98cb95ef65ff8fd8d2136ee5135f7"; + sha512 = "99343fddbd4d46b3f123a0d9d99bff1bdcf13ebef37d649a54d5b0f25577990d0891971336c4e138d7a8f9d52bba25f128e375177e925407786cbbed297d1ab9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/is/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/is/firefox-62.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ea3765044ecece6162e3d1b1bd10a3c1ca8a6dbfcab7a3acb9d35e27269da102315d1d65bb4029c17cca05ef6f3dd762ab96c3c13d15b06ebbdec865be806f52"; + sha512 = "5ab9e0cc0f624e700f7e7eb656ddf3bd1cb863eee57ac7534bb66999a4ec09e17360f526648ecc6733d5e2b0879d6ef39de77d0c448b721c8101d38bee144515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/it/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/it/firefox-62.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "400b8cf5733a93950d8b7f5d51b3b2feb04812fd63de1fdbc9b6cc53637182791239a2493da976b04dcaf30e1e121101a8fd905919f1c246b76edeb680bdc6f3"; + sha512 = "c18f825cd703aca1e5364cbe6a2c377bb683ecfb5f69407933eb593c889fd5838f093158d8494c862d00fb6fb662f535dd9b265a7e687905ac52843f7d118083"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ja/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ja/firefox-62.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "e20e4c624b1365c5b07097dbd94acc5cff41db8eb4f0d9656ee419f2571a8c82266819fd001f7ac75bf799a37855b036bd019071678cef54c8bf33685ae669af"; + sha512 = "00aa5f6478e5b69b6a1bd65751eedd16aa4d0d6122f16ea40dd45a20ec40ea1efea4b8668a881258c3050be06639199ade24e02fccf17a34c815a75989117ec9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ka/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ka/firefox-62.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "3c23f7f85b30d1e41968f5b5caced4f9632a4dbbc6c28d37766692658158e49a26afa8bb0ba7600f6c6dad9c8048d58c3befb36f822e372d053d2392ffc8ddd3"; + sha512 = "fb116868e59b3f46d53407a4706d88120810d8f50d86552f9ee75273825027ab4fc454a58d179d33838a68d66bd1bc37b736237156217dbfe5165064649c5979"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/kab/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kab/firefox-62.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d6623d0e0cd3776fa9983ce304728bbff19876927c68f4af25be40d8620f4c1af6000aee740c80773d4bc86a825ad5af869a36977eb5113b7b2bff390e328331"; + sha512 = "7d065d2ba0f6d9d00b092bf059212847b989490f00c1bb4dfe1599dab4ae219a229a250e7b2d357cf27358f6dad034e53dc94370adbc29ffc040eb6333592177"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/kk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kk/firefox-62.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a4bed4a76ec0d7892fbc2e89d839c66c625abef20c458d794283b1fe423d6f568a29e5e9e186de580cf6118e3d28fab515fdeb11fb1109109f2452c1b57575dd"; + sha512 = "3c9f591d4edcba7001ccfcde2393f581cc79f0cc3a05c098fbfb8a5023f9b20dca203d84241bc4aced261d482374411a06f66baf302881d52bb062c1b88ef0be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/km/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/km/firefox-62.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b3b99481cbd52bc0c15edda62689bf8a03e9056785e2ba93735138e805a6c992ec28b00eef24f739a8903e805370391c3f3a1577c6e39d661292fb46ed4b24c0"; + sha512 = "b922f2f45fb38940bef57054f307d0f5c37cc282841155f0ef09ed66722f80c04e64c1d7234cb1754e8afc6ee455f70067d25cf24c58cada9545234a95099075"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/kn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/kn/firefox-62.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "9ac915f31e9ac4306cabfd66396cb9cd5dbfda8ff20fe5fcad9c18843c1c15ef578d4c8ba34f0cb46039c28411abbdd6bd9d7ff05481d4f43a53f5222ed230aa"; + sha512 = "814f9fbf8e46f123cbe9999b1365226138a49b8f6d2fdc1dc23d472ea757c785f4458997e7a054121a0a72df6eb88782b0a449abfe3ea9e639af99d51325b238"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ko/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ko/firefox-62.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "88574a2ee7f59d9e77927d20d6b344a0b8fa28f077d69b881b20c12ef955df57343e02bb5e580c59cd17d9b1224d3b1c1f2dc1a557993585fca2552b50dcdd15"; + sha512 = "c41acc63d7dd60e50198084286da55a8d64e6544501aae1cb8b2aecbfb39e3ff9a630cb1f5cee164945a26d6bd42b302322c5533afad749dee76f5bab46f0b12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/lij/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lij/firefox-62.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "e5c30edcc21c2be21f9641e8f63e8b8a9422c9f59f6a6cd22a93f485b3b32a1087d54b25be06d8c4411d4fc75763830fc6ea0afb37f00ef2b4b941448a672d2c"; + sha512 = "a4b3ddb51502a21435eff747aba28f458a291c399f187f8eb8f008681014e0db9f09a813d5851e3e7bb7f4a5c882c5990c97ae40782f74a2aa28b4d2c1145dc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/lt/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lt/firefox-62.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "6cf6c1d5dc0950f0f435fadfb6fd50957b9f8d28f9c95654e5bb9becd5dbef5be616b32b44cfcaef34fa8e45023374eb865449a5f4ddc049fe81b992522c0e1c"; + sha512 = "06312f8b135122827c5a7f14242dfe2d8b2b8a80a4c6f707317ae57cf988b052016ba686c666de90bb6389e61b6194944f26d9d2886ef89f944bb31ad6a057b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/lv/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/lv/firefox-62.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "aeba4128b016c1f404037aac3151b570cc47a912d80b0790640b9f21833539be8cd08cbfd3e0c9ad97a922d6e8085f95e57368af4c8b18b8805ae02ef0ba5274"; + sha512 = "9f75c4260a6329fab8e18851fce460c8434d35c91c30c8aca0945d184bd65cf2407b46eb6354647a37935e4583e2327e9dff170f9b2b8b8925e1f317f4ff9637"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/mai/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mai/firefox-62.0b8.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "3d3721e6b94b8175fbfe89cdc1657705df41ec1cec4f3d41bc9de953db9f1e7c14e4b72d93bae77dd5c9819df005d051680e26fdf284c88b4b03e7e9d999e113"; + sha512 = "082492be40c27d720771422386948cca4c4704b8ac168b44e9cd3ec1c322ffb42050bf1a0c2be1698fd185cc10a9ed1acc665262b5280e131019a4aeeec69f6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/mk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mk/firefox-62.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "acc205c5db8d49c1aed33ddc16584c257f526cfaa659ac50973ea7535399cfcae2ae65f6e3fe6fa2928dd717f4e3dd68dc67bb803d4bbde97aa8b9c356be13a6"; + sha512 = "d7809ae69d01a6d259a72aad63daf03da539fd4aaf0e7dbe2bf863f2cc4f1040affad9ada368adfe1115e48568e32194d5bdd2645a9e53c124d370aec1f044ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ml/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ml/firefox-62.0b8.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "251117f4e329f725c6f732564d1e8ad2d768f9370bfcfb8ce02c59390e8f2950ba9cebfb6b6881d753bdf78942811e927cdfb16fa6e9f59aefa8b9096d59c3bd"; + sha512 = "bdb8681befb9600653dfa5365349c117115b2f62b0a35fa05e7858b077991296d5b0abf3fd6d9fb734eb556fa600a759a33cc171e938c05a6267a1b44dcb81fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/mr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/mr/firefox-62.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "e999b82d6ccf5b073471ff368b814040e108e3c77e61e1ba4295054d76a7614fbcfdaa179d40b5e3140c1bf5157a8f84766a05ab481de62e8e652ff1dca8bb17"; + sha512 = "4871f2109edfd3347f2524e22946828df8aebf36e09cab28922400163a9e8da2808d297c0f2961f3cf51f7659706f15e01ce14d91a11651d7d46607691d2b392"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ms/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ms/firefox-62.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "bdd77a30cd42a147a9ed01d892be581d33fdff7045368efe68e41595e0a90af3342a9aa6e5a0f8137ed4006fc312e1341af07a03d29d76f29fc216d2e546dfd0"; + sha512 = "75e18eada51ad229c6d9024f1e59f27fda7e3ce39c2a9d776d43e7b39f0490aa0b2e0f0072cb4d2102e21376d144e957a785d6917b49399470089a4c50b86fad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/my/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/my/firefox-62.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "571e3cc2ec073954b9db0655c2785a27b8d0f68caa4d5068aa4479c5ab2d8722d15aba9454017acf67ca8aea0fec66134e98bb9e7498b672e1bd5e1e227859bd"; + sha512 = "fdebc1ec11dd68f709bde3489e9f4048ca06ec098df86e059f049b3ac42c43fbd2385375d138481f94f74625d224044f8bb4ef9f8b99db7e3744ba5de40e2c2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/nb-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nb-NO/firefox-62.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "779f14cded9c57d5c3a17f0a6edbfceeab947d7619662b31c17f0140feb56aca461a9addb8361e966d1464424e980390be2b34f8ca8a8507479df7df6d597dfd"; + sha512 = "31bdb35e58f603734f02814a6ca8bb7d25e4e441006b4e1fa50f31c289607f2a8b87cc50196dda4cd2110c254a0aff828fcbf01b64fa7ee855ffda478566bafe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ne-NP/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ne-NP/firefox-62.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "aa2eac9565d6b9ff8d253700afea11cd3d770617cfaf0704d7ef0f638727a2aabf26c8e7722fb5489e182116cbaf00e11b0af72d1588ef795b9e48352e720542"; + sha512 = "665a95aa63f4484adbb5fab9175d9961b393cd4246503b127898ca7a75c014be6a942e2ebb5229e20309cb19c04ec1d28c908ec2fff763023469a4adf78241b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/nl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nl/firefox-62.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "6ea226ee8443f4f9896a83f93265e24cc26dd013948e0d9d3d19c76e3e15e1a434115fdf5a40abca1d83b1a176ec0e57600dcfa4b925ac39c0a61531c780c271"; + sha512 = "092a3b45b26d679dd709546816bd481330b6dfd69013dc5267a98bdf771eb2b97dcdf297ae7615735f96faa4ad72fc89417e3d5f6a09301d38683bd5db31c1c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/nn-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/nn-NO/firefox-62.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "125bd00e484542d33562baab2c43372b6ddc5d0e5cac726c9d8aa1197009b36f285ec374f92679af2d8735c83ac64e49e3dce66e91699d5085ab78cb3f828172"; + sha512 = "13a1d4e3931d4a0ba80f0cfbd6aed3974dc9ec6ace6477c32b1de0fb59076619d14105a3aa1f110fb52274dd2f29674e2bce2040eaeaa5e0caaff11b52de4ec3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/oc/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/oc/firefox-62.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "637d46a729d97bf89f19065e27a0df509eddfc004e1fb9747d8706e5a81cb08ef44ed4f39a33ef348b2ad1386bc170f87212c220e208d9873b60ffcc25d272e6"; + sha512 = "b37f0902e8b5e05a5e3d2690d64b7abee5293f260de6410d1721388d89cb60354114f18849d5be5957fb1b6db4221da23c35e2959fdb8392be6e2fa3effc2667"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/or/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/or/firefox-62.0b8.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "37937b438da3aa66c2b74c269f901064f688e35e90ba8f36965d1d5242f9f23662e2b2ed48a2bca6a2ef466993dc5fc83dd3805d481085ab7d38d0df1a8e67e1"; + sha512 = "bac38857fcaeecdecd3abbd837ae1b729f6bce1040985f38243402bcc1aad1e69e59f9c3a2237636174d9b2e1a080ee16364912392af5facf93f901aeab6b947"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pa-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pa-IN/firefox-62.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "f6824b350d585753ef731957266b1527153b9ee9170735c49054f230dd5a1c17489c87c9bc462c86b6cad9d24669a897e095ddbe5f07bd5385369ed70ad716b5"; + sha512 = "904edf40c00228017ab4defb97095b0636e0153043d74c33c9769bc7c134b5d8f5865fb0bb1081a69898e5bc0b52e5f9c0a8ff350e7fb9e7c2ac5c2d0148656c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pl/firefox-62.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "40b92107afe9ea94a7e4008a8f08fb75b5fcb7b0d1b4b0d7e3c1ad3fbf637c41e9a4529ea894b4f459348a1f2de6cd0c3605c235fec7a1208084b6b902b5d502"; + sha512 = "f79a1d18b0f2eb1e0e5f40f02fc582422f1c07ce13661976487e2b40621b190ad7d4d62ce3b2509553a5997d284ba4975ad681118589a7a6d9c170955c0efe83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pt-BR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pt-BR/firefox-62.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0193d7e979d418353fd2437ad198a2a3eb6ea84bc7c1a303d9770ae2225015225f77474e160436386ea9c5de5274a975f29328ae16774712d1ce79b84f5c73ee"; + sha512 = "5357a906a9f4920f25db77efb655ebbf54fba7acb1120e28cb0b22b4d825ce53e458fac1a7d5b3fd21df4a735d8d96f7d4ba9a878f0c54aec076c5ac58e592ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/pt-PT/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/pt-PT/firefox-62.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "ff3c111f38474f72934c1bc8830210e8af3c09e2ec8ba5375caa823d41a16c025c4eb8d252d81da5e176807c0140e192ec8b8363a1ec8b17cde2c8b9b3ddb59c"; + sha512 = "8bf5e145607a5ff3c84df57d6dc427a87973713d246677d2280f0452c7339c6008bcc49f0f9e70ff261b9cb44dacb8d3a442ef9ede46c728fb7f21a5bf0f95a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/rm/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/rm/firefox-62.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c425d9f963c7d44877bb0104d696f3e9e5a1ba5e12b89b456ab9619d3b9116f7029ad586de8db035808d624d2ca5eb3c8ec61bc3d55d00bc6a03cda54ee94c5b"; + sha512 = "16b5a217eb6179300ca709d97ff504339bcc0ed6684d68e118672974eadf58f1b5d28598c29f94aac2a1391d592e543cc42258672fef14c97197b2f4684b410d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ro/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ro/firefox-62.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "028da63125d09174d040c15fce7f9da9b09fa3f3bf3e186f4a82248193bf5f3b8654feed66f1cb6e499bc00bce1cdde052ba36da72576a53e7e5b34ddb00496c"; + sha512 = "5dceb3a11da2f02749341c9064c4bfa798f9ab1deb02f6eaaac4ade66acd73f1467deb491583e6eb74441ff56ecc15531ba3f241d0009d9bb42fb7e0dbc44d5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ru/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ru/firefox-62.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "55a40b58473f3dc69d6a5525ddd789a833a47ea6d5a7f328ca7badd3089064c726c420d3c208a33f6d9a42c4be5539f361fdf4ed99b82d168785275ed3242740"; + sha512 = "388fdda87262647ff1969bd5dafd0804304d4bdb1255323d84ddb4b4d8b423224701b417b0392f90ea13b90b8f8ab7db18fd3d015daadf5480fe0c8b2965813b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/si/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/si/firefox-62.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "301926c95511014b7c55a4138f4e0560ead95e2cb874af9e1705f1c78603e082c01c14c0ccce773ba419a536ab7b59e86ce7642cc3cbf6275960a1a13feb0451"; + sha512 = "8c84473bd83e31fea9569c374d94b95f8826be2c456d7848cb813bfcd76cdfcf5dc91ef6b406368f4170b932d5575fa79d126e4912fb2174a375c19922eb7191"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sk/firefox-62.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "b9481bedef44cce5de87460904f2b1f07a8b26fea90813426080ee5a8a3e5165eaa416f0eb2a12117a96ea7293f1ba3175eeaf926258987edef6fad4037836ec"; + sha512 = "10c03fadde9bfae654f349e87e791d1f71b6411fdbee46073a7883bb5e31f4eb34467838356b3c87c4f0a1db1bed0aa8a9de44ba25a7f7b25e69dc1516f51db7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sl/firefox-62.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "ac15b46ed6222081cc3efd45ec63d21f520b9b7f21497c878c4f92a85e7e220e81b9f0e06cc3e93dbdc0933dedaa23567644f07fd92fbb7b6c9e5c54f7df818f"; + sha512 = "c3d13be822bca5d45a584c50c9c31ce1050e9749eec9de273f77abbc9fdb9867e111e4731a8c22d55ea9cb7d07d608b6f19a4b38dfc7a4d9b1ed32baf751da64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/son/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/son/firefox-62.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "e8bec5d388d4fc9a188528268bf52a20052cb59fd241c95c5188b8bd10eac80358392b22d06d92a5e53c1d1b73711b988fe6eb330a7e23b3b9f36d73bf69dbea"; + sha512 = "ca7654c7e16da7233d74ca4a7850cddc57e74110be95ae1d3b97c51f89c34099a229a47ef519704846d6e172be615a87555716073a3ee4cee55d0785901e65f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sq/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sq/firefox-62.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "8b1ee554fe02b43df5caab092fee5f838ca9b6af08d7d0c0f5ca10fd2933df4a9889ca8868c935997e650c02a24856c4107f5e669f7f2b29dd6eaf14c8b89e14"; + sha512 = "623419b86e05f07b8c93d0238e308039235ebe0818afd352966850d39579fd4bad12f70406208fe7e69f72b67105f577953b921560877d33c3cb7289e3b7ee3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sr/firefox-62.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "9f4969e5aba2f17f7a8b0debec317bec2086bf57b37a0ac5f3dca35e44e2c9facd95b45c71d36ec304d81682a8c5c3d78e13069066c70ac8f98185ecc7a9463a"; + sha512 = "de6fefca0a95d228850b950fe20c5c5075f6d74ddbcd262a402fdb1057b4882c40d48f78d8f6260999e23d70fecd360d71b799ab6a486b28ac5f6d383bce0a02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/sv-SE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/sv-SE/firefox-62.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "3111191c3b39564bd5a82c709760b68198bc2b9f69cdaadece902416452e103ba046008b11a347bcd229a99016f1addce8e0467f2ad0df943202e01ebd646387"; + sha512 = "2bd609749a8b22c3ee48919dbf69e9940ffd0eaf9eb9dd5e1d3be6c8908ac36ef6a30b5d7173b5f6572c69bfbb899bf92ca7e69c8038645a38e2c601f86a6fe9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ta/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ta/firefox-62.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a27d8d850262a326354dbde3d2d89c1d0a3c5dcebcf6965389942deb0736fb3e757147e0be63b819186d04d2c8e6c990a42e66a45fb87d8c7086cb8e5f2ab51e"; + sha512 = "abad5a9264de2a1120ec53d6d44776a4072ec9f62caa565a6ebaff4791c10b790d2478e989318ba5ce18bb701e733bc413f902a78bc6d4cbfe565da36e255d71"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/te/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/te/firefox-62.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "d8ff44dda247279a5a317bb46f2c31592bb5eb5265dbfe49395689bce5b1fa5a4e68ef8572e1b22c38adc027f642d568384ee2fe0e617874a198c4c87078f004"; + sha512 = "1c4a99ff6218baa53fee4e260fc9a917a8be5e6abd5beaf960fe7a0e17c19f22268cc62acd106b2ff87772fe4f200c1eb9fbcefa9d84c5ea36066408f8c74a2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/th/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/th/firefox-62.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "cf0c879f72af58cb2d5d48dfeaba6fbecc8d7b9da98097bc4c809803abad16637c1cd2654c0f126d338f1293411570e00a6da9859f1fb1fa5cf21cdde3adf366"; + sha512 = "47bb945dbbd1b23721e86fd8f250d6bd05aaa7833c29d1d891b6e8a5555dce59c3adf2f4427c871275c085cc1d0b433ddf1e0dae8b4644136a96fbf01b2c884b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/tr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/tr/firefox-62.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "170a004877e6d291ff9806528942e3eeb40647606947eaac7894e1c00f2cb35c86a65cf1c3c43ae6add0dda45394182fc8f490d2ee03c8170ed5de6ce7d11c5e"; + sha512 = "40ee4e0b9dd1ad96cc1bc315453b2597c3a32230a7c009dae359562a844bfc6fc29d76bc779272b45bbedf7f51ac55b1940c34135113410151679ff6908eb174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/uk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/uk/firefox-62.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "376fe37bb899f4b55b281ca3de02bd64932f8b5e7ddea118040be782ade87136db0f20c7d4f5137ca4e46c8971c233e08773d182d304050409c15529e9948e32"; + sha512 = "9bd74d2fd76c9396e61eef04a5815c1c48c736700120c808090b28cd4b93eab6232c7ca67d40a685ab7d7878d4a894c8ef5edff1624a57d9fda1f1689ef8aa0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/ur/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/ur/firefox-62.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "5a0e5cf929a746f1c95cdc5f6a055f1db7cb3801cad7286f8fc2576670e11f82515cb585181dcefede8c07c5e28802733951a097734bb8290474844dead84c55"; + sha512 = "1250b38cc368996ff198adc3d4887628e8daca7f982e0c730d5f563757fe0744afb8c9fc35567cbaa97fc0d8eae51918ac2656e5b68a1c11bfaa41383ba85cd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/uz/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/uz/firefox-62.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "247e462b76fbe292c324f6f53ae1a28d6bc0848571d294727a7428e97585e78c3b9e6f5be0b475abb2fa693b714468b89501c9210712954a2df3e81ef879658d"; + sha512 = "3972912f74a387d8d5efc8c7f0158077259f12005a9634f98e604a37407c96517f7b652e3b319386723126122e32996fa6387fd2e8ae9454412590353ddbdc39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/vi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/vi/firefox-62.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "475e8385c72645bef3b6134d0b0188c010892ed3649059a6901b5d25f0531f0ec128634f2069bb12beee176aad54cee3354870eaae4bc0b83fa89d0a73277f9e"; + sha512 = "0990fcab28416bc0c4616ee1ecb33d38e6d9693b09a2aa3b546e1e9115a229a4ef94485cdabb8361619d944a02b1f516d7d229e984ec2cf4f68e2d85a71f83b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/xh/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/xh/firefox-62.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d115b5bfb5df8b9e75802edad2284f76443bac7a7f181f81de57a4b6a50205ab89f02bf0113eaf3229774bde4dc36680ae64cfe0e568da0ea9cf91ecc8cb6ddc"; + sha512 = "fba549690c99c67ab6c1d7c1e69c466fa9c91ae0133e052cd81846b18931aabd7d773817ecc6445c0819e71eb817c29b66d0061be60fd1caa30fb81f08473bfb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/zh-CN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/zh-CN/firefox-62.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "d5f1b3b6d61682bccdefd19af73fab12c06b2f3504118ffa08f87e79bed24e3bca665a25bbbfa260cef425bf9aec7ea5e727fa4c2c65a0a753fb7cdb5db32012"; + sha512 = "305f09e1cf68acccfc3eab5dd147acc07b186d66d34b7f4642c4ba4b63e5c5d523c55f8f92460b1db076e9105cf287517f39460e3a336bd28c819cc1ddf4c376"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-x86_64/zh-TW/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-x86_64/zh-TW/firefox-62.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "fcf99f7f0f4c38bad17549f1a52a420981a960a4340ace887d1ddf33e164f048fada855dbe35062a2051767d5a425676ba58e046836f42228b0b4445ce1e689a"; + sha512 = "3bea23377782c0ab887c8fd5406ab4f8201aa302b37f0621ba3383068da1395353c483ab59c779171d57049f6d0b82dc900298f93afceab232c74d894a3de91a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ach/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ach/firefox-62.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "975a54923bbfd96026682226a58d1e40f58de54c7e6254b519b0f3911c6cabd52580e079a780911e4607090a8f499c584c8b4394107468918df8096196cbab59"; + sha512 = "66ab08448681715644f1fd98796a96bd8fa9107ddb66454efb281ff81e2adf14d7aa4d3a78735dc8a88a73be3278b44fa4f7cd07eacd396e3c3a0ca663c4876a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/af/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/af/firefox-62.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "baf76b7abf35cf08b9472241c9e42818de0c0c0c01d7c6a184b43fb422e4106c2d7ded99bd5d1b2faefa79e9e2121d590462bff0f5af5d7022e07c6bff1d9b69"; + sha512 = "f162b28ff504ae53accdf80099e07c67fd5d8c4cbe4d28bf3d3a5312a29f0cbec018b4d1ceb058f7934c587b0d1d3956123dba97e5548a90eec073b2a46c682f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/an/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/an/firefox-62.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "61bfb531071ae9f2605db74093c492764fedceda42771f52cee1ae1230283db13deac806d277fce66914a38f8af21b6b447d033457bd2edee0317352efb82b9e"; + sha512 = "954e118d203ed335b43e22c4743021cd69856695af2900576e461c5a4fb82db6d2410db28b5f978c0f50c5bf443b1f499348c502540a6f718b9cae80b691ef3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ar/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ar/firefox-62.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "a015ad922023f7a9b0916ee998a69c0b4df1c09139acea785c81a6ee8f66e0788ed845f671235c96166bbbc3f2d7f815cf76cca37a4d74f9f84c01e11e535eb5"; + sha512 = "dabf1adddd6687b36db7be633f3944449af48b9e7d74bf91a963062058fa59fe5abc235f7d0c597b335141e9ae92ead05a486847f1d2a21a6ada38ce3938b93f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/as/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/as/firefox-62.0b8.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "7d07bd4eefefc3cc7a9ac5cf042e0e4bb7f1d8e7e62d5bd3e5ccb796aeba2979ea2d57535e3e7edccfd1fad5053e894399664d227f0d48d3bc15de48791e7877"; + sha512 = "54ac6533026a330ab7926115803af0b511fd85b4a56078bc152c6df88c0496dedf6cc59f7f4f180465e5716d06838b7560c9aa6a9e9a8e9de101c75fc8d2bda8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ast/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ast/firefox-62.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "7a2328a8464a845e880c0cc77b1de648b7259c669fd04b9a2845f0711750d4e80af29df93b5a79e27b2343bab851fc45e0ff235b49b5f05b3a8d140e63ec358c"; + sha512 = "ae0edb7e314404566ac706ba527c8481688555008026ba54f4acfd4c8c0e1b31aa84314820c137d412e75df9263143858a4e87e38e285db0eda7227850044762"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/az/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/az/firefox-62.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "3597dddf41b44a2668afe9f789db5a172f8275ef639005ff1c92064cf7138cec46abc69e6d1f5f47d4bb2359ca6cc2c00d340b875b187e4ae7868d1db61781ad"; + sha512 = "94695103f392e42dc21864ffb763cf5a29b5c279c043a867c7eb5f67640fa454b22118ee7928cd68299f14f58dffad093e67dda23f398c76971af24eae81c0dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/be/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/be/firefox-62.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ec3b9429dadfa050b01582bcc3c5cb3250f767af6caf29a073871c018eaf9769f6d22262db0292b57d848c976e754d04bd8a35eb7ad930f404310c1072c42491"; + sha512 = "a224ca31468ea32720a1bcab6b48479b5f1e75a475305fa922e3085e7636106011406b144904348ccbdbddced590210ea9e4a1f1aa5d1b42befd2a83fbaf68a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bg/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bg/firefox-62.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "71b37c2b49dfb4fd31391c0df76e0799a594fe290d47dff5d2302956eb345f087e2c4cb813d4b7dc362b1b94c13f41f7e8426a732fd35ac67cfc590ac6fe4941"; + sha512 = "31aec72f23a034acdf81bf7afdcbdd564bc0f8835191d6e95badd9c8f726106b6351169fea5b5f8fea1008b0786ec26aa693473eebae85f4c36f43197ae8f57a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bn-BD/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bn-BD/firefox-62.0b8.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "315f0731708a1a81ad533c70383911d1f6f895bf22c5cec89a75b94c1c7093b69338e3331f610e9fc636ce1efca8b3ff01571fd33f75e4ee86a840db57ca9827"; + sha512 = "69cf522ea9acfbe7ee28cb5dfa3e137f1b6b9192935e14b909131dbdcbadaef36c77d2660a5216361a63ebea1608fcb8aef0dc53e0a6ecda35e7946a7fc81371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bn-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bn-IN/firefox-62.0b8.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "b77c9d3f995a4de3eba4a70cafefb0264c41ff0f2d0e9991c3159d09c0e2ba54e982fb73553309dd8ca5dbfb2b58395f68cbf15da4d44536c572a8facdcbbc1c"; + sha512 = "337e70740147bc29e13e7c14d9e3705ca6477aa8791dff9f1752346514970e07ad134bc97571ef02659366e8d53657da688c3b5ad7dc808fca64382a5fce2a02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/br/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/br/firefox-62.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "442d858b40445db801b61840a8358c7bb3e41dc6a85bf76fe8c76e17b0d448614c2a6e7f8bfbd523e8f8a77527653caa58c874236f1f7a40de3b7729e482c927"; + sha512 = "e105100b11ac7f7271f2bf4d4adeb2a63dbd3c908ffbabdec2776fe15f2bd8c021142e2b20e9331481b9448fdae1fa7cac613194918671383ee7791d7a081d70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/bs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/bs/firefox-62.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "f9cae6d565ce99c61e05a76031499ee5c107e2fc80bdf9a9442d42c7c859267ef8f156129cb8ff40602be1e6f15ec523fb0c974ebb6564da76b11283cd593795"; + sha512 = "84309476b384672ba4f9ba8cbef78584eaf1c73de33627d02fb8e125da57391778927a57ef7b9839b52037bff4a9565c7a64e899b3a9fd0f6dd1ca422f82f659"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ca/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ca/firefox-62.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9967426788fddc85bff9c4cbbaf2a705798f140f37f02c83f0b775f7feb5e11eeea759a6a50fd4ab35df438f2b412158b5335277477f12cf34709cff4ad247a1"; + sha512 = "1ebd529177ccaf448609a9ea09e5aafdc39059c913c5c7b7e75d0967d1256121ce3427d9a9839cd4d086cd41b54560786186bd31cf3c00441d75c21c4dda50e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/cak/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cak/firefox-62.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "5be1ceb6040364565a7ae1b7efe8de17a8eb8019faa120a49e5dc65352e8222b16b870c12499da6f31014af6116df6d9f18edfda5e4b778184ef0a973df460e7"; + sha512 = "a9d9988afb346a133962def1414970c9793d81ff21731a985ff7a333e3869e5bdc59f1d6d8010cf11d636d3bc743dff7487f9aa8a5c3a400548d0759066bf067"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/cs/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cs/firefox-62.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "83b8037c67b4bd955df35c9f54324f8b4ab06174cd7109ef395eeaeef0c35913e177f7985f64ad2164cea4c81b5fb84f572ecbd7ce681ed05a4abc8ca63adee0"; + sha512 = "8ab01621c7533dca95e062c4f5fdb6d87a1db26db17f54a451d639c04816eb3bed2801355b9a168332dd6ddf6f452ae0aaf6db84f87837e8b6f0ad78130fb59a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/cy/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/cy/firefox-62.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "47062ba2911ff2cc5efa7492693f48ec9e07001067a6306fdd9a03a415809e663a46dd8e8e96cb96669383968505f44ffb2792db968c5812a2a34cc105fdf0a9"; + sha512 = "02d600eb55011b2351e90d3a2be289ba1ce6667b4fe0fb63a5dde03fbbadf85ea13d791b67161bcb0b604869e9dd2f1903c17337fb52b4ed32c3dfeb23bcca66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/da/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/da/firefox-62.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e898eb251bca4de247857ce2adb678774d610ad80b5f213c1c0475e6f569706faf9233a9ce097b589b0289542b272eb52579d86c58290a80065c4c0b676f0c18"; + sha512 = "d4feebf408b21e1258be3b4dc56830949d4652470b9c148dd675b250eb2ff756a06937b28ce88f143406813d8750f0504bad001e9289e86c3d4e274b5cca6a87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/de/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/de/firefox-62.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "358bcf61e25132f050579a5801a7ece46e3a896ddc179ccc346f763fb5e1f8f33835dd75e5d202e039b8c566d8f7d2d451794a64c20882aa3f25d95db0bdc71a"; + sha512 = "58ecbb11eecc19bd748b69b8979bf1f1d029c16eeeb2f4945a75d968d18093940b09614e2d6e969129a3e405285f971856e7c74f33f2915431616e43507b568f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/dsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/dsb/firefox-62.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "df3e10bf37b9daa974907068e4a10b12d2e709a9a8f291cdaa5b80435d002f4e88e3621ffb3805756cd9c14c7a5ce13a96420114ec282b04d939686a58f875d7"; + sha512 = "8cd3239bf1baaed9d222c70402121e866d98cddc66d5763d1ab8e533093828721c81bac9ec74bc62ae7062b4c176c1bb530886b506444ce1b2b2e69c503a6f77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/el/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/el/firefox-62.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "3d8d6709f55991451b908dc9555f1a9a6360bad4b99404c6a32b715a40d770361026fa238d924d33f8f7f9e0c9c480240e2bcc1d8a0c58328b6da19985c023be"; + sha512 = "25e495437e74fa9c2d55ed775cc7398acfc6eb8206847caabe8d1b99aa99fd9586bba1de6eb2c75119b8cc64b8f7f05ae816ff06f373b9552b7e9407d6eb17d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-CA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-CA/firefox-62.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "34ed55f1aa7ef63c12e21dadc6d26074d287524e51ac1fc36e4a83596fe5dc174744e36dbb54e4e6730918c0b3d81ebfb4bcecd3b831d10417f4cdf2f6a31df6"; + sha512 = "ac250fdfb15622b4f1001e8542591d43651c2123144286ced4b8323d18d320bad8d07fe3b5b1fbba245419e6f9a3e2c98d13499f61f3c8d1aabe6d4f3d51bf96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-GB/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-GB/firefox-62.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "f61e87d90b19818b0bfe0f5a143e2a0eb7c447acdb15cfcd14394cde3b24ef72dc993232717b9ffceaf8fbe67dc840f5c5b0e235c01b9b5299769de35216b915"; + sha512 = "47a59793dc03b6946d9d8410d86a593fb9c43e27e2843ca8268b503ee7043b4adcb613b11289c4727f4441e2502e5fd1bb1cd7d78fad51b343527db83220435e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-US/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-US/firefox-62.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0c790b5b49cbf7f5ef5c17dfd6401dde1bef6ebbe356e9aee9daebaba06e3990e0a11fffdfba0a1e292dfb29800f0886910ed9aa03a9557018c7054c6fc3f1e9"; + sha512 = "cf3148447d9a69457b2314f670a24c2f4bb433ebe043bad2d6333f308567871ea4b43d6658d71f4f889d69146d0b87f2898272e7e37b5ffee6e77aba42360ef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/en-ZA/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/en-ZA/firefox-62.0b8.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "91fec777ba79906bcd16d31a829308093e04c0459e5d53e12cc4cb896fda99ca8ba2d8d219ef7b8eb8bf078cc26740520290bcca6cd0db884ade9a3210608c3a"; + sha512 = "ac71ca325f78a04cd797a32e4ce02a511a9d86d39ecd3d730f990da201addad0a7d2d846e1467fe24f88a13f055194793fb1b79c929f902f87a8dad14a8c2ea1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/eo/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/eo/firefox-62.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "4f02fad274ab3f4df93a23a29585ea4a76dce1a03f4f0a7d5e8662b93bd7167ca03821aab5472e53df6812afbf432489c26d26a9d4971615c60928df80edc79d"; + sha512 = "919f469824c477539cb9bbfbd9a6b49282f22a05e2f5fa5b14f7d175005efbe819bb89b5219c70494d430f27450be8dbef682e7cd7aadb2ed08d0ab12a8ee8c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-AR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-AR/firefox-62.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "12e3736ea7aba1c7fca5c4a7588e2beabe4fb48a7f2e544643212bd5ed4fb7631cd194614db57f1d892d19d33dce72177dd382a7a444b0cf0d1e668e877395b2"; + sha512 = "d6d945117c4dca2b547f499e53dc8155e35497ff3cbbf4829a7148be6e6f473d679427d2d3e316d793d81f842cab5a0c4c65980a1f0182b0064808969c6468c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-CL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-CL/firefox-62.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "60925ee4a4b889309d6c06e488dedd0be0268ae53dd2925e798efb847c5ad55a44fc9a721929289dccb93ee71c9beabf02619664d2fefe079c488a8f78a0ddf7"; + sha512 = "cf45f9fa15f9082265f87e41a082ec83d6f6095112778aaa7843d3904417f0beb57cf8c05f3d7dd8d9ed72a25a9e7b029136a018098f6f87c157c125789e4e04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-ES/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-ES/firefox-62.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e0fd781ff41ea473a8c3290a833786ee805b531717ee2ceb4f047cb3be3b28f79de2e72ddabd386818b2edc91752ef7068d01a7b8be9c08ff10e04da7b389a75"; + sha512 = "c994dc12c7a2535ac941a6b5a7cf5ff6e4fd59be0c97abcaf68af0f978a50e5193f5bd66c16c0e720863796bc000aecb005b1537d370eefbf9c063ffdc17a211"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/es-MX/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/es-MX/firefox-62.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "241570b529b54ac5ed5e11c6994decb7ec150e3059e72c6b3fe2d0364e1b939a5814403854e2b6f304819e421894dc7e428d7b09383393e93bfa2a20cfbd3c1f"; + sha512 = "a594ed7d8122ea1b55679a830d41308a60cbf3bc5073a9884907027a49d1dcaf7310d72b2ad3f2b727d4c15e72955d6de87f5909193e6c65874eff6fe1ed57f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/et/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/et/firefox-62.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "dd7b97996d02ea78bde550e8a6e3c8d831783cf973d51bdee64bc4b1faa2788d3894927c7636419d6836076cfee19c2d93c87602437633c619274e17c2b7bee3"; + sha512 = "0e14c2efcbc025e109933766a42d79c048e4bcb2c37dbae2093d710cf4f3c277ad7d9c33239a38033affe1b45481e986f1677c168c7db47b9cc0bb0eb560f6c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/eu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/eu/firefox-62.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "4240417595f1b89e5fc4a4f52ea6df65a7377c496740da7fdad4b2cae8fdf705fce7d8a5722fed6d019c006f9c9e9e90c00050d4406c25e12517972bdcd70450"; + sha512 = "7b917ab09b1d8e02045c877de859330b3fa284f00b7888ecde7aad2897edbf00d130a0ce86ed52faf78f8c78bab791a005f9aa26d7de5b9bc18a510566d8a092"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fa/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fa/firefox-62.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "7edd528c3e29c429686dd5ee1e1bfa4e61fd205dfdd77fc22b0bd76ba02763376b0c83a63d0da6e692cf95da9d5defe04ae48ad06fea72bf5aea8442e43a84cd"; + sha512 = "4fcdace94e6881ebcbca35ab8505caee6faf3248eec47f48652af51738ea4148f3ba5aa5c6ad06922f41b42314a847fe390cc8ca0fd8208825fc6e40b201b29b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ff/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ff/firefox-62.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "c8f5a5df5e5b0859977e72007a5865f5f836aa8fa19375ff281c5e65f50c398f24108abe7334d9cc5a499af3c853df3e1e5c865c1947ee94dda1a812d73c412d"; + sha512 = "2371b589d46e4104219bd2514abe89b58c07edb6a1324be872d127ecdf3b03f711672620e12e751bb0d80d79f5073ea0783a4757281fd650da323584a06b496b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fi/firefox-62.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0d5ee626bddf4accb1d761035d7cc160fec82a014411f79f36aca58bc70794bf0888e0cf1f219b7531f834adba6234e3e664d612bf837da91a0f9c6e21ae336c"; + sha512 = "1c735d81f757948058a6433de854483552f8ab8bf863aa363cb89573a7d507048287f79279ea05ec805778cc70f39738f1bf3949a4491370ed41eddd95fd89e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fr/firefox-62.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "c2d339db93df22f0b62800a3eed28ce256d9a2d21f0fa1037729df9919d8d0a2a349cc093caf9391e543f02ae00852209c3aa99142461bcc13e502c7c6e3c3b5"; + sha512 = "94a52b48326b8c6708366e0a4d4b62428faec108d9897cbef60190608fd1a32bfc10e1180f5a4544815737b7f02c9f54327d7062e94466c51c7ac50121bd9cb0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/fy-NL/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/fy-NL/firefox-62.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e97bef4735689fefccf858e5e957361c95f7e7aaadbf7f72f558fdeacc9f63c009963d571e6771c148e8a4deb92f52024ec95caa46f2ce1287045c1e1af23a49"; + sha512 = "8e82dcfbbcd398200b3103efd62aee511d6594805034c049205a59dfc7042e18bb6a86a7f633a2c5d1717721f22a5a20fc00f31223b2ecaa2b316c5908c3a489"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ga-IE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ga-IE/firefox-62.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "2d21c9910979782560a664cf47931c270e117c047cf799e96701a2107b319c8536489f953f19ba2ebfcf6d5de5a363b6e8caadccfa18bdd5dc62a73018ca6503"; + sha512 = "7cf134789f157fb07254028227353dbafacc6f82bd361f263233b767c3d5a2d82a0c128dae6a2e186df3757088136502240c1254974a05bb7e7d9171fa5fec06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gd/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gd/firefox-62.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "0a2d662ec3639a6ece1ca03100e31b6059b87b31877a54cae0ae177c6d4cae94a8baf28d7a58701a9071d67a9cc164221ebca1fe271d8d18cdc1563dead12225"; + sha512 = "727b3ae49955f3652a4315f24f5b614b27eff8ee9e9ac2c879f5457f727ae4d8b4d6f829cdc095ccd7d5781e3afb2ab4bda9657e4069d4d7333a4ca6a6c4178d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gl/firefox-62.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "166887bf920823e2a713dc95b31ae76edb3d5b96947842c7887e701e91a2b8898cfd355eaa2b8ba4bd8ba5516ff5c976b4222f89d917d88bb339adf0a60275a8"; + sha512 = "52b49be17fc6054405e62aca76251f7b4d8d343e4320886777f6ab5dbf3fc212811742a0d2c8b6ff537cedee1451330cf97582b0de9f5e3380f7800fbbca50b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gn/firefox-62.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "ed2958f68188167813e57e15a7aa79e862e5b532b09291b6bc615796efdba2e146dfbc16bc9ea2066c5a2d8345d98666ca1cb5fcdd42f3e9683644f5ca7a8c72"; + sha512 = "cb61acdef2b5dcab12a9feb7c1c5fc95e42b94d0806ad551e3d6965082d1faa8e47517447d872ae068860e36f14dee1f2d611fcd1be3ab70b81b43ff60f9daa0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/gu-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/gu-IN/firefox-62.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "5579cec90bb0beed38066e1a7177bfa923c6da0c5ff7da43c115eb19ffe2b5ed534f4d77a10297a92732d4ab0d7d43d2a15367520c94d53a49e24aaa47be0259"; + sha512 = "8b8cbd3ba57812a57e9b5ac2427132aa832f4c6a132b4d5fb9312f53a7312bf83fc3d07034527b8364f6270d92161d2c855a4e97750c579c2ecf5e284d1830af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/he/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/he/firefox-62.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "90f9f3036ee8cebce48f095feef2d2e1998b99f7d80226d80a5a2a44426a2c2dcc0cec7eee689025fc2c2b91007b752716928240b39883703b7ca1a8d8ab9dcc"; + sha512 = "f56d01974a7f4377f59fa4d79d13735f3fd402fd54e2371cb375d081137ee461b1fadb37e87572e3d3e8f578eb39f3633849506fbd896b1528f71d9083cadb7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hi-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hi-IN/firefox-62.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "ac12919d6356c60f0c9ea5184757b797e2fdf6540b625e9d101bb5b39daa44387832643dee2a7b58099e2a3c38b5614140fb21e8db2b7386e2dfc68544f5009b"; + sha512 = "0c9fdaf9319b7f0e9e8a6f98f98389c1ad43bbf60f671901410d9b73a58d31be6d538cb70319b08c317aaa282ba6e27fd953806913fdd777dea53c35709cfd4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hr/firefox-62.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e109b586cf5dcd14cf5914367fd008edcd852dcb259f312f15394bbb0fd8a749d3adde245e603be86aa9c61941e35d149ac744380b3592210c448cb018e7d624"; + sha512 = "5b7d723b6a3bf484b63253652068963d3e2ceba4ce938a9e15ee8575516121dbc548e05e0067e4fb01b0226d018ee6c13b80f9ddc92924e107cc2399f30bf23e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hsb/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hsb/firefox-62.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a43016d11bce865c9cd0c6e5825ac17c949c411ba310aca474934822005e34a6daf650e2a46ed8520c8be7b6e0010a375f7947220c8da4ddbc4b8c36958f0ebf"; + sha512 = "0266f52a3f0e5afc0aca01fea7b043ebdaf7c8d2036c417b6fc43ca44dda5e42356100e15d91e8c96f55fefd791d30a9791957037da9c5922d020f5941d1deb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hu/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hu/firefox-62.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "5a55532786569b91d50432dce76a240ccfed3196bbac44de5027ab42644b1ca99b9e94197bf5d645ace3a21f8a449f6bebdf31e2f23ac0afca0e1852155582e6"; + sha512 = "d3d159603f644fce578b3595e4f536bcdd673cf9f7ed51ac2a3261a9896c977ea9ffbff3c514d388cfa5ed55f308558f7532c64615c014f307cc1ed417af3aa1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/hy-AM/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/hy-AM/firefox-62.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "129b2988cf27a90bf660fcfb7615c27d282931af8a199fadf2c50bfed1cab8c32a66bf67027fde017297ec7dfb987c4c602350b80c2a0aba046c22859b01373f"; + sha512 = "6a5275434a8d4a7c2ccd950a90dea8c01256dd06050fbb89f46e3b3b2af93eca58cc63ba0a3d2ce74638ca665c03e50f531a38c2e7ddc656ff8b790fc91b86ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ia/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ia/firefox-62.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "032eac26da807dda8443ea34d63b9ccc53181be8721e03ee620004f892378126829f79661f23fe59d558670d70bd915cdbe43d82235a54005d2474c84a538038"; + sha512 = "dde0b49642051ee119fc494ddcb8f460b4f2266bddb0b6bcbc9471024422b0e752e5931d463379b2bd093e263841770ed72b2a0f5ac6289738824582c9b5b26e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/id/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/id/firefox-62.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e30085d635bcee6059fd5689095b4b5d139d0d99bc5c4a7aa3d56a89dd03aea726151efc2b17f871da526628e6f30d1cd78d1cbe43945d2fa1e26bc861d1ee49"; + sha512 = "d28cc78cbace72125d82987477c2d9d2842588639a42ee5fad8ce32c27dc7b1c0d0fa11dbd780e2084033ec92337e02b16e1b8bf7a4cc07751fb431505576f0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/is/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/is/firefox-62.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "95818e4b3c919ba2437fe4be5d29b9154a42775f64d0e54a19b7113f1714778f8da7296d7a6335e6a886b37133cc2f77a0dbd23a56efb2a0b70b3f33b9e01d78"; + sha512 = "0fd3caf8fdb6131c925c4bd5dee53303eab3cd0974568291b2fcce7d3cf45ef303ecced2e1c35c36f4929a0ccaadb90c4f15eed7beac7cb557fa19d89c2ec589"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/it/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/it/firefox-62.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "58b9ef0bfd439c98f62050af113612f8c824fac859efa16bd4975162698b34580e80bcf1657851284794b6b06f67c51fa1352ae7e1338de657f751fe3faf667a"; + sha512 = "a532995d36104848afa55015ad2ace55bf75b08866d15a1d421e86dc9fe63db1e81ee394336266e466e4ccec91b152a52eaedda190acffde6c081d31d0034dd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ja/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ja/firefox-62.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "ea7097f03c814e02917ac1e87b1cf4957cd99807b1b67e4f505a9d49cbf259ad630b16d718590f767ce0a965f7e31e51eaf93913cb6d16b0fe7ec5d2c62df842"; + sha512 = "42b91ea7daaa5c95ba73f84b9bb2bc5f7a2822c265a6efc0c00c9d0c2627d066ed1a59ba0124cd7c23823997b5aebfcc79477d77fa7fc537fca96f7a949b678d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ka/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ka/firefox-62.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "e146702b09e49bacc799178bf926a26f2d737ba19577742ec200090340e3f9e96aff44db12d3075312d493a993e16e8668642bc7f0bfcb01785175be5594b7d3"; + sha512 = "56d98625777f708034abb9da0d2478b84742ad4a6275a0f4a410d35c431eb50f12364c6c822d5e315b8dfc4eddf7e2d36d5fdc42775ae1e49cc2b0165af027bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/kab/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kab/firefox-62.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "395878260f2c4bce8e853bb0b7fd8c027928c0b56b6e3ccf40fe012d8e2326cbe9425d077ac8bc8512026c56e629a532524a32119a92c8d9dc0fb5ae2a75b9ad"; + sha512 = "17d385688a810c6850ab2842777ed5af6848818d78226fd931a26394f2b423c04984c38822aa0b9172fdde39c14155e6cc35ba6afc3f7b1ecca37bd17aa3e088"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/kk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kk/firefox-62.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "3c1912aa0cd4e673a3838e4f903c0f4ad5867e21df55074e574e34ab4b90d86ce50fb9e0bbe1df63b3bcd2e66f0c260e2b4c4c299f9546d7cb0dacf0c5639112"; + sha512 = "ad28f77aefc1702d13ff96a4340cc59729d62d8cb195b9b909f991ad7d2886884fadfb029243a35ae78e400f0a9873ff26a60d609e5f2be934bd74193e971542"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/km/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/km/firefox-62.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4f37dfef1903e401c13956114e30f130ef75ac511146b35da0748c1cab40eee23ccbf66496b6f1d4810524b8e2b349d9d0eb89b50e0a41b85f2d612e4c42bd91"; + sha512 = "2a39367c11e5199a37b129f84011c724742d60496fa9d0abaaaad99b81dd42cfc170b49a91ee5227a138d2dc11f1558e2b6fcae1097f04195595e5a24d837910"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/kn/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/kn/firefox-62.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "9dcd039eb9686e03fb01794f24180f2de401eaae1d5249ce5d508eddcb9534919c7b03be4b28619ea877bcf66527425f3cb0ba29b016fe7657fefdd9cbe1d7f8"; + sha512 = "f8a3d491f4e2a4490df7948179d1f4a94c9d59f090512873853ac263632eb5b859eda30c630e00a37ba8834f53e7fe8803ff92f9c8c63b46fa11126e98b394e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ko/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ko/firefox-62.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "044c2cd92254bed7540f357565e10ba3904da78a97ccf9348034580a347dd3925b120cdc56e6ab7fdc48d42e353db23748d159fe85ae77c675339ccfa1b96c57"; + sha512 = "67f172b6674f2afb59624ce91b3fd5c478447270324b97f0399ee4020c83befcacb04ba43a34d58a7bcb75ac4e3bfe09c51213e27a30285a5085219ca9254812"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/lij/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lij/firefox-62.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e8d28f84f5529c2c87ffda9d9b2f7db70ef58053e45b36d5cec75fee9260c6be02f25d119121f0b88b3fbd38ee372210ae169fa7f4f5cabf83b3eacede5dbaec"; + sha512 = "c52abc55645828516da84e5a27374bdac3fadf939a916b728ed89f79ed3b63be2933a4a5d90f005935d14bf7d52a45311af2a63c0474a2749cdcba9a8943e83a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/lt/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lt/firefox-62.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "0382cffb8af29946cfe770833d17a679f6dfe9a6328d696400207412297bec12250cd76c9918bb4d92bd2093295313570a75c4a885d40db0f4ae78182340f5e9"; + sha512 = "6d690bc2fd294a58208935e4fbc63f286b4b2e719faccb918dd78b0a342afa278559347cf39ed1e7d040b85904dd9332397b129084d1aef267d488b3f3b4e272"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/lv/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/lv/firefox-62.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "1994c95642922959157f3604d8691f7d0dcac0ec28073e4dff29ff32243c54c5760b4ae757fead7d153dfb5f21774c482c9fa0a1b09c04109af490cdc2371e93"; + sha512 = "4c364a343e569fb793f8f0373d4c689b403e6d4fa44e38eb8560e1572d03c7958dfae42e6e0c1aca4c43eef455c41f8d592084852d11c93cc2c6e8c219bf39aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/mai/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mai/firefox-62.0b8.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "75c462bc0fb0cfcebf062e3d3135a966f7e4a3b3f490cd85fd6839d9dc7906ed426a5516d1ac281f3d053de0fd1632c38eaac70fb3426f53075bb8c17a82d59c"; + sha512 = "f65c7091e5b6382401c9acd175df3e0ed4db61371b467a2d5eda4da97c718b06ca911796d9a8fcff55cab3420155eda88226b2ef3ff2f00bfbdc9801e71b6cf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/mk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mk/firefox-62.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "cc1296d94246b063d87aa6805b8eadb3fc92d84fb7f51796b8880f6c4881b62ed5b5ed6e5df748b208d354ce2bf2835421cbfecd2d3e1d32200162e8308adeb7"; + sha512 = "ed38247a800564d8bc7c480fef34b342353d6fd6ae6cf9c77af3928d849cd0ae85d717a0e71429ea0bc0ab3cf11d66a8b68375159c25fdbb30379312880b390b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ml/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ml/firefox-62.0b8.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "82227e46042b0b6fe01431df21f4352f711dbdb83d23a18686778045e013ecfe3d23c99b8fa3ad54f3dab3ffef4310528e6f33c38549971f524a2b35bf632b54"; + sha512 = "417b83980dc5019681d13989650019ad81a399a340b7388152648cc98f8e8c5740ad892b0a905e5dc4dab8f25f277b982783aa62d5846653caadbd40fca11a64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/mr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/mr/firefox-62.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "4e55466c4930b2c3e04b6448fccda355e881e1bc952828a64774767f0558cfb5ab62fb5bbc5025f723018cc9f77983ba930b16eee94a42a7e791de91283ea8d6"; + sha512 = "894e581f7596e7700234cdd0bf1dd787abcb3f088b12f7374e391cc2da834b4ff3737a4ba6ab1cf1b3d9ac43316551b794e4d0760559267f106369da9d8090da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ms/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ms/firefox-62.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5e199272f433765ed505abd5e973f03f8b651249256072b7e3c9c5f3fbd6d19fbba2212f63fd77598c862e021ce2a5a5652fd2c290edc2ed06845fc0c26384db"; + sha512 = "8a258945d4a6ebcd92362bffa54ae7e1910ff53b2c8026978fa419407842349412b621213b3265da867183aab1ecb0ad5f7a01f0e994c411a4e4caeecba6ad55"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/my/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/my/firefox-62.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0b6e1f8b5503590cf357c398e24851d751a8f11e4dc11e9332a8c270bcc2250fc64762cc8ac8d5d31fbdd1c8370536b0fc9c4555992cee7c1780983282437afc"; + sha512 = "14319f1cfbba49420dd36d8c72df942ea7bbb8347e1354603709be1a74ea72e1cc347f906d14aa658f52a6a200b38212666175023fe60fa320abd08c5188b3c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/nb-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nb-NO/firefox-62.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "de93e7a9f4d7d0b080e461b2019d563d7808487f05e0fe8f1fe629deb06989c9a855f62e37d4b6a29156771f5f9e3c5878ccf554611f868602f93e32a7226f51"; + sha512 = "699a1823692cff174f372ed91f42fb3e39789ef7eef98b2e7dd67586113b949ca36136f71b6ddd7671966e01cf782ee6503794d2c2728294b1c7dcecd960cc47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ne-NP/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ne-NP/firefox-62.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c2fad6afb58300f0254a48ff15b4b2cc9c7340b83cbed601d8bf04f2ae4751a3c44d88d3cc25d4cb6a84fbfdeb833da73b926433028aa38f51d57379a63b812d"; + sha512 = "f32b70758b5da00462b02bee115e2fc17a75587996b32bd3ec6fde8de1be3b3d1639e813230545d218b94b23a74bfea71a47f6313e264914b14e624f2d5ffdc4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/nl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nl/firefox-62.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "92214e4f739b269cd22f0199c69f4a412d201810d2d3c2db9ae14ee7313cce13caebe6bbb76fb761e5877557c161f157d06e8b00c99d6427dca19d7c66494e4d"; + sha512 = "66b2ce7a9a315c7b79addd6579e82c8e28ba5d4629976b8eb848b9fc07ab86990470e71f767dde34279a0021c7d9670a74ac3cf9bf499403377d6fe6c7047288"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/nn-NO/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/nn-NO/firefox-62.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "53af052d5eabb1df13610df29a861480a280956481296177ee9d7a23bd2d13aaf25f43e7ddee36578c6f2ff9d4720e6a23b02881332c398499f40b5bd4aca111"; + sha512 = "e29bf8120d1828f25664c66871bde593f5adeed9c5772d3d8460d4eab410387a05a68b4c61a1d909557b069eae31650a61694b0b938a269fd7eb026c9166a94f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/oc/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/oc/firefox-62.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ee1d736d5dd6ad580d6c9f4306efa40c17dde30f4942ef69b3fe0ce5922394910989a8881cf17a92c8ca04b8fdbdc52af3495a29cf6a4db98e563d2b57cb7437"; + sha512 = "0e87d74e3714b391a7adefe05432dbf3d0d0a59f8a042b02ecf3c26d08cf21fdb69e276965b801c942704c935a2190bdd381165c2e1eb76825e861268fe4e305"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/or/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/or/firefox-62.0b8.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "dcec55dc91b45c0629d312e12b6967b9195b8d5fbb3a14f894eaaed751c2c207c3a534d7dea2cb8395801d4541a9a8206f2faeade2cbf8c17091a8f5cd1faf53"; + sha512 = "92530b4abcc39fd7411a432e4e0978cf9558970dc1a98b1f383f6878fada5e3d9cdd258e41b62876a768014c213afd577fb250c4688e234715841275e6f0b81b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pa-IN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pa-IN/firefox-62.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "4d26ba158ebb7a7a8f13f629e3c9ae9e50d7271710daec503a89ff962269ab4ddbeb01e62fb2e2cae3b43426ede9c98a2f5857804e44e473a6e6b6f97f3ba72e"; + sha512 = "65e8d369ee686ae8ad3e26bb72e768dc859e5c49c7a1cb93108309e917c97619984429a5fb3250f52276609a23ca330c49576aabce2fab99982940e92caeacc3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pl/firefox-62.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "c289eb22fe70b0e75177dd5bcd8fdd9f73a9215e06d9ee1de7b17c1cc5a566b801491a2ff3370cf565ff4d8cf4078300bb87e58a3a8eee81b6993f75f7d1d767"; + sha512 = "8c81dcab1ecf4c63dfad587b12cccd8d130633c41a80964852866b31e5075946e40ae3b4ac38e46a986840dd72a1cc1e4da90d4fa5325c1c5c87e187593ad268"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pt-BR/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pt-BR/firefox-62.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3343bc7d0c1b9ea2f4a36e2b2d91e8681348409eb92dd694d692502cba2dda4a3a8e90a9639508a4a954106f86b557ece96348b216736b262e59d7907dc02c0d"; + sha512 = "3982eb2823a7bc4cfc2477e6b39f45b821f6e4f3a86e8941af5d308e5b3e9f299bac6bee27b1ae9a360d55a5be82bc08e39aad6058ad9d26520197a333d12b5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/pt-PT/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/pt-PT/firefox-62.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "dd482faeac423ab8c1d8721930e1c1ba56fc37a7f8bb263098bdb41bb54c9bff3835e774290f7ec1de494c922dd800454c3405f893d942b0f813d8e7ae9459cc"; + sha512 = "b6ac02641a856cde768dfb3d9bf3d843be1926c2be97690823d9b1b8acf6add653d388dbe388321e5149cf68b8b6e33228a698e3bcf84eacd073078f3fdeedaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/rm/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/rm/firefox-62.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "50dc6a0e06eabb8ed5bbfa5d5cfb8672c429b1d0df858723225cdf14026f86746b4b3e8b43da9c3c3676c475ad4fcb6b8eb9ad6cac3321c3c891c57706518ceb"; + sha512 = "5df66816dc8bc2a094b62851c451c3276217b4f5f3223bee0c93d07cfdec5dc32092b85adf2a4bc924773abbb24aea1a734ca0a81d322513ab4c24a4429f186a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ro/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ro/firefox-62.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e657a1a1860357b63616a8d3460ef68647681cfd4e379ed9020d050e7301e8ed3ec03b55b390fb62127cb42cb5f38f44c550be27b5ea596ef344f6e678723aeb"; + sha512 = "08dc28f4affffe6c26ac26ba0e572e8b5b68c856317836b7e936cc88a2559c8ee92ac5ea1b796d0e42c614de4839aa3cd40e9e9bb7d1852262d92baf91255827"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ru/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ru/firefox-62.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "301a985f4f8141e6009301f33dcd0fea04e5ca93b3e90cb04bff8335dbdcf24c0ce620c530ddeb1329fcdc4d2f0302fd377bd5c6cf9d084427a2ae3a9c93ca16"; + sha512 = "173b0b854c3e0cc681d0e7b576e350b7912d6441345b8e9ac404523d12c49fbded11d561bc2c409c56da41022e0b683b8c1c39bea743eed4a0fec5dc8608ec16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/si/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/si/firefox-62.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a614e7c7ce0c0a7adb3be20caa1c14c8149d62d2954ddecec9f93aa59e04d19a99430bdde16f7b6bfc4e9fb08baa3db4f18fea9096af5d77aa1978e046bba944"; + sha512 = "73edb5fb6138df5f4a48f246a36fa36f2b1d3b8196cec6e3de7fc2258bfa6cbf1c4fa2b30eabcafc76bed63f59fd824d6956367f151b5edc5346b5f3f9fae29b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sk/firefox-62.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "e057fe25cac653c8ac8fda77a7652304e41363c321c558d3f259f34ffc28495ce4ffd4f262715a9dacb4fb4cefa241679062323b3f06518f4f98908453375de8"; + sha512 = "440c8176c33d9c9d32dfee994a6e19f25fd66334e5654b13472e31a3bba0e3aba82848b5c8f14762a8192ba2c391c8e32775ad856d99ed66cbca22ad246cf61b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sl/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sl/firefox-62.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "fe9dcc8335fe0fb9f0192bc7b8e36316c0cc97788b5f0faf07c2df7eb7074a5339a05155c8c2bd750869d4bb48b43769b1f291697e5c58a1361426ab09bd8b25"; + sha512 = "ec372b7fba0127ef08ab288e97590b3e0a70739a8d36d874d3a7a140c2e01fe186c80122aa96b6ac46bb4937911ff1f0d3e9c50f03240a931c63f43540e07cf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/son/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/son/firefox-62.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "71ffdcbf18952c3d74c380c827e09985b417554f9534e6900af88f8b2eaea63d88a5856b5b0ebccabbe61f03136863ddafc6ee2e25a677a37eac367163787716"; + sha512 = "5bd52abe9e2bd74bac9b372a26075e32647f09da235046926449ff252b12d9f7b67b3af2e66190db0ab344d62f367f0e2e9d57078ffbd0f758cff0140fb3570d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sq/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sq/firefox-62.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "cd1c70628d454b36f784ffcd5fcddbe8706efdbdc8e4f2787383d6abf21fc7389df535d8e0cb56b02e8ba81201e96be72460338c164923ca98db2f0560ebadb3"; + sha512 = "f06bc7d0af089eadb7f465b997f2f626347fdf2d418e9c5c74f3f9b810faa67977575600ae8e20ee888eb0acdc9da9378eb26044d8cc2ee0ef611c4d4ee88526"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sr/firefox-62.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b651ab59602beb11b770078fde359018c10fb5daff660bbac5001659d702eaccc378089ed70137534d72405c55a7adc779e3718d5af9ed65708d6c855a0fd564"; + sha512 = "c29b7090f8890ba26e8d3c8a32fafa7a56b0618109547b3f911304029f831aeb6eea7407e165d1b2643d98153df86c358978da4cf4ae301bcdbe9b287667816e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/sv-SE/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/sv-SE/firefox-62.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "83978cbcc69ce53398792e8a45771c0546120921d6692424e6f5c224d271deac960adbea2427335d2f02f3aa146372577d545905ceb3e7e05919ce0679858bcc"; + sha512 = "8caad6ef2d4302b0ac0d41344a5c8c1e6ce490dbaee8b727d2113a47354c56a4ab7c62925875fe52f946d7850111358a1c24890fcdea6b62f3e2e716d907d82c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ta/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ta/firefox-62.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "00f3ce929753843a2dc702e5a7620708426cfa76447bed7c1c35dc621d3963ac96cdf9fc6148063011bd71b78cd21fb1cb250f35e3da0de4e82ddc4fb39b0a03"; + sha512 = "5e9f415e6c6d706b9fa895e6166b147ddb53b5d7f86d556e436736dd469f2478d9807ec9a8453e54829fe4a34c97d85a6c4854e9ff8e67d5f4c5e0194d626f13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/te/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/te/firefox-62.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a3c79939a66aa443a9507ea9598b8e95623b667df5a7b164c40f399e0360ac4e01e62298558f0ef908954152eeed029935a2ad56723848797486b889699eaa61"; + sha512 = "f74eb03c0d08cc80c9c8954d23e70b2356fcc530c4fff4b38cbff17e7d295fe065a2388042d52eca2297ae9234cf3fb1735448ee767b8ca087cc5189b8c15016"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/th/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/th/firefox-62.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "de4fd5d543517dcc20d2001a315a9d5b91c95de2d3ba7effd155606bfe49b59c8f3289b11fc8843e5923b2d897a7fbd069246f73d463055b30e7c77afc1946c0"; + sha512 = "160a29622cbd47af6a914a20554b0f64786aabe06496e2cb0f647bb722f405922d52fcb7e49f6f44441641a1e987f6ad70bc1e995a63e691f2cab685e5192b25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/tr/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/tr/firefox-62.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3bbe97c3ac6c99364346883033bc60535a897730a24e1b102424e6a04729367bd219cfddcb6b28ac61dac8cac12bbaa0a70088afd38f9fe96cc865cff838ad4b"; + sha512 = "369171223ce036e3066abeeb30b14b4206a89824cca71e5a42b83ed00652e30fdd297670659e55e923298e26c4f256d18041f6dcabb71268641e940c2a753fe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/uk/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/uk/firefox-62.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "eb2e0e2e9a4d9ee565a4f0a70e7c38802de5a97ce03ed29f7a3b75db24627433007fa905863e5c039e556844bab78e1533868f8c3b0de6df7ad433c75adf260d"; + sha512 = "12179e32d115d8077cd9d765f3aa9131fca58645515ecee0c9b9f853fbc498fa4c93cc2c29eada9f3c487658ba1a13815a85ad9d4d9bc4e81d0f1122b132afc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/ur/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/ur/firefox-62.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "c20be19ffe828443c21207e2fc7c0384e784ffe89df4ca495e8ff74a2c0a8cdefc3b5184d274898f9e60347138d8bb93051068537066d229be12602260b3c8bc"; + sha512 = "69c276cbd9e5541c27accd171308ac575cb86c25035800b80eb3fa3a7962c55da79fff129b8c6cd96710481c3aa51d94ad8daa3bad200408ab138a90e59d7826"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/uz/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/uz/firefox-62.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "aa72e03bdb97454165d65dece955a992a99060bbb0bd5442abde44c9f5c16a150a46d2c4c86df25545c45ee6eb5a46957336b1ea5620d1075ef8f854de1167de"; + sha512 = "c670e1ae6e93e54d71737f6fcdad8398a61e6a0184efc8690567bfaf3e71a97c25ce852886442d74d8bbcea2dbefdc8bf498db602cd0e9b61ffe09fa6978f198"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/vi/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/vi/firefox-62.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "7b675b04a88431c7e30499bef4d7b686f82c78ccef13b736f608fbe6d2679bcdf2775617b373768bb8522fe783a6d188006c6bd4331a5bef7cd704c003dca64e"; + sha512 = "dd74b6ebe0d820b808444ad87dc21c72490cb56dc6e3cc0b80e979074456d9f9df8538fe64326fc9d1e9825e9e2846efab87ca3e43282ced753effdf605746cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/xh/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/xh/firefox-62.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "c01ef2654fe8c6ca63a3fc60f1e8ae0c60f210aa369ff162da14efd5893c508f01fea15010393be524b4b8eaaca4904bd744000c079cb5ef4ff128aca7f98918"; + sha512 = "1e7e2dc1456772c6fb9c9bf7dc41136d0466643db2757ac865dd6595b46e38a1f4c0c10f0e34dc11da5f66fe8e810ab512a39ee21ee5d1470ce46e79a6cf568f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/zh-CN/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/zh-CN/firefox-62.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a0715b49ff620ffbba8387032df76359f8921de3bed66a1f1151dafb7b2cfde5fe9776e6826cc189d3b4292042bb32bc008eec7f06a572b8e8839e1e32ae4098"; + sha512 = "c9521852c781e2b57c6dd6dee07c184525b61eaca7ed49e4cd792608e7ecf4268ea4fd02a19c86cde07e0493dc4ef360716fed4ec51e03b8eab11af98c55ac3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b7/linux-i686/zh-TW/firefox-62.0b7.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b8/linux-i686/zh-TW/firefox-62.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "2e9a9799e6f3da140f557c58ebaad55a1492ee462d622dd256370a36e5dd6b82f122fdaac7642265debdf7feb97fd6ae741293bdb3e7c1b142e1f90b06817cba"; + sha512 = "234a05c330e0b13396b523a522439106015dce8c6b76f49becc2e8e9498e325b73d35cab168950e059d79a0220bca2845fcd09940b29336277643733f742f316"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 0531ec8d94e9..50eb396d6442 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation (rec { buildInputs = [ gtk2 perl zip libIDL libjpeg zlib bzip2 - dbus dbus-glib pango freetype fontconfig xorg.libXi + dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 507697f0c2c3..2384a9da19cb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "30.0.0.113"; + version = "30.0.0.134"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1s4i9lmlydm8b373pi8jw5xf3fhcq75fgqyp7xd7aava8hay7x0j" + "1xa2mcbcxpfrqdf37a98nvvsvyp0bm3lsv21ky3ps9cba8a13z80" else - "1jhzvrn6f9zcynx3zq0vxidaps946aymm7l16c42p1f7q9s8msb4" + "1jgl57ggcszdim51dcr0gsjmrdb2kdvxl0lv5zl83cvxcyz0z4p6" else if arch == "x86_64" then - "05dv4cn9i3zz5fmy16dxs9m1rpvlaih4gzsrf0q1zfjn46jbyw2l" + "0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw" else - "0pn159rzx6nb6lmkghccl0ynnc9ihfbr4rvfp14gm4n6jzbl6vg8"; + "011cf0kycs4ih45l23bp6rr2vm7w7jaj4pjvmqwjax4xrb5pzkic"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 8664b20e82d7..dbf0bbbd4d54 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "30.0.0.113"; + version = "30.0.0.134"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "0vdzmk9l04jq9mfkdddsqrga7ndikq910indl7wa3vndghrahmn0" + "1plmhv1799j0habmyxy7zhvilh823djmg4i387s6qifr5iv66pax" else - "10rm48i3h6x1dygjivv2mvd0jq6n40j5c2ik090s7i0ily5z97m8"; + "13cb7sca5mw5b1iiimyxbfxwpmdh7aya8rnlhkv3fgk5a1jwrxqr"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix index 65ebaa3f80c5..031c520275fe 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle/default.nix @@ -340,7 +340,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial version of the tor browser bundle, built from source"; homepage = https://torproject.org/; - license = licenses.unfreeRedistributable; # TODO: check this + license = licenses.free; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix new file mode 100644 index 000000000000..8a60023b4350 --- /dev/null +++ b/pkgs/applications/networking/charles/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, makeDesktopItem, jre, makeWrapper }: + +let + desktopItem = makeDesktopItem { + categories = "Network;Development;WebDevelopment;Java;"; + desktopName = "Charles"; + exec = "charles %F"; + genericName = "Web Debugging Proxy"; + icon = "charles-proxy"; + mimeType = "application/x-charles-savedsession;application/x-charles-savedsession+xml;application/x-charles-savedsession+json;application/har+json;application/vnd.tcpdump.pcap;application/x-charles-trace"; + name = "Charles"; + startupNotify = "true"; + }; + +in stdenv.mkDerivation rec { + name = "charles-${version}"; + version = "4.2.6"; + + src = fetchurl { + url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz"; + sha256 = "1hjfimyr9nnbbxadwni02d2xl64ybarh42l1g6hlslq5qwl8ywzb"; + }; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + makeWrapper ${jre}/bin/java $out/bin/charles \ + --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar" + + for fn in lib/*.jar; do + install -D -m644 $fn $out/share/java/$(basename $fn) + done + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications/ + + mkdir -p $out/share/icons + cp -r icon $out/share/icons/hicolor + ''; + + meta = with stdenv.lib; { + description = "Web Debugging Proxy"; + homepage = https://www.charlesproxy.com/; + maintainers = [ maintainers.kalbasit ]; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix new file mode 100644 index 000000000000..fe2420a719d5 --- /dev/null +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoPackage, fetchFromGitHub, ... }: + +let version = "0.3.1"; in + +buildGoPackage { + name = "hetzner-kube-${version}"; + + src = fetchFromGitHub { + owner = "xetys"; + repo = "hetzner-kube"; + rev = "${version}"; + sha256 = "1xldh1ca8ym8cg3w5cxizmhqxwi5kmiin28f320mxdr28fzljc2w"; + }; + + goPackagePath = "github.com/xetys/hetzner-kube"; + + meta = { + description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; + homepage = https://github.com/xetys/hetzner-kube; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ eliasp ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix index 69de076cd1cf..ad4edec6b4ea 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-ibm/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "terraform-provider-ibm-${version}"; - version = "0.11.0"; + version = "0.11.1"; goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; subPackages = [ "./" ]; @@ -20,7 +20,7 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "IBM-Cloud"; repo = "terraform-provider-ibm"; - sha256 = "0zgzzs2l9p06angqw6vjpkd88gcn2mswmmwycc31ihkglzs6yw2p"; + sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv"; rev = "v${version}"; }; diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index ecad7549117d..901229f86cae 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -36,11 +36,11 @@ with python'.pkgs; buildPythonApplication rec { pname = "FlexGet"; - version = "2.13.5"; + version = "2.14.5"; src = fetchPypi { inherit pname version; - sha256 = "1lkmxwy7k4zlcqpigwk8skc2zi8a70vrw21pz80wvmf9yg0wc9z9"; + sha256 = "05kczj10p8f9b1ll4ii5anbg6nk5dhb7lm9skbj6ix7v9hi48hz4"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 6c716cc3e1c0..2e2489870ed1 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "quaternion-${version}"; - version = "0.0.9"; + version = "0.0.9.2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "Quaternion"; rev = "v${version}"; - sha256 = "0zdpll953a7biwnklhgmgg3k2vz7j58lc1nmfkmvsfcj1fmdf408"; + sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib"; }; buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 279f347ccbbb..dbf17d9cbdb1 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -3,11 +3,11 @@ let configFile = writeText "riot-config.json" conf; in stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.15.6"; + version = "0.15.7"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "032svv30dhj9gl0v37djn9bnwh7f9bfg2czhmcszdygsd0879x08"; + sha256 = "09sa2qcmns4b9by3hzmyppc6fi3845vppkal2ylrf2vi9yczb2ch"; }; installPhase = '' diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 89a3005b1279..fcdc16101346 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.13.0"; + version = "1.14.1"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1iapkkfqssbjcksgic7i8x0cwp6gwcbbrfxlw7vp6k1cfvjwv9pf"; + sha256 = "1f54azqdfqa2yrzlp9b7pz7nswl5n3pgln38yxcvb3y5k6x0ljqp"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index dc2bb4ba1e12..196cbb70b4e1 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook +{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem, autoPatchelfHook, env # Dynamic libraries , dbus, glib, libGL, libX11, libXfixes, libuuid, libxcb, qtbase, qtdeclarative -, qtlocation, qtquickcontrols2, qtscript, qtwebchannel, qtwebengine +, qtimageformats, qtlocation, qtquickcontrols, qtquickcontrols2, qtscript, qtsvg +, qttools, qtwayland, qtwebchannel, qtwebengine # Runtime -, libjpeg_turbo, pciutils, procps, qtimageformats +, coreutils, libjpeg_turbo, pciutils, procps, utillinux , pulseaudioSupport ? true, libpulseaudio ? null }: assert pulseaudioSupport -> libpulseaudio != null; let - inherit (stdenv.lib) concatStringsSep makeBinPath optional optionalString; + inherit (stdenv.lib) concatStringsSep makeBinPath makeLibraryPath + makeSearchPath optional optionalString; version = "2.2.128200.0702"; srcs = { @@ -20,6 +22,13 @@ let }; }; + qtDeps = [ + qtbase qtdeclarative qtlocation qtquickcontrols qtquickcontrols2 qtscript + qtwebchannel qtwebengine qtimageformats qtsvg qttools qtwayland + ]; + + qtEnv = env "zoom-us-qt-${qtbase.version}" qtDeps; + in stdenv.mkDerivation { name = "zoom-us-${version}"; @@ -28,10 +37,8 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; buildInputs = [ - dbus glib libGL libX11 libXfixes libuuid libxcb qtbase qtdeclarative - qtlocation qtquickcontrols2 qtscript qtwebchannel qtwebengine - libjpeg_turbo - ]; + dbus glib libGL libX11 libXfixes libuuid libxcb qtEnv libjpeg_turbo + ] ++ qtDeps; runtimeDependencies = optional pulseaudioSupport libpulseaudio; @@ -46,7 +53,6 @@ in stdenv.mkDerivation { "ZXMPPROOT.cer" "ZoomLauncher" "config-dump.sh" - "qtdiag" "timezones" "translations" "version.txt" @@ -67,11 +73,10 @@ in stdenv.mkDerivation { # TODO Patch this somehow; tries to dlopen './libturbojpeg.so' from cwd ln -s $(readlink -e "${libjpeg_turbo.out}/lib/libturbojpeg.so") $packagePath/libturbojpeg.so + ln -s ${qtEnv}/bin/qt.conf $packagePath + makeWrapper $packagePath/zoom $out/bin/zoom-us \ - --prefix PATH : "${makeBinPath [ pciutils procps ]}" \ - --set QSG_INFO 1 \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-${qtbase.qtCompatVersion}/plugins/platforms \ - --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtimageformats}/${qtbase.qtPluginPrefix} \ + --prefix PATH : "${makeBinPath [ coreutils glib.dev pciutils procps qttools.dev utillinux ]}" \ --run "cd $packagePath" runHook postInstall diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d8029f02a6f0..13f7bce49218 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, fetchpatch, pkgconfig +{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, pkgconfig , qt4, qmake4Hook, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap , alsaLib, python , jackSupport ? false, libjack2 ? null @@ -126,14 +126,16 @@ let }; gitSource = rec { - version = "2018-01-12"; + version = "2018-07-01"; qtVersion = 5; # Needs submodules - src = fetchgit { - url = "https://github.com/mumble-voip/mumble"; - rev = "e348e47f4af68eaa8e0f87d1d9fc28c5583e421e"; - sha256 = "12z41qfaq6w3i4wcw8pvyb8wwwa8gs3ar5zx6aqx6yssc6513lr3"; + src = fetchFromGitHub { + owner = "mumble-voip"; + repo = "mumble"; + rev = "c19ac8c0b0f934d2ff206858d7cb66352d6eb418"; + sha256 = "1mzp1bgn49ycs16d6r8icqq35wq25198fs084vyq6j5f78ni7pvz"; + fetchSubmodules = true; }; }; in { diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index c9d2a111753d..ea0a756e76d1 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.2.1"; + version = "6.2.2"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "02nzihs720pmgr5139s7fz88f7gm19dn1x2kqdpi81k7gdwqq0bp"; + sha256 = "19204fqi4x4q7hsc500y6gj0qdfzf4kjgfsr808w13qnh1lxhvr4"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index b752f552ba97..c94d79a0ced7 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmake, qtsvg }: let - version = "1.42.2"; + version = "1.43.27"; in stdenv.mkDerivation rec { name = "mytetra-${version}"; src = fetchurl { url = "https://github.com/xintrea/mytetra_dev/archive/v.${version}.tar.gz"; - sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804"; + sha256 = "1gzr11jy1bvnp28w2ar3wmh76g55jn9nra5la5qasnal6b5pg28h"; }; nativeBuildInputs = [ qmake ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 0c9a6bda2c23..2df8b188f785 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.11"; + version = "2.4.13"; src = fetchurl { url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "11zbbasqpvf7inbgrk6jzd9pqdfn4v4g4nl149bivg475mmqpnwl"; + sha256 = "0cl6fs1v9rqkzjq4syx0m1pr71hbhvidwa3ym57pvz8ardfs3qa1"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 4c4278c30faa..d5dae364cc3d 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , unzip , makeDesktopItem @@ -16,15 +17,15 @@ let }; in stdenv.mkDerivation rec { - version = "${baseVersion}.${patchVersion}"; - baseVersion = "14.29"; - patchVersion = "12"; + version = "14.29.17"; pname = "jmol"; name = "${pname}-${version}"; - src = fetchurl { + 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 = "1ndq9am75janshrnk26334z1nmyh3k4bp20napvf2zv0lfp8k3bv"; + sha256 = "1dnxbvi8ha9z2ldymkjpxydd216afv6k7fdp3j70sql10zgy0isk"; }; patchPhase = '' diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index bf8ccee4a635..0d8ab0d0e191 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, symlinkJoin, gfortran, perl, procps -, libyaml, libxc, fftw, openblas, gsl +, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack }: let - version = "7.3"; + version = "8.1"; fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; in stdenv.mkDerivation { @@ -11,11 +11,11 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; - sha256 = "0hnpqjjxdxh2ggf6ckrsy4hs9iglnazscb4siczddvmysi4kv15d"; + sha256 = "0rxwvcp22364nnhwhqlr38w4rwv1yl60snxi2f8nqdflx1143n10"; }; nativeBuildInputs = [ perl procps fftw.dev ]; - buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out ]; + buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ]; configureFlags = '' --with-yaml-prefix=${libyaml} @@ -37,6 +37,8 @@ in stdenv.mkDerivation { patchShebangs testsuite/oct-run_testsuite.sh ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Real-space time dependent density-functional theory code"; homepage = http://octopus-code.org; diff --git a/pkgs/applications/science/logic/abc/default.nix b/pkgs/applications/science/logic/abc/default.nix index bab9b302d7d1..6e7a3cfc88ac 100644 --- a/pkgs/applications/science/logic/abc/default.nix +++ b/pkgs/applications/science/logic/abc/default.nix @@ -1,20 +1,21 @@ -{ fetchhg, stdenv, readline }: +{ fetchFromGitHub, stdenv, readline, cmake }: stdenv.mkDerivation rec { name = "abc-verifier-${version}"; - version = "20160818"; + version = "2018-07-08"; - src = fetchhg { - url = "https://bitbucket.org/alanmi/abc"; - rev = "a2e5bc66a68a72ccd267949e5c9973dd18f8932a"; - sha256 = "09yvhj53af91nc54gmy7cbp7yljfcyj68a87494r5xvdfnsj11gy"; + src = fetchFromGitHub { + owner = "berkeley-abc"; + repo = "abc"; + rev = "24407e13db4b8ca16c3996049b2d33ec3722de39"; + sha256 = "1rckji7nk81n6v1yajz7daqwipxacv7zlafknvmbiwji30j47sq5"; }; + nativeBuildInputs = [ cmake ]; buildInputs = [ readline ]; - preBuild = '' - export buildFlags="CC=$CC CXX=$CXX LD=$CXX" - ''; + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/bin mv abc $out/bin @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool for squential logic synthesis and formal verification"; - homepage = "https://people.eecs.berkeley.edu/~alanmi/abc/abc.htm"; + homepage = https://people.eecs.berkeley.edu/~alanmi/abc; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index 171d72a3e560..2f765572f9ad 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -1,17 +1,20 @@ -{stdenv, fetchurl, gmp, cmake, python}: +{stdenv, fetchFromGitHub, gmp, cmake, python}: -let version = "0.1.5"; -in +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "libpoly"; + version = "0.1.7"; -stdenv.mkDerivation { - name = "libpoly-${version}"; - - src = fetchurl { - url = "https://github.com/SRI-CSL/libpoly/archive/v${version}.tar.gz"; - sha256 = "0yj3gd60lx8dcgw7hgld8wqvjkpixx3ww3v33sdf7p6lln7ksxyn"; + src = fetchFromGitHub { + owner = "SRI-CSL"; + repo = "libpoly"; + rev = "v${version}"; + sha256 = "0i5ar4lhs88glk0rvkmag656ii434i6i1q5dspx6d0kyg78fii64"; }; - buildInputs = [ cmake gmp python ]; + nativeBuildInputs = [ cmake ]; + + buildInputs = [ gmp python ]; meta = with stdenv.lib; { homepage = https://github.com/SRI-CSL/libpoly; diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 17fbcca642d8..3121a83e5b98 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -26,9 +26,11 @@ stdenv.mkDerivation rec { # Includes a fix for the embedded soname being libyices.so.2.5, but # only installing the libyices.so.2.5.x file. - installPhase = '' + installPhase = let + ver_XdotY = builtins.concatStringsSep "." (stdenv.lib.take 2 (stdenv.lib.splitString "." version)); + in '' make install LDCONFIG=true - (cd $out/lib && ln -s -f libyices.so.${version} libyices.so.2.5) + ln -sfr $out/lib/libyices.so.{${version},${ver_XdotY}} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix index 54c9799a01b8..1cbe914779e6 100644 --- a/pkgs/applications/science/logic/z3/default.nix +++ b/pkgs/applications/science/logic/z3/default.nix @@ -20,6 +20,18 @@ stdenv.mkDerivation rec { cd build ''; + postInstall = '' + mkdir -p $dev $lib $python/lib + + mv $out/lib/python* $python/lib/ + mv $out/lib $lib/lib + mv $out/include $dev/include + + ln -sf $lib/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} $python/${python.sitePackages}/z3/lib/libz3${stdenv.hostPlatform.extensions.sharedLibrary} + ''; + + outputs = [ "out" "lib" "dev" "python" ]; + meta = { description = "A high-performance theorem prover and SMT solver"; homepage = "https://github.com/Z3Prover/z3"; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 9ad112213ffd..afb230cf4287 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -14,16 +14,6 @@ let cvxopt = super.cvxopt.override { inherit glpk; }; - # https://github.com/sagemath/sagenb/issues/437 - flask-babel = super.flask-babel.overridePythonAttrs (attrs: rec { - version = "0.9"; - src = attrs.src.override { - inherit version; - sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa"; - }; - doCheck = false; - }); - # python packages that appear unmaintained and were not accepted into the nixpkgs # tree because of that. These packages are only dependencies of the more-or-less # deprecated sagenb. However sagenb is still a default dependency and the doctests diff --git a/pkgs/applications/science/math/sage/patches/eclib-20180710.patch b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch new file mode 100644 index 000000000000..d06e1e6cedf2 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch @@ -0,0 +1,40 @@ +diff --git a/src/sage/interfaces/mwrank.py b/src/sage/interfaces/mwrank.py +index 4417b59276..ae57ca2991 100644 +--- a/src/sage/interfaces/mwrank.py ++++ b/src/sage/interfaces/mwrank.py +@@ -54,8 +54,9 @@ def Mwrank(options="", server=None, server_tmpdir=None): + sage: M = Mwrank('-v 0 -l') + sage: print(M('0 0 1 -1 0')) + Curve [0,0,1,-1,0] : Rank = 1 +- Generator 1 is [0:-1:1]; height 0.0511114082399688 +- Regulator = 0.0511114082399688 ++ Generator 1 is [0:-1:1]; height 0.051111408239969 ++ Regulator = 0.051111408239969 ++ + """ + global instances + try: +diff --git a/src/sage/libs/eclib/wrap.cpp b/src/sage/libs/eclib/wrap.cpp +index 5fd5693b53..d12468faa8 100644 +--- a/src/sage/libs/eclib/wrap.cpp ++++ b/src/sage/libs/eclib/wrap.cpp +@@ -133,8 +133,8 @@ char* Curvedata_isogeny_class(struct Curvedata* E, int verbose) + + + int mw_process(struct Curvedata* curve, struct mw* m, +- const struct bigint* x, const struct bigint* y, +- const struct bigint* z, int sat) ++ const bigint* x, const bigint* y, ++ const bigint* z, int sat) + { + Point P(*curve, *x, *y, *z); + if (!P.isvalid()) +@@ -188,7 +188,7 @@ int mw_rank(struct mw* m) + } + + /* Returns index and unsat long array, which user must deallocate */ +-int mw_saturate(struct mw* m, struct bigint* index, char** unsat, ++int mw_saturate(struct mw* m, bigint* index, char** unsat, + long sat_bd, int odd_primes_only) + { + vector<long> v; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 2eb7f8100597..d342fba21164 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -84,6 +84,12 @@ stdenv.mkDerivation rec { ]; packageUpgradePatches = [ + (fetchpatch { + name = "cypari2-1.2.1.patch"; + url = "https://git.sagemath.org/sage.git/patch/?h=62fe6eb15111327d930336d4252d5b23cbb22ab9"; + sha256 = "1xax7vvs8h4xip16xcsp47xdb6lig6f2r3pl8cksvlz8lhgbyxh2"; + }) + # matplotlib 2.2.2 deprecated `normed` (replaced by `density`). # This patch only ignores the warning. It would be equally easy to fix it # (by replacing all mentions of `normed` by `density`), but its better to @@ -170,6 +176,9 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/24838 rebased ./patches/pynac-0.7.22.patch + + # https://trac.sagemath.org/ticket/25862 + ./patches/eclib-20180710.patch ]; patches = nixPatches ++ packageUpgradePatches; diff --git a/pkgs/applications/science/math/sage/sagenb.nix b/pkgs/applications/science/math/sage/sagenb.nix index 5ab387ebc5e1..cc883cc24b42 100644 --- a/pkgs/applications/science/math/sage/sagenb.nix +++ b/pkgs/applications/science/math/sage/sagenb.nix @@ -36,6 +36,14 @@ buildPythonPackage rec { # tests depend on sage doCheck = false; + patches = [ + # work with latest flask-babel + (fetchpatch { + url = "https://github.com/sagemath/sagenb/commit/ba065eca63dd34a383e4c7ba7561430a90fcd087.patch"; + sha256 = "1lamzsrgymdd618imrasjp6ivhw2aynh83gkybsd7pm1rzjcq4x8"; + }) + ]; + meta = with stdenv.lib; { description = "Sage Notebook"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index 8ecbf656a821..0f0b44ccfa5e 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}: stdenv.mkDerivation rec { baseName="golly"; - version = "3.1"; + version = "3.2"; name="${baseName}-${version}"; src = fetchurl { - sha256 = "0dn74k3rylhx023n047lz4z6qrqijfcxi0b6jryqklhmm2n532f7"; + sha256 = "0cg9mbwmf4q6qxhqlnzrxh9y047banxdb8pd3hgj3smmja2zf0jd"; url="mirror://sourceforge/project/golly/golly/golly-${version}/golly-${version}-src.tar.gz"; }; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 597429c0cc7a..001ee2ddb681 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -31,8 +31,9 @@ stdenv.mkDerivation rec { installPhase = '' make install make install-doc - mkdir -p $out/etc/bash_completion.d/ - cp contrib/tig-completion.bash $out/etc/bash_completion.d/ + install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash + install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig + cp contrib/vim.tigrc $out/etc/ wrapProgram $out/bin/tig \ --prefix PATH ':' "${git}/bin" diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 1179398693d5..ef01ac4cdae3 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "24.0.0"; + version = "25.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0r6v7n4wq1ivjcfs4br5ywz2f0jbwxrharfcjmycnbjsckz1l7ps"; + sha256 = "04m57719q7q0h0gcj1b2bh8xbdcl5bijic4hw71xf9xd19a95k78"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index 491e6fcd1648..dbf22aa9f8ee 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -26,7 +26,7 @@ pythonPackages.buildPythonApplication rec { Streamlink is a fork of the livestreamer project. ''; license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ dezgeg zraexy ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ dezgeg zraexy enzime ]; }; } diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index b6f4a5976e44..ff05cb757066 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.5.1"; + version = "2.5.2"; enableParallelBuilding = true; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "1i029qs6dfpyirhbdz0nrx2sh5fddysk4wqkjqj5m60kxs4x8a3d"; + sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index f49009e76f3e..34c949519baa 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3 }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3 }: stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "paper-icon-theme"; - version = "2017-11-20"; + version = "2018-06-24"; src = fetchFromGitHub { owner = "snwh"; repo = pname; - rev = "af0296ecc872ad723fad7dca6e7e89eb85cbb3a8"; - sha256 = "18a9zl9lbw9gc3zas49w329xrps4slvkp4nv815nlnmimz8dj85m"; + rev = "c7cd013fba06dd8fd5cdff9f885520e2923266b8"; + sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v"; }; - nativeBuildInputs = [ autoreconfHook gtk3 ]; + nativeBuildInputs = [ meson ninja gtk3 ]; - postFixup = '' - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done + postPatch = '' + patchShebangs meson/post_install.py ''; meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; homepage = https://snwh.org/paper; license = with licenses; [ cc-by-sa-40 lgpl3 ]; - platforms = platforms.all; + # darwin cannot deal with file names differing only in case + platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index d5ab50f0b8c2..f3b9bf150e00 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "iana-etc-${version}"; - version = "20180405"; + version = "20180711"; src = fetchurl { url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0x6i95arrc4lcq2il3r05hbnd9vsi87z4yc8s3agkvbj74d6hfhj"; + sha256 = "0xigkz6pcqx55px7fap7j6p3hz27agv056crbl5pgfcdix7y8z26"; }; installPhase = '' diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index ae2b0f29f980..18f7f9f6fd4e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,28 +1,15 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils +{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }: stdenv.mkDerivation rec { name = "gnome-logs-${version}"; - version = "3.28.3"; + version = "3.28.5"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1bpg8172f16sgbhsn2sis3xh2ylrv8vj7j12xdxkmsmfh2k2bqfy"; + sha256 = "0zw6nx1hckv46hn978g57anp4zq4alvz9dpwibgx02wb6gq1r23a"; }; - patches = [ - # Fix post_install script - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-logs/commit/2f498464ac539fdf98199294bfb9205436b9c323.patch; - sha256 = "1v6d8zgd31waliwlvk5xlfjap5h84bpqb1az0wdjm4c2a53iiwlp"; - }) - # Fix a typo in manpage generation - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-logs/commit/02b782fcd64d4773e2dadbdb9ea74bf3923003b3.patch; - sha256 = "1a8zcp62shspw45s0dvi2iv83qppz4hcw31id6zlwq0dp94vvb46"; - }) - ]; - mesonFlags = [ "-Dtests=true" "-Dman=true" diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 45a4a97205b8..1562c42b374a 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -1,41 +1,55 @@ -{ stdenv, intltool, fetchurl, pkgconfig, gtk3, defaultIconTheme -, glib, desktop-file-utils, bash, appdata-tools +{ stdenv, intltool, fetchFromGitLab, pkgconfig, gtk3, defaultIconTheme +, glib, desktop-file-utils, bash, appdata-tools, gtk-doc, autoconf, automake, libtool , wrapGAppsHook, gnome3, itstool, libxml2 , callPackage, unzip, gobjectIntrospection }: -stdenv.mkDerivation rec { +let + unicode-data = callPackage ./unicode-data.nix {}; +in stdenv.mkDerivation rec { name = "gucharmap-${version}"; - version = "10.0.4"; - - src = fetchurl { - url = "mirror://gnome/sources/gucharmap/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00gh3lll6wykd2qg1lrj05a4wvscsypmrx7rpb6jsbvb4scnh9mv"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gucharmap"; }; + version = "11.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gucharmap"; + rev = version; + sha256 = "13iw4fa6mv8vi8bkwk0bbhamnzbaih0c93p4rh07khq6mxa6hnpi"; }; - doCheck = true; - - preConfigure = "patchShebangs gucharmap/gen-guch-unicode-tables.pl"; - nativeBuildInputs = [ pkgconfig wrapGAppsHook unzip intltool itstool appdata-tools + autoconf automake libtool gtk-doc gnome3.yelp-tools libxml2 desktop-file-utils gobjectIntrospection ]; buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas defaultIconTheme ]; - unicode-data = callPackage ./unicode-data.nix {}; + configureFlags = [ + "--with-unicode-data=${unicode-data}" + ]; - configureFlags = "--with-unicode-data=${unicode-data}"; + doCheck = true; + + postPatch = '' + patchShebangs gucharmap/gen-guch-unicode-tables.pl + ''; + + preConfigure = '' + NOCONFIGURE=1 ./autogen.sh + ''; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gucharmap"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gucharmap; description = "GNOME Character Map, based on the Unicode Character Database"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Gucharmap; license = licenses.gpl3; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index 72299b8a3690..6bf2fd39a2d3 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,30 +1,31 @@ { fetchurl, stdenv, gnome3 }: -stdenv.mkDerivation { - name = "unicode-data-10.0.0"; +stdenv.mkDerivation rec { + name = "unicode-data-${version}"; + version = "11.0.0"; srcs = [ (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/Blocks.txt"; - sha256 = "19zf2kd198mcv1paa194c1zf36hay1irbxssi35yi2pd8ad69qas"; + url = "http://www.unicode.org/Public/${version}/ucd/Blocks.txt"; + sha256 = "0lnh9iazikpr548bd7nkaq9r3vfljfvz0rg2462prac8qxk7ni8b"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/DerivedAge.txt"; - sha256 = "1h9p1g0wnh686l6cqar7cmky465vwc6vjzzn1s7v0i9zcjaqkr4h"; + url = "http://www.unicode.org/Public/${version}/ucd/DerivedAge.txt"; + sha256 = "0rlqqd0b1sqbzvrj29dwdizx8lyvrbfirsnn8za9lb53x5fml4gb"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/NamesList.txt"; - sha256 = "0gvpcyq852rnlqmx4y5i1by7bavvcw6rj40i54w48yc7xr3zmgd1"; + url = "http://www.unicode.org/Public/${version}/ucd/NamesList.txt"; + sha256 = "0yr2h0nfqhirfi3bxl33z6cc94qqshlpgi06c25xh9754irqsgv8"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/Scripts.txt"; - sha256 = "0b9prz2hs6w61afqaplcxnv115f8yk4d5hn9dc5hks8nqpj28bnh"; + url = "http://www.unicode.org/Public/${version}/ucd/Scripts.txt"; + sha256 = "1mbnvf97nwa3pvyzx9nd2wa94f8s0npg9740kic2p2ag7jmc1wz9"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/UnicodeData.txt"; - sha256 = "1cfak1j753zcrbgixwgppyxhm4w8vda8vxhqymi7n5ljfi6kwhjj"; + url = "http://www.unicode.org/Public/${version}/ucd/UnicodeData.txt"; + sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }) (fetchurl { - url = "http://www.unicode.org/Public/10.0.0/ucd/Unihan.zip"; - sha256 = "199kz6laypkvc0ykms6d7bkb571jmpds39sv2p7kd5jjm1ij08q1"; + url = "http://www.unicode.org/Public/${version}/ucd/Unihan.zip"; + sha256 = "0cy8gxb17ksi5h4ysypk4c09z61am1svjrvg97hm5m5ccjfrs1vj"; }) ]; phases = "installPhase"; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index df37377e52e8..7cf1872da5a9 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -34,6 +34,10 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dwith-nautilusdir=lib/nautilus/extensions-3.0" + # https://bugs.launchpad.net/ubuntu/+source/totem/+bug/1712021 + # https://bugzilla.gnome.org/show_bug.cgi?id=784236 + # https://github.com/mesonbuild/meson/issues/1994 + "-Denable-vala=no" ]; wrapPrefixVariables = [ "PYTHONPATH" ]; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 548936dc5e52..37f149c7ad9a 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -6,14 +6,14 @@ let pname = "geary"; - version = "0.12.2"; + version = "0.12.3"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "09j5gh4zm49fcg2ycvy00dkkw69rfppqwc3lqdi4994hry4jivx9"; + sha256 = "18zzjzs075zja00xpnyvjrrdzm54icdhfw4ywhpr6rqfcpnzifw7"; }; nativeBuildInputs = [ vala_0_40 intltool pkgconfig wrapGAppsHook cmake ninja desktop-file-utils gnome-doc-utils gobjectIntrospection ]; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index a04dbb27a88b..63ad4e671254 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "caja-${version}"; - version = "1.21.1"; + version = "1.21.2"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "013lmngnm0i2746qrkkyhg62kyh4cjdd0i634cz5fm7ah65ylxg4"; + sha256 = "0kswpghpsz69l417ammniy1ja0dsg1hrsm2k0rx28q9mhdfdmnwq"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 57e4ed100a02..2becc40a46c3 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "engrampa-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "09p9jaljaihc723zp17la6lw7h7q16ysk7q0fr0al0k11ss16w6f"; + sha256 = "0y79rzmv3i03la443bp8f6gsgm03vr4nd88npwrvjqlxs59lg1gw"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index 15b81a628863..842ab5b214da 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmatekbd-${version}"; - version = "1.20.2"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1l1zbphs4snswf4bkrwkk6gsmb44bdhymcfgaaspzbrcmw3y7hr1"; + sha256 = "0xi5ds2psbf0qb0363ljxz5m9xxh1hr2hcn8zv6ni6mdqsqnkajz"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 8bf0d9bec18c..dab73ed34991 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "libmatemixer-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "00p67mi0flsbgn15qpwq60rzf917s5islbmhirbvz6npcvv0d493"; + sha256 = "1376x3rlisrc6hsz6yzi637msplmacxryyqnrsgfc580knp1nrvm"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 9a7ba4f006f7..e6769a2e978e 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libmateweather-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0bp1nn3b5gf5nqrdwl43fxbb82j74s3x8jkmp40ilv2qpc2mxwr1"; + sha256 = "1vj2pgry6wdscdcpwwagqlsjf8rkh4id67iw7d9qk1pfbhb2sznl"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index c1c6d96688ba..e2c2a54bc748 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "marco-${version}"; - version = "1.20.2"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1fn0yfqjp44gr4kly96qjsd73x06z1xyw6bpyhh09kdqwd80rgiy"; + sha256 = "1vg3dl7kqhzgspa2ykyql4j3bpki59769qrkakqfdcavb9j5c877"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index f154829c4cb5..eda4e9b05bcd 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-applets-${version}"; - version = "1.20.2"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0c860yxbphpvci281gj78ipw1rvcka4rr0bxwvg0nkpangdhj9ls"; + sha256 = "0jr66xrwjrlyh4hz6h5axh96pgxm8n1xyc0rmggah2fijs940rsb"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 52f21225cbb8..a4d7e0a20988 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-calc-${version}"; - version = "1.20.2"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1ghz03j9lfgrjrh8givsw83dpbkw4wlhq4ar3r5g1bf1z636jlx0"; + sha256 = "07mmc99wwgqbp15zrr6z7iz0frc388z19jwk28ymyzgn6bcc9cn6"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 9815952c5405..957da4504eb8 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-menus-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1p8pkw6aby2hq2liqrnsf3lvyn2jqamfbs83fv6q7clw5w179sy6"; + sha256 = "168f7jgm4kbnx92xh3iqvvrgpkv1q862xg27zxg40nkz5xhk95hx"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index e2b50127b89b..14f5f0443730 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-power-manager-${version}"; - version = "1.20.2"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1z754jxnwashwxxfg3cxb9ifbqyjxgavzzwy2mjnzl6z7k95hvjh"; + sha256 = "1l7rxv16j95w26igs4n7fdfv5hqm91b9ddc1lw5m26s42nkzzf85"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index b108a20d5f06..a317b175f9bb 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-sensors-applet-${version}"; - version = "1.20.2"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0khxzwjjf2gp9ma6ji0ynvvqlw6hhr8j4gff9klkrn60xbg5h16b"; + sha256 = "1l84hfxz5qzipchxxi5whccq5d0kg9c8fxisar8pbckl6763b4dx"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index cf63e3e69d94..6a24e67d2c70 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mate-settings-daemon-${version}"; - version = "1.20.3"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "018f2yg4jd6hy0z7ks0s3jyjgpyi3vhd9j61951v5lb1x8ckzxhk"; + sha256 = "1k0xbwxpv3wfl7z3hgaf2ylzaz3aky4j7awdy8cfgxr0d6nqhp3w"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 0dc21f276732..0f281cfc004e 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-system-monitor-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1a68il7pbch5028fm2caxyjkfrdc6ixhqnaspbwfziw6y8p9bscn"; + sha256 = "0filf6qyw4fk45br3cridbqdngwl525z49zn36r7q4agzhny4phz"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 036f996da6aa..a2f35284f4e3 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-terminal-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "0yfr857mpxy35zzdmicvd7mpwka8s1h0rqagfjqc2p1gv4a7ka97"; + sha256 = "15vx7b5nbjbym22pz3l3cyqhv4dnd6vl2hb56xhwq625aw2a7chv"; }; buildInputs = [ diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 8ea8ab33700c..e4cd9126dfaa 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mate-utils-${version}"; - version = "1.20.1"; + version = "1.21.0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${mate.getRelease version}/${name}.tar.xz"; - sha256 = "1kr0612h6r2gj3yg4ccyzr844lh640cd4wdj3gl8qzqikjx0n7ka"; + sha256 = "0q05zzxgwwk7af05yzcjixjd8hi8cqykirj43g60ikhzym009n4q"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index cac09d0ad35c..d18c3b8ee256 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "xfce4-hardware-monitor-plugin"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; - sha256 = "0sqvisr8gagpywq9sfyzqw37hxmj54ii89j5s2g8hx8bng5a98z1"; + sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b"; }; nativeBuildInputs = [ diff --git a/pkgs/development/beam-modules/hex-registry-snapshot.nix b/pkgs/development/beam-modules/hex-registry-snapshot.nix index 6f127d86285b..991e9717b801 100644 --- a/pkgs/development/beam-modules/hex-registry-snapshot.nix +++ b/pkgs/development/beam-modules/hex-registry-snapshot.nix @@ -2,15 +2,14 @@ stdenv.mkDerivation rec { name = "hex-registry"; - rev = "9f736e7"; - version = "0.0.0+build.${rev}"; + rev = "11d7a24e9f53f52490ce255a6248e71128e73aa1"; + version = "20180712.${rev}"; - # src = /home/gleber/code/erl/hex-pm-registry-snapshots; src = fetchFromGitHub { - owner = "erlang-nix"; - repo = "hex-pm-registry-snapshots"; inherit rev; - sha256 = "1xiw5yifyk3bbmr0cr82y1nc4c6zk11f6azdv07glb7yrgccrv79"; + owner = "erlang-nix"; + repo = "hex-pm-registry-snapshots"; + sha256 = "0dbpcrdh6jqmvnm1ysmy7ixyc95vnbqmikyx5kk77qwgyd43fqgi"; }; installPhase = '' diff --git a/pkgs/development/compilers/ghc/8.2.1-binary.nix b/pkgs/development/compilers/ghc/8.2.1-binary.nix index 9bd7dfcb9fc1..bfb9c4cd6164 100644 --- a/pkgs/development/compilers/ghc/8.2.1-binary.nix +++ b/pkgs/development/compilers/ghc/8.2.1-binary.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl, perl, gcc, llvm_39 -, ncurses5, gmp, libiconv +, ncurses5, gmp, glibc, libiconv }: # Prebuilt only does native @@ -14,6 +14,13 @@ let libEnvVar = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; + glibcDynLinker = assert stdenv.isLinux; + if stdenv.hostPlatform.libc == "glibc" then + # Could be stdenv.cc.bintools.dynamicLinker, keeping as-is to avoid rebuild. + ''"$(cat $NIX_CC/nix-support/dynamic-linker)"'' + else + "${stdenv.lib.getLib glibc}/lib/ld-linux*"; + in stdenv.mkDerivation rec { @@ -95,7 +102,7 @@ stdenv.mkDerivation rec { find . -type f -perm -0100 -exec patchelf \ --replace-needed libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5 libncurses.so \ --replace-needed libtinfo.so libtinfo.so.5 \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; + --interpreter ${glibcDynLinker} {} \; paxmark m ./ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 @@ -107,7 +114,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gmp-libraries=${stdenv.lib.getLib gmp}/lib" "--with-gmp-includes=${stdenv.lib.getDev gmp}/include" - ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"; + ] ++ stdenv.lib.optional stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" + ++ stdenv.lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; # Stripping combined with patchelf breaks the executables (they die # with a segfault or the kernel even refuses the execve). (NIXPKGS-85) diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index fefd07b12043..d740a7ee673b 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,7 +8,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 12e01a159a21..182afa6b3496 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 9627e87f8bde..fb294d1fdbaf 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 43e6473fc241..4c1e5d986dcf 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. diff --git a/pkgs/development/compilers/go/1.10.nix b/pkgs/development/compilers/go/1.10.nix index 6f5a65bd03c6..b4fa005c3de8 100644 --- a/pkgs/development/compilers/go/1.10.nix +++ b/pkgs/development/compilers/go/1.10.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { sha256 = "0i89298dgnmpmam3ifkm0ax266vvbq1yz7wfw8wwrcma0szrbrnb"; }; + GOCACHE = "off"; + # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch makeWrapper procps ]; buildInputs = [ cacert pcre ] diff --git a/pkgs/development/compilers/openjdk/10.nix b/pkgs/development/compilers/openjdk/10.nix index 2c76d59512b6..7ed493fe92e9 100644 --- a/pkgs/development/compilers/openjdk/10.nix +++ b/pkgs/development/compilers/openjdk/10.nix @@ -142,7 +142,7 @@ let # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" patchELF $jre propagatedBuildInputs+=" $jre" diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 57771e383279..5b31bc18b8c2 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -206,7 +206,7 @@ let # FIXME: this is unnecessary once the multiple-outputs branch is merged. preFixup = '' - prefix=$jre stripDirs "$stripDebugList" "''${stripDebugFlags:--S}" + prefix=$jre stripDirs "$STRIP" "$stripDebugList" "''${stripDebugFlags:--S}" patchELF $jre propagatedBuildInputs+=" $jre" diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index f07f68241794..36dc8b6f1471 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation ( rec { name = "ponyc-${version}"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "ponylang"; repo = "ponyc"; rev = version; - sha256 = "1m0zvl30926652akyzpvy5m7jn35697d5mkg3xbn3yqwbsfk4yhk"; + sha256 = "1yq82jj0c9nxrx4vxcb3s6yr154kaj2a3wrk12m6fm3dscsqsqq1"; }; buildInputs = [ llvm makeWrapper which ]; diff --git a/pkgs/development/compilers/ponyc/disable-tests.patch b/pkgs/development/compilers/ponyc/disable-tests.patch index d15561721e22..f8c996137af9 100644 --- a/pkgs/development/compilers/ponyc/disable-tests.patch +++ b/pkgs/development/compilers/ponyc/disable-tests.patch @@ -12,16 +12,3 @@ index baf29e7..b63f368 100644 test(_TestTCPWritev) test(_TestTCPExpect) test(_TestTCPMute) -diff --git a/packages/net/http/_test.pony b/packages/net/http/_test.pony -index e55d5a7..40a4cb6 100644 ---- a/packages/net/http/_test.pony -+++ b/packages/net/http/_test.pony -@@ -29,8 +29,6 @@ actor Main is TestList - test(_Valid) - test(_ToStringFun) - -- test(_HTTPConnTest) -- - class iso _Encode is UnitTest - fun name(): String => "net/http/URLEncode.encode" - diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7251ace30a71..c7e7cd4f4c3f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1095,4 +1095,9 @@ self: super: { stylish-cabal = super.stylish-cabal.override { hspec = self.hspec_2_4_8; hspec-core = self.hspec-core_2_4_8; }; hspec_2_4_8 = super.hspec_2_4_8.override { hspec-core = self.hspec-core_2_4_8; hspec-discover = self.hspec-discover_2_4_8; }; + # musl fixes + # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test + unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time; + # dontCheck: printf double rounding behavior + prettyprinter = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.prettyprinter else super.prettyprinter; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index ed324e018552..881771a3a4c2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -51,6 +51,10 @@ self: super: { # https://github.com/xmonad/xmonad-contrib/issues/235 xmonad-contrib = doJailbreak (appendPatch super.xmonad-contrib ./patches/xmonad-contrib-ghc-8.4.1-fix.patch); + # Our xmonad claims that it's version 0.14, which is outside of this + # package's version constraints. + xmonad-extras = doJailbreak super.xmonad-extras; + # This package desperately needs a maintainer. xmobar = super.xmobar.overrideScope (self: super: { hinotify = self.hinotify_0_3_9; # https://github.com/jaor/xmobar/issues/356 diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index d2d923d783d7..961cfb4dad07 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1qzciri8qjx5p7x015rk5ws7gj53qidamp85r2r7aj6ssyp3r40k"; + sha256 = "1zqq2jsaq547rm8qh8zpj36059jahsba733cwrmg6iq0c8ai4z3s"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 48a409b5367a..11a06d4f39ac 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -15,11 +15,14 @@ stdenv.mkDerivation rec { sed -e "s@ldconfig@@" -i Makefile ''; - installPhase = '' - make PREFIX="$out" SUFFIX="" install + makeFlags = [ + "PREFIX=$(out)" + "SUFFIX=" + ]; + postInstall = '' # create lib link for building apps - ln -s $out/lib/libzita-convolver.so.$version $out/lib/libzita-convolver.so.3 + ln -s $out/lib/libzita-convolver.so.${version} $out/lib/libzita-convolver.so.${stdenv.lib.versions.major version} ''; meta = { diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 2144dc4eec26..9f41bf1af47c 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -15,13 +15,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.4.78"; + version = "1.4.82"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "15nrrv94vp8i1azi2bcpi08wxb2dbqlmy9y6jyfw0n1vkr6gz2fw"; + sha256 = "1m5xylcwx5vhz0q3srlq9rbr4x9kydd77mf45agd60clq25sxs69"; }; # FIXME: might be nice to put different APIs in different outputs diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index c1c867abcdf5..a2188f687d13 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "curlcpp-${version}"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "JosephP91"; repo = "curlcpp"; rev = "${version}"; - sha256 = "1akibhrmqsy0dlz9lq93508bhkh7r1l0aycbzy2x45a9gqxfdi4q"; + sha256 = "025qg5hym73xrvyhalv3jgbf9jqnnzkdjs3zwsgbpqx58zyd5bg5"; }; buildInputs = [ cmake curl ]; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index b2a224e10b11..e4d1fa2073fa 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , libtool , gettext @@ -17,13 +18,25 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "eclib"; - version = "20171219"; + version = "20180710"; # upgrade might break the sage interface + # sage tests to run: + # src/sage/interfaces/mwrank.py + # src/sage/libs/eclib + # ping @timokau for more info src = fetchFromGitHub { owner = "JohnCremona"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1yw488ng0labpxqqpxq0710qnndxl8plvcaqklpbwwd62a47knlr"; + sha256 = "1kmwpw971sipb4499c9b35q5pz6sms5qndqrvq7396d8hhwjg1i2"; }; + patches = [ + # One of the headers doesn't get installed. + # See https://github.com/NixOS/nixpkgs/pull/43476. + (fetchpatch { + url = "https://github.com/JohnCremona/eclib/pull/42/commits/c9b96429815e31a6e3372c106e31eef2a96431f9.patch"; + sha256 = "0cw26h94m66rbh8jjsfnb1bvc6z7ybh8zcp8xl5nhxjxiawhcl73"; + }) + ]; buildInputs = [ pari ntl @@ -35,12 +48,12 @@ stdenv.mkDerivation rec { autoreconfHook ]; doCheck = true; - meta = { + meta = with stdenv.lib; { inherit version; description = ''Elliptic curve tools''; homepage = https://github.com/JohnCremona/eclib; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin timokau ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index fcbaaaba6ba4..c5ce5e252fac 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; stdenv.mkDerivation rec { name = "ffmpeg-full-${version}"; - version = "4.0"; + version = "4.0.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d"; + sha256 = "1vn04n0n46zdxq14cma3w8ml2ckh5jxwlybsc4xmvcqdqq0mqpv0"; }; prePatch = '' diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index 98cbfdf43f6c..05da9e18c594 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "3.4.2"; - sha256 = "0nkq4451masmzlx3p4vprqwc0sl2iwqxbzjrngmvj29q4azp00zb"; + branch = "3.4.3"; + sha256 = "0s2p2bcrywlya4wjlyzi1382vngkiijjvjr6ms64xww5jplwmhmk"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index a6e67052cd03..40b697c7a76a 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,7 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.0"; - sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii"; + branch = "4.0.1"; + sha256 = "0w0nq98sn5jwx982wzg3vfrxv4p0k1fvsksiz9az0rpvwyqr3rby"; darwinFrameworks = [ Cocoa CoreMedia ]; }) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 270e96055822..bc70c5ab2371 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation rec { "--disable-stripping" # Disable mmx support for 0.6.90 (verFix null "0.6.90" "--disable-mmx") - ] ++ optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "--cross-prefix=${stdenv.cc.targetPrefix}" "--enable-cross-compile" ] ++ optional stdenv.cc.isClang "--cc=clang"; @@ -170,9 +170,15 @@ stdenv.mkDerivation rec { doCheck = false; # fails + # ffmpeg 3+ generates pkg-config (.pc) files that don't have the + # form automatically handled by the multiple-outputs hooks. postFixup = '' moveToOutput bin "$bin" moveToOutput share/ffmpeg/examples "$doc" + for pc in ''${!outputDev}/lib/pkgconfig/*.pc; do + substituteInPlace $pc \ + --replace "includedir=$out" "includedir=''${!outputInclude}" + done ''; installFlags = [ "install-man" ]; diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 9a7acc287cc4..a229beb5ccb8 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -4,7 +4,7 @@ , libsoup, lzma, ostree, polkit, python3, systemd, xlibs, valgrind, glib_networking, makeWrapper, gnome3 }: let - version = "0.99.2"; + version = "0.99.3"; desktop_schemas = gnome3.gsettings_desktop_schemas; in stdenv.mkDerivation rec { name = "flatpak-${version}"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz"; - sha256 = "1cc82nxd290m4ljkd1phllwb3hkhz41h4ncfdrmhbg3gk47zgpyw"; + sha256 = "0wd6ix1qyz8wmjkfrmr6j99gwywqs7ak1ilsn1ljp72g2z449ayk"; }; patches = [ diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index 0c2b7da79eb3..3f4bc56721ee 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,6 @@ --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -324,7 +324,7 @@ +@@ -315,7 +315,7 @@ # running installed-tests: assume we know what we're doing : elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +9,7 @@ sed -e 's/^/# /' < bwrap-result echo "1..0 # SKIP Cannot run bwrap" exit 0 -@@ -332,7 +332,7 @@ +@@ -323,7 +323,7 @@ } skip_without_python2 () { @@ -18,7 +18,7 @@ echo "1..0 # SKIP this test requires /usr/bin/python2 (2.7) support" exit 0 fi -@@ -352,12 +352,12 @@ +@@ -335,12 +335,12 @@ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -135,12 +135,12 @@ collection_args=--collection-id=${COLLECTION_ID} --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -610,7 +610,7 @@ +@@ -584,7 +584,7 @@ { gint exit_code = 0; - char *argv[] = { (char *)bwrap, "--unshare-ipc", "--unshare-net", -- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; -+ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; + char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", +- "--unshare-pid", "--ro-bind", "/", "/", "/bin/true", NULL }; ++ "--unshare-pid", "--ro-bind", "/", "/", "@coreutils@/bin/true", NULL }; g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index ddc962d0aab6..405d80031e37 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,13 +1,11 @@ -{ stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng -, cfg ? {} +{ stdenv, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi +, freeglut, libGLU_combined, libjpeg, zlib, libXft, libpng , darwin, libtiff, freetype }: -let inherit (composableDerivation) edf; in - -let version = "1.3.4"; in -composableDerivation.composableDerivation {} { +let + version = "1.3.4"; +in stdenv.mkDerivation { name = "fltk-${version}"; src = fetchurl { @@ -18,6 +16,23 @@ composableDerivation.composableDerivation {} { patches = stdenv.lib.optionals stdenv.isDarwin [ ./nsosv.patch ]; nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ + libGLU_combined + libjpeg + zlib + libpng + libXft + ]; + + configureFlags = [ + "--enable-gl" + "--enable-largefile" + "--enable-shared" + "--enable-threads" + "--enable-xft" + ]; + propagatedBuildInputs = [ inputproto ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [Cocoa AGL GLUT freetype libtiff]) @@ -25,33 +40,6 @@ composableDerivation.composableDerivation {} { enableParallelBuilding = true; - flags = - # this could be tidied up (?).. eg why does it require freeglut without glSupport? - edf { name = "cygwin"; } # use the CygWin libraries default=no - // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes - // edf { name = "shared"; } # turn on shared libraries default=no - // edf { name = "threads"; } # enable multi-threading support - // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) - // edf { name = "largefile"; } # omit support for large files - // edf { name = "localjpeg"; disable = { buildInputs = [libjpeg]; }; } # use local JPEG library, default=auto - // edf { name = "localzlib"; disable = { buildInputs = [zlib]; }; } # use local ZLIB library, default=auto - // edf { name = "localpng"; disable = { buildInputs = [libpng]; }; } # use local PNG library, default=auto - // edf { name = "xinerama"; enable = { buildInputs = [libXinerama]; }; } # turn on Xinerama support default=no - // edf { name = "xft"; enable = { buildInputs=[libXft]; }; } # turn on Xft support default=no - // edf { name = "xdbe"; }; # turn on Xdbe support default=no - - cfg = { - largefileSupport = true; # is default - glSupport = true; # doesn't build without it. Why? - localjpegSupport = false; - localzlibSupport = false; - localpngSupport = false; - sharedSupport = true; - threadsSupport = true; - xftSupport = true; - } // cfg; - meta = { description = "A C++ cross-platform lightweight GUI library"; homepage = http://www.fltk.org; diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 75335f08545e..ccf2d6d05855 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "folly-${version}"; - version = "2018.06.25.00"; + version = "2018.07.09.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "0i0c2130xjrpzf5k29j09ckl1nc9ab2hapf5l6004axq6v1kw9sa"; + sha256 = "08irwa2pb3f2gnk31rq31jjrqk2xxx0a0m72gf0bsv2w9fgn5sfm"; }; nativeBuildInputs = [ autoreconfHook python pkgconfig ]; diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 424ffd184994..20dda589b9cc 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { version = "1.1"; }; + PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + src = fetchurl { url = "${meta.homepage}${name}.tar.gz"; sha256 = "08x7rigq5pa1pfpl30qp353hbdkpadr1zc49slpczhsn0sg36pd6"; @@ -21,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://hspell.ivrix.org.il/; platforms = stdenv.lib.platforms.all; maintainers = [ ]; -# Note that I don't speak hebrew, so I can only fix compile problems }; } diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index b5b2b8e37349..59651af2b8cf 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libebml-1.3.5"; + name = "libebml-${version}"; + version = "1.3.6"; - src = fetchurl { - url = "https://dl.matroska.org/downloads/libebml/${name}.tar.xz"; - sha256 = "005a0ipqnfbsq47zrc61zszi439jw32q5xd6dc1jyb3lc0zl266q"; + src = fetchFromGitHub { + owner = "Matroska-Org"; + repo = "libebml"; + rev = "release-${version}"; + sha256 = "0fl8d35ywj9id93yp78qlxy7j81kjri957agq40r420kmwac3dzs"; }; + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=YES" + ]; + meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; - license = licenses.lgpl21; homepage = https://dl.matroska.org/downloads/libebml/; - maintainers = [ maintainers.spwhitt ]; + license = licenses.lgpl21; + maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index e7bce0e80187..bbc694619d4c 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchurl, pkgconfig, libebml }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, libebml }: stdenv.mkDerivation rec { - name = "libmatroska-1.4.8"; + name = "libmatroska-${version}"; + version = "1.4.9"; - src = fetchurl { - url = "https://dl.matroska.org/downloads/libmatroska/${name}.tar.xz"; - sha256 = "14n9sw974prr3yp4yjb7aadi6x2yz5a0hjw8fs3qigy5shh2piyq"; + src = fetchFromGitHub { + owner = "Matroska-Org"; + repo = "libmatroska"; + rev = "release-${version}"; + sha256 = "1hfrcpvmyqnvdkw8rz1z20zw7fpnjyl5h0g9ky7k6y1a44b1fz86"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libebml ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=YES" + ]; + meta = with stdenv.lib; { description = "A library to parse Matroska files"; homepage = https://matroska.org/; license = licenses.lgpl21; - maintainers = [ maintainers.spwhitt ]; + maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; }; } - diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 7d8ec42700c5..d1dae0cfee6e 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libqmatrixclient-${version}"; - version = "0.2.1"; + version = "0.3.0.2"; src = fetchFromGitHub { owner = "QMatrixClient"; repo = "libqmatrixclient"; rev = "v${version}"; - sha256 = "0sv5hhdsffq7092n6hggfz9a78qn3jfmbvw2flmc4ippzz563akv"; + sha256 = "03pxmr4wa818fgqddkr2fkwz6pda538x3ic9yq7c40x98zqf55w5"; }; buildInputs = [ qtbase ]; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index 67ec3b57fa77..1293b0af8cce 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, gfortran, perl }: let - version = "3.0.1"; + version = "4.2.3"; in stdenv.mkDerivation { name = "libxc-${version}"; src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=libxc/${version}/libxc-${version}.tar.gz"; - sha256 = "1xyac89yx03vm86rvk07ps1d39xss3amw46a1k53mv30mgr94rl3"; + sha256 = "0mj26jga0nj76blf2rp9cmgf0v0yhsp7xrg92zgih7fjlydrxr02"; }; buildInputs = [ gfortran ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 57b810c0b448..2d4de3390422 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.8.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0hmxlz3i9yasw5jdkrczak8shzlnpi1acaahn50lvgg9b14kg7b8"; + sha256 = "0ki86yslr5ywa6sz8pjrgd9a4rn2rr4mss2zkmqi7pq8prgsm1fr"; }; buildInputs = [ diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index dc3c2c157138..f6e4a0472828 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.15"; + name = "tdb-1.3.16"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "0a37jhpij8wr4f4pjqdlwnffy2l6a2vkqdpz1bqxj6v06cwbz8dl"; + sha256 = "1ibcz466xwk1x6xvzlgzd5va4lyrjzm3rnjak29kkwk7cmhw4gva"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 12576eed14ce..e43c62684240 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.36"; + name = "tevent-0.9.37"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "0k1v4vnlzpf7h3p4khaw8a7damrc68g136bf2xzys08nzpinnaxx"; + sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 82b72a0fc7b3..59f6af7eddb2 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "wxSVG-${version}"; srcName = "wxsvg-${version}"; - version = "1.5.13"; + version = "1.5.14"; src = fetchurl { url = "mirror://sourceforge/project/wxsvg/wxsvg/${version}/${srcName}.tar.bz2"; - sha256 = "029a1rayp4c480x8ayng13rcjk1j98ar0z6ggijrznkn8kgx8j2j"; + sha256 = "0xl5ghd8yj1ciwf87f12ii7vg38ir0snrds2rhi47pv5gypfkiq5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index aec6851e12bc..1dcafe4c6a48 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,20 +1,21 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, jsonm, hex, sexplib, lwt }: +{ stdenv, fetchzip, ocaml, findlib, jbuilder, jsonm, hex, sexplib }: -let version = "0.4.3"; in +let version = "0.6.0"; in stdenv.mkDerivation { - name = "ocaml-ezjsonm-${version}"; + name = "ocaml${ocaml.version}-ezjsonm-${version}"; src = fetchzip { url = "https://github.com/mirage/ezjsonm/archive/${version}.tar.gz"; - sha256 = "1y6p3ga6vj1wx5dyns7hjgd0qgrrn2hnn323a7y5didgci5pybls"; + sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj"; }; - buildInputs = [ ocaml findlib ocamlbuild lwt ]; + buildInputs = [ ocaml findlib jbuilder ]; propagatedBuildInputs = [ jsonm hex sexplib ]; - createFindlibDestdir = true; - configureFlags = "--enable-lwt"; + buildPhase = "jbuilder build -p ezjsonm"; + + inherit (jbuilder) installPhase; meta = { description = "An easy interface on top of the Jsonm library"; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 37bcff375ea9..345ca037fec9 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchzip, pkgconfig, ncurses, libev, jbuilder -, ocaml, findlib, camlp4, cppo +, ocaml, findlib, cppo , ocaml-migrate-parsetree, ppx_tools_versioned, result +, withP4 ? !stdenv.lib.versionAtLeast ocaml.version "4.07" +, camlp4 ? null }: stdenv.mkDerivation rec { @@ -13,12 +15,13 @@ stdenv.mkDerivation rec { }; preConfigure = '' - ocaml src/util/configure.ml -use-libev true -use-camlp4 true + ocaml src/util/configure.ml -use-libev true -use-camlp4 ${if withP4 then "true" else "false"} ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ncurses ocaml findlib jbuilder camlp4 cppo - ocaml-migrate-parsetree ppx_tools_versioned ]; + buildInputs = [ ncurses ocaml findlib jbuilder cppo + ocaml-migrate-parsetree ppx_tools_versioned ] + ++ stdenv.lib.optional withP4 camlp4; propagatedBuildInputs = [ libev result ]; installPhase = '' diff --git a/pkgs/development/ocaml-modules/lwt_log/default.nix b/pkgs/development/ocaml-modules/lwt_log/default.nix new file mode 100644 index 000000000000..bdabe677a858 --- /dev/null +++ b/pkgs/development/ocaml-modules/lwt_log/default.nix @@ -0,0 +1,24 @@ +{ stdenv, ocaml, findlib, jbuilder, lwt }: + +stdenv.mkDerivation rec { + version = "1.0.0"; + name = "ocaml${ocaml.version}-lwt_log-${version}"; + + inherit (lwt) src; + + buildInputs = [ ocaml findlib jbuilder ]; + + propagatedBuildInputs = [ lwt ]; + + buildPhase = "jbuilder build -p lwt_log"; + + inherit (jbuilder) installPhase; + + meta = { + description = "Lwt logging library (deprecated)"; + homepage = "https://github.com/aantron/lwt_log"; + license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index 1c391d3495dd..124e8b80ba02 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -44,7 +44,7 @@ in buildPythonPackage rec { checkPhase = '' export HOME="$NIX_BUILD_TOP" - ${python.interpreter} runtests.py \ + ${python.interpreter} runtests.py -j$NIX_BUILD_CORES \ ${stdenv.lib.optionalString (builtins.length excludedTests != 0) ''--exclude="(${builtins.concatStringsSep "|" excludedTests})"''} ''; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index 274fa0fbbf27..8e75f1f3d8de 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -1,5 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi -, pytest, glibcLocales, vega, pandas, ipython, traitlets }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch +, pytest, jinja2, sphinx, vega_datasets, ipython, glibcLocales +, entrypoints, jsonschema, numpy, pandas, six, toolz, typing }: buildPythonPackage rec { pname = "altair"; @@ -10,18 +11,19 @@ buildPythonPackage rec { sha256 = "e8b222588dde98ec614e6808357fde7fa321118db44cc909df2bf30158d931c0"; }; - postPatch = '' - sed -i "s/vega==/vega>=/g" setup.py - ''; + patches = fetchpatch { + url = https://github.com/altair-viz/altair/commit/bfca8aecce9593c48aa5834e3f8f841deb58391c.patch; + sha256 = "01izc5d8c6ry3mh0k0hfasb6jc4720g75yw2qdlp9ja8mnjsp4k3"; + }; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest jinja2 sphinx vega_datasets ipython glibcLocales ]; checkPhase = '' export LANG=en_US.UTF-8 py.test altair --doctest-modules ''; - propagatedBuildInputs = [ vega pandas ipython traitlets ]; + propagatedBuildInputs = [ entrypoints jsonschema numpy pandas six toolz typing ]; meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix new file mode 100644 index 000000000000..c42ad6f1d6c9 --- /dev/null +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi +, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3, requests, click, configparser }: + +buildPythonPackage rec { + version = "0.12.0"; + pname = "aws-adfs"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cjrm61k6905dmhgrqyc5caxx5hbhj3sr6cx4r6sbdyz453i7pc6"; + }; + + # Relax version constraint + patchPhase = '' + sed -i 's/coverage < 4/coverage/' setup.py + ''; + + # Test suite writes files to $HOME/.aws/, or /homeless-shelter if unset + HOME = "."; + + # Required for python3 tests, along with glibcLocales + LC_ALL = "en_US.UTF-8"; + + checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; + propagatedBuildInputs = [ lxml boto3 requests click configparser ]; + + meta = { + description = "Command line tool to ease aws cli authentication against ADFS"; + homepage = https://github.com/venth/aws-adfs; + license = lib.licenses.psfl; + maintainers = [ lib.maintainers.bhipple ]; + }; +} diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index b3a15ba08682..dca7844dec9c 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.7.48"; + version = "1.7.57"; src = fetchFromGitHub { owner = "boto"; repo = "boto3"; rev = version; - sha256 = "0pag37yy6693k8xvlyx4f06asab52i89xljy2ip121i60ih3jfw4"; + sha256 = "0rp3vclx7mvfl6isa47m7dzlrf33qb9vj53p0gj4cw3mgl14cnbl"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index fada751968b3..70a5af97fdaa 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.10.48"; + version = "1.10.57"; src = fetchPypi { inherit pname version; - sha256 = "1432drc7482nwrppwkk1i6ars3wz9w2g9rsxkz5nlxmyf9qm260j"; + sha256 = "0mif7c12643hac6zxq89gv0wjf4r3vqlmm01bm68psljaj40jnpi"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 3a357282c165..71911da08f43 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, iana-etc, libredirect, +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, iana-etc, libredirect, pytest, case, kombu, billiard, pytz, anyjson, amqp, eventlet }: @@ -11,6 +11,13 @@ buildPythonPackage rec { sha256 = "ff727c115533edbc7b81b2b4ba1ec88d1c2fc4836e1e2f4c3c33a76ff53e5d7f"; }; + # Skip test_RedisBackend.test_timeouts_in_url_coerced + # See https://github.com/celery/celery/pull/4847 + patches = fetchpatch { + url = https://github.com/celery/celery/commit/b2668607c909c61becd151905b4525190c19ff4a.patch; + sha256 = "11w0z2ycyh8kccj4y69zb7bxppiipcwwigg6jn1q9yrcsvz170jq"; + }; + # make /etc/protocols accessible to fix socket.getprotobyname('tcp') in sandbox preCheck = stdenv.lib.optionalString stdenv.isLinux '' export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols \ diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 5ffa51def0d2..e83fd4163e4a 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchPypi, buildPythonPackage, pythonOlder -, pyperclip, six, pyparsing, vim +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder, isPy3k +, pyperclip, six, pyparsing, vim, wcwidth, colorama , contextlib2 ? null, subprocess32 ? null , pytest, mock, which, fetchFromGitHub, glibcLocales }: buildPythonPackage rec { pname = "cmd2"; - version = "0.8.0"; + version = "0.9.1"; - src = fetchFromGitHub { - owner = "python-cmd2"; - repo = "cmd2"; - rev = version; - sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + src = fetchPypi { + inherit pname version; + sha256 = "1wpw4f9zix30hfncm0hwxjjdx78zq26x3r8s9nvsq9vnxf41xb49"; }; LC_ALL="en_US.UTF-8"; @@ -31,14 +29,16 @@ buildPythonPackage rec { py.test -k 'not test_path_completion_user_expansion' ''; doCheck = !stdenv.isDarwin; + disabled = !isPy3k; propagatedBuildInputs = [ + colorama pyperclip six pyparsing + wcwidth ] ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 - ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 ; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cmd2/old.nix b/pkgs/development/python-modules/cmd2/old.nix new file mode 100644 index 000000000000..5ffa51def0d2 --- /dev/null +++ b/pkgs/development/python-modules/cmd2/old.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchPypi, buildPythonPackage, pythonOlder +, pyperclip, six, pyparsing, vim +, contextlib2 ? null, subprocess32 ? null +, pytest, mock, which, fetchFromGitHub, glibcLocales +}: +buildPythonPackage rec { + pname = "cmd2"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "python-cmd2"; + repo = "cmd2"; + rev = version; + sha256 = "0nw2b7n7zg51bc3glxw0l9fn91mwjnjshklhmxhyvjbsg7khf64z"; + }; + + LC_ALL="en_US.UTF-8"; + + postPatch = stdenv.lib.optional stdenv.isDarwin '' + # Fake the impure dependencies pbpaste and pbcopy + mkdir bin + echo '#/bin/sh' > bin/pbpaste + echo '#/bin/sh' > bin/pbcopy + chmod +x bin/{pbcopy,pbpaste} + export PATH=$(realpath bin):$PATH + ''; + + checkInputs= [ pytest mock which vim glibcLocales ]; + checkPhase = '' + # test_path_completion_user_expansion might be fixed in the next release + py.test -k 'not test_path_completion_user_expansion' + ''; + doCheck = !stdenv.isDarwin; + + propagatedBuildInputs = [ + pyperclip + six + pyparsing + ] + ++ stdenv.lib.optional (pythonOlder "3.5") contextlib2 + ++ stdenv.lib.optional (pythonOlder "3.0") subprocess32 + ; + + meta = with stdenv.lib; { + description = "Enhancements for standard library's cmd module"; + homepage = https://github.com/python-cmd2/cmd2; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 8be1780aa992..e19850be8cee 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,19 +1,15 @@ -{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, cryptography, boto3, pyyaml, docutils, nose }: buildPythonPackage rec { pname = "credstash"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "718b337f7a6fa001e014386071f05c59900525d0507009126d2fe8d75fe0761d"; + sha256 = "814560f99ae2409e2c6d906d878f9dadada5d1d0a950aafb6b2c0d535291bdfb"; }; - patches = fetchpatch { - url = https://github.com/fugue/credstash/pull/178.patch; - sha256 = "15ih4h5v63g7qfmqdl4zca147wkcrx8vnsh4ns33001dipcfb5sc"; - excludes = [ ".travis.yml" ]; - }; + nativeBuildInputs = [ nose ]; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index e17bd38da02b..906e2c0bbe4a 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -46,6 +46,11 @@ buildPythonPackage rec { export CVXOPT_FFTW_INC_DIR=${fftw.dev}/include ''; + # https://github.com/cvxopt/cvxopt/issues/122 + # This is fixed on staging (by #43234, status 2018-07-15), but until that + # lands we should disable the tests. Otherwise the 99% of use cases that + # should be unaffected by that failure are affected. + doCheck = false; checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index fc3c311a5061..6df19e4c94be 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -7,16 +7,15 @@ , gmp , cython , cysignals -, six }: buildPythonPackage rec { pname = "cypari2"; - version = "1.1.4"; # remove six dependency on upgrade to >1.1.4 + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0n0mp8qmvvzmfaawg39d3mkyzf65q2zkz7bnqyk4sfjbz4xwc6mb"; + sha256 = "0v2kikwf0advq8j76nwzhlacwj1yys9cvajm4fqgmasjdsnf1q4k"; }; # This differs slightly from the default python installPhase in that it pip-installs @@ -39,7 +38,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cysignals cython - six # after 1.1.4: will not be needed ]; checkPhase = '' diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index aaea8175f726..1659d46abbc5 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -1,5 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi, - celery, django, psycopg2 +{ lib, buildPythonPackage, fetchPypi +, glibcLocales +, celery, django, psycopg2 }: buildPythonPackage rec { @@ -7,7 +8,7 @@ buildPythonPackage rec { version = "1.1.0"; meta = { - description = "Simple, powerfull and nonobstructive django email middleware."; + description = "Simple, powerfull and nonobstructive django email middleware"; homepage = https://github.com/bameda/djmail; license = lib.licenses.bsd3; }; @@ -17,6 +18,10 @@ buildPythonPackage rec { sha256 = "87d2a8b4bdf67ae9b312e127ccc873a53116cf297ec786460d782ce82eaa76b5"; }; + nativeBuildInputs = [ glibcLocales ]; + + LC_ALL = "en_US.UTF-8"; + propagatedBuildInputs = [ celery django psycopg2 ]; # django.core.exceptions.ImproperlyConfigured: Requested setting DEFAULT_INDEX_TABLESPACE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. diff --git a/pkgs/development/python-modules/eve/default.nix b/pkgs/development/python-modules/eve/default.nix index deed6536fe74..b8daa5304c77 100644 --- a/pkgs/development/python-modules/eve/default.nix +++ b/pkgs/development/python-modules/eve/default.nix @@ -4,17 +4,12 @@ buildPythonPackage rec { pname = "Eve"; version = "0.8"; - name = "${pname}-${version}"; src = fetchPypi { inherit pname version; sha256 = "9f926c715f88c7a92dc2b950ccc09cccd91f72fe0e93cde806b85d25b947df2f"; }; - patches = [ - ./setup.patch - ]; - propagatedBuildInputs = [ cerberus events diff --git a/pkgs/development/python-modules/eve/setup.patch b/pkgs/development/python-modules/eve/setup.patch deleted file mode 100644 index 8e5ca27757e1..000000000000 --- a/pkgs/development/python-modules/eve/setup.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git i/setup.py w/setup.py -index 0176467..2b74988 100755 ---- i/setup.py -+++ w/setup.py -@@ -9,11 +9,11 @@ install_requires = [ - 'cerberus>=0.9.2,<0.10', - 'events>=0.2.1,<0.3', - 'simplejson>=3.3.0,<4.0', -- 'werkzeug>=0.9.4,<=0.11.15', -- 'markupsafe>=0.23,<1.0', -- 'jinja2>=2.8,<3.0', -- 'itsdangerous>=0.24,<1.0', -- 'flask>=0.10.1,<=0.12', -+ 'werkzeug>=0.9.4', -+ 'markupsafe>=0.23', -+ 'jinja2>=2.8', -+ 'itsdangerous>=0.24', -+ 'flask>=0.10.1', - 'pymongo>=3.4', - 'flask-pymongo>=0.4', - ] diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix new file mode 100644 index 000000000000..28e7726a829b --- /dev/null +++ b/pkgs/development/python-modules/events/default.nix @@ -0,0 +1,17 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "Events"; + version = "0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "f4d9c41a5c160ce504278f219fe56f44242ca63794a0ad638b52d1e087ac2a41"; + }; + + meta = with lib; { + homepage = http://events.readthedocs.org; + description = "Bringing the elegance of C# EventHanlder to Python"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index 902d1b266534..faf557735399 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -2,11 +2,13 @@ buildPythonPackage rec { pname = "geojson"; - version = "2.3.0"; + version = "2.4.0"; + + format = "wheel"; src = fetchPypi { - inherit pname version; - sha256 = "06ihcb8839zzgk5jcv18kc6nqld4hhj3nk4f3drzcr8n8893v1y8"; + inherit pname version format; + sha256 = "0r9pc8hgnc5hf5rq98vinbrncn08v4kgzdfmfs14rfypvacsmfpj"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix new file mode 100644 index 000000000000..7620ee944417 --- /dev/null +++ b/pkgs/development/python-modules/kombu/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pytest, case, pytz, amqp }: + +buildPythonPackage rec { + pname = "kombu"; + version = "4.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "86adec6c60f63124e2082ea8481bbe4ebe04fde8ebed32c177c7f0cd2c1c9082"; + }; + + postPatch = '' + substituteInPlace requirements/test.txt --replace "pytest-sugar" "" + ''; + + checkInputs = [ pytest case pytz ]; + + propagatedBuildInputs = [ amqp ]; + + meta = with lib; { + description = "Messaging library for Python"; + homepage = https://github.com/celery/kombu; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/pdfx/default.nix b/pkgs/development/python-modules/pdfx/default.nix new file mode 100644 index 000000000000..d2397fb5c82b --- /dev/null +++ b/pkgs/development/python-modules/pdfx/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pdfminer, chardet, pytest }: + +buildPythonPackage rec { + pname = "pdfx"; + version = "1.3.1"; + + src = fetchFromGitHub { + owner = "metachris"; + repo = "pdfx"; + rev = "v${version}"; + sha256 = "1183k4h5qdf8y0imbir9ja3yzzsvdmqgbv3bi6dnkgr1wy2xfr0v"; + }; + + # Remove after https://github.com/metachris/pdfx/pull/28 + prePatch = '' + sed -i -e "s|pdfminer2|pdfminer.six|" setup.py + ''; + + propagatedBuildInputs = [ pdfminer chardet ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Extract references (pdf, url, doi, arxiv) and metadata from a PDF"; + license = licenses.asl20; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index dc63fe7d104d..edaf7cd90cc5 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -14,6 +14,10 @@ buildPythonPackage rec { sha256 = "5ca0ad32ee04abe0d4ba02c8d89d501b4e5e0304bdf4d45c2e9875a735b323a0"; }; + # basically https://github.com/scikit-learn/scikit-learn/pull/10723, + # but rebased onto 0.19.1 + patches = [ ./n_iter-should-be-less-than-max_iter-using-lbgfs.patch ]; + buildInputs = [ nose pillow gfortran glibcLocales ]; propagatedBuildInputs = [ numpy scipy numpy.blas ]; diff --git a/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch b/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch new file mode 100644 index 000000000000..67309a673d08 --- /dev/null +++ b/pkgs/development/python-modules/scikitlearn/n_iter-should-be-less-than-max_iter-using-lbgfs.patch @@ -0,0 +1,73 @@ +diff --git a/sklearn/linear_model/huber.py b/sklearn/linear_model/huber.py +index e17dc1e..665654d 100644 +--- a/sklearn/linear_model/huber.py ++++ b/sklearn/linear_model/huber.py +@@ -181,7 +181,11 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator): + + n_iter_ : int + Number of iterations that fmin_l_bfgs_b has run for. +- Not available if SciPy version is 0.9 and below. ++ ++ .. versionchanged:: 0.20 ++ ++ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed ++ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``. + + outliers_ : array, shape (n_samples,) + A boolean mask which is set to True where the samples are identified +@@ -272,7 +276,9 @@ class HuberRegressor(LinearModel, RegressorMixin, BaseEstimator): + raise ValueError("HuberRegressor convergence failed:" + " l-BFGS-b solver terminated with %s" + % dict_['task'].decode('ascii')) +- self.n_iter_ = dict_.get('nit', None) ++ # In scipy <= 1.0.0, nit may exceed maxiter. ++ # See https://github.com/scipy/scipy/issues/7854. ++ self.n_iter_ = min(dict_.get('nit', None), self.max_iter) + self.scale_ = parameters[-1] + if self.fit_intercept: + self.intercept_ = parameters[-2] +diff --git a/sklearn/linear_model/logistic.py b/sklearn/linear_model/logistic.py +index 8646c9a..c72a7d9 100644 +--- a/sklearn/linear_model/logistic.py ++++ b/sklearn/linear_model/logistic.py +@@ -718,7 +718,9 @@ def logistic_regression_path(X, y, pos_class=None, Cs=10, fit_intercept=True, + warnings.warn("lbfgs failed to converge. Increase the number " + "of iterations.") + try: +- n_iter_i = info['nit'] - 1 ++ # In scipy <= 1.0.0, nit may exceed maxiter. ++ # See https://github.com/scipy/scipy/issues/7854. ++ n_iter_i = min(info['nit'], max_iter) + except: + n_iter_i = info['funcalls'] - 1 + elif solver == 'newton-cg': +@@ -1115,6 +1117,11 @@ class LogisticRegression(BaseEstimator, LinearClassifierMixin, + it returns only 1 element. For liblinear solver, only the maximum + number of iteration across all classes is given. + ++ .. versionchanged:: 0.20 ++ ++ In SciPy <= 1.0.0 the number of lbfgs iterations may exceed ++ ``max_iter``. ``n_iter_`` will now report at most ``max_iter``. ++ + See also + -------- + SGDClassifier : incrementally trained logistic regression (when given +diff --git a/sklearn/linear_model/tests/test_huber.py b/sklearn/linear_model/tests/test_huber.py +index 08f4fdf..ca1092f 100644 +--- a/sklearn/linear_model/tests/test_huber.py ++++ b/sklearn/linear_model/tests/test_huber.py +@@ -42,6 +42,13 @@ def test_huber_equals_lr_for_high_epsilon(): + assert_almost_equal(huber.intercept_, lr.intercept_, 2) + + ++def test_huber_max_iter(): ++ X, y = make_regression_with_outliers() ++ huber = HuberRegressor(max_iter=1) ++ huber.fit(X, y) ++ assert huber.n_iter_ == huber.max_iter ++ ++ + def test_huber_gradient(): + # Test that the gradient calculated by _huber_loss_and_gradient is correct + rng = np.random.RandomState(1) diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix new file mode 100644 index 000000000000..a7b6c6865cca --- /dev/null +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pandas, pytest }: + +buildPythonPackage rec { + pname = "vega_datasets"; + version = "0.5.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1fa672ba89ded093b30c6d59fce10aca3ac7c927df254e588da7b6d14f695181"; + }; + + propagatedBuildInputs = [ pandas ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + py.test vega_datasets --doctest-modules + ''; + + meta = with lib; { + description = "A Python package for offline access to vega datasets"; + homepage = https://github.com/altair-viz/vega_datasets; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix new file mode 100644 index 000000000000..fa993c593e1a --- /dev/null +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, buildPythonPackage }: + +buildPythonPackage rec { + name = "wcwidth-${version}"; + version = "0.1.7"; + + src = fetchurl { + url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; + sha256 = "0pn6dflzm609m4r3i8ik5ni9ijjbb5fa3vg1n7hn6vkd49r77wrx"; + }; + + # Checks fail due to missing tox.ini file: + doCheck = false; + + meta = with stdenv.lib; { + description = "Measures number of Terminal column cells of wide-character codes"; + longDescription = '' + This API is mainly for Terminal Emulator implementors -- any Python + program that attempts to determine the printable width of a string on + a Terminal. It is implemented in python (no C library calls) and has + no 3rd-party dependencies. + ''; + homepage = https://github.com/jquast/wcwidth; + license = licenses.mit; + }; + } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d65f07dfa966..68ab42a76dd7 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -264,7 +264,7 @@ let graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; h5 = [ pkgs.hdf5-cpp pkgs.which ]; - haven = [ pkgs.libiconv ]; + haven = [ pkgs.libiconv pkgs.zlib.dev ]; h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; imager = [ pkgs.x11 ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 07f3053b9d43..70e476c4572d 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,34 +1,27 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, - findlib, camlp4, sedlex, ocamlbuild, lwt_ppx, wtf8, dtoa }: +{ stdenv, fetchFromGitHub, lib, ocamlPackages, libelf, cf-private, CoreServices }: with lib; stdenv.mkDerivation rec { - version = "0.75.0"; + version = "0.76.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0xrcjjk16w6anpy58qa4la1jyfjs0xg5xkp58slhai996wqif24k"; + sha256 = "0r3yl4m7dhm1h4c431zp8hd2gg6k1d9bwd2371xav5q7hviwmjl6"; }; - # lwt.log is being split out into a separate package, so this can be - # removed once nixpkgs is updated. - # See https://github.com/ocsigen/lwt/issues/453#issuecomment-352897664 - postPatch = '' - substituteInPlace Makefile --replace lwt_log lwt.log - ''; - installPhase = '' mkdir -p $out/bin cp bin/flow $out/bin/ ''; - buildInputs = [ - ocaml libelf findlib camlp4 sedlex ocamlbuild lwt_ppx wtf8 dtoa - ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; + buildInputs = [ libelf + ] ++ (with ocamlPackages; [ + ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx lwt_log wtf8 dtoa + ]) ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { description = "A static type checker for JavaScript"; diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 4aec0f65783a..ff2b4d3b54f5 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,22 +1,32 @@ { stdenv, fetchFromGitHub # nativeBuildInputs -, qmake, pkgconfig, makeWrapper +, qmake, pkgconfig # Qt , qtbase, qtsvg, qtwebengine # buildInputs , radare2 , python3 }: - +let + r2 = radare2.overrideDerivation (o: { + name = "radare2-for-cutter-${version}"; + src = fetchFromGitHub { + owner = "radare"; + repo = "radare2"; + rev = "a98557bfbfa96e9f677a8c779ee78085ee5a23bb"; + sha256 = "04jl1lq3dqljb6vagzlym4wc867ayhx1v52f75rkfz0iybsh249r"; + }; + }); + version = "1.6"; +in stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.5"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "0xwls8jhhigdkwyq3nf9xwcz4inm5smwinkyliwmfzvfflbbci5c"; + sha256 = "1ps52yf94yfnws3nn1iiwch2jy33dyvi7j47xkmh0m5fpdqi5xk7"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; @@ -30,8 +40,8 @@ stdenv.mkDerivation rec { --replace "include(lib_radare2.pri)" "" ''; - nativeBuildInputs = [ qmake pkgconfig makeWrapper ]; - buildInputs = [ qtbase qtsvg qtwebengine radare2 python3 ]; + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase qtsvg qtwebengine r2 python3 ]; qmakeFlags = [ "CONFIG+=link_pkgconfig" @@ -42,13 +52,6 @@ stdenv.mkDerivation rec { "CUTTER_ENABLE_JUPYTER=false" ]; - # Fix crash on startup in some situations - postInstall = '' - wrapProgram $out/bin/Cutter \ - --prefix QT_PLUGIN_PATH : ${qtbase.bin}/${qtbase.qtPluginPrefix} \ - --prefix LD_LIBRARY_PATH : ${qtbase.out}/lib - ''; - enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 9b18bcb25616..953a10ca47ab 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -1,14 +1,14 @@ { stdenv, binutils, cmake, zlib, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2018-05-22"; + version = "2018-06-15"; name = "bloaty-${version}"; src = fetchFromGitHub { owner = "google"; repo = "bloaty"; - rev = "054788b091ccfd43b05b9817062139145096d440"; - sha256 = "0pmv66137ipzsjjdz004n61pz3aipjhh3b0w0y1406clqpwkvpjm"; + rev = "bdbb3ce196c86d2154f5fba99b5ff73ca43446a9"; + sha256 = "1r7di2p8bi12jpgl6cm4ygi1s0chv767mdcavc7pb45874vl02fx"; fetchSubmodules = true; }; @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = "ctest"; - installPhase = '' install -Dm755 {.,$out/bin}/bloaty ''; diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index 48b68e9cb006..0441ba0c665d 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,9 +1,9 @@ -{ stdenv, lib, writeText, writeScript, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, binutils, makeWrapper, which, python, gnused +{ stdenv, lib, fetchurl, jdk, zip, unzip, bash, writeCBin, coreutils, makeWrapper, which, python, gnused # Always assume all markers valid (don't redownload dependencies). # Also, don't clean up environment variables. , enableNixHacks ? false # Apple dependencies -, cctools, clang, libcxx, CoreFoundation, CoreServices, Foundation +, libcxx, CoreFoundation, CoreServices, Foundation }: stdenv.mkDerivation rec { @@ -56,396 +56,9 @@ stdenv.mkDerivation rec { } ''; - buildFile = writeText "BUILD" '' - package(default_visibility = ['//visibility:public']) - - filegroup(name = "empty") - - cc_toolchain_suite( - name = "nix", - toolchains = { - "darwin|compiler": ":nix_darwin_toolchain", - "k8|compiler": ":nix_linux_toolchain", - }, - ) - - cc_toolchain( - name = "nix_darwin_toolchain", - all_files = ":osx_wrapper", - compiler_files = ":osx_wrapper", - cpu = "darwin", - dwp_files = ":empty", - dynamic_runtime_libs = [":empty"], - linker_files = ":osx_wrapper", - objcopy_files = ":empty", - static_runtime_libs = [":empty"], - strip_files = ":empty", - supports_param_files = 0, - ) - - cc_toolchain( - name = "nix_linux_toolchain", - all_files = ":empty", - compiler_files = ":empty", - cpu = "k8", - dwp_files = ":empty", - dynamic_runtime_libs = [":empty"], - linker_files = ":empty", - objcopy_files = ":empty", - static_runtime_libs = [":empty"], - strip_files = ":empty", - supports_param_files = 0, - ) - - filegroup( - name = "osx_wrapper", - srcs = ["osx_cc_wrapper.sh"], - ) - ''; - - crosstoolFile = writeText "CROSSTOOL" ('' - major_version: "local" - minor_version: "" - default_target_cpu: "same_as_host" - '' + lib.optionalString stdenv.isDarwin '' - default_toolchain { - cpu: "darwin" - toolchain_identifier: "local_darwin" - } - toolchain { - abi_version: "local" - abi_libc_version: "local" - builtin_sysroot: "" - compiler: "compiler" - host_system_name: "local" - needsPic: true - target_libc: "macosx" - target_cpu: "darwin" - target_system_name: "local" - toolchain_identifier: "local_darwin" - - tool_path { name: "ar" path: "${cctools}/bin/libtool" } - tool_path { name: "compat-ld" path: "${cctools}/bin/ld" } - tool_path { name: "cpp" path: "${clang}/bin/cpp" } - tool_path { name: "dwp" path: "${coreutils}/bin/false" } - tool_path { name: "gcc" path: "osx_cc_wrapper.sh" } - cxx_flag: "-std=c++0x" - linker_flag: "-lstdc++" - linker_flag: "-undefined" - linker_flag: "dynamic_lookup" - linker_flag: "-headerpad_max_install_names" - # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them - cxx_builtin_include_directory: "/nix/store" - tool_path { name: "gcov" path: "${coreutils}/bin/false" } - tool_path { name: "ld" path: "${cctools}/bin/ld" } - tool_path { name: "nm" path: "${cctools}/bin/nm" } - tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } - objcopy_embed_flag: "-I" - objcopy_embed_flag: "binary" - tool_path { name: "objdump" path: "${binutils}/bin/objdump" } - tool_path { name: "strip" path: "${cctools}/bin/strip" } - - # Anticipated future default. - unfiltered_cxx_flag: "-no-canonical-prefixes" - - # Make C++ compilation deterministic. Use linkstamping instead of these - # compiler symbols. - unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" - - # Security hardening on by default. - # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. - compiler_flag: "-D_FORTIFY_SOURCE=1" - compiler_flag: "-fstack-protector" - - # Enable coloring even if there's no attached terminal. Bazel removes the - # escape sequences if --nocolor is specified. - compiler_flag: "-fcolor-diagnostics" - - # All warnings are enabled. Maybe enable -Werror as well? - compiler_flag: "-Wall" - # Enable a few more warnings that aren't part of -Wall. - compiler_flag: "-Wthread-safety" - compiler_flag: "-Wself-assign" - - # Keep stack frames for debugging, even in opt mode. - compiler_flag: "-fno-omit-frame-pointer" - - # Anticipated future default. - linker_flag: "-no-canonical-prefixes" - - compilation_mode_flags { - mode: DBG - # Enable debug symbols. - compiler_flag: "-g" - } - compilation_mode_flags { - mode: OPT - # No debug symbols. - # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or even generally? - # However, that can't happen here, as it requires special handling in Bazel. - compiler_flag: "-g0" - - # Conservative choice for -O - # -O3 can increase binary size and even slow down the resulting binaries. - # Profile first and / or use FDO if you need better performance than this. - compiler_flag: "-O2" - - # Disable assertions - compiler_flag: "-DNDEBUG" - - # Removal of unused code and data at link time (can this increase binary size in some cases?). - compiler_flag: "-ffunction-sections" - compiler_flag: "-fdata-sections" - } - linking_mode_flags { mode: DYNAMIC } - } - '' + lib.optionalString stdenv.isLinux '' - default_toolchain { - cpu: "k8" - toolchain_identifier: "local_linux" - } - - toolchain { - abi_version: "local" - abi_libc_version: "local" - builtin_sysroot: "" - compiler: "compiler" - host_system_name: "local" - needsPic: true - supports_gold_linker: false - supports_incremental_linker: false - supports_fission: false - supports_interface_shared_objects: false - supports_normalizing_ar: false - supports_start_end_lib: false - target_libc: "local" - target_cpu: "k8" - target_system_name: "local" - toolchain_identifier: "local_linux" - - tool_path { name: "ar" path: "${binutils}/bin/ar" } - tool_path { name: "compat-ld" path: "${binutils}/bin/ld" } - tool_path { name: "cpp" path: "${stdenv.cc}/bin/cpp" } - tool_path { name: "dwp" path: "${coreutils}/bin/false" } - tool_path { name: "gcc" path: "${stdenv.cc}/bin/cc" } - cxx_flag: "-std=c++0x" - linker_flag: "-lstdc++" - # We know all files in `/nix/store` are immutable so it's safe to disable inclusion checks for them - cxx_builtin_include_directory: "/nix/store" - tool_path { name: "gcov" path: "${coreutils}/bin/false" } - - # C(++) compiles invoke the compiler (as that is the one knowing where - # to find libraries), but we provide LD so other rules can invoke the linker. - tool_path { name: "ld" path: "${binutils}/bin/ld" } - - tool_path { name: "nm" path: "${binutils}/bin/nm" } - tool_path { name: "objcopy" path: "${binutils}/bin/objcopy" } - objcopy_embed_flag: "-I" - objcopy_embed_flag: "binary" - tool_path { name: "objdump" path: "${binutils}/bin/objdump" } - tool_path { name: "strip" path: "${binutils}/bin/strip" } - - # Anticipated future default. - unfiltered_cxx_flag: "-no-canonical-prefixes" - unfiltered_cxx_flag: "-fno-canonical-system-headers" - - # Make C++ compilation deterministic. Use linkstamping instead of these - # compiler symbols. - unfiltered_cxx_flag: "-Wno-builtin-macro-redefined" - unfiltered_cxx_flag: "-D__DATE__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIMESTAMP__=\"redacted\"" - unfiltered_cxx_flag: "-D__TIME__=\"redacted\"" - - # Security hardening on by default. - # Conservative choice; -D_FORTIFY_SOURCE=2 may be unsafe in some cases. - # We need to undef it before redefining it as some distributions now have - # it enabled by default. - compiler_flag: "-U_FORTIFY_SOURCE" - compiler_flag: "-D_FORTIFY_SOURCE=1" - compiler_flag: "-fstack-protector" - linker_flag: "-Wl,-z,relro,-z,now" - - # Enable coloring even if there's no attached terminal. Bazel removes the - # escape sequences if --nocolor is specified. This isn't supported by gcc - # on Ubuntu 14.04. - # compiler_flag: "-fcolor-diagnostics" - - # All warnings are enabled. Maybe enable -Werror as well? - compiler_flag: "-Wall" - # Enable a few more warnings that aren't part of -Wall. - compiler_flag: "-Wunused-but-set-parameter" - # But disable some that are problematic. - compiler_flag: "-Wno-free-nonheap-object" # has false positives - - # Keep stack frames for debugging, even in opt mode. - compiler_flag: "-fno-omit-frame-pointer" - - # Anticipated future default. - linker_flag: "-no-canonical-prefixes" - # Have gcc return the exit code from ld. - linker_flag: "-pass-exit-codes" - # Gold linker only? Can we enable this by default? - # linker_flag: "-Wl,--warn-execstack" - # linker_flag: "-Wl,--detect-odr-violations" - - compilation_mode_flags { - mode: DBG - # Enable debug symbols. - compiler_flag: "-g" - } - compilation_mode_flags { - mode: OPT - - # No debug symbols. - # Maybe we should enable https://gcc.gnu.org/wiki/DebugFission for opt or - # even generally? However, that can't happen here, as it requires special - # handling in Bazel. - compiler_flag: "-g0" - - # Conservative choice for -O - # -O3 can increase binary size and even slow down the resulting binaries. - # Profile first and / or use FDO if you need better performance than this. - compiler_flag: "-O2" - - # Disable assertions - compiler_flag: "-DNDEBUG" - - # Removal of unused code and data at link time (can this increase binary size in some cases?). - compiler_flag: "-ffunction-sections" - compiler_flag: "-fdata-sections" - linker_flag: "-Wl,--gc-sections" - } - linking_mode_flags { mode: DYNAMIC } - } - ''); - - osxCcWrapperFile = writeScript "osx_cc_wrapper.sh" (if stdenv.isDarwin then '' - #!${customBash}/bin/bash - # - # Copyright 2015 The Bazel Authors. All rights reserved. - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - # - # OS X relpath is not really working. This is a wrapper script around gcc - # to simulate relpath behavior. - # - # This wrapper uses install_name_tool to replace all paths in the binary - # (bazel-out/.../path/to/original/library.so) by the paths relative to - # the binary. It parses the command line to behave as rpath is supposed - # to work. - # - # See https://blogs.oracle.com/dipol/entry/dynamic_libraries_rpath_and_mac - # on how to set those paths for Mach-O binaries. - # - set -eu - - GCC="${clang}/bin/clang" - INSTALL_NAME_TOOL="${cctools}/bin/install_name_tool" - - LIBS= - LIB_DIRS= - RPATHS= - OUTPUT= - # let parse the option list - for i in "$@"; do - if [[ "''${OUTPUT}" = "1" ]]; then - OUTPUT=$i - elif [[ "$i" =~ ^-l(.*)$ ]]; then - LIBS="''${BASH_REMATCH[1]} $LIBS" - elif [[ "$i" =~ ^-L(.*)$ ]]; then - LIB_DIRS="''${BASH_REMATCH[1]} $LIB_DIRS" - elif [[ "$i" =~ ^-Wl,-rpath,\@loader_path/(.*)$ ]]; then - RPATHS="''${BASH_REMATCH[1]} ''${RPATHS}" - elif [[ "$i" = "-o" ]]; then - # output is coming - OUTPUT=1 - fi - done - - # Call gcc - ''${GCC} "$@" - - function get_library_path() { - for libdir in ''${LIB_DIRS}; do - if [ -f ''${libdir}/lib$1.so ]; then - echo "''${libdir}/lib$1.so" - elif [ -f ''${libdir}/lib$1.dylib ]; then - echo "''${libdir}/lib$1.dylib" - fi - done - } - - # A convenient method to return the actual path even for non symlinks - # and multi-level symlinks. - function get_realpath() { - local previous="$1" - local next=$(readlink "''${previous}") - while [ -n "''${next}" ]; do - previous="''${next}" - next=$(readlink "''${previous}") - done - echo "''${previous}" - } - - # Get the path of a lib inside a tool - function get_otool_path() { - # the lib path is the path of the original lib relative to the workspace - get_realpath $1 | sed 's|^.*/bazel-out/|bazel-out/|' - } - - # Do replacements in the output - for rpath in ''${RPATHS}; do - for lib in ''${LIBS}; do - unset libname - if [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.so" ]; then - libname="lib''${lib}.so" - elif [ -f "$(dirname ''${OUTPUT})/''${rpath}/lib''${lib}.dylib" ]; then - libname="lib''${lib}.dylib" - fi - # ''${libname-} --> return $libname if defined, or undefined otherwise. This is to make - # this set -e friendly - if [[ -n "''${libname-}" ]]; then - libpath=$(get_library_path ''${lib}) - if [ -n "''${libpath}" ]; then - ''${INSTALL_NAME_TOOL} -change $(get_otool_path "''${libpath}") \ - "@loader_path/''${rpath}/''${libname}" "''${OUTPUT}" - fi - fi - done - done - '' else ""); - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" '' + '' - mkdir nix - cp ${buildFile} nix/BUILD - cp ${crosstoolFile} nix/CROSSTOOL - line=70 - for flag in $NIX_CFLAGS_COMPILE; do - sed -i -e "$line a compiler_flag: \"$flag\"" nix/CROSSTOOL - line=$((line + 1)) - done - for flag in $NIX_LDFLAGS; do - sed -i -e "$line a linker_flag: \"-Wl,$flag\"" nix/CROSSTOOL - line=$((line + 1)) - done - - cp ${osxCcWrapperFile} nix/osx_cc_wrapper.sh find src/main/java/com/google/devtools -type f -print0 | while IFS="" read -r -d "" path; do substituteInPlace "$path" \ --replace /bin/bash ${customBash}/bin/bash \ @@ -454,14 +67,15 @@ stdenv.mkDerivation rec { # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ --replace /bin/sh ${customBash}/bin/bash - sed -i -e "361 a --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \\\\" scripts/bootstrap/compile.sh + echo "build --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\"" >> .bazelrc + echo "build --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\"" >> .bazelrc + echo "build --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\"" >> .bazelrc + echo "build --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\"" >> .bazelrc + sed -i -e "361 a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh + sed -i -e "361 a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" scripts/bootstrap/compile.sh patchShebangs . - '' + lib.optionalString stdenv.isDarwin '' - sed -i "s,/usr/bin/xcrun clang,clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation,g" \ - scripts/bootstrap/compile.sh \ - src/tools/xcode/realpath/BUILD \ - src/tools/xcode/stdredirect/BUILD \ - tools/osx/BUILD ''; buildInputs = [ @@ -469,14 +83,13 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - gnused zip python unzip makeWrapper which customBash - ] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; + ] ++ lib.optionals (stdenv.isDarwin) [ libcxx CoreFoundation CoreServices Foundation ]; # If TMPDIR is in the unpack dir we run afoul of blaze's infinite symlink # detector (see com.google.devtools.build.lib.skyframe.FileFunction). @@ -487,8 +100,7 @@ stdenv.mkDerivation rec { ./compile.sh ./output/bazel --output_user_root=$TMPDIR/.bazel build //scripts:bash_completion \ --spawn_strategy=standalone \ - --genrule_strategy=standalone \ - --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix + --genrule_strategy=standalone cp bazel-bin/scripts/bazel-complete.bash output/ ''; @@ -498,7 +110,6 @@ stdenv.mkDerivation rec { checkPhase = '' export TEST_TMPDIR=$(pwd) ./output/bazel test --test_output=errors \ - --crosstool_top=//nix:nix --host_crosstool_top=//nix:nix \ examples/cpp:hello-success_test \ examples/java-native/src/test/java/com/example/myproject:hello ''; diff --git a/pkgs/development/tools/build-managers/cask/default.nix b/pkgs/development/tools/build-managers/cask/default.nix deleted file mode 100644 index 234dab99c03c..000000000000 --- a/pkgs/development/tools/build-managers/cask/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ emacsPackagesNg, writeScriptBin }: -let - - emacs = emacsPackagesNg.emacsWithPackages (epkgs: [ epkgs.cask-package-toolset ]); - cpt = emacsPackagesNg.cask-package-toolset; - -in writeScriptBin "cask" '' -#!/bin/sh - -exec ${emacs}/bin/emacs --script ${cpt}/share/emacs/site-lisp/elpa/cask-package-toolset-${cpt.version}/cask-package-toolset.el -- "$@" -'' diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 04555f58884b..ff6dc07ea9e9 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -3,19 +3,19 @@ tree, fetchFromGitHub, hexRegistrySnapshot }: let - version = "3.4.3"; + version = "3.6.1"; bootstrapper = ./rebar3-nix-bootstrap; erlware_commons = fetchHex { pkg = "erlware_commons"; - version = "1.0.0"; - sha256 = "0wkphbrjk19lxdwndy92v058qwcaz13bcgdzp33h21aa7vminzx7"; + version = "1.2.0"; + sha256 = "149kkn9gc9cjgvlmakygq475r63q2rry31s29ax0s425dh37sfl7"; }; ssl_verify_fun = fetchHex { pkg = "ssl_verify_fun"; - version = "1.1.2"; - sha256 = "0qdyx70v09fydv4wzz1djnkixqj62ny40yjjhv2q6mh47lns2arj"; + version = "1.1.3"; + sha256 = "1zljxashfhqmiscmf298vhr880ppwbgi2rl3nbnyvsfn0mjhw4if"; }; certifi = fetchHex { pkg = "certifi"; @@ -24,23 +24,23 @@ let }; providers = fetchHex { pkg = "providers"; - version = "1.6.0"; - sha256 = "0byfa1h57n46jilz4q132j0vk3iqc0v1vip89li38gb1k997cs0g"; + version = "1.7.0"; + sha256 = "19p4rbsdx9lm2ihgvlhxyld1q76kxpd7qwyqxxsgmhl5r8ln3rlb"; }; getopt = fetchHex { pkg = "getopt"; - version = "0.8.2"; - sha256 = "1xw30h59zbw957cyjd8n50hf9y09jnv9dyry6x3avfwzcyrnsvkk"; + version = "1.0.1"; + sha256 = "174mb46c2qd1f4a7507fng4vvscjh1ds7rykfab5rdnfp61spqak"; }; bbmustache = fetchHex { pkg = "bbmustache"; - version = "1.3.0"; - sha256 = "042pfgss8kscq6ssg8gix8ccmdsrx0anjczsbrn2a6c36ljrx2p6"; + version = "1.5.0"; + sha256 = "0xg3r4lxhqifrv32nm55b4zmkflacc1s964g15p6y6jfx6v4y1zd"; }; relx = fetchHex { pkg = "relx"; - version = "3.23.1"; - sha256 = "13j7wds2d7b8v3r9pwy3zhwhzywgwhn6l9gm3slqzyrs1jld0a9d"; + version = "3.26.0"; + sha256 = "1f810rb01kdidpa985s321ycg3y4hvqpzbk263n6i1bfnqykkvv9"; }; cf = fetchHex { pkg = "cf"; @@ -49,13 +49,13 @@ let }; cth_readable = fetchHex { pkg = "cth_readable"; - version = "1.3.0"; - sha256 = "1s7bqj6f2zpbyjmbfq2mm6vcz1jrxjr2nd0531wshsx6fnshqhvs"; + version = "1.4.2"; + sha256 = "1pjid4f60pp81ds01rqa6ybksrnzqriw3aibilld1asn9iabxkav"; }; eunit_formatters = fetchHex { pkg = "eunit_formatters"; - version = "0.3.1"; - sha256 = "0cg9dasv60v09q3q4wja76pld0546mhmlpb0khagyylv890hg934"; + version = "0.5.0"; + sha256 = "1jb3hzb216r29x2h4pcjwfmx1k81431rgh5v0mp4x5146hhvmj6n"; }; rebar3_hex = fetchHex { pkg = "rebar3_hex"; @@ -70,7 +70,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/rebar/rebar3/archive/${version}.tar.gz"; - sha256 = "1a05gpxxc3mx5v33kzpb5xnq5vglmjl0q8hrcvpinjlazcwbg531"; + sha256 = "0cqhqymzh10pfyxqiy4hcg3d2myz3chx0y4m2ixmq8zk81acics0"; }; inherit bootstrapper; @@ -121,6 +121,6 @@ stdenv.mkDerivation { ''; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.gleber ]; + maintainers = with stdenv.lib.maintainers; [ gleber tazjin ]; }; } diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch index db45827f5831..59004561126c 100644 --- a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch +++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch @@ -1,5 +1,5 @@ diff --git a/bootstrap b/bootstrap -index 7c56bab..16c1be5 100755 +index 5dedd713..864056c4 100755 --- a/bootstrap +++ b/bootstrap @@ -101,7 +101,7 @@ extract(Binary) -> @@ -12,9 +12,8 @@ index 7c56bab..16c1be5 100755 [{body_format, binary}], rebar) of diff --git a/src/rebar_hermeticity.erl b/src/rebar_hermeticity.erl -new file mode 100644 -index 0000000..8f6cc7d ---- /dev/null +index e69de29b..8f6cc7d0 100644 +--- a/src/rebar_hermeticity.erl +++ b/src/rebar_hermeticity.erl @@ -0,0 +1,42 @@ +%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*- @@ -60,20 +59,20 @@ index 0000000..8f6cc7d + ?ERROR("Request: ~p ~s", [Method, Url]), + erlang:halt(1). diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl -index d588f24..9ac8ad4 100644 +index 2cf167ee..6080aaca 100644 --- a/src/rebar_pkg_resource.erl +++ b/src/rebar_pkg_resource.erl -@@ -109,7 +109,7 @@ make_vsn(_) -> +@@ -127,7 +127,7 @@ make_vsn(_) -> request(Url, ETag) -> - HttpOptions = [{ssl, ssl_opts(Url)}, {relaxed, true} | rebar_utils:get_proxy_auth()], - -- case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, -+ case rebar_hermeticity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]}, - HttpOptions, - [{body_format, binary}], - rebar) of + HttpOptions = [{ssl, ssl_opts(Url)}, + {relaxed, true} | rebar_utils:get_proxy_auth()], +- case httpc:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} ++ case rebar_hermeticity:request(get, {Url, [{"if-none-match", "\"" ++ ETag ++ "\""} + || ETag =/= false] ++ + [{"User-Agent", rebar_utils:user_agent()}]}, + HttpOptions, [{body_format, binary}], rebar) of diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl -index a019c5a..697cbab 100644 +index 17446311..4d44d794 100644 --- a/src/rebar_prv_update.erl +++ b/src/rebar_prv_update.erl @@ -38,6 +38,8 @@ init(State) -> @@ -85,17 +84,17 @@ index a019c5a..697cbab 100644 do(State) -> try case rebar_packages:registry_dir(State) of -@@ -52,7 +54,7 @@ do(State) -> - case rebar_utils:url_append_path(CDN, ?REMOTE_REGISTRY_FILE) of +@@ -53,7 +55,7 @@ do(State) -> {ok, Url} -> + HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()], ?DEBUG("Fetching registry from ~p", [Url]), - case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, + case rebar_hermeticity:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]}, - [], [{stream, TmpFile}, {sync, true}], + HttpOptions, [{stream, TmpFile}, {sync, true}], rebar) of {ok, saved_to_file} -> -@@ -76,6 +78,7 @@ do(State) -> - ?DEBUG("Error creating package index: ~p ~p", [C, erlang:get_stacktrace()]), +@@ -77,6 +79,7 @@ do(State) -> + ?DEBUG("Error creating package index: ~p ~p", [C, S]), throw(?PRV_ERROR(package_index_write)) end. +-endif. diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index f2b9348103ab..38432e58d0d9 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv }: +{ stdenv, lib, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }: let version = "1.8.2"; @@ -47,7 +47,7 @@ let patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${atomEnv.libPath}:$out/lib/electron" \ + --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/electron" \ $out/lib/electron/electron wrapProgram $out/lib/electron/electron \ diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix index 01d54c01bc78..082edb37a4f3 100644 --- a/pkgs/development/tools/erlang/hex2nix/default.nix +++ b/pkgs/development/tools/erlang/hex2nix/default.nix @@ -1,32 +1,23 @@ -{ stdenv, fetchFromGitHub, buildRebar3, buildHex +{ stdenv, fetchFromGitHub, buildRebar3, buildHex, -, getopt_0_8_2, erlware_commons_1_0_0 }: + # Erlang dependencies: + ibrowse_4_2_2, + getopt_0_8_2, + erlware_commons_1_0_0, + jsx_2_8_0 }: -let - ibrowse_4_4_0 = buildHex { - name = "ibrowse"; - version = "4.4.0"; - sha256 = "1hpic1xgksfm00mbl1kwmszca6jmjca32s7gdd8g11i0hy45k3ka"; - }; - jsx_2_8_2 = buildHex { - name = "jsx"; - version = "2.8.2"; - sha256 = "0k7lnmwqbgpmh90wy30kc0qlddkbh9r3sjlyayaqsz1r1cix7idl"; - }; - -in buildRebar3 rec { name = "hex2nix"; - version = "0.0.6"; + version = "0.0.6-a31eadd7"; src = fetchFromGitHub { - owner = "erlang-nix"; - repo = "hex2nix"; - rev = "${version}"; - sha256 = "17rkzg836v7z2xf0i5m8zqfvr23dbmw1bi3c83km92f9glwa1dbf"; + owner = "erlang-nix"; + repo = "hex2nix"; + rev = "a31eadd7af2cbdac1b87991b378e98ea4fb40ae0"; + sha256 = "1hnkrksyrbpq2gq25rfsrnm86n0g3biab88gswm3zj88ddrz6dyk"; }; - beamDeps = [ ibrowse_4_4_0 jsx_2_8_2 erlware_commons_1_0_0 getopt_0_8_2 ]; + beamDeps = [ ibrowse_4_2_2 jsx_2_8_0 erlware_commons_1_0_0 getopt_0_8_2 ]; enableDebugInfo = true; diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index 5552bdcc5e6c..377791007a36 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -36,7 +36,7 @@ }: let - version = "0.99.1"; + version = "0.99.3"; in stdenv.mkDerivation rec { name = "flatpak-builder-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/flatpak/flatpak-builder/releases/download/${version}/${name}.tar.xz"; - sha256 = "0xgywl4qsxq7lw1v7hmvczzv3pl12bzz3jv59y8s5gbk54rzbyi5"; + sha256 = "0sq3rcy3vwa36p6wq63wdvkk0hrs3qj1ngk26j9947nc14z39plk"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch index 001ddd645683..6b82e623a02c 100644 --- a/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -1,6 +1,6 @@ --- a/src/builder-context.c +++ b/src/builder-context.c -@@ -711,7 +711,7 @@ +@@ -763,7 +763,7 @@ g_autoptr(GFile) rofiles_base = NULL; g_autoptr(GFile) rofiles_dir = NULL; g_autofree char *tmpdir_name = NULL; @@ -31,7 +31,7 @@ return res; --- a/src/builder-source-archive.c +++ b/src/builder-source-archive.c -@@ -401,7 +401,7 @@ +@@ -430,7 +430,7 @@ va_list ap; va_start (ap, error); @@ -40,7 +40,7 @@ va_end (ap); return res; -@@ -416,7 +416,7 @@ +@@ -445,7 +445,7 @@ va_list ap; va_start (ap, error); @@ -49,7 +49,7 @@ va_end (ap); return res; -@@ -428,7 +428,7 @@ +@@ -457,7 +457,7 @@ GError **error) { gboolean res; @@ -58,6 +58,15 @@ "sh", /* shell's $0 */ rpm_path, /* shell's $1 */ NULL }; +@@ -604,7 +604,7 @@ + va_list ap; + + va_start (ap, error); +- res = flatpak_spawn (dir, NULL, 0, error, "git", ap); ++ res = flatpak_spawn (dir, NULL, 0, error, "@git@", ap); + va_end (ap); + + return res; --- a/src/builder-source-bzr.c +++ b/src/builder-source-bzr.c @@ -124,7 +124,7 @@ @@ -71,7 +80,7 @@ return res; --- a/src/builder-source-patch.c +++ b/src/builder-source-patch.c -@@ -204,11 +204,11 @@ +@@ -215,15 +215,15 @@ args = g_ptr_array_new (); if (use_git) { @@ -79,6 +88,11 @@ + g_ptr_array_add (args, "@git@"); g_ptr_array_add (args, "apply"); g_ptr_array_add (args, "-v"); + } else if (use_git_am) { +- g_ptr_array_add (args, "git"); ++ g_ptr_array_add (args, "@git@"); + g_ptr_array_add (args, "am"); + g_ptr_array_add (args, "--keep-cr"); } else { - g_ptr_array_add (args, "patch"); + g_ptr_array_add (args, "@patch@"); @@ -87,7 +101,7 @@ g_ptr_array_add (args, (gchar *) extra_options[i]); --- a/src/builder-utils.c +++ b/src/builder-utils.c -@@ -139,7 +139,7 @@ +@@ -149,7 +149,7 @@ va_list ap; va_start (ap, error); @@ -96,7 +110,7 @@ va_end (ap); return res; -@@ -153,7 +153,7 @@ +@@ -163,7 +163,7 @@ va_list ap; va_start (ap, error); @@ -105,7 +119,7 @@ va_end (ap); return res; -@@ -167,7 +167,7 @@ +@@ -177,7 +177,7 @@ va_list ap; va_start (ap, error); diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 866366353345..70f6d8021ff8 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "5.1.3"; + version = "5.1.4"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.3/flyway-commandline-${version}.tar.gz"; - sha256 = "08nrjrpcb56f2mhghgjbvl7bfzvlgc81ykxzghq3kpslx5d560lm"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.1.4/flyway-commandline-${version}.tar.gz"; + sha256 = "1raz125k55v6xa8gp6ylcjxz77r5364xqp9di46rayx3z2282f7q"; }; buildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix index 3f64f4a925f1..88c4fc14a666 100644 --- a/pkgs/development/tools/haskell/multi-ghc-travis/default.nix +++ b/pkgs/development/tools/haskell/multi-ghc-travis/default.nix @@ -3,25 +3,15 @@ , tasty-golden, transformers, fetchFromGitHub, fetchpatch }: -let - - newShellCheck = fetchpatch { - url = https://github.com/haskell-CI/haskell-ci/pull/159.patch; - sha256 = "17qn099lvfiii5z3hg24idmg4sk6ph7m2k940fsxzhqrad8fkjmw"; - }; - -in - mkDerivation { pname = "haskell-ci"; version = "0"; src = fetchFromGitHub { owner = "haskell-CI"; repo = "haskell-ci"; - rev = "b592d290cff68c7abcbd7f99f41aac998e7b7916"; - sha256 = "0jwaifp9wx6lb27qj191hjm125kq3vndh5lf7ibd86x19h5zmy4c"; + rev = "f7ab8c794d7a957370d89f9b4e285a6d20bf8af8"; + sha256 = "0w8qjdy8hzdrwmqnkf4y967r9xh0k21w3hxqlsjp66cay1vby2s8"; }; - patches = [ newShellCheck ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix new file mode 100644 index 000000000000..2bd12b409f19 --- /dev/null +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, docker, makeWrapper }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "circleci-cli"; + version = "2018-05-12"; + + src = fetchFromGitHub { + owner = "circleci"; + repo = "local-cli"; + rev = "2c7c1a74e3c3ffb8eebc03fccd782b1bfe9e940a"; + sha256 = "0fp0fz0xr7ynp32lqcmaigl9p45wk1hd2gv9i5q5bj9syj3g7qzm"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p "$out/bin/" + cp "$src/circleci.sh" "$out/bin/circleci" + ''; + + postFixup = '' + wrapProgram $out/bin/circleci \ + --prefix "PATH" : "${docker}/bin" + ''; + + meta = with stdenv.lib; { + # Box blurb edited from the AUR package circleci-cli + description = '' + Command to enable you to reproduce the CircleCI environment locally and + run jobs as if they were running on the hosted CirleCI application. + ''; + maintainers = with maintainers; [ synthetica ]; + platforms = platforms.linux; + license = licenses.mit; + homepage = https://circleci.com/; + }; +} diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index a3c5fd7f009c..5c6b8cfd9605 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -8,18 +8,18 @@ stdenv.mkDerivation rec { name = "creduce-${version}"; - version = "2.7.0"; + version = "2.8.0"; src = fetchurl { url = "https://embed.cs.utah.edu/creduce/${name}.tar.gz"; - sha256 = "0h8s4d54q6cl6i45x3143l2xmr29b2yhr3m0n5qqx63sr5csip1n"; + sha256 = "1vqx73ymfscvlyig03972a5m7ar3gx2yv6m8c6h2mibz792j5xkp"; }; + nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ # Ensure stdenv's CC is on PATH before clang-unwrapped stdenv.cc # Actual deps: - cmake makeWrapper llvm clang-unwrapped flex zlib perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 04a300c56f44..2ee573e4ba18 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -3,11 +3,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation rec { name = "elfutils-${version}"; - version = "0.172"; + version = "0.173"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2"; - sha256 = "090fmbnvd9jblkwhb2bm3hanim63rrvd5f30mfxq4jac6kk9k73p"; + sha256 = "1zq0l12k64hrbjmdjc4llrad96c25i427hpma1id9nk87w9qqvdp"; }; patches = ./debug-info-from-env.patch; diff --git a/pkgs/development/tools/misc/gtkperf/bench.patch b/pkgs/development/tools/misc/gtkperf/bench.patch new file mode 100644 index 000000000000..3d00a03e9a58 --- /dev/null +++ b/pkgs/development/tools/misc/gtkperf/bench.patch @@ -0,0 +1,60 @@ +--- gtkperf/src/callbacks.c 2005-10-30 11:33:42.000000000 +0000 ++++ gtkperf-patched/src/callbacks.c 2008-05-23 23:41:17.000000000 +0100 +@@ -219,6 +219,13 @@ + } + + ++void ++on_cmdline_test(char *optarg) ++{ ++ appdata->test_type = atoi(optarg); ++} ++ ++ + /* Initialize appdata */ + void + setup_appdata(AppData * appdata_in) +@@ -398,7 +405,7 @@ + appdata->pixbuf_drawing = gdk_pixbuf_new_from_file (filename, NULL); + + gtk_combo_box_set_active (GTK_COMBO_BOX (appdata->combobox_testtype), +- 0); ++ appdata->test_type); + + /* create end mark to info textview */ + GtkTextIter iter; +--- gtkperf/src/callbacks.h 2005-10-30 10:21:23.000000000 +0000 ++++ gtkperf-patched/src/callbacks.h 2008-05-23 23:22:30.000000000 +0100 +@@ -13,6 +13,7 @@ + void on_cmdline_run_all (); + void on_cmdline_help () ; + void on_cmdline_count (char *optarg) ; ++void on_cmdline_test (char *optarg) ; + void on_window_main_show (AppData * data); + + gboolean +--- gtkperf/src/main.c 2005-10-30 11:26:42.000000000 +0000 ++++ gtkperf-patched/src/main.c 2008-05-23 23:44:02.000000000 +0100 +@@ -65,9 +65,10 @@ + {"help", 0, 0, 0}, + {"automatic", 0, 0, 0}, + {"count", 1, 0, 0}, ++ {"test", 1, 0, 0}, + {0, 0, 0, 0} + }; +- c = getopt_long (argc, argv, "hac:", ++ c = getopt_long (argc, argv, "hac:t:", + long_options, &option_index); + if (c == -1) + break; +@@ -104,6 +105,10 @@ + on_cmdline_count(optarg); + break; + ++ case 't': ++ on_cmdline_test(optarg); ++ break; ++ + default: + case 'h': + on_cmdline_help (); diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix new file mode 100644 index 000000000000..5280b69cdcec --- /dev/null +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, gtk2, pkgconfig, libintl }: + +stdenv.mkDerivation { + name = "gtkperf-0.40.0"; + src = fetchurl { + url = "mirror://sourceforge//gtkperf/gtkperf_0.40.tar.gz"; + sha256 = "0yxj3ap3yfi76vqg6xjvgc16nfi9arm9kp87s35ywf10fd73814p"; + }; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gtk2 libintl ]; + + # https://openbenchmarking.org/innhold/7e9780c11550d09aa67bdba71248facbe2d781db + patches = [ ./bench.patch ]; + + meta = with stdenv.lib; { + description = "Application designed to test GTK+ performance"; + homepage = http://gtkperf.sourceforge.net/; + license = with licenses; [ gpl2 ]; + maintainers = with maintainers; [ dtzWill ]; + }; +} diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index abfcdb61c1e6..142a30eba8da 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "jbuilder-${version}"; - version = "1.0+beta20"; + version = "1.0.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; rev = "${version}"; - sha256 = "0571lzm8caq6wnia7imgy4a27x5l2bvxiflg0jrwwml0ylnii65f"; + sha256 = "08gb7l2rrfrsqvigna1cvvphww80zlvj7lqvaj4m4y9llanmnxcg"; }; buildInputs = with ocamlPackages; [ ocaml findlib ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { preFixup = "rm -rf $out/jbuilder"; meta = { - homepage = https://github.com/janestreet/jbuilder; + inherit (src.meta) homepage; description = "Fast, portable and opinionated build system"; maintainers = [ stdenv.lib.maintainers.vbgl ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 42ff463e1cc6..886706ed30bd 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,9 +1,9 @@ { lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive }: let - version = "2.1.1"; + version = "2.1.2"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0kgsb33f3wh6x4450x74wri6z78ky92sfrv7ba7h7zmxsadb6m4b"; + sha256 = "0fb90v43d30whhyjlgb9mmy93ccbpr01pz97kp5hrg3wfd7703b1"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 3acd556e80cc..baad45298441 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -46,6 +46,7 @@ let fetchSubmodules = true; }; + patches = [ ./fix-stonesense.patch ]; nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib SDL ] diff --git a/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch new file mode 100644 index 000000000000..da860cd55624 --- /dev/null +++ b/pkgs/games/dwarf-fortress/dfhack/fix-stonesense.patch @@ -0,0 +1,23 @@ +From f5be6fe5fb192f01ae4551ed9217e97fd7f6a0ae Mon Sep 17 00:00:00 2001 +From: Herwig Hochleitner <hhochleitner@gmail.com> +Date: Sun, 1 Oct 2017 18:01:43 +0200 +Subject: [PATCH] include <GL/glext.h> + +this fixes `GLhandleARB` not being defined +--- + plugins/stonesense/common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/plugins/stonesense/common.h b/plugins/stonesense/common.h +index eb36691..ef45389 100644 +--- a/plugins/stonesense/common.h ++++ b/plugins/stonesense/common.h +@@ -31,6 +31,8 @@ using namespace df::enums; + #include <allegro5/allegro_opengl.h> + #include <allegro5/utf8.h> + ++#include <GL/glext.h> ++ + // allegro leaks X headers, undef some of it here: + #undef TileShape + #undef None \ No newline at end of file diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix index 334c7ebbf6fc..54f0f0405ac5 100644 --- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix +++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix @@ -19,6 +19,7 @@ in symlinkJoin { # therefore uses many relative paths. wrapProgram $out/bin/dwarftherapist \ --run "cd $out/share/dwarftherapist" + ln -s $out/bin/dwarftherapist $out/bin/DwarfTherapist rm -rf $out/share/dwarftherapist/memory_layouts/linux mkdir -p $out/share/dwarftherapist/memory_layouts/linux diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 5a35b06a1e3d..9e67c7847f83 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,17 +1,24 @@ { stdenv, fetchurl, fetchFromGitHub, - SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, + SDL2, cmake, curl, fontconfig, freetype, icu, jansson, libiconv, libpng, libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib }: let name = "openrct2-${version}"; - version = "0.1.2"; + version = "0.2.0"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1zqrdxr79c9yx4bdxz1r5866hhwq0lcs9qpv3vhisr56ar5n5wk3"; + sha256 = "1nmz8war8b49iicpc70gk7zlqizrvvwpidqm70lfpa0p68m7m3px"; + }; + + objects-src = fetchFromGitHub { + owner = "OpenRCT2"; + repo = "objects"; + rev = "v1.0.2"; + sha256 = "1gl37fmhhrfgd6gilw0n7hfdq80a9b31bi5r0xhxg7d579jccb04"; }; title-sequences-src = fetchFromGitHub { @@ -32,6 +39,7 @@ stdenv.mkDerivation rec { curl fontconfig freetype + icu jansson libiconv libpng @@ -45,11 +53,15 @@ stdenv.mkDerivation rec { ]; postUnpack = '' - cp -r ${title-sequences-src} $sourceRoot/title + cp -r ${objects-src} $sourceRoot/data/object + cp -r ${title-sequences-src} $sourceRoot/data/title ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_TITLE_SEQUENCES=OFF"]; + "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" + "-DDOWNLOAD_OBJECTS=OFF" + "-DDOWNLOAD_TITLE_SEQUENCES=OFF" + ]; makeFlags = ["all" "g2"]; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index b1a39a609a1b..377dc8652292 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }: +{ stdenv, fetchurl, fetchFromGitHub, zip, love, lua, makeWrapper, makeDesktopItem }: let pname = "orthorobot"; - version = "1.0"; + version = "1.1.1"; icon = fetchurl { url = "http://stabyourself.net/images/screenshots/orthorobot-5.png"; @@ -24,32 +24,26 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - src = fetchurl { - url = "http://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip"; - sha256 = "023nc3zwjkbmy4c8w6mfg39mg69zpqqr2gzlmp4fpydrjas70kbl"; + src = fetchFromGitHub { + owner = "Stabyourself"; + repo = pname; + rev = "v${version}"; + sha256 = "1ca6hvd890kxmamsmsfiqzw15ngsvb4lkihjb6kabgmss61a6s5p"; }; - nativeBuildInputs = [ makeWrapper unzip ]; - buildInputs = [ lua love ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ lua love zip ]; phases = [ "unpackPhase" "installPhase" ]; - unpackPhase = '' - unzip -j $src - ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/games/lovegames - - cp -v ./*.love $out/share/games/lovegames/${pname}.love - + mkdir -p $out/bin $out/share/games/lovegames $out/share/applications + zip -9 -r ${pname}.love ./* + mv ${pname}.love $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love - - chmod +x $out/bin/${pname} - mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ + chmod +x $out/bin/${pname} ''; meta = with stdenv.lib; { diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index c47b3c322ca5..0425fb430c5b 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, which, autoreconfHook, pkgconfig, curl, vala, python, intltool, fuse, ccnet}: stdenv.mkDerivation rec { - version = "6.2.1"; + version = "6.2.2"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "199ivh6fbz4sgbz15mr6m8985yky5n3z6vpcpnh2ldjx4277gq68"; + sha256 = "05swp7sjp7pzgp8hjjr2prg0wq213l04iyqdfwwasdczdx6j6g59"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix index 5c2cab90df42..f7c920abc48e 100644 --- a/pkgs/misc/themes/adapta/default.nix +++ b/pkgs/misc/themes/adapta/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "adapta-gtk-theme-${version}"; - version = "3.93.1.28"; + version = "3.94.0.1"; src = fetchFromGitHub { owner = "adapta-project"; repo = "adapta-gtk-theme"; rev = version; - sha256 = "0r7fsyy074xd63p58fin3qsfq1535wafk0nag49551915hgdr18n"; + sha256 = "17hck0hzkdj1bibn9wi7cxca8r539idb916v2l71gz7ynhav006d"; }; preferLocalBuild = true; diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index bac766c7b722..2a628e0cdf49 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,16 +1,9 @@ -{ stdenv, fetchurl, fetchpatch, bc, dtc, openssl, python2, swig +{ stdenv, fetchurl, fetchpatch, bc, bison, dtc, flex, openssl, python2, swig , armTrustedFirmwareAllwinner , hostPlatform, buildPackages }: let - # Various changes for 64-bit sunxi boards, (hopefully) destined for 2018.05 - sunxiPatch = fetchpatch { - name = "sunxi.patch"; - url = "https://github.com/u-boot/u-boot/compare/v2018.05...dezgeg:2018-05-sunxi.patch"; - sha256 = "1dfv4s1f71iv80vjxgyghv4pcwjv4mjphk75a8hfl3jdbpd66d36"; - }; - buildUBoot = { filesToInstall , installDir ? "$out" , defconfig @@ -21,25 +14,17 @@ let stdenv.mkDerivation (rec { name = "uboot-${defconfig}-${version}"; - version = "2018.05"; + version = "2018.07"; src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0j60p4iskzb4hamxgykc6gd7xchxfka1zwh8hv08r9rrc4m3r8ad"; + sha256 = "1m7nw64mxflpc6sqvnz2kb5fxfkb4mrpy8b1wi15dcwipj4dy44z"; }; patches = [ (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch1.patch; - sha256 = "0xvw16mp6mm36987rd5yb8bw0n5b3p1gq35wch2gbj15wx55450p"; - }) - (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/rpi-2018-05-patch2.patch; - sha256 = "0q1a5l5rfgddncxrjk59qr1f5587dwbvcf6z15bsfl2invs19m2b"; - }) - (fetchpatch { - url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-03.patch; - sha256 = "1rhhlhrwhv7ic1n5i720jfh2cxwrkssrkvinllyjy3j9k9bpzcqd"; + url = https://github.com/dezgeg/u-boot/commit/pythonpath-2018-07.patch; + sha256 = "096zqrlr8m9lxjma0iv7y6x78qswfs3q1w2irjkbmcvniz1azbs8"; }) (fetchpatch { url = https://github.com/dezgeg/u-boot/commit/extlinux-path-length-2018-03.patch; @@ -51,7 +36,7 @@ let patchShebangs tools ''; - nativeBuildInputs = [ bc dtc openssl python2 swig ]; + nativeBuildInputs = [ bc bison dtc flex openssl python2 swig ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; hardeningDisable = [ "all" ]; @@ -180,7 +165,6 @@ in rec { }; ubootPine64 = buildUBoot rec { - extraPatches = [sunxiPatch]; defconfig = "pine64_plus_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; @@ -236,7 +220,6 @@ in rec { }; ubootSopine = buildUBoot rec { - extraPatches = [sunxiPatch]; defconfig = "sopine_baseboard_defconfig"; extraMeta.platforms = ["aarch64-linux"]; BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 8f835b6d7ed0..29db64ab48f4 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, kernel }: -let base = "batman-adv-2018.0"; in +let base = "batman-adv-2018.1"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0v2pyy9lxyy71nr9600k9935qcpn2wpyl9fsf2a4m4d2x0wgh9j8"; + sha256 = "12q48dw02p3dswdlrklqd2jxw9n51z1vnnnzpf527jg5pf6v4rmq"; }; nativeBuildInputs = kernel.moduleBuildDependencies; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 4f0a423600f8..3104004b3d67 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,14 +4,14 @@ }: python.pkgs.buildPythonApplication rec { - version = "0.5.0"; + version = "0.6.0"; name = "bcc-${version}"; src = fetchFromGitHub { - owner = "iovisor"; - repo = "bcc"; - rev = "v${version}"; - sha256 = "0bb3244xll5sqx0lvrchg71qy2zg0yj6r5h4v5fvrg1fjhaldys9"; + owner = "iovisor"; + repo = "bcc"; + rev = "v${version}"; + sha256 = "1fk2kvbdvm87rkha2cigz2qhhlrni4g0dcnmiiyya79y85ahfvga"; }; format = "other"; @@ -23,12 +23,6 @@ python.pkgs.buildPythonApplication rec { ]; patches = [ - # fix build with llvm > 5.0.0 && < 6.0.0 - (fetchpatch { - url = "https://github.com/iovisor/bcc/commit/bd7fa55bb39b8978dafd0b299e35616061e0a368.patch"; - sha256 = "1sgxhsq174iihyk1x08py73q8fh78d7y3c90k5nh8vcw2pf1xbnf"; - }) - # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix new file mode 100644 index 000000000000..0918279cc9a9 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "raspberrypi-wireless-firmware-${version}"; + version = "2018-05-30"; + + srcs = [ + (fetchurl { + url = "https://archive.raspberrypi.org/debian/pool/main/b/bluez-firmware/bluez-firmware_1.2-3+rpt5.debian.tar.xz"; + sha256 = "06zpyrz6frkgjy26hr3998klnhjdqxwashgjgvj9rgbcqy70nkxg"; + }) + (fetchurl { + url = "https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/firmware-brcm80211_20161130-3+rpt3_all.deb"; + sha256 = "10l74ac28baprnsiylf2vy4pkxgb3crixid90ngs6si9smm7rn6z"; + }) + ]; + + sourceRoot = "."; + dontBuild = true; + # Firmware blobs do not need fixing and should not be modified + dontFixup = true; + + # Unpack the debian package + unpackCmd = '' + if ! [[ "$curSrc" =~ \.deb$ ]]; then return 1; fi + ar -xf "$curSrc" + tar -xf data.tar.xz + ''; + + installPhase = '' + mkdir -p "$out/lib/firmware/brcm" + + # Wifi firmware + for filename in lib/firmware/brcm/brcmfmac434??-sdio.*; do + cp "$filename" "$out/lib/firmware/brcm" + done + + # Bluetooth firmware + cp broadcom/*.hcd "$out/lib/firmware/brcm" + ''; + + meta = with stdenv.lib; { + description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W"; + homepage = https://archive.raspberrypi.org/debian/pool/main/f/firmware-nonfree/; + license = licenses.unfreeRedistributableFirmware; + platforms = platforms.linux; + maintainers = with maintainers; [ lopsided98 ]; + }; +} diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index 344d224df948..83ca21719faa 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "raspberrypi-firmware-${version}"; - version = "1.20180417"; + version = "1.20180619"; src = fetchFromGitHub { owner = "raspberrypi"; repo = "firmware"; rev = version; - sha256 = "17mnnhni0wgdnc3mw60nfhcj9v6p5dwcqkwnbpvzczab3r2hziji"; + sha256 = "1wppk6c5mbanx9h2wa3yz3rzh5am8bqvgw23gxqgwhbar8w99cfn"; }; installPhase = '' diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index 04a4a1a0e1f1..d813258f95a9 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -53,22 +53,18 @@ in stdenv.mkDerivation rec { # The configure phase will delete these files (temporary workaround for # ./fuse3-install_man.patch) install -D -m444 doc/fusermount3.1 $out/share/man/man1/fusermount3.1 - install -D -m444 doc/mount.fuse.8 $out/share/man/man8/mount.fuse.8 + install -D -m444 doc/mount.fuse3.8 $out/share/man/man8/mount.fuse3.8 '' else '' sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh ./makeconf.sh ''); postFixup = "cd $out\n" + (if isFuse3 then '' - mv bin/mount.fuse3 bin/mount.fuse - install -D -m444 etc/fuse.conf $common/etc/fuse.conf install -D -m444 etc/udev/rules.d/99-fuse3.rules $common/etc/udev/rules.d/99-fuse.rules - install -D -m444 share/man/man8/mount.fuse.8.gz $common/share/man/man8/mount.fuse.8.gz '' else '' cp ${fusePackages.fuse_3.common}/etc/fuse.conf etc/fuse.conf cp ${fusePackages.fuse_3.common}/etc/udev/rules.d/99-fuse.rules etc/udev/rules.d/99-fuse.rules - cp ${fusePackages.fuse_3.common}/share/man/man8/mount.fuse.8.gz share/man/man8/mount.fuse.8.gz ''); enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index f308930f0dc5..cdbcca55d2ff 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -11,7 +11,7 @@ in { }; fuse_3 = mkFuse { - version = "3.2.3"; - sha256Hash = "185p1vjcsyzpcdkrcyw06zpapv4jc43qw9i8a4amzpgk1rsgg19d"; + version = "3.2.4"; + sha256Hash = "1ybgd4s7naiyvaris7j6fzp604cgi5mgrn715x8l4kn5k9d840im"; }; } diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 37dd4d727ec2..84a621e7f120 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, kernel }: -assert stdenv.lib.versionOlder kernel.version "4.13"; +assert stdenv.lib.versionOlder kernel.version "4.17"; let sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; @@ -11,6 +11,7 @@ stdenv.mkDerivation { src = sourceAttrs.src; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; prePatch = '' diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index ace103a92f91..f15b91f9f142 100644 --- a/pkgs/os-specific/linux/jool/source.nix +++ b/pkgs/os-specific/linux/jool/source.nix @@ -1,11 +1,11 @@ { fetchFromGitHub }: rec { - version = "3.5.4"; + version = "3.5.7"; src = fetchFromGitHub { owner = "NICMx"; repo = "Jool"; rev = "v${version}"; - sha256 = "09b9zcxgmy59jb778lkdyslx777bpsl216kkivw0zwfwsgd4pyz5"; + sha256 = "1qxhrchhm4lbyxkp6wm47a85aa4d9wlyy3kdijl8rarngvh8j1yx"; }; } diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix index d869ea090360..e68a0ed26719 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix @@ -1,8 +1,8 @@ { stdenv, buildPackages, hostPlatform, fetchFromGitHub, perl, buildLinux, ... } @ args: let - modDirVersion = "4.14.34"; - tag = "1.20180417"; + modDirVersion = "4.14.50"; + tag = "1.20180619"; in stdenv.lib.overrideDerivation (buildLinux (args // rec { version = "${modDirVersion}-${tag}"; @@ -12,7 +12,7 @@ stdenv.lib.overrideDerivation (buildLinux (args // rec { owner = "raspberrypi"; repo = "linux"; rev = "raspberrypi-kernel_${tag}-1"; - sha256 = "1xgisvmcq50lpnd4rpqhaw52399n0rx2n8mp6k0bf8qm1g3vnza2"; + sha256 = "0yccz8j3vrzv6h23b7yn7dx84kkzq3dmicm3shhz18nkpyyq71ch"; }; defconfig = { diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix index fbc1685c577c..b4e584f2979b 100644 --- a/pkgs/os-specific/linux/tpacpi-bat/default.nix +++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, perl, kmod }: +{ stdenv, fetchFromGitHub, perl, kmod, coreutils }: # Requires the acpi_call kernel module in order to run. stdenv.mkDerivation rec { @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { ''; postPatch = '' - substituteInPlace tpacpi-bat --replace modprobe ${kmod}/bin/modprobe + substituteInPlace tpacpi-bat \ + --replace modprobe ${kmod}/bin/modprobe \ + --replace cat ${coreutils}/bin/cat ''; meta = { diff --git a/pkgs/os-specific/linux/usbguard/default.nix b/pkgs/os-specific/linux/usbguard/default.nix index 2ca825a27d71..3df0023bd678 100644 --- a/pkgs/os-specific/linux/usbguard/default.nix +++ b/pkgs/os-specific/linux/usbguard/default.nix @@ -12,14 +12,14 @@ with stdenv.lib; assert libgcrypt != null -> libsodium == null; stdenv.mkDerivation rec { - version = "0.7.2"; + version = "0.7.4"; name = "usbguard-${version}"; repo = "https://github.com/USBGuard/usbguard"; src = fetchurl { url = "${repo}/releases/download/${name}/${name}.tar.gz"; - sha256 = "5bd3e5219c590c3ae27b21315bd10b60e823cef64e5deff3305ff5b4087fc2d6"; + sha256 = "1qkskd6q5cwlh2cpcsbzmmmgk6w63z0825wlb2sjwqq3kfgwjb3k"; }; nativeBuildInputs = [ diff --git a/pkgs/servers/dns/dnsdist/default.nix b/pkgs/servers/dns/dnsdist/default.nix index 772292b0a57e..6757542050af 100644 --- a/pkgs/servers/dns/dnsdist/default.nix +++ b/pkgs/servers/dns/dnsdist/default.nix @@ -2,11 +2,11 @@ , boost, libsodium, libedit, re2 , net_snmp, lua, protobuf, openssl }: stdenv.mkDerivation rec { name = "dnsdist-${version}"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${version}.tar.bz2"; - sha256 = "025sgvpi3ps0n4mzfwkk6a5ang90a3c7s2fi9vni6jj0p16wsrxa"; + sha256 = "1i3b1vpk9a8zbx9aby2s1ckkzhlvzgn11hcgj3b8x2j1b9771rqb"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index f94ff56373d4..80caa3779912 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "couchdb-${version}"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${name}.tar.gz"; - sha256 = "1k3v9v05417087b6fcj5yv03wl6i61xqrrhp0prl9b3ir2mmbwnm"; + sha256 = "1c1ghrmrcyjd3s3pzml6akxf8xxcqy4mfzn5xf8jg158dzarmk53"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 71cb6fc72ab9..5afd73c88686 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.13.12"; - sha256 = "1pl5ii1w2ycxprxk8zdnxlpdd1dia6hyrns7mnqkm3fv5ihgb4pv"; + version = "1.15.1"; + sha256 = "0q2lkpnfqf74p22vrcldx0gcnss3is7rnp54fgpvhcpqsxc6h867"; }) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 1919cfddf62d..869551ef03a9 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -15,6 +15,15 @@ inputs = [ pkgs.brotli ]; }; + fancyindex = { + src = fetchFromGitHub { + owner = "aperezdc"; + repo = "ngx-fancyindex"; + rev = "v0.4.3"; + sha256 = "12xdx6a76sfrq0yciylvyjlnvyczszpadn31jqya8c2dzdkyyx7f"; + }; + }; + ipscrub = { src = fetchFromGitHub { owner = "masonicboom"; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index befb4039ea09..332372830d69 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchFromGitHub, bison, flex, openssl }: +{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, openssl, gnutls }: stdenv.mkDerivation rec { - name = "charybdis-3.5.5"; + name = "charybdis-4.1"; src = fetchFromGitHub { owner = "charybdis-ircd"; repo = "charybdis"; rev = name; - sha256 = "16bl516hcj1chgzkfnpg9bf9s6zr314pqzhlz6641lgyzaw1z3w0"; + sha256 = "1j0fjf4rdiyvakxqa97x272xra64rzjhbj8faciyb4b13pyrdsmw"; }; - patches = [ - ./remove-setenv.patch - ]; + postPatch = '' + substituteInPlace include/defaults.h --replace 'PKGLOCALSTATEDIR "' '"/var/lib/charybdis' + ''; + + autoreconfPhase = "sh autogen.sh"; configureFlags = [ "--enable-epoll" "--enable-ipv6" "--enable-openssl=${openssl.dev}" "--with-program-prefix=charybdis-" - "--sysconfdir=/etc/charybdis" ]; - buildInputs = [ bison flex openssl ]; + nativeBuildInputs = [ autoreconfHook bison flex ]; + buildInputs = [ openssl gnutls ]; meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; diff --git a/pkgs/servers/irc/charybdis/remove-setenv.patch b/pkgs/servers/irc/charybdis/remove-setenv.patch deleted file mode 100644 index c53c1ff294e0..000000000000 --- a/pkgs/servers/irc/charybdis/remove-setenv.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/bandbi.c b/src/bandbi.c -index 03dd907..3698e85 100644 ---- a/src/bandbi.c -+++ b/src/bandbi.c -@@ -82,7 +82,6 @@ start_bandb(void) - const char *suffix = ""; - #endif - -- rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1); - if(bandb_path == NULL) - { - rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix); diff --git a/pkgs/servers/mattermost/matterircd.nix b/pkgs/servers/mattermost/matterircd.nix index d489deb5944f..6707055eaa6b 100644 --- a/pkgs/servers/mattermost/matterircd.nix +++ b/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "matterircd-${version}"; - version = "0.16.5"; + version = "0.18.2"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "1rsmc2dpf25rkl8c085xwssbry3hv1gv318m7rdj616agx4m7yr2"; + sha256 = "0g57g91v7208yynf758k9v73jdhz4fbc1v23p97rzrl97aq0rd5r"; }; goPackagePath = "github.com/42wim/matterircd"; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 2f9016b74991..38b789261773 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "alertmanager-${version}"; - version = "0.14.0"; + version = "0.15.1"; rev = "v${version}"; goPackagePath = "github.com/prometheus/alertmanager"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "prometheus"; repo = "alertmanager"; - sha256 = "0f6yi19zffxnp3dlr4zs52b7bllks3kjxkdn9zvvi5lvpkzmba5j"; + sha256 = "110l8xy3bkgq137hvvz2v5cr464j02fy43lvgd3l8n5v8qmv81vy"; }; # Tests exist, but seem to clash with the firewall. diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index fde66a71e2e6..35637e7f73ac 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -34,7 +34,7 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.20"; - minor = "18"; + minor = "20"; in stdenv.mkDerivation rec { name = "mpd-${version}"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "020vdn94fwjbldnkgr2h3dk9sm6f5k59qic568mw88yi7cr3mjsh"; + sha256 = "0v7xpsr8b4d0q9vh1wni0qbkbkxdjpn639qm2q553ckk5idas4lm"; }; patches = [ ./x86.patch ]; diff --git a/pkgs/servers/sql/postgresql/timescaledb/default.nix b/pkgs/servers/sql/postgresql/timescaledb/default.nix index ce298cb2745d..1eaa7775793c 100644 --- a/pkgs/servers/sql/postgresql/timescaledb/default.nix +++ b/pkgs/servers/sql/postgresql/timescaledb/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "timescaledb-${version}"; - version = "0.9.2"; + version = "0.10.1"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "1zgyd407skqbsw2zj3l9hixwlisnj82yb6hbq5khjg9k0ifvvgyp"; + sha256 = "07qkkf7lbwaig26iia54vdakwmv33f71p8saqifz9lf0zy6xn0w0"; }; # Fix the install phase which tries to install into the pgsql extension dir, @@ -34,6 +34,13 @@ stdenv.mkDerivation rec { done ''; + postInstall = '' + # work around an annoying bug, by creating $out/bin, so buildEnv doesn't freak out later + # see https://github.com/NixOS/nixpkgs/issues/22653 + + mkdir -p $out/bin + ''; + meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; homepage = https://www.timescale.com/; diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6f5a45cd390b..6d2a92dd78b1 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1676,11 +1676,11 @@ let }) // {inherit ;}; xeyes = (mkDerivation "xeyes" { - name = "xeyes-1.1.1"; + name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xeyes-1.1.1.tar.bz2; - sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp"; + url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2; + sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libX11 libXext libXmu libXrender libXt ]; diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 453a57744071..390039944c09 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -8,14 +8,14 @@ # ''; stdenv.mkDerivation rec { - version = "2017-05-09"; + version = "2018-04-30"; name = "zsh-command-time-${version}"; src = fetchFromGitHub { owner = "popstas"; repo = "zsh-command-time"; - rev = "2111361cbc88c542c834fbab7802ae5ae8339824"; - sha256 = "0hr9c7196wy9cg7vkmknszr2h446yvg9pqrq0rf3213kz074dhpg"; + rev = "afb4a4c9ae7ce64ca9d4f334a79a25e46daad0aa"; + sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; installPhase = '' diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index b7d41ac7a960..331a4bffb814 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.15.49"; + version = "1.15.58"; src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1rn1d274vg2zq93cswh6w5ybgqw6gk2pgiqxhsyd04f2v4smr98i"; + sha256 = "19wnr498q2mwbp8l978ahy9y7p7icahx53898fki6sbhd9pn2miq"; }; # No tests included diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index a5e0186fa2dc..a037a2e42aaa 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bubblewrap-${version}"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${name}.tar.xz"; - sha256 = "1qhzwgpfsw66hcv5kqc7i4dbzhxr8drrqn3md4grcp7dn02wif2l"; + sha256 = "0b5gkr5xiqnr9cz5padkkkhm74ia9cb06pkpfi8j642anmq2irf8"; }; nativeBuildInputs = [ libcap libxslt docbook_xsl ]; diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/backup/dar/default.nix index 315ef7272838..99c0bd4a34ca 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -3,27 +3,37 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.5.14"; + version = "2.5.15"; name = "dar-${version}"; src = fetchurl { - url = "mirror://sourceforge/dar/${name}-bis.tar.gz"; - sha256 = "1sbd7n5mfqkwxy5rz2v8575y21j94ypwrpinizr3l2yy9pq49rx5"; + url = "mirror://sourceforge/dar/${name}.tar.gz"; + sha256 = "1h700i2k524w5rf5gr9yxl50ca5jwzqlkifay4ffcbhbkqln1n2q"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; - configureFlags = [ "--disable-dar-static" ]; + configureFlags = [ + "--disable-birthtime" + "--disable-upx" + "--disable-dar-static" + "--disable-build-html" + "--enable-threadar" + ]; + + postInstall = '' + rm -r "$out"/share/dar # Disable html help + ''; enableParallelBuilding = true; hardeningDisable = [ "format" ]; meta = { - homepage = http://dar.linux.free.fr/; + homepage = http://dar.linux.free.fr; description = "Disk ARchiver, allows backing up files into indexed archives"; - maintainers = [ maintainers.viric ]; + maintainers = with maintainers; [ viric ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 6899ba88a22c..712d0af29a95 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -1,41 +1,40 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, boost, bison, curl, ncurses, openssl, readline, xxd +, boost, bison, curl, ncurses, openssl, xxd , libaio, libev, libgcrypt, libgpgerror, libtool, zlib }: stdenv.mkDerivation rec { name = "percona-xtrabackup-${version}"; - version = "2.4.9"; + version = "2.4.12"; src = fetchFromGitHub { owner = "percona"; repo = "percona-xtrabackup"; rev = name; - sha256 = "11w87wj2jasrnygzjg3b59q9x0m6lhyg1wzdvclmgbmqsk9bvqv4"; + sha256 = "1w17v2c677b3vfnm81bs63kjbfiin7f12wl9fbgp83hfpyx5msan"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - boost bison curl ncurses openssl readline xxd + boost bison curl ncurses openssl xxd libaio libev libgcrypt libgpgerror libtool zlib ]; cmakeFlags = [ "-DBUILD_CONFIG=xtrabackup_release" "-DINSTALL_MYSQLTESTDIR=OFF" - "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DWITH_BOOST=system" "-DWITH_SSL=system" "-DWITH_ZLIB=system" - "-DWITH_MECAB=system" - "-DWITH_EXTRA_CHARSETS=all" - "-DWITH_INNODB_MEMCACHED=1" "-DWITH_MAN_PAGES=OFF" - "-DWITH_HTML_DOCS=OFF" - "-DWITH_LATEX_DOCS=OFF" - "-DWITH_PDF_DOCS=OFF" + "-DCMAKE_CXX_FLAGS=-std=gnu++03" ]; + postInstall = '' + rm -r "$out"/lib/plugin/debug + ''; + meta = with stdenv.lib; { description = "Non-blocking backup tool for MySQL"; homepage = http://www.percona.com/software/percona-xtrabackup; diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix new file mode 100644 index 000000000000..01f0de25a900 --- /dev/null +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, coreutils, makeWrapper +, rsync, python3, pythonPackages }: + +stdenv.mkDerivation rec { + name = "mergerfs-tools-${version}"; + version = "20171221"; + + src = fetchFromGitHub { + owner = "trapexit"; + repo = "mergerfs-tools"; + rev = "9b4fe0097b5b51e1a7411a26eb344a24cc8ce1b4"; + sha256 = "0qrixh3j58gzkmc8r2sgzgy56gm8bmhakwlc2gjb0yrpa1213na1"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ python3 ]; + + makeFlags = [ + "INSTALL=${coreutils}/bin/install" + "PREFIX=$(out)" + ]; + + postInstall = with stdenv.lib; '' + wrapProgram $out/bin/mergerfs.balance --prefix PATH : ${makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.dup --prefix PATH : ${makeBinPath [ rsync ]} + wrapProgram $out/bin/mergerfs.mktrash --prefix PATH : ${makeBinPath [ pythonPackages.xattr ]} + ''; + + meta = with stdenv.lib; { + description = "Optional tools to help manage data in a mergerfs pool"; + homepage = https://github.com/trapexit/mergerfs-tools; + license = licenses.isc; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix index 7f09b488c289..a3f12d648d55 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-anthy-${version}"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz"; - sha256 = "0ayrzfx95670k86y19bzl6i6w98haaln3x8dxpb39a5dwgz59pf8"; + sha256 = "01jx7wwq0mifqrzkswfglqhwkszbfcl4jinxgdgqx9kc6mb4k6zd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix index 361355d1d688..e2d58c564989 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-chewing-${version}"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz"; - sha256 = "0l548xdx2fvjya1ixp37pn382yak0m4kwfh9lgh7l3y2sblqw9zs"; + sha256 = "1w5smp5zvjx681cp1znjypyr9sw5x6v0wnsk8a7ncwxi9q9wf4xk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index ebb6627dccae..f7bb7126bef0 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-cloudpinyin-${version}"; - version = "0.3.4"; + version = "0.3.6"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-cloudpinyin/${name}.tar.xz"; - sha256 = "143x9gbswzfngvgfy77zskrzrpywj8qg2d19kisgfwfisk7yhcf1"; + sha256 = "1f3ryx817bxb8g942l50ng4xg0gp50rb7pv2p6zf98r2z804dcvf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix index 41560227bca0..32c9ecff9bd8 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-hangul-${version}"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz"; - sha256 = "1jq78nczliw6pnhfac8hspffybrry6syk17y0wwcq05j3r3nd2lp"; + sha256 = "0ds4071ljq620w7vnprm2jl8zqqkw7qsxvzbjapqak4jarczvmbd"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix index c0c921f7b18d..292d2dbb57f5 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fcitx-m17n-${version}"; - version = "0.2.3"; + version = "0.2.4"; src = fetchurl { url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz"; - sha256 = "0ffyhsg7bc6525k94kfhnja1h6ajlfprq72d286dp54cksnakyc4"; + sha256 = "15s52h979xz967f8lm0r0qkplig2w3wjck1ymndbg9kvj25ib0ng"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index b69a9ec81f69..7943903d6f7c 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, cmake, fcitx, gtk3, isocodes, gnome3 }: stdenv.mkDerivation rec { - name = "fcitx-configtool-0.4.9"; + name = "fcitx-configtool-0.4.10"; meta = with stdenv.lib; { description = "GTK-based config tool for Fcitx"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.fcitx-im.org/fcitx-configtool/${name}.tar.xz"; - sha256 = "1ypr2jr3vzs2shqfrvhqy69xvagrn9x507180i9wxy14hb97a82r"; + sha256 = "1yyi9jhkwn49lx9a47k1zbvwgazv4y4z72gnqgzdpgdzfrlrgi5w"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 2181e1cb916f..bffcc597ea0a 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "clipster-${version}"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "mrichar1"; repo = "clipster"; rev = "${version}"; - sha256 = "0bj7fk19z3c29vxm3mcp3s7vggkigmz3hrn4pcsqgfh96i5i5203"; + sha256 = "0v1412zdkps21i5bw1p7jdv5ydnbw9dcr02318qr5mvk8lwdmsgw"; }; pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index e2e2f66f558b..f84b37d48cc5 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -8,12 +8,12 @@ python3Packages.buildPythonApplication rec { name = "diffoscope-${version}"; - version = "95"; + version = "98"; src = fetchgit { url = "https://anonscm.debian.org/git/reproducible/diffoscope.git"; rev = "refs/tags/${version}"; - sha256 = "1x06krs3lp41x5w2l8ck8g47il3qzlclyphw9a2wv71sqkb5zxzi"; + sha256 = "1xvalxz11jlyk9aczq5g367ldx0wfib4kpxs8f1rg7kh97r8z1rh"; }; patches = [ @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ debian libarchive-c python_magic tlsh rpm ] ++ [ acl binutils-unwrapped bzip2 cdrkit colordiff coreutils cpio db diffutils dtc e2fsprogs file findutils fontforge-fonttools gettext gnutar gzip - libarchive libcaca pgpdump sng sqlite squashfsTools unzip xxd xz + libarchive libcaca pgpdump progressbar33 sng sqlite squashfsTools unzip xxd xz ] ++ lib.optionals enableBloat [ apktool cbfstool colord fpc ghc ghostscriptX giflib gnupg1 imagemagick llvm jdk mono openssh pdftk poppler_utils tcpdump unoconv diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index 1946cbeb3f01..d0bbd10d1e51 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { name = "hdf-${version}"; - version = "4.2.13"; + version = "4.2.14"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; - sha256 = "1wz0586zh91pqb95wvr0pbh71a8rz358fdj6n2ksp85x2cis9lsm"; + sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"; }; buildInputs = [ diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7e503f326fd5..90489e126fa5 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPlatform, fetchurl, buildPythonPackage +{ stdenv, lib, targetPlatform, fetchurl, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc # Pandoc is required to build the package's man page. Release tarballs contain a # formatted man page already, though, it will still be installed. We keep the @@ -12,20 +12,19 @@ , hlsEncryptedSupport ? true , makeWrapper }: -with stdenv.lib; buildPythonPackage rec { pname = "youtube-dl"; - version = "2018.05.18"; + version = "2018.07.10"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "11r0hv6885w8k4m307kvf9545vr5a3ym9bf7szghvbcgmgc8lm5w"; + sha256 = "1rigah941k2drzx5qz937lk68gw9jrizj5lgd9f9znp0bgi2d0xd"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ zip ] ++ optional generateManPage pandoc; - propagatedBuildInputs = optional hlsEncryptedSupport pycryptodome; + buildInputs = [ zip ] ++ lib.optional generateManPage pandoc; + propagatedBuildInputs = lib.optional hlsEncryptedSupport pycryptodome; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. # rtmpdump is required to download files over RTMP @@ -33,10 +32,10 @@ buildPythonPackage rec { makeWrapperArgs = let packagesToBinPath = [ atomicparsley ] - ++ optional ffmpegSupport ffmpeg - ++ optional rtmpSupport rtmpdump - ++ optional phantomjsSupport phantomjs2; - in [ ''--prefix PATH : "${makeBinPath packagesToBinPath}"'' ]; + ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional rtmpSupport rtmpdump + ++ lib.optional phantomjsSupport phantomjs2; + in [ ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"'' ]; postInstall = '' mkdir -p $out/share/zsh/site-functions @@ -46,7 +45,7 @@ buildPythonPackage rec { # Requires network doCheck = false; - meta = { + meta = with lib; { homepage = https://rg3.github.io/youtube-dl/; repositories.git = https://github.com/rg3/youtube-dl.git; description = "Command-line tool to download videos from YouTube.com and other sites"; @@ -58,6 +57,6 @@ buildPythonPackage rec { ''; license = licenses.publicDomain; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz ]; + maintainers = with maintainers; [ bluescreen303 phreedom AndersonTorres fuuzetsu fpletz enzime ]; }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 6205934084e8..ebbe5a11b523 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -11,23 +11,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.78"; + name = "dnsmasq-2.79"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "0ar5h5v3kas2qx2wgy5iqin15gc4jhqrqs067xacgc3lii1rz549"; + sha256 = "07w6cw706yyahwvbvslhkrbjf2ynv567cgy9pal8bz8lrbsp9bbq"; }; - patches = [ - (fetchpatch { - name = "CVE-2017-15107.patch"; - url = "http://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=4fe6744a220eddd3f1749b40cac3dfc510787de6"; - sha256 = "0r8grhh1q46z8v6manx1vvfpf2vmchfzsg7l1djh63b1fy1mbjkk"; - # changelog does not apply cleanly but its safe to skip - excludes = [ "CHANGELOG" ]; - }) - ]; - preBuild = '' makeFlagsArray=("COPTS=${copts}") ''; diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index e2049967e889..55abeb4f583d 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.34"; + name = "i2p-0.9.35"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1b3qw096b9i55izvrh2793sbg0ikvihfi6k15sz2pzmjn30hy37l"; + sha256 = "02p76vn1777lgv4zs27r6i9s4yk7b2x61b25i8dqmn6j60y3fa4g"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 67428664556a..f35ceeae8640 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf"; + sha256 = "0a0inchisrjry59z14w4ha210q2ffl31gjbhp5dgrbap6swyry60"; }; patches = [ ./dont-create-var.patch ]; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" - "--with-dhcp-pgsql=${postgresql}/bin/pg_config" - "--with-dhcp-mysql=${mysql.connector-c}/bin/mysql_config" + "--with-pgsql=${postgresql}/bin/pg_config" + "--with-mysql=${mysql.connector-c}/bin/mysql_config" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/kea/dont-create-var.patch b/pkgs/tools/networking/kea/dont-create-var.patch index 595942673c68..385113d160f6 100644 --- a/pkgs/tools/networking/kea/dont-create-var.patch +++ b/pkgs/tools/networking/kea/dont-create-var.patch @@ -1,8 +1,8 @@ diff --git a/Makefile.am b/Makefile.am -index 897be34..b146729 100644 +index 2c0733c..974bb5e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -103,11 +103,6 @@ cppcheck: +@@ -135,11 +135,6 @@ cppcheck: --template '{file}:{line}: check_fail: {message} ({severity},{id})' \ src @@ -15,14 +15,12 @@ index 897be34..b146729 100644 EXTRA_DIST += tools/mk_cfgrpt.sh diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am -index 066b410..16d3135 100755 +index 564f623..7cea9f2 100644 --- a/src/lib/dhcpsrv/Makefile.am +++ b/src/lib/dhcpsrv/Makefile.am -@@ -210,7 +210,3 @@ EXTRA_DIST += database_backends.dox libdhcpsrv.dox - # Specification file - EXTRA_DIST += logging.spec +@@ -352,5 +352,3 @@ libkea_dhcpsrv_parsers_include_HEADERS = \ + parsers/simple_parser6.h + -install-data-local: - $(mkinstalldirs) $(DESTDIR)$(dhcp_data_dir) -- -- diff --git a/pkgs/tools/networking/network-manager/PppdPath.patch b/pkgs/tools/networking/network-manager/PppdPath.patch deleted file mode 100644 index 4850d93716de..000000000000 --- a/pkgs/tools/networking/network-manager/PppdPath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- NetworkManager-1.6.2.org/src/ppp/nm-ppp-manager.c 2017-02-15 13:10:27.000000000 +0100 -+++ NetworkManager-1.6.2/./src/ppp/nm-ppp-manager.c 2017-04-03 11:45:39.891653216 +0200 -@@ -724,7 +724,7 @@ - - g_return_val_if_fail (setting != NULL, NULL); - -- pppd_binary = nm_utils_find_helper ("pppd", NULL, err); -+ pppd_binary = nm_utils_find_helper ("pppd", PPPD_PATH, err); - if (!pppd_binary) - return NULL; - diff --git a/pkgs/tools/networking/network-manager/applet.nix b/pkgs/tools/networking/network-manager/applet.nix index ecd10a139766..98b9b0aef4d6 100644 --- a/pkgs/tools/networking/network-manager/applet.nix +++ b/pkgs/tools/networking/network-manager/applet.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 +{ stdenv, fetchurl, fetchpatch, meson, ninja, intltool, gtk-doc, pkgconfig, networkmanager, gnome3 , libnotify, libsecret, polkit, isocodes, modemmanager, libxml2, docbook_xsl , mobile-broadband-provider-info, glib-networking, gsettings-desktop-schemas , libgudev, hicolor-icon-theme, jansson, wrapGAppsHook, webkitgtk, gobjectIntrospection @@ -6,18 +6,25 @@ let pname = "network-manager-applet"; - version = "1.8.10"; + version = "1.8.14"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1hy9ni2rwpy68h7jhn5lm2s1zm1vjchfy8lwj8fpm7xlx3x4pp0a"; + sha256 = "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya"; }; + patches = [ + (fetchpatch { + url = https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/12.patch; + sha256 = "0q5qbjpbrfvhqsprnwjwz4c42nly59cgnbn41w2zlxvqf29gjvwk"; + }) + ]; + mesonFlags = [ "-Dselinux=false" - "-Dappindicator=true" + "-Dappindicator=yes" "-Dgcr=${if withGnome then "true" else "false"}" ]; @@ -34,7 +41,6 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ hicolor-icon-theme - gnome3.gnome-keyring # See https://github.com/NixOS/nixpkgs/issues/38967 ]; NIX_CFLAGS = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 9a129f522134..85c285fd3ece 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, intltool, pkgconfig, dbus-glib, gnome3 -, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, iptables +{ stdenv, fetchurl, substituteAll, intltool, pkgconfig, dbus-glib, gnome3 +, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables , libgcrypt, dnsmasq, bluez5, readline , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, iputils, gnused, coreutils, file, inetutils, kmod, jansson, libxslt -, python3Packages, docbook_xsl, fetchpatch, openconnect, curl, autoreconfHook }: +, python3Packages, docbook_xsl, openconnect, curl, autoreconfHook }: let - pname = "NetworkManager"; - version = "1.10.6"; + pname = "NetworkManager"; in stdenv.mkDerivation rec { - name = "network-manager-${version}"; + name = "network-manager-${version}"; + version = "1.12.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xmc3x41dbcaxjm85wfv405xq1a1n3xw8m8zg645ywm3avlb3w3a"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "15bzjkrfa7sw5p5hkdha4a67y1zfnzh1s6za11sh8s1yxmyvkziq"; }; outputs = [ "out" "dev" ]; @@ -25,11 +25,6 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file - substituteInPlace src/devices/nm-device.c \ - --replace /usr/bin/ping ${inetutils}/bin/ping \ - --replace /usr/bin/ping6 ${inetutils}/bin/ping - substituteInPlace src/devices/nm-arping-manager.c \ - --replace '("arping", NULL, NULL);' '("arping", "${iputils}/bin/arping", NULL);' substituteInPlace data/84-nm-drivers.rules \ --replace /bin/sh ${stdenv.shell} substituteInPlace data/85-nm-unmanaged.rules \ @@ -38,10 +33,6 @@ in stdenv.mkDerivation rec { --replace /bin/sed ${gnused}/bin/sed substituteInPlace data/NetworkManager.service.in \ --replace /bin/kill ${coreutils}/bin/kill - substituteInPlace clients/common/nm-vpn-helpers.c \ - --subst-var-by openconnect ${openconnect} - substituteInPlace src/nm-core-utils.c \ - --subst-var-by modprobeBinPath ${kmod}/bin/modprobe # to enable link-local connections configureFlags="$configureFlags --with-udev-dir=$out/lib/udev" @@ -70,16 +61,32 @@ in stdenv.mkDerivation rec { "--with-modem-manager-1" "--with-nmtui" "--disable-gtk-doc" + "--with-libnm-glib" # legacy library, TODO: remove + "--disable-tests" ]; patches = [ - ./PppdPath.patch - ./openconnect_helper_path.patch - ./modprobe.patch + # https://bugzilla.gnome.org/show_bug.cgi?id=796752 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=372955; + sha256 = "17rl19lprnsz4wjmp54c1qw6a3pf8x97bhd69xavwy7cx6z84b3n"; + }) + # https://bugzilla.gnome.org/show_bug.cgi?id=796751 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=372953; + sha256 = "1crjplyiiipkhjjlifrv6hhvxinlcxd6irp9ijbc7jij31g44i0a"; + }) + (substituteAll { + src = ./fix-paths.patch; + inherit inetutils kmod openconnect; + }) + ]; - buildInputs = [ systemd libgudev libnl libuuid polkit ppp libndp curl - bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson ]; + buildInputs = [ + systemd libuuid polkit ppp libndp curl + bluez5 dnsmasq gobjectIntrospection modemmanager readline newt libsoup jansson + ]; propagatedBuildInputs = [ dbus-glib gnutls libgcrypt python3Packages.pygobject3 ]; @@ -114,10 +121,10 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = https://wiki.gnome.org/Projects/NetworkManager; description = "Network configuration and management tool"; - license = licenses.gpl2Plus; + license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom rickynils domenkozar obadz ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/network-manager/fix-paths.patch b/pkgs/tools/networking/network-manager/fix-paths.patch index b735da28dca1..5deaa2026d0f 100644 --- a/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/pkgs/tools/networking/network-manager/fix-paths.patch @@ -1,34 +1,41 @@ ---- a/properties/nm-openvpn-editor.c -+++ b/properties/nm-openvpn-editor.c -@@ -775,8 +775,7 @@ - nm_find_openvpn (void) - { - static const char *openvpn_binary_paths[] = { -- "/usr/sbin/openvpn", -- "/sbin/openvpn", -+ "@openvpn@/bin/openvpn", - NULL - }; - const char **openvpn_binary = openvpn_binary_paths; ---- a/src/nm-openvpn-service.c -+++ b/src/nm-openvpn-service.c -@@ -522,9 +522,7 @@ - openvpn_binary_find_exepath (void) - { - static const char *paths[] = { -- "/usr/sbin/openvpn", -- "/sbin/openvpn", -- "/usr/local/sbin/openvpn", -+ "@openvpn@/bin/openvpn", - }; - int i; +--- a/clients/common/nm-vpn-helpers.c ++++ b/clients/common/nm-vpn-helpers.c +@@ -205,7 +205,7 @@ + char *argv[4]; + const char *path; -@@ -2326,7 +2324,7 @@ - _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting..."); +- path = nm_utils_find_helper ("openconnect", "/usr/sbin/openconnect", error); ++ path = "@openconnect@/bin/openconnect"; + if (!path) + return FALSE; - if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS) -- && (system ("/sbin/modprobe tun") == -1)) -+ && (system ("@kmod@/bin/modprobe tun") == -1)) - return EXIT_FAILURE; +--- a/src/devices/nm-device.c ++++ b/src/devices/nm-device.c +@@ -11828,14 +11828,14 @@ + gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); + if (gw) { + nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); +- ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL); ++ ping_binary = "@inetutils@/bin/ping"; + log_domain = LOGD_IP4; + } + } else if (priv->ip_config_6 && priv->ip6_state == IP_DONE) { + gw = nm_ip6_config_best_default_route_get (priv->ip_config_6); + if (gw) { + nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); +- ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL); ++ ping_binary = "@inetutils@/bin/ping"; + log_domain = LOGD_IP6; + } + } +--- a/src/nm-core-utils.c ++++ b/src/nm-core-utils.c +@@ -428,7 +428,7 @@ - plugin = nm_openvpn_plugin_new (bus_name); + /* construct the argument list */ + argv = g_ptr_array_sized_new (4); +- g_ptr_array_add (argv, "/sbin/modprobe"); ++ g_ptr_array_add (argv, "@kmod@/bin/modprobe"); + g_ptr_array_add (argv, (char *) arg1); + + va_start (ap, arg1); diff --git a/pkgs/tools/networking/network-manager/modprobe.patch b/pkgs/tools/networking/network-manager/modprobe.patch deleted file mode 100644 index 487c70b0165c..000000000000 --- a/pkgs/tools/networking/network-manager/modprobe.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/nm-core-utils.c 2017-02-15 13:10:27.000000000 +0100 -+++ b/src/nm-core-utils.c 2017-07-06 14:28:41.575815695 +0200 -@@ -419,7 +419,7 @@ - - /* construct the argument list */ - argv = g_ptr_array_sized_new (4); -- g_ptr_array_add (argv, "/sbin/modprobe"); -+ g_ptr_array_add (argv, "@modprobeBinPath@"); - g_ptr_array_add (argv, (char *) arg1); - - va_start (ap, arg1); diff --git a/pkgs/tools/networking/network-manager/openconnect_helper_path.patch b/pkgs/tools/networking/network-manager/openconnect_helper_path.patch deleted file mode 100644 index 597fb753e268..000000000000 --- a/pkgs/tools/networking/network-manager/openconnect_helper_path.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c -index 15611c45c..4a7444d3a 100644 ---- a/clients/common/nm-vpn-helpers.c -+++ b/clients/common/nm-vpn-helpers.c -@@ -203,23 +203,8 @@ nm_vpn_openconnect_authenticate_helper (const char *host, - gboolean ret; - char **strv = NULL, **iter; - char *argv[4]; -- const char *path; -- const char *const DEFAULT_PATHS[] = { -- "/sbin/", -- "/usr/sbin/", -- "/usr/local/sbin/", -- "/bin/", -- "/usr/bin/", -- "/usr/local/bin/", -- NULL, -- }; -- -- path = nm_utils_file_search_in_paths ("openconnect", "/usr/sbin/openconnect", DEFAULT_PATHS, -- G_FILE_TEST_IS_EXECUTABLE, NULL, NULL, error); -- if (!path) -- return FALSE; - -- argv[0] = (char *) path; -+ argv[0] = "@openconnect@/bin/openconnect"; - argv[1] = "--authenticate"; - argv[2] = (char *) host; - argv[3] = NULL; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index b1ee3da1b058..2eef7f31ab55 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -3,13 +3,13 @@ let pname = "NetworkManager-openvpn"; - version = "1.8.2"; + version = "1.8.4"; in stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p9pjk81h1j1dk9jkkvvk17cq21wyq5kfa4j49fmx9b9yg8syqc8"; + sha256 = "0gyrv46h9k17qym48qacq4zpxbap6hi17shn921824zm98m2bdvr"; }; patches = [ diff --git a/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch new file mode 100644 index 000000000000..b735da28dca1 --- /dev/null +++ b/pkgs/tools/networking/network-manager/openvpn/fix-paths.patch @@ -0,0 +1,34 @@ +--- a/properties/nm-openvpn-editor.c ++++ b/properties/nm-openvpn-editor.c +@@ -775,8 +775,7 @@ + nm_find_openvpn (void) + { + static const char *openvpn_binary_paths[] = { +- "/usr/sbin/openvpn", +- "/sbin/openvpn", ++ "@openvpn@/bin/openvpn", + NULL + }; + const char **openvpn_binary = openvpn_binary_paths; +--- a/src/nm-openvpn-service.c ++++ b/src/nm-openvpn-service.c +@@ -522,9 +522,7 @@ + openvpn_binary_find_exepath (void) + { + static const char *paths[] = { +- "/usr/sbin/openvpn", +- "/sbin/openvpn", +- "/usr/local/sbin/openvpn", ++ "@openvpn@/bin/openvpn", + }; + int i; + +@@ -2326,7 +2324,7 @@ + _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting..."); + + if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS) +- && (system ("/sbin/modprobe tun") == -1)) ++ && (system ("@kmod@/bin/modprobe tun") == -1)) + return EXIT_FAILURE; + + plugin = nm_openvpn_plugin_new (bus_name); diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix new file mode 100644 index 000000000000..20f129357dff --- /dev/null +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -0,0 +1,35 @@ +{ stdenv, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "s4cmd"; + version = "2.0.1"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "14gfpnj4xa1sq3x3zd29drpzsygn998y32szwm069ma0w9jwjjz6"; + }; + + propagatedBuildInputs = with python3Packages; [ boto3 pytz ]; + + # The upstream package tries to install some bash shell completion scripts in /etc. + # Setuptools is bugged and doesn't handle --prefix properly: https://github.com/pypa/setuptools/issues/130 + patchPhase = '' + sed -i '/ data_files=/d' setup.py + sed -i 's|os.chmod("/etc.*|pass|' setup.py + ''; + + # Replace upstream's s4cmd wrapper script with the built-in Nix wrapper + postInstall = '' + ln -fs $out/bin/s4cmd.py $out/bin/s4cmd + ''; + + # Test suite requires an S3 bucket + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/bloomreach/s4cmd; + description = "Super S3 command line tool"; + license = licenses.asl20; + maintainers = [ maintainers.bhipple ]; + }; +} diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix new file mode 100644 index 000000000000..2a4cf3506df8 --- /dev/null +++ b/pkgs/tools/networking/subfinder/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "subfinder-git-${version}"; + version = "2018-07-15"; + + goPackagePath = "github.com/subfinder/subfinder"; + + src = fetchFromGitHub { + owner = "subfinder"; + repo = "subfinder"; + rev = "26596affed961c535676395f443acc5af95ac9e6"; + sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Subdomain discovery tool"; + longDescription = '' + SubFinder is a subdomain discovery tool that discovers valid + subdomains for websites. Designed as a passive framework to be + useful for bug bounties and safe for penetration testing. + ''; + homepage = https://github.com/subfinder/subfinder; + license = licenses.mit; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/tools/networking/subfinder/deps.nix b/pkgs/tools/networking/subfinder/deps.nix new file mode 100644 index 000000000000..8d8a1a571d66 --- /dev/null +++ b/pkgs/tools/networking/subfinder/deps.nix @@ -0,0 +1,57 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/bogdanovich/dns_resolver"; + fetch = { + type = "git"; + url = "https://github.com/bogdanovich/dns_resolver"; + rev = "a8e42bc6a5b6c9a93be01ca204be7e17f7ba4cd2"; + sha256 = "0l1hgxxqafappw0y18sbkkk2vijclvf1b8x73b0nhi4r74wyib49"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "3e6e47bc11bc7f93f9e2f1c7bd6481ba4802808b"; + sha256 = "1vmsnv6r799z5lz5g9l2dh065m9003yfjb18w8n6c053hp8jvrfm"; + }; + } + { + goPackagePath = "github.com/subfinder/subfinder"; + fetch = { + type = "git"; + url = "https://github.com/subfinder/subfinder"; + rev = "26596affed961c535676395f443acc5af95ac9e6"; + sha256 = "0m842jyrwlg4kaja1m3kca07jf20fxva0frg66b13zpsm8hdp10q"; + }; + } + { + goPackagePath = "github.com/subfinder/urlx"; + fetch = { + type = "git"; + url = "https://github.com/subfinder/urlx"; + rev = "8e731c8be06edbae81cab15937cd3c291c2a7680"; + sha256 = "11vrx1c0mq1h6lwpsvibd3386wy4kirzmmm8ibrlx2gj0h6pkkcb"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"; + sha256 = "020q1laxjx5kcmnqy4wmdb63zhb0lyq6wpy40axhswzg2nd21s44"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d0887baf81f4598189d4e12a37c6da86f0bba4d0"; + sha256 = "00dmz9a5d3myyb0256b33vf1bk8wv1khhh88kcvbmqsfd6x1n6p5"; + }; + } +] \ No newline at end of file diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index 23aec604d2d1..e71d313e20ab 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "gnu-pw-mgr-${version}"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "http://ftp.gnu.org/gnu/gnu-pw-mgr/${name}.tar.xz"; - sha256 = "0x60g0syqpd107l8w4bl213imy2lspm4kz1j18yr1sh10rdxlgxd"; + sha256 = "04xh38j7l0sfnb01kp05xc908pvqfc0lph94k7n9bi46zy3qy7ma"; }; buildInputs = [ gnulib ]; diff --git a/pkgs/tools/security/libmodsecurity/default.nix b/pkgs/tools/security/libmodsecurity/default.nix index f746e8c8ffd9..3bf906fb4c12 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { name = "libmodsecurity-${version}"; - version = "3.0.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity"; fetchSubmodules = true; rev = "v${version}"; - sha256 = "1y9nxbf5vgip4zl948a27xpw4mpimqd7xmskfi40k6g0cmmsx1x1"; + sha256 = "0jhyqsvcjxq9ybndcinc08awknrg3sbkaby5w3qw03aqbfjkpywc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 4407d5abbfa1..67e388d5728b 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -1,29 +1,42 @@ -{ stdenv, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig, qt5 }: +{ stdenv, makeWrapper, bash-completion, cmake, fetchgit, hidapi, libusb1, pkgconfig +, qtbase, qttranslations, qtsvg }: stdenv.mkDerivation rec { name = "nitrokey-app-${version}"; - version = "1.2"; + version = "1.3.1"; # We use fetchgit instead of fetchFromGitHub because of necessary git submodules src = fetchgit { url = "https://github.com/Nitrokey/nitrokey-app.git"; rev = "v${version}"; - sha256 = "0mm6vlgxlmpahmmcn4awnfpx5rx5bj8m44cywhgxlmz012x73hzi"; + sha256 = "0zf2f7g5scqd5xfzvmmpvfc7d1w66rf22av0qv6s37875c61j9r9"; }; + postPatch = '' + substituteInPlace libnitrokey/CMakeLists.txt \ + --replace '/data/41-nitrokey.rules' '/libnitrokey/data/41-nitrokey.rules' + ''; + buildInputs = [ bash-completion hidapi libusb1 - qt5.qtbase - qt5.qttranslations + qtbase + qttranslations + qtsvg ]; nativeBuildInputs = [ cmake pkgconfig + makeWrapper ]; cmakeFlags = "-DCMAKE_BUILD_TYPE=Release"; + postFixup = '' + wrapProgram $out/bin/nitrokey-app \ + --prefix QT_PLUGIN_PATH : "${qtbase}/${qtbase.qtPluginPrefix}" + ''; + meta = with stdenv.lib; { description = "Provides extra functionality for the Nitrokey Pro and Storage"; longDescription = '' diff --git a/pkgs/tools/security/nitrokey-app/udev-rules.nix b/pkgs/tools/security/nitrokey-app/udev-rules.nix index 33d2dd1c8fa7..a89fa7238269 100644 --- a/pkgs/tools/security/nitrokey-app/udev-rules.nix +++ b/pkgs/tools/security/nitrokey-app/udev-rules.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation { dontBuild = true; patchPhase = '' - substituteInPlace data/41-nitrokey.rules --replace plugdev "${group}" + substituteInPlace libnitrokey/data/41-nitrokey.rules --replace plugdev "${group}" ''; installPhase = '' mkdir -p $out/etc/udev/rules.d - cp data/41-nitrokey.rules $out/etc/udev/rules.d + cp libnitrokey/data/41-nitrokey.rules $out/etc/udev/rules.d ''; meta = { diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index 6db16c95fc88..facbfcad4cfd 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.2.0"; name = "sshguard-${version}"; src = fetchurl { url = "mirror://sourceforge/sshguard/${name}.tar.gz"; - sha256 = "12h2rx40lf3p3kgazmgakkgajjk2d3sdvr2f73ghi15d6i42l991"; + sha256 = "1hjn6smd6kc3yg2xm1kvszqpm5w9a6vic6a1spzy8czcwvz0gzra"; }; doCheck = true; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 3efba58ea11d..4923a9019ed3 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -15,11 +15,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.3.3.7"; + name = "tor-0.3.3.9"; src = fetchurl { url = "https://dist.torproject.org/${name}.tar.gz"; - sha256 = "036ybfvldj7yfci9ipjki8smpzyxdg8c5r12bghc9yxdqh9basza"; + sha256 = "0vyf5z0dn5jghp2qjp076aq62lsz9g32qv9jiqf08skf096nnd45"; }; outputs = [ "out" "geoip" ]; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 30f5b6ceaba5..36368e172a29 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "mdbook-${version}"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; - rev = "ea0b835b38aba9566c1cc50ad119fbbf2c56f59d"; - sha256 = "0jkyys8dg5mchbj8b73mmzsgv0k0zp7knima9s69s5ybplmd2n8s"; + rev = "v${version}"; + sha256 = "1xmw4v19ff6mvimwk5l437wslzw5npy60zdb8r4319bjf32pw9pn"; }; - cargoSha256 = "0w3slfzm29pkyr6zhr7k9rx9mddh42asyb46bzy57j0a2qvan3k4"; + cargoSha256 = "0kcc0b2644qbalz7dnqwxsjdmw1h57k0rjrvwqh8apj2sgl64gyv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 7b87fd1e492c..b51f811644d1 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "peco-${version}"; - version = "0.5.2"; + version = "0.5.3"; goPackagePath = "github.com/peco/peco"; subPackages = [ "cmd/peco" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "peco"; repo = "peco"; rev = "v${version}"; - sha256 = "0cgfwbnz4jp2nvmqf2i03xf69by8g0xgd3k5k9aj46y9hps1ka92"; + sha256 = "1m3s1jrrhqccgg3frfnq6iprwwi97j13wksckpcyrg51z6y5q041"; }; goDeps = ./deps.nix; @@ -23,5 +23,6 @@ buildGoPackage rec { # peco should work on Windows or other POSIX platforms, but the go package # declares only linux and darwin. platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ pSub ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a52db70835ff..02352e0ff056 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -848,6 +848,8 @@ with pkgs; bluemix-cli = callPackage ../tools/admin/bluemix-cli { }; + charles = callPackage ../applications/networking/charles { }; + libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; @@ -1680,6 +1682,8 @@ with pkgs; ciopfs = callPackage ../tools/filesystems/ciopfs { }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; + citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { }; citrix_receiver_13_10_0 = citrix_receiver.override { version = "13.10.0"; }; citrix_receiver_13_9_1 = citrix_receiver.override { version = "13.9.1"; }; @@ -1946,7 +1950,7 @@ with pkgs; daq = callPackage ../applications/networking/ids/daq { }; - dar = callPackage ../tools/archivers/dar { }; + dar = callPackage ../tools/backup/dar { }; darkhttpd = callPackage ../servers/http/darkhttpd { }; @@ -2867,6 +2871,8 @@ with pkgs; gtkgnutella = callPackage ../tools/networking/p2p/gtk-gnutella { }; + gtkperf = callPackage ../development/tools/misc/gtkperf { }; + gtkvnc = callPackage ../tools/admin/gtk-vnc {}; gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; @@ -4043,7 +4049,7 @@ with pkgs; networkmanager-iodine = callPackage ../tools/networking/network-manager/iodine.nix { }; - networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn.nix { }; + networkmanager-openvpn = callPackage ../tools/networking/network-manager/openvpn { }; networkmanager-l2tp = callPackage ../tools/networking/network-manager/l2tp.nix { }; @@ -4910,6 +4916,8 @@ with pkgs; s3cmd = callPackage ../tools/networking/s3cmd { }; + s4cmd = callPackage ../tools/networking/s4cmd { }; + s3gof3r = callPackage ../tools/networking/s3gof3r { }; s6Dns = callPackage ../tools/networking/s6-dns { }; @@ -5238,6 +5246,8 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; + subfinder = callPackage ../tools/networking/subfinder { }; + surfraw = callPackage ../tools/networking/surfraw { }; swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; @@ -7798,9 +7808,7 @@ with pkgs; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel = callPackage ../development/tools/build-managers/bazel { - inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; - binutils = binutils-unwrapped; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; @@ -7981,7 +7989,7 @@ with pkgs; creduce = callPackage ../development/tools/misc/creduce { inherit (perlPackages) perl ExporterLite FileWhich GetoptTabular RegexpCommon TermReadKey; - inherit (llvmPackages_4) llvm clang-unwrapped; + inherit (llvmPackages_6) llvm clang-unwrapped; }; cscope = callPackage ../development/tools/misc/cscope { }; @@ -8098,8 +8106,6 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; - inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild lwt_ppx - wtf8 dtoa; }; foreman = callPackage ../tools/system/foreman { }; @@ -10913,6 +10919,8 @@ with pkgs; mergerfs = callPackage ../tools/filesystems/mergerfs { }; + mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; + ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them @@ -14301,6 +14309,8 @@ with pkgs; radeontop = callPackage ../os-specific/linux/radeontop { }; raspberrypifw = callPackage ../os-specific/linux/firmware/raspberrypi {}; + raspberrypiWirelessFirmware = callPackage ../os-specific/linux/firmware/raspberrypi-wireless { }; + raspberrypi-tools = callPackage ../os-specific/linux/firmware/raspberrypi/tools.nix {}; regionset = callPackage ../os-specific/linux/regionset { }; @@ -14712,6 +14722,8 @@ with pkgs; helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; + hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; hanazono = callPackage ../data/fonts/hanazono { }; @@ -15394,8 +15406,6 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; - cask = callPackage ../development/tools/build-managers/cask { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -19210,6 +19220,8 @@ with pkgs; xsd = callPackage ../development/libraries/xsd { }; + xscope = callPackage ../applications/misc/xscope { }; + xscreensaver = callPackage ../misc/screensavers/xscreensaver { inherit (gnome2) libglade; }; @@ -19724,7 +19736,7 @@ with pkgs; openxcom = callPackage ../games/openxcom { }; - orthorobot = callPackage ../games/orthorobot { love = love_0_7; }; + orthorobot = callPackage ../games/orthorobot { }; pacvim = callPackage ../games/pacvim { }; @@ -21867,7 +21879,7 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - nitrokey-app = callPackage ../tools/security/nitrokey-app { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; fpm2 = callPackage ../tools/security/fpm2 { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fb51cb949442..a49d638dc47e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -242,9 +242,7 @@ let estring = callPackage ../development/ocaml-modules/estring { }; - ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { - lwt = ocaml_lwt; - }; + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { }; facile = callPackage ../development/ocaml-modules/facile { }; @@ -394,6 +392,10 @@ let ocaml_lwt = if lib.versionOlder "4.02" ocaml.version then lwt3 else lwt2; + lwt_log = callPackage ../development/ocaml-modules/lwt_log { + lwt = lwt3; + }; + lwt_ppx = callPackage ../development/ocaml-modules/lwt/ppx.nix { lwt = lwt3; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7861b2a231d0..a1761e68631e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.12.1"; + version = "2.12.2"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1ifwb30wddp5blqnrkdmf0x11dk7nbxj4z2v5403fn7wfhgvibd2"; + sha256 = "19cq04x1wi489259vyad15zy6y0k3qd7dj77pcf74gxqw92hgg5c"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ac09121fac2..f04e149bac97 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -205,6 +205,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + # packages defined elsewhere amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; @@ -335,6 +337,8 @@ in { pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdfx = callPackage ../development/python-modules/pdfx { }; + plantuml = callPackage ../tools/misc/plantuml { }; Pmw = callPackage ../development/python-modules/Pmw { }; @@ -2415,22 +2419,7 @@ in { }; }; - events = buildPythonPackage rec { - name = "Events-${version}"; - version = "0.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/E/Events/${name}.tar.gz"; - sha256 = "0rymyfvarjdi2fdhfz2iqmp4wgd2n2sm0p2mx44c3spm7ylnqzqa"; - }; - - meta = { - homepage = "http://events.readthedocs.org"; - description = "Bringing the elegance of C# EventHanlder to Python"; - license = licenses.bsd3; - }; - }; - + events = callPackage ../development/python-modules/events { }; eyeD3 = buildPythonPackage rec { version = "0.7.8"; @@ -6932,33 +6921,7 @@ in { koji = callPackage ../development/python-modules/koji { }; - kombu = buildPythonPackage rec { - name = "kombu-${version}"; - version = "4.0.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/kombu/${name}.tar.gz"; - sha256 = "18hiricdnbnlz6hx3hbaa4dni6npv8rbid4dhf7k02k16qm6zz6h"; - }; - - # Backport fix for python-3.6 from master (see issue https://github.com/celery/kombu/issues/675) - # TODO remove at next update - patches = [ (pkgs.fetchpatch { - url = "https://github.com/celery/kombu/commit/dc3fceff59d79ceac3f8f11a5d697beabb4b7a7f.patch"; - sha256 = "0s6gsihzjvmpffc7xrrcijw00r56yb74jg0sbjgng2v1324z1da9"; - name = "don-t-modify-dict-size-while-iterating-over-it"; - }) ]; - - buildInputs = with self; [ pytest case pytz ]; - - propagatedBuildInputs = with self; [ amqp ]; - - meta = { - description = "Messaging library for Python"; - homepage = "https://github.com/celery/kombu"; - license = licenses.bsd3; - }; - }; + kombu = callPackage ../development/python-modules/kombu { }; konfig = callPackage ../development/python-modules/konfig { }; @@ -9149,7 +9112,9 @@ in { cachetools_1 = callPackage ../development/python-modules/cachetools/1.nix {}; cachetools = callPackage ../development/python-modules/cachetools {}; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + cmd2_8 = callPackage ../development/python-modules/cmd2/old.nix {}; + cmd2_9 = callPackage ../development/python-modules/cmd2 {}; + cmd2 = if isPy27 then self.cmd2_8 else self.cmd2_9; warlock = buildPythonPackage rec { name = "warlock-${version}"; @@ -14603,6 +14568,8 @@ in { }; }; + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = callPackage ../development/python-modules/virtual-display { }; @@ -14774,30 +14741,7 @@ EOF imagemagick = pkgs.imagemagickBig; }; - wcwidth = buildPythonPackage rec { - name = "wcwidth-${version}"; - version = "0.1.6"; - - src = pkgs.fetchurl { - url = "mirror://pypi/w/wcwidth/${name}.tar.gz"; - sha256 = "02wjrpf001gjdjsaxxbzcwfg19crlk2dbddayrfc2v06f53yrcyw"; - }; - - # Checks fail due to missing tox.ini file: - doCheck = false; - - meta = { - description = "Measures number of Terminal column cells of wide-character codes"; - longDescription = '' - This API is mainly for Terminal Emulator implementors -- any Python - program that attempts to determine the printable width of a string on - a Terminal. It is implemented in python (no C library calls) and has - no 3rd-party dependencies. - ''; - homepage = https://github.com/jquast/wcwidth; - license = licenses.mit; - }; - }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; web = buildPythonPackage rec { version = "0.37"; |