diff options
Diffstat (limited to 'pkgs')
169 files changed, 3449 insertions, 1673 deletions
diff --git a/pkgs/applications/altcoins/aeon/default.nix b/pkgs/applications/altcoins/aeon/default.nix index 4bff3aa23296..42717d3a2667 100644 --- a/pkgs/applications/altcoins/aeon/default.nix +++ b/pkgs/applications/altcoins/aeon/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.12.6.0"; + version = "0.12.8.0"; in stdenv.mkDerivation { name = "aeon-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { repo = "aeon"; rev = "v${version}-aeon"; fetchSubmodules = true; - sha256 = "19r1snqwixccl27jwv6i0s86qck036pdlhyhl891bbiyvi55h14n"; + sha256 = "1qmlz820mjs0b60d7i90lxcwwxmsdy6swq67v6n8mbb79zmcx8ii"; }; nativeBuildInputs = [ cmake pkgconfig git doxygen graphviz ]; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 156cbc01a29b..2d6312364fd1 100644 --- a/pkgs/applications/altcoins/go-ethereum.nix +++ b/pkgs/applications/altcoins/go-ethereum.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "go-ethereum-${version}"; - version = "1.8.17"; + version = "1.8.19"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,13 +16,13 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "0vm526gbyi8bygqwwki9hx7gf5g3xk2s1biyvwjidrydzj9i46zd"; + sha256 = "0shp8ak44v52ynlyawfh53wczd3zch7ydf6bmbrhm5rpbribirwr"; }; meta = with stdenv.lib; { homepage = https://ethereum.github.io/go-ethereum/; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; - maintainers = [ maintainers.adisbladis ]; + maintainers = [ maintainers.adisbladis maintainers.lionello ]; }; } diff --git a/pkgs/applications/altcoins/monero-gui/default.nix b/pkgs/applications/altcoins/monero-gui/default.nix index d1177c82fd6e..331ef6b92a4f 100644 --- a/pkgs/applications/altcoins/monero-gui/default.nix +++ b/pkgs/applications/altcoins/monero-gui/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { name = "monero-wallet-gui"; exec = "monero-wallet-gui"; icon = "monero"; - desktopName = "Monero Wallet"; + desktopName = "Monero"; genericName = "Wallet"; categories = "Application;Network;Utility;"; }; diff --git a/pkgs/applications/audio/luppp/build-install.patch b/pkgs/applications/audio/luppp/build-install.patch new file mode 100644 index 000000000000..4dae65438cb5 --- /dev/null +++ b/pkgs/applications/audio/luppp/build-install.patch @@ -0,0 +1,16 @@ +commit 4ec09e6f6e00e40622a5207ed24dc657da9a9090 +Author: Pavol Rusnak <stick@gk2.sk> +Date: Tue Dec 4 12:06:22 2018 +0100 + + build: add install: true to executable in meson.build + +diff --git a/meson.build b/meson.build +index 050e1b1..9224ed5 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,4 +39,5 @@ endforeach + + # compile the main project + executable('luppp', luppp_src + [version_hxx], ++ install: true, + dependencies: deps) diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix new file mode 100644 index 000000000000..fdba836a6ae2 --- /dev/null +++ b/pkgs/applications/audio/luppp/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub +, meson +, ninja +, pkgconfig +, jack2 +, cairo +, liblo +, libsndfile +, libsamplerate +, ntk +}: + +stdenv.mkDerivation rec { + pname = "luppp"; + version = "1.2.0"; + patches = [ ./build-install.patch ]; + + src = fetchFromGitHub { + owner = "openAVproductions"; + repo = "openAV-Luppp"; + rev = "release-${version}"; + sha256 = "194yq0lqc2psq9vyxmzif40ccawcvd9jndcn18mkz4f8h5w5rc1a"; + }; + + nativeBuildInputs = [ + meson ninja pkgconfig + ]; + + buildInputs = [ + jack2 cairo liblo libsndfile libsamplerate ntk + ]; + + meta = with stdenv.lib; { + homepage = http://openavproductions.com/luppp/; + description = "A music creation tool, intended for live use"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ prusnak ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 658ba1700f26..85d0e1fbaf71 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}: +{stdenv, fetchurl, libogg, libao, pkgconfig, flac, opusfile, libopusenc}: stdenv.mkDerivation rec { - name = "opus-tools-0.1.10"; + name = "opus-tools-0.2"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "135jfb9ny3xvd27idsxj7j5ns90lslbyrq70cq3bfwcls4r7add2"; + sha256 = "11pzl27s4vcz4m18ch72nivbhww2zmzn56wspb7rll1y1nq6rrdl"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libogg libao libopus flac ]; + buildInputs = [ libogg libao flac opusfile libopusenc ]; meta = { description = "Tools to work with opus encoded audio streams"; diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix index 529b0dbd42b6..2016d21c5926 100644 --- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix +++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix @@ -98,6 +98,6 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ xvapx ]; + broken = true; # 2018-12-06 }; - } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index de7e3977ad83..8e54dd6f9eea 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,14 +13,14 @@ let sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r"; }; betaVersion = { - version = "3.3.0.17"; # "Android Studio 3.3 RC 1" - build = "182.5138683"; - sha256Hash = "0apc566l4gwkwvfgj50d4qxm2gw26rxdlyr8kj3kfcra9a33c2b7"; + version = "3.3.0.18"; # "Android Studio 3.3 RC 2" + build = "182.5160847"; + sha256Hash = "05rjwvcph0wx0p0hai5z6n9lnyhk3i5yvbvhr51jc8s3k3b6jyi5"; }; latestVersion = { # canary & dev - version = "3.4.0.5"; # "Android Studio 3.4 Canary 6" - build = "183.5146016"; - sha256Hash = "1z2asimpsw15iild7c4aqicph6v327qx3ffjgvl2n8vr5rspsns1"; + version = "3.4.0.6"; # "Android Studio 3.4 Canary 7" + build = "183.5159543"; + sha256Hash = "0r685qqx4w1hwbd8jgrh7ks8bw9m7823ffhd3x6pl7j4b9hpc858"; }; in rec { # Old alias diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 834c6bedf3c0..73a9f26a1221 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -44,8 +44,7 @@ let buildCommand = '' mkdir -p $out/usr/ ar p $src data.tar.xz | tar -C $out -xJ ./usr - substituteInPlace $out/usr/share/applications/${pname}.desktop \ - --replace /usr/share/${pname} $out/bin + sed -i -e "s|Exec=.*$|Exec=$out/bin/${pname}|" $out/usr/share/applications/${pname}.desktop mv $out/usr/* $out/ rm -r $out/share/lintian rm -r $out/usr/ diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 201ebf7b2984..4d835e6590ed 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -3,7 +3,7 @@ , libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, shared-mime-info , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2 , harfbuzz, mypaint-brushes, libwebp, libheif, libgudev, openexr -, AppKit, Cocoa, gtk-mac-integration }: +, AppKit, Cocoa, gtk-mac-integration-gtk2, cf-private }: let inherit (python2Packages) pygtk wrapPython python; @@ -23,8 +23,11 @@ in stdenv.mkDerivation rec { freetype fontconfig lcms libpng libjpeg poppler poppler_data libtiff openexr libmng librsvg libwmf zlib libzip ghostscript aalib shared-mime-info libwebp libheif python pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes - ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Cocoa gtk-mac-integration ] - ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # cf-private is needed to get some things not in swift-corefoundation. + # For instance _OBJC_CLASS_$_NSArray is missing. + AppKit Cocoa gtk-mac-integration-gtk2 cf-private + ] ++ stdenv.lib.optionals stdenv.isLinux [ libgudev ]; pythonPath = [ pygtk ]; @@ -69,7 +72,9 @@ in stdenv.mkDerivation rec { "--with-icc-directory=/var/run/current-system/sw/share/color/icc" ]; - doCheck = true; + # on Darwin, + # test-eevl.c:64:36: error: initializer element is not a compile-time constant + doCheck = !stdenv.isDarwin; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 9100efc86394..7267e9bc4857 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -1,16 +1,15 @@ -{ stdenv, requireFile, makeWrapper, unzip, jre }: +{ stdenv, fetchzip, makeWrapper, unzip, jre }: stdenv.mkDerivation rec { name = "yEd-${version}"; - version = "3.18.1.1"; + version = "3.18.2"; - src = requireFile { - name = "${name}.zip"; - url = "https://www.yworks.com/en/products/yfiles/yed/"; - sha256 = "0jl0c18jkmy21ka5xgki8dqq2v8cy63qvmx3x01wrhiplmczn97y"; + src = fetchzip { + url = "https://www.yworks.com/resources/yed/demo/${name}.zip"; + sha256 = "1csj19j9mfx4jfc949sz672h8lnfj217nn32d54cxj8llks82ycy"; }; - nativeBuildInputs = [ unzip makeWrapper ]; + nativeBuildInputs = [ makeWrapper unzip ]; installPhase = '' mkdir -p $out/yed diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix index 77f758394e5f..e80921f46ebd 100644 --- a/pkgs/applications/misc/aminal/default.nix +++ b/pkgs/applications/misc/aminal/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { name = "aminal-${version}"; - version = "0.7.8"; + version = "0.7.12"; goPackagePath = "github.com/liamg/aminal"; @@ -36,7 +36,7 @@ buildGoPackage rec { owner = "liamg"; repo = "aminal"; rev = "v${version}"; - sha256 = "02gamvvs56w4zwqdvalbsgb2gbh0398gl7qk36pgyqkcgj3bcwv8"; + sha256 = "1ak5g2i4ggi00b4q7qigfwsrwb5rvswjjbr2hp9kyxd45nycb0g4"; }; preBuild = '' diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix new file mode 100644 index 000000000000..0431f35057be --- /dev/null +++ b/pkgs/applications/misc/hivemind/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "hivemind-${version}"; + version = "1.0.4"; + goPackagePath = "github.com/DarthSim/hivemind"; + + src = fetchFromGitHub { + owner = "DarthSim"; + repo = "hivemind"; + rev = "v${version}"; + sha256 = "1z2izvyf0j3gi0cas5v22kkmkls03sg67182k8v3p6kwhzn0jw67"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/DarthSim/; + description = "Process manager for Procfile-based applications"; + license = with licenses; [ mit ]; + maintainers = [ maintainers.sveitser ]; + }; +} diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 41bc94a51300..9622689199a8 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,91 +1,62 @@ -{ stdenv, fetchFromGitHub, python2 }: +{ stdenv, lib, fetchFromGitHub, python2 }: let - - pythonPackages = python2.pkgs.override { - overrides = self: super: with self; { - backports_ssl_match_hostname = super.backports_ssl_match_hostname.overridePythonAttrs (oldAttrs: rec { - version = "3.4.0.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "07410e7fb09aab7bdaf5e618de66c3dac84e2e3d628352814dc4c37de321d6ae"; - }; - }); - - flask = super.flask.overridePythonAttrs (oldAttrs: rec { - version = "0.12.4"; - src = oldAttrs.src.override { - inherit version; - sha256 = "2ea22336f6d388b4b242bc3abf8a01244a8aa3e236e7407469ef78c16ba355dd"; - }; - }); - - tornado = buildPythonPackage rec { - pname = "tornado"; - version = "4.0.2"; - - propagatedBuildInputs = [ backports_ssl_match_hostname certifi ]; - - src = fetchPypi { - inherit pname version; - sha256 = "1yhvn8i05lp3b1953majg48i8pqsyj45h34aiv59hrfvxcj5234h"; - }; - }; - - flask_login = buildPythonPackage rec { - pname = "Flask-Login"; - version = "0.2.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p"; - }; - - propagatedBuildInputs = [ flask ]; - checkInputs = [ nose ]; - - # No tests included - doCheck = false; - }; - - jinja2 = buildPythonPackage rec { - pname = "Jinja2"; - version = "2.8.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; - }; - - propagatedBuildInputs = [ markupsafe ]; - - # No tests included - doCheck = false; - }; - - pylru = super.pylru.overridePythonAttrs (oldAttrs: rec { - version = "1.0.9"; + mkOverride = attrname: version: sha256: + self: super: { + ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + inherit version; src = oldAttrs.src.override { - inherit version; - sha256 = "71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c"; + inherit version sha256; }; }); }; + + py = python2.override { + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ + (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") + (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") + (mkOverride "jinja2" "2.8.1" "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m") + (mkOverride "pylru" "1.0.9" "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi") + (mkOverride "sarge" "0.1.4" "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar") + (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + ]); }; -in pythonPackages.buildPythonApplication rec { + ignoreVersionConstraints = [ + "Click" + "Flask-Assets" + "Flask-Babel" + "Flask-Principal" + "PyYAML" + "emoji" + "flask" + "future" + "futures" + "pkginfo" + "psutil" + "pyserial" + "python-dateutil" + "requests" + "rsa" + "scandir" + "semantic_version" + "websocket-client" + "werkzeug" + "wrapt" + ]; + +in py.pkgs.buildPythonApplication rec { pname = "OctoPrint"; - version = "1.3.8"; + version = "1.3.9"; src = fetchFromGitHub { - owner = "foosel"; - repo = "OctoPrint"; - rev = version; - sha256 = "00zd5yrlihwfd3ly0mxibr77ffa8r8vkm6jhml2ml43dqb99caa3"; + owner = "foosel"; + repo = "OctoPrint"; + rev = version; + sha256 = "1yqbsfmkx4wiykjrh66a05lhn15qhpc9ay67l37kv8bhdqf2xkj4"; }; - # We need old Tornado - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with py.pkgs; [ awesome-slugify flask_assets rsa requests pkginfo watchdog semantic-version flask_principal werkzeug flaskbabel tornado psutil pyserial flask_login netaddr markdown sockjs-tornado @@ -94,31 +65,13 @@ in pythonPackages.buildPythonApplication rec { frozendict ]; - checkInputs = with pythonPackages; [ nose mock ddt ]; + checkInputs = with py.pkgs; [ nose mock ddt ]; - # Jailbreak dependencies. postPatch = '' - sed -i \ - -e 's,pkginfo>=[^"]*,pkginfo,g' \ - -e 's,Flask-Principal>=[^"]*,Flask-Principal,g' \ - -e 's,websocket-client>=[^"]*,websocket-client,g' \ - -e 's,Click>=[^"]*,Click,g' \ - -e 's,rsa>=[^"]*,rsa,g' \ - -e 's,flask>=[^"]*,flask,g' \ - -e 's,Flask-Babel>=[^"]*,Flask-Babel,g' \ - -e 's,Flask-Assets>=[^"]*,Flask-Assets,g' \ - -e 's,PyYAML>=[^"]*,PyYAML,g' \ - -e 's,scandir>=[^"]*,scandir,g' \ - -e 's,werkzeug>=[^"]*,werkzeug,g' \ - -e 's,psutil==[^"]*,psutil,g' \ - -e 's,requests>=[^"]*,requests,g' \ - -e 's,future>=[^"]*,future,g' \ - -e 's,pyserial>=[^"]*,pyserial,g' \ - -e 's,semantic_version>=[^"]*,semantic_version,g' \ - -e 's,wrapt>=[^"]*,wrapt,g' \ - -e 's,python-dateutil>=[^"]*,python-dateutil,g' \ - -e 's,emoji>=[^"]*,emoji,g' \ - -e 's,futures>=[^"]*,futures,g' \ + sed -r -i \ + ${lib.concatStringsSep "\n" (map (e: + ''-e 's@${e}[<>=]+.*@${e}",@g' \'' + ) ignoreVersionConstraints)} setup.py ''; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index bd65acf5e5e9..2e3bc058280a 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchFromGitHub, octoprint, pythonPackages }: +{ stdenv, fetchFromGitHub, octoprint, python2Packages }: let - buildPlugin = args: pythonPackages.buildPythonApplication (args // { - buildInputs = (args.buildInputs or []) ++ [ octoprint ]; + buildPlugin = args: python2Packages.buildPythonPackage (args // { + propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ]; + # none of the following have tests + doCheck = false; }); self = { @@ -42,6 +44,28 @@ let }; }; + mqtt = buildPlugin rec { + name = "OctoPrint-MQTT-${version}"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-MQTT"; + rev = version; + sha256 = "1318pgwy39gkdqgll3q5lwm7avslgdwyiwb5v8m23cgyh5w8cjq7"; + }; + + propagatedBuildInputs = with python2Packages; [ paho-mqtt ]; + + meta = with stdenv.lib; { + homepage = https://github.com/OctoPrint/OctoPrint-MQTT; + description = "Publish printer status MQTT"; + platforms = platforms.all; + license = licenses.agpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; + }; + titlestatus = buildPlugin rec { name = "OctoPrint-TitleStatus-${version}"; version = "0.0.4"; diff --git a/pkgs/applications/misc/soapyrtlsdr/default.nix b/pkgs/applications/misc/soapyrtlsdr/default.nix new file mode 100644 index 000000000000..c62cb88e4954 --- /dev/null +++ b/pkgs/applications/misc/soapyrtlsdr/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig +, rtl-sdr, soapysdr +} : + +let + version = "0.2.5"; + +in stdenv.mkDerivation { + name = "soapyrtlsdr-${version}"; + + src = fetchFromGitHub { + owner = "pothosware"; + repo = "SoapyRTLSDR"; + rev = "soapy-rtlsdr-${version}"; + sha256 = "1wyghfqq3vcbjn5w06h5ik62m6555inrlkyrsnk2r78865xilkv3"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ rtl-sdr soapysdr ]; + + cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; + + meta = with stdenv.lib; { + homepage = https://github.com/pothosware/SoapyRTLSDR; + description = "SoapySDR plugin for RTL-SDR devices"; + license = licenses.mit; + maintainers = with maintainers; [ ragge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 1acbf4fa57b9..54e7216544e4 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -100,11 +100,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "31.0.0.153"; + version = "32.0.0.101"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "0c7vh1h9lzx09njf7w1acvj2v91girlzflqxzli8nxza7pd1zb2v"; + sha256 = "1bmmjraqzdz03jzbgs1l932gka1zhiyiis06r4yi4f93mdy31w72"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c2a73480b987..a6dc397cbc5a 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0nxxqfncw9ci3rhg8fiqaxy6zvh9x3j10lw8yw7c0cg2yni10qsp"; - sha256bin64 = "0frcaplyzhkxzzcfcf0vigqpzixar4jg9hhrh4i8z8vx2gnxkwwy"; - version = "71.0.3578.53"; + sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2"; + sha256bin64 = "147lh1way8db0j0m6wbpfzmfsvvlsjb29cjgf7s9hljb00wqv6ay"; + version = "71.0.3578.80"; }; dev = { - sha256 = "11bsn77kvjqdwpiwjf4gaindfj0sx932wp6g7cald0638wdz7pqv"; - sha256bin64 = "1j5pd8imc35ch7l3jmnmjm2yda2xzdwha5im34240wm6rrdr2v2j"; - version = "72.0.3610.2"; + sha256 = "0whw1kq5gd07k061ycfdn7bygahbl6zqa54wkz2lqh73yknbbnj4"; + sha256bin64 = "0hlfzzf7kx90jw0zin685c4haiv262hf9a4sj6fmb2yhj21hbp87"; + version = "72.0.3622.0"; }; stable = { - sha256 = "0bwlq5xii26b3yngwkwb7l2mx03c30ffpym4xg0hcci8ry7zhpj4"; - sha256bin64 = "1gnhjbpkp2gn3y5pingwv153bakidq60pr4fj2iq1kniyllsmmpg"; - version = "70.0.3538.110"; + sha256 = "03ddfxxzh8pxil9n28y8nkzl8x0kb5bzzjy4mihg448dflh3anq2"; + sha256bin64 = "1rnw3whn2aaxxb4w3s2nf0wb91qjrq099550j42wig7xa71j6rz4"; + version = "71.0.3578.80"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index d18e82771956..e16567809d6f 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 = "64.0b10"; + version = "64.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ach/firefox-64.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e63de6a872ec67b80cc488be329f4a89b56544de02da871904cdbef47cbf65b9aff2f83974ad3b8e661b2361c6cd836279dd006aef95e16c0f85af21dff7bd69"; + sha512 = "a2a467acf4d76b09d7f04760dda0ed2e49f31e96166c26bee8efea0cde4dce914deec16a7b6bc3cc8e06b2acc70a250c7db980b180c5ad7b363e8e0334afbfab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/af/firefox-64.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "7e745d102fbee703e4c065a597a26f225aa8259e5544465b6f131c5f6edc878f652c2f3529f74366d3aa7181c47f4b448287021696168e8c9873b8183300e937"; + sha512 = "7a271ec7e0600299fd73101ca2148a5057149deefe5ac5747213791f5cf6a2fecd54e04ee7b3b0bd8d3a5cc3ff8ed852724b602b797d6a8e43128ff2ebc83af8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/an/firefox-64.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "8507a65610f8fa2c23c086094ca71936e0249adcde13105ce0ab9879b32434aae38534b90098e40e031dc406de49390824bbbecf17f3a6903dbc065fb5fbe0aa"; + sha512 = "418f50d3b71d265d7669a7ab3d4027164dbac85a7970c6fe690fa592c08a33ffdf8feaa6a58e13b28566e8218f2988f134219608d4a1804fe7aef8a154c16f96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ar/firefox-64.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "f5c49d943b0ccaed81389b161ec744dda771adf93c90c5ab09325b7de57744c1814bcb7caa88ea9269e8754ec44bdad5fc948a5a903a77dc0657dd6fc03510cb"; + sha512 = "61439fc182462d27a03ad8d9472d96a50336a864915632f8e0c8ac3b0c5e2f7aa6a346ffedc1f0712fcfd6417063b0894e2d8b4f015f85ee1ec4d9ab0ed48c01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/as/firefox-64.0b14.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "cc5b14798da8a759be04518f97b7ee4995138893ad08c2e0d721212f69de63088e1a08237f9bf4e725d154806441d1a89b1514d4c789bd1381d6caa9737abb94"; + sha512 = "64f83e85f4ef5c169f4683e92224134cc260e052f2e837e2e272d052cbddb106ab6a14a985dcad7e9928a7ac17e28b9f847a22df681fc4600183606330012e16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ast/firefox-64.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "8256d617d336d08a6effcad9e445ab0a4a80a747bdd2a85c50eedf3dd2495d41280db0d52bb6563f96c2041320a411b519f0978efd2f7f059ecf40a3fb164ab8"; + sha512 = "9a7cff9892fa4fd89bff4b4be462a949d70c6c07eaf4c2373946f8f991e1eb6656d2a7af6ba55a7a4fafeb54988add6a779c01b42861aad37a58b81adbb487fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/az/firefox-64.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d11f0e0c8967c1562ca9455a23905b4b3a057f7819d2093fe7e60e785aeda718215e636b42e9b60bdcbe1ac89a326d47da5d6559d01c3583865996df4b42fda0"; + sha512 = "1b635a7599459e3f270bdec64cf6d9b984fb0b2470c49a3fd3566e1da3ebd4302ae0f0b575f739f9c175a4630f45f31ec39feefc8ce2decfcd84383582171b8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/be/firefox-64.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "335ad773e97afacedb62cb3a4dfbd583732e2bd8408b253143cd99922b116498cc5c55c39c9e2431dd3db39d7cd05f2aa2d769ba334d683bd975fcd4e6395f42"; + sha512 = "f9935dd0f3a9ae11812acb03bfb0166e6030872b847cf3cfc29e9b56eea5050cc1e75a898a404deff6b01d8131c112c3dd2df754c197a69fc9f0e0093bf2c128"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bg/firefox-64.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "5d002e9993f0e1a63742e5a34f96161b43ef58146c28cde4563079bb073f7299551cdf0a9f35a6e961f2dbdbb87c29a7326676ef927ef4737eb9103157f2a7ab"; + sha512 = "13b3618c401fd41f8f199444e84eb5bbdd3b50605b30fefbc15819ca54f92c8bb8e542396c2a32d856453e1a01df98d4755fe6c840360ab16a308af1cfe0eef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-BD/firefox-64.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "c54af20089bd32eaeb17d8e574b674ffa193842e809eeccb4fe6694c4b3b674371b60ef06f1abde2012465c458a36a624fb9146470cadf2596c3369c3ab05ca0"; + sha512 = "ed5492d0f16d45d5e22f9fc5691b1672fa46b7b71389ff80d35b16de9b02320acfd416d44e6186e7fc2ee54099fcfe8a356f302bc049092d9c955f2f0e2b29f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bn-IN/firefox-64.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "fac070b57346188b9aac15257fe1bc30a0b4feec05d80a93fa5f4f0104891ee4ffafd81f8ecd1e55939cce4a10b728b10db0fb1d0be5ba14533e515b798b2d45"; + sha512 = "df84b6688aed1dcf4de5ff8eb8d8bf802d5062989259c2255684d329d172c1fc509c1fffbc6fbf7f045f8aeb0b4955a3c12da85140899e0a5d6e6193f2bc4170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/br/firefox-64.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "4549764420a4c7b6b6583e5770aa246ac1dd24e57f792c03e98d2311d5bfb47869e228c54d4a7fd296101e9a1881b1ac0cbc66dd60bdd63f7149f8d3b175289d"; + sha512 = "f8b148f8a86774a0ab8b2f7590b6d76feb9d2cef99629e76b6fb86fd1195de86aa6693c03655ec4dcc9d062978c542d13d55c2ba7573242d2793f8f71bc9b34a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/bs/firefox-64.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "fa8e664ecbef781ef5ecbee5ad692e37640c2537c35ece772fadddc2e4d79391f756f28891f0c22c16964f247aa787a096e28a662fc08c3f6b8a971a43dc1876"; + sha512 = "150783ad5f748514f46743b7d1bfddd63175cd8b17eedc6b4f1049ac9fdd4d4b06288411fa894f09e18c0b66c2d03dfabe769bd77f909062a36ca78af9b1b60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ca/firefox-64.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "fd7072341f3451481f4e50e986bf02f45541730db7320bace3d3a343014e01a28595cf0ace6bad1a099504fd9943a5cece2833e4d156122db8bbbf88b7ff3193"; + sha512 = "3d4b5ba4f9efb0960a2e7556cb08331f4ae78cd193f065c1c2d8c9d6fdacccc1de5418bc7e9a71ba19d9de7ea78f2ef154a4a95ac58489a8f9990a3ff27c1395"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cak/firefox-64.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "a9920a8d8ca455b85accc51e4337d6813de263b432decd5b2d275b0c272ede7351c187299cbd7c0745e6cfe356b793f37335bb2840b23b8ff4ddaeca4e8a9332"; + sha512 = "a21f14531c8e77695f49cfd8ba035dee340cec05764dd009000614eb3b1e5ea73c6c677dda6d13bce7805e1a17669749a37fe4cca9e6c10db555b6dd0f057af7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cs/firefox-64.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d622c8c1dd679bf90ba7150381a04f70ac0479b261584cd18e17b44261529a8dc023f7a4b2ad8d495cd1f292a0ddc053e4e4daf70cbcf7ab02d10c6aa072a502"; + sha512 = "70421e5d7c0ae97a941b9b008afdacbc883b4d9c2672610bc08a1b9b31f90c9414aac791c4bf63443dcd8155f90777b1aa29ab8e9d56284b9da7a872d0055f0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/cy/firefox-64.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2812212393f826387206adc0968b0efafb62176b11e55a126ddbccdedb13d8a8656ef1400d262d9120dc50b59a0028c43d97ca45a3da5b167485a9c5378bed9b"; + sha512 = "d4b903a0e7391080be7c3dde5d714466550d55c82354d5ce87195ea40e1bc026dd43e5529ec2749761d0578ba76254bd12bcbd127b364202dbd6dac3ec474b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/da/firefox-64.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "52d690a5c4406ee9a0fe69a598a8d4d7b24ff3475676d79de67d45658058a139629ca0c1080fbd849d52dec119691e19a3c79e2a0994f5e96ed057da322b4578"; + sha512 = "ac3b7b0957c48b34b2266e46144dc20e8d24e131f86c227ccecc07fb232e02dc4e11b7019df3f0319a90ed58c837bc1f4ab520e91a6279e4e37b7fe6a02f57f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/de/firefox-64.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e1cf5a56bca2d62e56b2cc9c32da15b3add35ce06dbcd648a241f1d36047c86c13ee5cc0619a2aee22d2652698bf83e5974e330b18b65e00391e913f9975e8b7"; + sha512 = "4187a9813c2a948d135f1f8e70d31dc8ee1b8ecdd3a07905e7265533e6df77fa68b5ec09ca7525a9a642758c99e91d3118d02cab23468c9e383e2bdc9389d457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/dsb/firefox-64.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d0a07800b6a25683effe02c4222215e6af478b0582d0fa53e25e74f337966edc33add3dd907b9831038e4d1349a6828148f61e4e4413cece20bc5d160e0269ae"; + sha512 = "8aee6ad9200054c3124bbc227fb3c64e4a2665ce68616c145c7ea7eb71d35aae3846068616ec39d8b80fc29adee954c4ea31fbe5491169e39a70988866e16133"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/el/firefox-64.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3c5b88c1bb6028735e7594d64dbc5fff9a9fb28ee02abe912c18c1d9e4f8266a78f0c0636e9dc058063fb79982a7b13666b2287e9bf89953df9511c2ea8ea855"; + sha512 = "85e9efc9615d6b1cc12af25e8a4051ef885e2f1b535ce9d2f9aee16162aee91672e6230774343991896f993dc93ff10ccc2e24d7c3ff13ed1acc93c7537dad26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-CA/firefox-64.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "9fdd11055d0ee06f27b080f813d2eda68637c8028c20b2a7b4122e4b3b4398c22d5339f54d25ab4d221c76765e490b83ba30368a7641869d660060c60a18afe7"; + sha512 = "8776b5d1286d90522b133ec1923b5f510981d9a9a59f502a421a2e12f0e6fc46af66cb887db37326802e18dfa99ffba823143ffa60ffb03a95f62772af132126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-GB/firefox-64.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "15a07fd9cee551320e808dbe538519c18caadfe50da7711b576feca337385b623eb958f0d97f04c23a266daf19355e1e2a69a2f24ec3482a2d2d8938e38afd27"; + sha512 = "477d56e4f5b7c2c26ecde42388fac36ab1045cb52eb5d0ed5a316dcb148efa8be8eb5deaf37eccd8ea906ef702441af476c43cac795278e6a0071d46c5830861"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-US/firefox-64.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e113244031727118e50d5f44515e64e4c8b576e260877d5c9009397b36732095b98a701858a82ac421e56fbc40c2a7b3a2d39e391bddaf49f74f9818e0ab48dd"; + sha512 = "e6de3cee9298362fe3a93ccc23ab3ec1a4e8597224c44e2c3f31e1cecacf05270563f988156107c4d4b009a5a8e7f50ba849a94e38518fc30f986f6a73bd06aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/en-ZA/firefox-64.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "583d871b48a41e2f21f468f6702484e5875c02f2df9c9eeab4b1faf99fa977d84e4878e673c915f907d131b655f6dcd1875ebc126093589baec2f5091d98e05f"; + sha512 = "03944b015f1ed1521dd79c9f3948ba280d6b52cc9655f6e884310e4032a44e4fa38b4ee7ecf8cf50c48f4bb325986835a7002cd7e7e21ae6c1c8d63764478cec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eo/firefox-64.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "bdadfe17850e57163ebcd66a3c0ce3e20fc69453df09029d7f31d541d98bc6c3a0a5c98e6902a659e3b54e2669beb6133ef45373221a21eaa3f3f26bea0b892a"; + sha512 = "fbc1bd9143f9450c0c42356c20696890a64b333e0506ed959d3531cc4fea7b50fe379178c7fb51ef5e8449838d2749ed7f3343a3a2617afdb994784192fa8c2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-AR/firefox-64.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "61453a1e4141e7a19fd7d31fb8872574b5e3750058675f1b00c6a78e2212f69210f00b15288b68af2de8a56b3d09a63be4650e280a5385a86e0003721126a35c"; + sha512 = "3f64bb89d8311b82e93c121256232cf7420d1d8aecf2cbad62b823904f4d0cdcb6192a276e97a2004614294f7893885292736f7e3bbcef9217554f680c0fb509"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-CL/firefox-64.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "98e9e06267e7a6f700acbdb6c1f35a557d7a67e9ad294ff391b0464796f5eb16a41c1c755c3a890e7e82dd94e62af302fd3392b4d553e2490c28c5f15eda0b7c"; + sha512 = "705b55e42f4a1982712c1c76f758293e6fa8785938c5270c95285b0e31a7caca1552adeb69ecbbf5e5b5d714ef2e282d00762b147c42a0ffd50c01d56cf9cf6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-ES/firefox-64.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "cb37d107d742289f88f6e88afdbda3d18d41c3d37cb6209c5991d20c36a3ccf780376f3ec6cb3c0fddd08c33f35f98c22b71236987a537410abc72a6d46ea7bf"; + sha512 = "583337f9a52132f2265337892071bb88557c4bb5a8e827ff2c37c99ad45a51b516ce16a145e7e32c98bba3deadbc79fda03f0dd0f2438b8573774ba60ff61e50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/es-MX/firefox-64.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2969ee93e447c8e9bfd5702f43f32c46bff39a073dec5137d72c5cdce64054c7067b385622a24375966ec13770173317bdb1037237e2de980ae755c9a072a6e8"; + sha512 = "2178c0f13035d9050550101a090818b4c3fce5577a13389e93353db2d33b025ab8f5904660f2b1516c2356af4aabef9cd6f403fd5e70560e3f4392db7c873c22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/et/firefox-64.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "21a75474dd5ce519ecbd78fc803ee3a80041a0f1eb2daac15c8fc861856a15e365909b40eb250689d5aab4dac9121a9acba6f0805533c71c2a9ef034d566bae6"; + sha512 = "405a1592c91e51fedcb68e526f75e9db7cc28e333fc75effa4963d4313216080d863a071b0f881e2d79c990d721503e6f2794d4a374f108aaa65a63ecd9c3346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/eu/firefox-64.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5d332bff9b85956b1a1b0c83a27a1c5211d4700f53b1a38f34ec7072c3d000bc6af7cce48a51084ba3a295c9d025730313747ef8e759c5fbf662879bd14aac61"; + sha512 = "ad8f627889b4c801dec0e73e4ace1e62f3d7a9e561629b2c7907554740bc74d67e9ea69bebc85d7f79e671c3bf95a3c3bad8585afe590a9d1da28acbe2bd71d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fa/firefox-64.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "1bb42cc21b65dab7b950a877e21a3ee9cff78ba4eae034da4e322930120d8cf5076598801ea609b77cdfa41d084fe62f8322d42da773336597c30102bb61eb10"; + sha512 = "91dfbdf6caf769bb45e168630dc028dde338fdaeb25e72a5f1fc98787a877d4c95504f4a0152fc6c7f7b347a4629aa8250c3a328607ddc6340c61f867e7d274f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ff/firefox-64.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "9ced85f9ae63885b49953a733f2081fee55dfc14e12bccc3f3531ff605181c7c04156e272c100ccafe7d88169df1f128efbcf6bee0737afaa28c5ca22a77d286"; + sha512 = "5271040348c6fb046e04df8e0181b045a1bdd8ec46979324f8ce98eec6ecde148dbbcd7eb84d7b3102dd10ddabc14360487cc8735c3c3fd84a25aea79b304492"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fi/firefox-64.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "3624699d5945964f16035a87fd666efa202de1b25a29f742131131f23dfa4b8e38a17c061e3ce95b40bbbd45026c60139b961062a7c5a9d6c01ea3399d56ebf2"; + sha512 = "09386d83a26a8dfba3da620460026ce4bf92032dc8e35db28ad0bf9501b11b4c8108350e3823135567df03194573c69483de967d9632e4b22904fa7b2a1450b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fr/firefox-64.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "56c304d07c4f357170620e13c2f986b2c87f39c7dee3a8d0c0ec12bc54dab02ac12d0c9c281a011bace55e36327d64a0710d8fbdc345ea0bc4f9b6f19ff42514"; + sha512 = "b14931c9146a5784dca231e9eafbee32845af405baffe2cbabd70fb2369294d797fea8a719a2679945c375f2355773cd4a54b287a823bc7e9896f41e56a2ceaf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/fy-NL/firefox-64.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "0b75d75abb56ba70b421ca819fc80aff409ccc98b373d91102ad84ca7967aec5e8f01f93f9019c6b223bf9063456d2891a1e04dc43ce34643d6bf9ef162f508f"; + sha512 = "7d8f480a075692d93cd03fa9aa1b1359e41782925e91cf670100101edd8e4136e52e004a80cc3f8f36332b16885e97394871fd9b0c553a6868f91a30742fe599"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ga-IE/firefox-64.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "0a6a39c1c93cdb67fb413719f32dfc583bfff1a8d98cd330de126f9f1189f594c9b85b51ea210bfe07439a9ebf5b5266edfe0621d6b544fdb25098107435a418"; + sha512 = "787a5ec8470f0a06a0b16c1bc3bf11f46e26dc375d0fc0d413d6bd663baa014a313b9fcd511463eb587e39dee1657a534511033d0d92842911334ad9005abe55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gd/firefox-64.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "5406d839461cefa0741a89b4b5bf95b6bb09c4096694db7a58540a31ceb0ae63c83d9d23f983056ad7515d17d152777b0851f21149454f5ce67ffd4951e07070"; + sha512 = "22ba14425e3a08660562e03a89a4f7edc7e8759378f549b284bc69275f0660fc52ed87f6ca028ed361b619d33446fa7c397843095d4ca4eebdfc4edadef4651e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gl/firefox-64.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "f1a383801edd077b57bffcc3ed2ac2f2616be9cbb56d21b842490c40f9aa59796e6301b0b1c51ed4178a9ddb21ecd5daa4ef9155b633d0d1886373519222ce91"; + sha512 = "d36f2bf1b3be13d64dfc36f853d67defc8a6d08d93afe41beb7f8b63854baff198fdfee13c65a4e6f9e907f91753844dd41a5503313a1e8c364c8dc3f2de97d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gn/firefox-64.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "37c4eef718dd9e76e87d4ac08f86cffb843aa0a90894e3da46bfaf2b6e89282fa7aedeaec061439f5e61ec57d299966df3185cd266fa1451b57f53788817c1b3"; + sha512 = "cef46c079c13fa606a4c5b072ae14f6ab2b578c8b6a43532b38b65547b4fd0618237e84a89d4fe3ea8bfefd8a28984af783b9beaa7478cd42b5cc42784c2f70a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/gu-IN/firefox-64.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "8a6fc54b0a203b5b03c3cbcbed26f5908af361958cbfe0b2ecdccaa28f7db7b5488b3f9aa47b94da19be0f41bc2ddbef782bfeb6c3a3516f9c41090e45dcad0d"; + sha512 = "2bbc4c4af3f927b51c57afdb780bb1ab55357f40f7934b43468933db4ffda115b19fc95a95bbb292ac68c083b6c7ea0ea2feb3a072779fd5416bb41f7938b89a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/he/firefox-64.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "00553c2131873c7c0353129e402193b8c285738d2553067233e8919eb617f6cea5344b2b1076629d33b036cff9bda4cb923a89e6a1a38841ea42c5bd3ac7a5a1"; + sha512 = "897577cf30f2b6c31f779ffeb74b221513fcea262af77e2ff8beecc53e5c1140b478b530ca1c2b88f98f5b3070509c6e06a7cdf9a1b512c455e2676cd4345c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hi-IN/firefox-64.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6ddab934e6e6157955d9e2eb8209e2107c6e451f3731ef141eb07757fc60e59b76251a61d8d6b3b918f300588add2413d119005a16d420cb879f279a134c11dd"; + sha512 = "998cd2d0b00d372023c223541c4980ce22cff87724c57135de801aa89841db3f348f183e69d6743d3aa19a0ca0e3676a6443ec8263d7a00806f537895256623b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hr/firefox-64.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "94d13d40681176087279bbf0e2cf21d4cd1ae442270317174519375b9bf9f9731e98ead581e17a734bf992ce3f71183232b8af3156aea0abf8e07845de56d8bf"; + sha512 = "18c4a3483b1561a71dee3408ad8a26a4f16207216af25b48abc892bd5298f8cc43b03005e4f06543985c5ff3fb3b3811176cbfe349ba59b5578675ee1c7ed698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hsb/firefox-64.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "26cd09691d013306507e4f6166fdeea9f2978cfd12bd9fa40f5a5dfb8b09e6444ea5cd062c09271effed3c3319b197c71cc055fdc8b8fe556de195b0cec0e7ad"; + sha512 = "ef1c6a4eb5afdaeb06a6bf98ff411a3b92f86fd0143df3a8473a71a434734c688c1145f150da1db6f9d2ec943f2f6cc906de43a68853a6b0dcdd126638855946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hu/firefox-64.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "05a3189384bd7a83b736b826a21241434d88e1e67699c9b3add789a3ae2ccbc715cdf4addfab32fba0c844c238d15f72cb8545a5ab0507054f69e5f8701ff98b"; + sha512 = "8b8bf3d8d763135e766360847163541897c44d0039b7929b24bc4c4c70187866ab2a91dcc37e1755048611f15c957bc9801734b289dc0de98aaa712f9efb1170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/hy-AM/firefox-64.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9bea0ec38b5a0178c573edb5ccb5d23290b6a04a79d182473dbf60bfa4c98ecf6cf097cb00488462b329bd828df15ad40a2029cd4d81850c0ed30124cd0ac192"; + sha512 = "91691bdff5334bf1bf51fca19bf558045b6fda537f4d4094a572c015b486def65591ce2bd6f988a3b5daca357482df3a0ba90cacd3454886d4f747d4b8fc8e8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ia/firefox-64.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4603670c8aa74cc722840b6329cd111f954e926359a6e9f483b8a40d73767a9d24760d2bf517e02bb180c462440b8fd871a46e15333f29103ecaf62aa28f3004"; + sha512 = "a8b41cfb69f44bcf37c3ea84710a4df5cf183804afc8882e3929ebcd50de23d212f53051716445c42d9eb78d13930cbfdbc46cb1c1b9df20c57815a0433b38b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/id/firefox-64.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "edecd1dd815b93cefbf433c369f4cc02fb2c3c11993c8f66d155acbe90a7068e9208e46dee2324b5ce223b5c2e7593a13a773ab3ba3cffc89ccb312d15ddee5a"; + sha512 = "a93348f890565262294d0e45c8189b80075519bc631184de4eb5258945fe5542a9412dfc2a1eb4eef97802efce995ed53a3c3b13c5d0784e74ebe5a4aa040695"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/is/firefox-64.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d528fefe33aa41d36339441ff036d86dfb19405881011aa51731149414797c8206a112f824fe3f7a0578955e8a4d462d9c9e79f08dd478170fa3f5029cf12dda"; + sha512 = "6d9a6561f898689e20105da5ddbc4740e6af53d7f0b3df9c7a91fae241c56e3babdf6c82733249ba4433ede312792643d9da5e291b8c9fb884f3178a2670ffb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/it/firefox-64.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a2226c02ee56897a5fb47222f03c7f72f6606321b7b82909eea206c37c9842931ecfd203088416bcf0e2b0d2bac7dae5fce2179408225f6ecd9d213635a5f0c6"; + sha512 = "b1c404d585c245d0df17531587bccdecc8e6d548de149bfc9755539e66a8d74769e12b2af95ccbc0ac062923ee6abb259e9bac5a556c40341e2c64dcb710228d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ja/firefox-64.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "3c22833f791b47422fbf6fe937ab4c557b60e1101582b05fd469a350b81cba9f56c0f88a4dc7aebd4a13aeadddcf7f69b001cd8c0c3c9845b2e9207ae118709f"; + sha512 = "4fc1d401c0ac6e991d038107b73693407f91106ac79cf67926144efbd3921aceba2eaedbf5f7aea395cdefd46c8c275fde651d1f84ef2fec607d23823a1bb271"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ka/firefox-64.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "fb6c44387c76cca30dc03c07a50612287cd24f812b8b864998323d8751e65c7db3bcb409c3b399b742980f0dc86311e4b7df88854e471dbda69120b582d60c95"; + sha512 = "ae14719f16db6c8f247e47cb56ece7a099321566c192b1481f5ed24256bbb2e04c6e944e9754dc9251cc70e41766d88bb25d61ea484afa1dac8992ecfc766d6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kab/firefox-64.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "c8b0ff8ab93496627b2b6ea284699fd436d6afdd26d136e7ec9ad8c5e456d87aea78754ed767b07999e54829668cc47da43319ee37e36366944176dcb5ca8ea4"; + sha512 = "78c533f5b0ee07b3e984367bb0703ecbdef5218e697ef8a1f03c37e30dd54ed4222479b450e760f0cf079da76cbe58d4784b5dd057e035d29bd56b554d442992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kk/firefox-64.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ce93679ce4886662481f556fa438bb4ae988f4c2179686753be2ed1c176a7066414d3cf034093ce5ba46ba2f2ec68a9ef7e5cdf585c4dcb40ec89a48cdce7b57"; + sha512 = "b59c5d709944696aee587cd72ea4b38c79ad45ff89e0c0e0fbaa305adc5a47ef4a9556696ff74e833ec73d74b184efd775f21306af5313df3c0473b9a196f6a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/km/firefox-64.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "4dc669e5795a9a426690397773b5146c9424fabfaaff9bc3bcb880c9e862c3eca7856ad7e6d642975cac476fb7645b4613df6a7a5b1431e669c89cc78a05a791"; + sha512 = "238ef7dadf712f13037f478427fee757a28ab0b3d570d936f416a49b192ec8620275e5a5a5254e8330dea242de6e6ed2e13044f098a03d64706f4600db4a695b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/kn/firefox-64.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "f65033d3050e27b62db028f95476f8637d8c7ed7437c2da1bb383e32dffd2c4be9bd82e76a3a26572bcedc6379fb4a3c3bb2b977ca690142f7046ca7e95f906f"; + sha512 = "3a965a435fd652cfb73b7b002561b2ec8e47159c7a239ffa9b316595907c54ca61fe978f57556f35775aab613f134078865b25546cea251708001f30b1d09bc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ko/firefox-64.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "e0bfa42023ef0562f5b4ca7116687f33f403bd2130e0e3deed402f3dd0772da0f8cc15b2f4dfed43fdb9adc0bafd776f920f4bebd9463dfa0ca477ddf5d0f234"; + sha512 = "5fbb7f5611b2a335c194fa1790eb34cd56c4adfd82f298468853796b485a36c610562b7d883ad953910c80db6d771a21cc1c49c8c723de0f3109be1f0b2c66d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lij/firefox-64.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "36719e381e743eeb034c89cf8361a8bc89c567c726939a6ba0cac29f818e5d0565de1505133ac7a5822859d60a5be53c569bb861b2091c208bfd1602918b5cd2"; + sha512 = "f957ecb83a0e47538264ec4960c120e6e71aa4d83276e6927605f224074825d4aeaa79fd5086a5f2c0d7cfc822eeed35aa177f565868f7e710a5eeea11f3d4d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lt/firefox-64.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "c40c524bab02c3220c703d3122c37f2748253b059d55427ff88a3a0548efe91af161efd220bbc20bae343ef577f8c97bc9b6257ca19e895bfe014c6cd0edd1d9"; + sha512 = "2ae0eaf4ef059bda2ecee65327410aa1f0ddd1a825879ca34821c4738fb53b2a9cdccd619aa66ba535965ac10315deadebd8d70f08026138f367751179b328d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/lv/firefox-64.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "da660dd435b4b821d3468d6bea3e0d514864e131e91dd5f7fe4a5723e2520c4014dbd52fe5d5f160cdebea2a5f4c6e3c99704fed7b606b929dbb5a6ebaecaa25"; + sha512 = "ba0e7d68728ba12b435e87cf55b1435dee7a61df4ad114f1b609dfa7aa38b506725c8c492bb1e6b48069102bfc2a6211d996c76c122a7b90f58f67a738c66633"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mai/firefox-64.0b14.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "f03ecb9a811ba3027d15d849de620668946d7309bbc5ea61df26688afb0a93319c03fc0b04eb91ba97536731f000c40ca2eb5e8aeca95acaee09749e8d61c51b"; + sha512 = "9ddd2dd8b0d0b109bdd0d552e613a74b1e1716b8ce74951b66c74968c23a679679562f4f06fae90efeb36ac7066b1da7cec2f9937f4bba476b80d412ecf91b3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mk/firefox-64.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f5addba550f781ed310b87ba8cba6ee2528f655f0c688ebb471e0a5cfa7341670d85df0c0e2885ac0c8d9d71b4ff21ae01cbd36db9c3538199e73a0cc3e697ff"; + sha512 = "0b1d34e3f27d79f3d46db0698f025d0da5e6f961ab1933b211ba8e468df766339a47d9d8e4a6c643896987078fac5c6b3aad5a605db4c7faea2b3da1c0a84232"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ml/firefox-64.0b14.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "6114ef12f355d862b9f8530ee2b49d266ab07801be3d09846ab6c412465ad11d767490a867d8ce4ca66ff36f94d580375dd5b69ccfda6f68bb60dd85ce1986dd"; + sha512 = "afa01233b121d94b3695c1fef488a70e55216ebb4c69238905bdf20d5fe594f98cf1a331afaac56514c1a75631fb75781aaece1a77570db9c384b8bcf7a08710"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/mr/firefox-64.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "05d320b82a4eab53752d63b461d324882e392b8f2a95c2ef64e149b3ecc03f1f6e7b151f96ec2105f92c45fc92e7f329d5a750ce35f71c5660c78c21a9c03f47"; + sha512 = "faa143b4a04f0c86d6281ca6ef7fffc99fa468c4a6e14ee39d552fca910c0133682d5ef79a13e82aa2829d5f1cb17afec16582618631c0ec57656d330e2a5596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ms/firefox-64.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "ec6d0251fdc0732f75911694eaafff1b57bd986caf83513b0dda9adc4409d583d2053a99d655daffb3ee8eed1cb6080c743d1ddabe49c133ed55f1a6c9ea58cf"; + sha512 = "0be2311c606cc2031d63d2eacff2d6a30022e1d65206091dde08f4adcc7fd51cd8d82c2a532db3debe32aa0fcf8355d6ec8b16822b286b3fb81faff44a98d452"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/my/firefox-64.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "e37d41dafc186fe94856542b6640364f48af9e22f04b21d81e0b36013a879049ddf69e3e43e31b7a44661c56afe5306ee93b215d9c93357bb4c13c86852d583e"; + sha512 = "079fb4cc46e0e89f4b5cf645617f5ca1a6b6f8b5d6dfab305de07870593181cae996472dde9c92be66cd6be06f74ce1f1d2ce8e57cec2ea331de608e83ba33a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nb-NO/firefox-64.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "67c12df46d949b16a496267feba440960fa02305afe3b2b147c8715adec432b9e75c5b93df7e3605c1f9b5f0c24cd6f863445874f7d269a1cb20bfcf12028ee2"; + sha512 = "f76089d3bf28e96b0c99eec8533119d43beffe697f85c8ce0d70779390ac24ffe1b5d190f58bfc6dcf7cda268e5c4feec825cdab8c72cdd1d8b93853eba23d89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ne-NP/firefox-64.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c0d76f22b1aaeac6055a9b8954c6ac77b106b7086a67f763f95e036e973b4d2754d78fc1d4d0fbbb9659d881cce0c04d8de5e529c62d5c0b128f2aa696fed791"; + sha512 = "3ea45dd8243eac66b08e892d2cccafa4e1e6b39f7cb11c04a2af6c77b150d0e0315d16dcc298376208df1526953e1490efae31460ca8a2f77edaef45b12a0dc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nl/firefox-64.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "09d303724b5adc4a7cd1760dbaafc55f32d81ad31ac1e9b91ec4818ff7199a3204f7962fa09c6d4350773610f06d337e201646c04847030592ffd9be2a55e265"; + sha512 = "cb6c6b3539bcb8e78d2e9d6ced29513c7394c7dc9b66481cde01d54afacdf16f035b5eed3a247cd70104561a429f6dd76925b4a84ed74b8e23e27393631d2629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/nn-NO/firefox-64.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "97126166aba2ec50a12f9e9f5383d8f72a90005ec038bc77150252cb8899bee0976e26f8b7a12d38d5a51518b7dd274880a39e8e98a054765bda98f33acb1096"; + sha512 = "a8fdeab729b27235f11327e217c77568502805961b7999c239f93fa721557cdb61e5a97cd38b2d397cc248c8b93b6aa1fc547a86dba5bc7ed096391e0482ad8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/oc/firefox-64.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "042d63d26a19a6f0796aaf1c16ea14c65d75a99175def2f3fb89b659c358b1dee1250d1495a85d0a0b41d5fd6040e995a55bdc32d0abeeecabb6dc18a16127c8"; + sha512 = "e1c6951b62508bc9533b485785edaa23dfd5c2dbeba6847ae12b7fab91a46ee49ad348a6aa6a79923f6689c149c203284ee210a97fdbac4c8aed4bf55c932140"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/or/firefox-64.0b14.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "029e8313015d35833dcbb7c79937fedde78596fa8257e7bf411bc104692a3b659849cb974810d27d3abd88d674d3cde978bfddeca9cabc567f4a91207afa760b"; + sha512 = "9bc58b76ff74e3e05ea9fd525670fb3126cd01d84217b2eccfde2c5e6f8e079c9466a1dc121ec39b4b849361b033d122c78ca7babae6ec968b939c2eab0ddbc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pa-IN/firefox-64.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "c805bca742259579fab0c04b3d692d809723acbaab83c092668212ef584254157ec9522ead6891fd2b69687c7ac95c39374194160e81a11872e3f76acb65b5b0"; + sha512 = "7a4d6b8937d266463b81694e7e68c332fe443649c8c11ca24d329d95d1dc5b0c3bf4af1f430a953a274ba1e5b008096d7462e502949f8dd2238b3b2a0ec70a38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pl/firefox-64.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "91bbb80fcb8f5b7537bc9353db38f54521948a13da4829e973837be29f0710db5f31a55fa075c58f7938ca0f78402e77eed67a96314b5ebb3e5d54a697ef2067"; + sha512 = "3e20e6322afd239402bc8ed9adc9301f24d9fe58ddc7d5ce98c4a8909af4c0fd5d3af6de9d5a66006a75aff80e1107d016efdfd0a9765dbb32cb2a9dfaa5e8a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-BR/firefox-64.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fb14e2c177b7bba82e2fa5f9aa3039a60b8342c9ea2f74f24af5698b5a1d95c31342d8f3911d89995e9c606ebd4335e36736c470b4563c9c089ea38ef1636db4"; + sha512 = "5c437f8473a6cd0f195c2c6bf9061fd1805b26f2f41af69b3bf3a49de3c78e4927966ae3a319dff2508b97681c388a44f2d7e07fca316debed978db678c79ccc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/pt-PT/firefox-64.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "582e2e7c1f85cc827405f1207da4bb000b239d278a33c397af3f4fe5a17dc0d4201ebfb98738b1802aa8c02b6f44b2e6ddd82ca9ab5fe3c08eee99759ee8eae1"; + sha512 = "fded195a4bec193e7cd0ddb3b75c40cad78bb518b87349d59f8efe548e1b22118bda1a078e2501a06996c981f2576604369d08a1a6457055670a7d3b44e97db0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/rm/firefox-64.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "8f4452458e39b8f9415541130b8e0ea739f7f60c4c6781d98b3ff2f937563ffb0511428990dcc1db2e70832c54b35394e4380bf8b13e5a4c653a920c46cc4e35"; + sha512 = "694e50bd6007cb7a7f857e146e266217e94dc447f1ec72ff279e045f7133621dce77a67bbe126d805842bdf47021e43c1e3faa26af930690b7e2309e6449e758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ro/firefox-64.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "db746c0350ddd99c2c30094cb76675a06e648958144b08d31002fd9204541b6522ac06b6954410277c4191d06ea4f8595c8e33b151b25de52f805c16c12c5365"; + sha512 = "23f4cb17987f66b0bcbd07bb75896c3bf29ace882294b30ad8b6ef61548ea271ed55f005c6ead3d6836e3ce4024d4f77ab1de0627afefcababef0bee94bd7fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ru/firefox-64.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "772cba5c3beb070a579e765216693bf193eca4ed66a9ae6eabd452f6e8b3b3254a12642111bc2eacb7b65b15df81b61584e3c91220d35000d1c1985ce5e147b5"; + sha512 = "36b68d824ac8fc64a207ac13801612dab3bd3e2efc364c6dc54381e359edd8e022c79e1b96cbe49937ed71cdf7beccf106942cf55ba311a943be9220914c2a41"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/si/firefox-64.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "31514d4c77608e88d1ce0a0505d8cf9774c834724a14feb17377c50c0eb517d4cadf101c25f1ed2a9edeac620d5fb6de1717b37e35322202eb3af2aa37c4672d"; + sha512 = "e1f486def762c77868c6e2bfe38a3e83919f4a59e0b198f4d8ea04baaedfcfd8e3e87a70c593fd4cec587f15f57379a6ebf99fb80458a7e857c5ad19a58d5f8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sk/firefox-64.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "34c7f9dcb8de54621707f0da0b4e1e3d4fab2792d971fdde4b67e13ad05e458d5aa91249a58c87ae9d9772f8c83d9ebc8a6faa2cb94554c48ab8f4daeef222bc"; + sha512 = "a8cd34e876cfb491259a7ca1419a51a7ff2929defc94d16d6d582c3938be83fa30b46ec482bdea6e4589143cd7889da3b85550c2872e5fa0ce09f909ae8c62d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sl/firefox-64.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e8c4edeccd8fd9aa61e148b430d882aa30d560995b65500e03e5be64fa24f008fb8a0b65c271161326127f1ce748da155cba54a507692877ec4035036c183fe3"; + sha512 = "558d671ab59316383760919ab673475e578e8a8a3ae0bc4c37282b3064371b8a048f5c631e64589f24f360eeca49a6a326274b45f55947ae2972e01f330efc30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/son/firefox-64.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2f9ec511eaf8ab90de5ab2e945f0dc798c51297b9f8fd766c73860e74d7d18f1e6d6cefb2e01e060bbc103c59adb38c6af8d0ab34806fc5ceafd5907c09af322"; + sha512 = "8983fcf775fb1d7c975a56eccc7f821c0c9e2f4d689c601b21a748e898baaeeb46166561e368676d966f9bf8d78d89a896040ed0d5914248fdfafd1c64bc09de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sq/firefox-64.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4b967cb914f450bd48349100e925248d39b7fc9f86b6ba339805e1707cee0d5b181ddfd40089f6ef64a8e3619bd47605b07b96178037bd12f0f43e447f979df4"; + sha512 = "db12d81b9ec8f7f412496d1995acf28295d8d49069d2a7f982fc6a82de39550d9cdaaa005431a8ca5608df2c530d6596341567793435a0efb5854038b0532d93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sr/firefox-64.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "0aa75350e7b7356e0bfbf70547cb177175bdded6f56d8eb1313474f8e2888f5c16b29fcd74ccd03f14158f21f1f9d1acf48df4b9a206bba1ed511a0a872cfb05"; + sha512 = "c6e2b768d08623232740fe8bfc77a2bba47e415450020e0367be83629308aeb85fe9235b5e32716721b91153ba527d03d3592df9da91d6b386ff808758631244"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/sv-SE/firefox-64.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "d1d6105972409f9dd3cc1ee126c592684dac0eaffe5ce15f34252608dd940aee37734717d25801df2c9b8c9fc979075619349c3399a5cf96618f6144928a154d"; + sha512 = "202d503eeefc8e8026607fd2079c7231c4a7eaf097acac6bc1066262f05557c002a2e0da191e6bd92832baed6ae1095e04407395e9dcbb7c7b51fd204680d653"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ta/firefox-64.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8e8487396ebd36ac42cf773544869379bf510eff530f893737cbffe248eebf132d7782904ec7ac02a1b65379c14f886d953a031f6f6e1b0728e4c5e37cdd9e84"; + sha512 = "bc6d40ec162b760b527795aa3ed79937abecdae0cb9489b886c184a3fde732afe2ff743cf56db5d70d2d87fa7038065583811a2e6d7ff7e2de884b7d4adb463e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/te/firefox-64.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "f33333903d4fe5d49ba26b67f06edfcd2faf533b833d68b3488cefefe6045304400f905e7167a153b072f624f8ff36cf4627a4fd8e76a5cebe6772f819081d1d"; + sha512 = "f03e0e987effc10ca3fae20fa0be07ec21a8d3ad0feff77c4d2ff0a44cd048cde44e27f33fafc28fffe771c3a0582162bf7cb9704099ff3738922210e6066ade"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/th/firefox-64.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ab05599f0426eea4a86c8998f884073a835d81a85c4cb68847714c463ea5dfe68942e4a4086cdbc1140d02b3f3801784bce05f319721df1c79079e85eb7ab4e4"; + sha512 = "8fe21c9e494dc1f5ae38ca950b178d005a8adbb0fce84b80d0d427d544513b15bc41cd901fd7cdbfd816a3b716c261d81f034516bb354402ab8fe03adc963aff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/tr/firefox-64.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "27adf56f2306125bf5d1fee5759066668f87766dbab9c64cf882427aeae2d7294aa42f72c456177f4c5fc5fdcce8854ea386d60014bf2e32c65a84150672318e"; + sha512 = "3d1bf804ac3bd65d8ab36817a03e0d51f6a439e7ec37e18a6e4bbb8f690b44c3c3c6acc88d0a2bfea5586ccf78bbec89811d7d38bed381b272546b12f2442838"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uk/firefox-64.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "b224cc1c6edcf61ba52e3ee3cc87b8a069e7a2761ae0f0157b97db7db0486114ddf994f55e6548da81ff35533f66fd91ef117d1f2edd8460190274966178f886"; + sha512 = "b0c14a7e9ab36a5428e842370ce04c3856c7845924e42e604bba4d426b5b8ec2bbbd8ccb88f96030cd1971eafa1c40666f424122250d05f88026f2336b8f8f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/ur/firefox-64.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "86df507c3ff62a3912c037ffc45729cf7836e6735e30568f55f0f7d00c1c1a0cdfd41536705a74bfd8cd06c9cf9f3d2fbd8cc2019f0204d1f7e04015392d4016"; + sha512 = "cc7a5cc3ad79dd76a50a5373dad37209f8c574bd459eadbafadb327037c6335e1b6bf28fb9aed93d29a76a00f12e5d22747c45091eca5a9ebd451c8d24d6c16a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/uz/firefox-64.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "d8a1195868fe5ad8c73304b92b854ead1dd51621a618abb4c42391fd4ae0cf7205d5caa490279e7dd86f5c2f8802eefd79aa2373b47fd16ed06f797bb8e4fda4"; + sha512 = "9f263397c4bd072935d4d484d238082f3779cc83a59bd01d2810c635d994749ff55722dafa718286456af2fd2b4b1f02622c9ded919b850aa6c6bf46913371cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/vi/firefox-64.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "c5e4f110d96386edc7cdc2252c10f3f24826763fae7a35d0ff0d803033c7e2384ed6fd3b1c3dab722c22927f1869e7fb87d82cd60abe920a1e9212a43a64f2ae"; + sha512 = "149422236d100f5ffe064070047cfb4a6716630d75d72d31a420970002194ba883581b9793d5b16699d0e2dee1105ea849d76f0dce5b086ac606068feeaed0a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/xh/firefox-64.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "908741b67bfef70bcaec20b76cb393e8497ecd6bb82f8302919df99cadc189fb665bff31388f81aa876927161dc753c63abfb63613e79a10065913e6762f3e97"; + sha512 = "cb96bf8137975343245e00662590b558d66f01aad33522932c18306ef339ddd4dc2334be9a57f14331fe6dadb9a5ae06473ac3875f515163bead1b69bd03b6ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-CN/firefox-64.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "7ce0fb5fd6622c1a03ae2faf3f84fd56abc65beda43cef0d8d5d4889cda831ec3dd54566f383705625637b7d93b1684b6e6b6fbf345467fa44e3d690d118299d"; + sha512 = "33e4c94fefb32dde1b80740bb7304a4da916964466f23de19a32f447be02300f9c97b6dd5709bc469773bc7680c3a8e88f39553ccef838b439b6e5b25850e0d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-x86_64/zh-TW/firefox-64.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "3308bd7a442a84392bad111c3c8903b110b901075991774a9593d5a6a37e4fd805406e27a3bd5e39686fe348bd079a17aa063894f55912033ed75bdd64316ab8"; + sha512 = "6d8deca1cc1f542d5de5137bcd6c10f7d1e70adfc67be286744224bcce3f0c1f76a9e6310c94c23842d952568293746888945c0fa89552b0550a3527b1d4067c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ach/firefox-64.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "18ac2cd8ca4c630aa80fa3b4c473fd2c7d20e9002cb40bdabc29a73fce7e5da6c4b5c5c3912efa067780b46e264a23aa39da466296741a942c1cc74fc3758fe9"; + sha512 = "217d749356819fb06ca2208af220e176b0cd9552e9c3b540939df7f39e429121e4b3f48617fda16b9ddd4f8bfd48d88f215fc9556ed95d5191bed0b681d1cf23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/af/firefox-64.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "2befe913a134bad225ab7dad76cc6202ee8184b271434636176ab3ed057db17481ed7ac925e48aa24509ae57e7fcdd176c187d55e4949ab5bd038e502f32e9ab"; + sha512 = "a2032bf0c3eed7d6525a0e3b3cda01797334b345732f69c4689a3e39261a53c83512d822fd55086e6df88f216e158603842f6cd7225485a993d8645d780bf10a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/an/firefox-64.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "31af4d6a84c601fbf31f0e52d9eb7f68ab666de129f3a8c1b2d3a54e7061b159cdae09e6da54942fcded87abd2f5c41ea003563d0d657761cb9078446e138c36"; + sha512 = "c25b2d0ced9bb95453581027f478d928ec343561a4c16f49d0f95e8e3194034c4e220f4c418f23f1e107e3f271314753b92d133073310c5c95586aec61c81850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ar/firefox-64.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "3a62ec619dd5a8e041a443665188edeade532a2ecb0b5d78cfead8c4a0a4609de241701cea184453fdb58d295a0460b55009e94b6e01eb0f4d538da15bde8ba5"; + sha512 = "955146bea4ecde03b4b27290c54f5a633de09ec882bb2a2ffd8fb675a31b51b5a448be66d170f4f3795896f1eb3ec9e54ebdf6f5872aec7170f57c4210b58871"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/as/firefox-64.0b14.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "801beb19f6df2528996bd399607ae86ea3b31e8b11584d33cc7437857b5f77caa442c4ef26834839d4b99a0ee2b7ad1f33d43561f71879cf501823e5f0f6a9fa"; + sha512 = "85b77a481fc7a82bb1b192176928e4095db19e03c19bbe64da4e07f1498620a6e31db44074b39dfa4f77641f7a74fa98669421f82c2c6bec053878c17c8390f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ast/firefox-64.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "29f3dd7b31f647e9b4ea4ca32b8c2a263816f929675e71ff995c8fb979fd079b5b42e71bebfc66e6470e0f5d029b90aee0c78c7a86d8825f411330624acf87b5"; + sha512 = "48f56f503a0b036c4575a166a4c181d61d70d88ba6c2bfd984b0f5e392df175bf95d9eac93fde657ef1157a0ae0e727dfefc446a38a577a395c7a685e1aa09b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/az/firefox-64.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "97228f40fb86942a9870ff1c705dd70921f847a9b72db2f8c44738221dda1cade35d5fadc5f826169eba35c062e78dd7fe1aef02c9ae620c60a1366f6948b990"; + sha512 = "07bce90b9ae3bbb45a93aff4cf9b645d4a700eec311463aa84cb0b08cffd2ae7b293f94b57c8f098ace91a5a949b1fabdd048d68829db16ea69f6e23b027eeed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/be/firefox-64.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "84ce6814ed7286bc616d6a225f3818584dd6a021c741bf3ee93b319b1367389ff893ebfb9f19d06c59131403fc6ce33e546257f0023ae3265189d984b5774c17"; + sha512 = "800de070b9e722ba07831d86aab41c9fb3ed9377e796770887b71cdfb9eda9165ac752525bfdc5b7af28cd6b316863268820773741662dbc6287e5a3727e2407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bg/firefox-64.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "fd075c08eccf7847a1d9b00a3d721e13a75b5387c5be8582a222c72bc7eeafe3b5972534c0ce15f14f5fd5158dcb7c22835b310d8ba64a69954ecba64dca3802"; + sha512 = "804b72fa923fcdb6dbd5c4ce819557d71469ee797bef48fb6d51df150fe79b6d4f20612b7c2d69277facbb4164592028cbd514fa9e63ba00bbf4be4a3fe733a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-BD/firefox-64.0b14.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "fcdb381d2b6d175f250144db7a13a682bf3589825a5157693f929801414b6e0e932d94caff9492e34da029b8589703913ae3a6e65175d5e1f0bab143663c72ae"; + sha512 = "8ad135f5b98d792b7250c2dbb9d8616a3e2454f6cffa5850ba8ab7f8b1f1d2041fcce39e45333e8e6d08371da39dde3a8221cad6217e3264e1d32bdb7a7ce73f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bn-IN/firefox-64.0b14.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "c7379dd8549a83ff3cf67c2493ee7386aa90858f2169ce58727c6276ea113e7df9c9cc499bdb56b381e193f8fadbd23eb35f786153db0ff89f9bbf8f4408fe29"; + sha512 = "c9cf90d40dc319df43f681bd7583681548924aa04e963c1c4d6f6128db7c9402810d3747e223ec4f6e3589e2ea6cb913329b238d15d4d9771b8efec6635cefc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/br/firefox-64.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "66a04d15ef3a77fabe4ba0e51c601315057377517b1428dace9036f0f7e4691bdf7e9ff7784065bcd6f5508bccc03eaa9181069f5b8f726e3d4937d1812d3eb0"; + sha512 = "9ad73b35d93aa81732f35478da526be05e6c9f66773010b718f88cfa80817f0f3ff8d537a864a9c01cb197c2c780d604d82458ed982e1089febd85042a11ebc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/bs/firefox-64.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "d7f0d44131ef2dba579067ead466b43b50ec3ed627c4d6fcadca1d9de93f754ee1bfc838bc7eaec90b2e4a9d08a4a057257e676e9de3699b4b6b8999b1fa375c"; + sha512 = "10cb7314d0a56fc4c2b0bc7197c71c99f1693adabea53da6a1d1bc7abd17ab6d91a983030017a8cc09c759eb5d678efa4ca0dc8388b2c4c8e84ea52a0b849c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ca/firefox-64.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "43e52f7581535f86df2730e1aa4c3489a0842addf1c40c8f168913c1f5e6fae7713d24aea0a1d8dc7aa5afa7eeb9e5ae8701744861d715ad002ffc76c26c07df"; + sha512 = "efcd45c51970dc198e1019410601b8788f0071f0b98d5d341fd6e9bf2733c2ddd84e9f29cb3d3239acc691e0f7d549f0714ab9fcf4dbba8d0f5a288075d65bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cak/firefox-64.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "efa9b4744c1a3507e528d8a960d807df7c14b7cf7ed79e6d237897d7bb2d72305c0f147bdb5690468ff7ddda1cf56ee25d0aaf07b5cc7432e0e6d079f18e164b"; + sha512 = "d33062aab7ecd8975539c1188c796f23ff045a27e3f357ccd747dfc6bbec50e79bc94f5c9bd2660e86d083259f69268397b405262e106b16956f9eedd73db106"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cs/firefox-64.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "0539e29a711894942d2732e5ec667101ac66f4a847cbcdd0155de776614882a0e41ac94df73ee8b85bc9b57dc6aa98650537d57115fbce7f95ebd4a6965e990c"; + sha512 = "e3e5ebeba62b199c667b99abc3c06073603addd7ab76e0dbe1822d8b9c55aae69bf1f6dd6971190b52073cfbbaf66bcf01dfe5b9dcd13feaf96e5d0681aa240c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/cy/firefox-64.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "72b69630ff274ede07fe09ea6bf09b85fbb5cc93dc3dcaa891cf9436d665f98634036397a67f7448aedfa1053018536e706c74ccdd35c523fbac8d47c16edfcf"; + sha512 = "b1f9d3b0e9c004d8612fb3c852151c3384631f439432a766c01c1ea595095b154429ee6bb7881d3fdad0faf99674d81127be57ebb17bae1922b2d4de9f0dc699"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/da/firefox-64.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "e70f4d9dbf404638a83e1e07aa5fd815b54577291bee161093cff772c6227e54afa76e031711aa1c36dd7b13052c976d3ee69785c84084d00e2f9f9558b3199b"; + sha512 = "8f56d6653eb56d3f32f74c04d58014126899d3a5349f7a6c56d015aab71cac523f4f3261fc21ae0a7645a99a83e9b55198391d2606c7b8a70e2b0d3fe58d1e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/de/firefox-64.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "9ea87bad16b995f3e262df85d5fa321cf5f00484eea66dd92e77b79c6872ed2d496fca277be5afb937e35f98d72e71452f43cd7c27f28b27fe427b48ba014cc4"; + sha512 = "c0b472e2080a24c5c35efff86adbb91dc5bdc89fc2c93804ec9ba35846d3d18d85022c7c2a0a0e405a14561fb635063149a4195928d1486ed8880a29c05e9904"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/dsb/firefox-64.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "e30ab23fcd411ebeb62a86de32055d24ff683a3c5f4977ae4d23e312ab9a2f1b7f339e0f23732688674dbacb49c498f6a75352a4bed74ce677c55c1e495ed0d5"; + sha512 = "fe5a95eb0c311c3131126ee92c4fc8f4e547b87871b6cf736c986a366bca60a85e5b6f593931725761417fa13d9edc275430ae1e73add67eee23fe0ff2750933"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/el/firefox-64.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "a06fcc2bc07fb904a4a18e393001b0f204fc1a6a254def69eedd96b68ddab0f2a51863c78468e69dc534ac4948620ea8d643d14b2ca88ad68f0f367113a5b447"; + sha512 = "c2d34ca92cd36fe745ca66d803569a26752e4f834dea0d07b0fea24365286a2f215c25fff6833be4f0fbe6fd89313693080fece2a1490d99b08ac85f76407e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-CA/firefox-64.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "e1b1abd09668bd0865b5c802f748867a8fb26e0789710a636167731b97fcdc9b5490ceff11ce1968672abbfe315da473f7bea187799fb6c4e627d4a39fd1b7e4"; + sha512 = "85b3d450ba292c2cc669af1d9f27821b96f0d13ad9d59fec2bd685bfc5bbf02489970337b51653108f64aa164182fdc670624a36eb07e55e8a7eafa6f16e1071"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-GB/firefox-64.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b5dbc47b11fe634a5a53610fa0d45b975bcf3f7fcf8d7d7a739a1fb432647ee3da7b3b2d31c6eb1129e95ba6f5c7a42043c269405002b8507a8ff21743224db4"; + sha512 = "bcd36733e157ae4e5c8580fd9deeb4e5d37084db4e7a4539ff2cdc7532bce95dfd26b4810c098d22ba89ae107f62272625a9702399ac2678c461efd7825142ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-US/firefox-64.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "df29871a2b3d44680781c8fd1436f92fe983e57d63c3952aa2ef67946165ae2ec55862c16678fa80e3edffffd604a9aa56c318deb9ab758d5d396802b762ca76"; + sha512 = "5bf5c1cdd79d6bffd7137bc19ed0fd4ed91d4c9263e1d50c128fc06def9021cf9df67fa2f3b591a512189d7a0af98e85078b69382928417dc17881edddb11985"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/en-ZA/firefox-64.0b14.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "a7e97961d8900024fc546329e328cb01187407362186ca7b0285aa45ed8c201ead6bafcd3eb4576f2afdb97ab8204786723823830b3d889a889a377fd89f0e4c"; + sha512 = "b39a6b3b404997a2379cabe03ce8c62ad0ab85dc48bb6ef76541fe3b91b0e51996ef02ec0c84d0f418814bf216344283cdb0a5f5ff7a6b554a69fb36bff02b69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eo/firefox-64.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "4a9b84fdc1962dd7de8878d6fe69f7eb541e61ce19522735f7a9cfaa07682d9ce4e85d7afc21258164b6687b2f99b232a6c8aeb4eb801cd136d49702458fc263"; + sha512 = "50a61fe7e83bd540233773f9ba2684f4a9da9dd5ebd8a34dd05f1f56df7b442494263d83ac8114dfcf0d169548c02dfad9c3df5e05082718eb9ecd645fcd5e2d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-AR/firefox-64.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "0e5d63725b14fa54fdc3303d94e23ad22fa0b705bd76a625652aac62e51038b4e0e24374b619c85d9b22ebede4a21bb42ad8085641dbb2a0bffbe58f62891a86"; + sha512 = "352493a6c32f7108239f56cb6ff49e21d06a2c9dabace1ac11032023822b6b6ef7b38c1d9b1c7cd4832d2b120b60020608b51c286ee8d12757153fcc134aea0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-CL/firefox-64.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7973b9defe83a8af0b34085edb76ca4fbfcf82c22180aacbecede0fc6c19ad78cf45ae85f2621204b95cc5040240a287812001f22d3d3d199abb5759baebf65f"; + sha512 = "093e218a562c96b54eed599dbed1aa41c2c396f5bba58e87888dfffae5a11084eaa6d8fdcb58c8f128346234d1df78241c0f6ae741b93e3f91a4c27481227b8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-ES/firefox-64.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8be4155ee76c366b8505133117dd3fc6c1cd19441d336b2541d9e118adb555d75dc63192f03f24ece93e007239b4a367199af1fd239dffa092637971817b4533"; + sha512 = "60f46eb602026ed148e3b9d7728c9ed750e1e650e7d048b8dd4b4310ea1dcdf5d5b9b497d0a6719cfbbc8e390107d10836919ddd09cf4ee1fa156a841cc17424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/es-MX/firefox-64.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "b24773ebf3a61ccd304936269bf5e0ff84a0e3730d72f30efc068709c5282b3eb5a5405b0e690ad08f113433a32dac45cd0a2867f818225c99d69270e9fd036c"; + sha512 = "05880045040e12908f563fc7b6e0b093ebd0452ad780e166f897a36caf38438d45844d784291720d6cb341adb7c983d2077f9327b433e05f1bb737d200fdad32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/et/firefox-64.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "3767557a7e7e7452ed9703a9916d568a01e6e540b85e698dce5c7c8bdd238f495ce3001f9b81bfa7587f1ea35e4631de238c9153687cc9f745a6676d72e7a6b8"; + sha512 = "4013943318b6d50be6a2f0f77bc5843915ac2d45ebf230fd69d005df4360b3e6e15b99212d32b7f48f250f6294f48604c57b325107b9e39c4934af325c21c4cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/eu/firefox-64.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "55ea423b5127d1217c5b006f9e2f1e4b0cccf133c10be88d8058ce30bac1fe6fca49792924a0a3e0c0b601ac1c9c42d7c7cc0d73eca9624380cd733421572e24"; + sha512 = "05cb185b8de02664e16170686d59fe32c55415002c9c75631ea1d105cbe6e7a2d144aef5d185948a051ef1841f7dddb7ba093d559421a49e0b458659009d1495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fa/firefox-64.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "acc15a2dc4569a3d185a53fa70aa617320ff799a1f2dc9117d6c683385aac4d38232b3a6764cfe7af358095acd2c3392cab841b6c4d9df3e40a591de78b4523a"; + sha512 = "78dff03e7719da65e6b96deb2ef9890bca4d79f8937fd012805876dea8ff3f66d9613bd805587fb5057f0bc2bb310933748484a7bde28ff4d1fc7f8982f20867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ff/firefox-64.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "b4bd8fb4f6124a4d669044be697d54867e172f13f589fb93c3369f57827d1e3ac2c3e82ae943babccde27cac9781b3c7d17b2315f2485b269553aacb293c8b17"; + sha512 = "28b3e96c1ea34f3fe07c60442d3808698f9950ff818fea8a05a4b0298caf8195b602d6860837e91ec0a1129d389184ab0e2b577811b9c4e5d9b0c734c7cbe14e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fi/firefox-64.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b7718b4ffe415b9ad394920dfb1f5fd63369aa77b94eba8d3e30ec15c38cf968869a84628aaebde70b3645fff387476ebb0b3ca1f55d304329b26256f4dea50f"; + sha512 = "98825f294ad8a3c1eb8488e5600c1fa2b6b471b7a305b434775c07b8fd267656c160fa7c8d5f73c847f48714d1d5ebf108fae57e14ecff10ed7cca5cb5825c8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fr/firefox-64.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "2f8b421c7d8ad9d56bf95e433f7062ea8565f08c7eb573c8ffe55615a4de2ee405035c1eada3bb6d0ab104c80869bbddc74a9930d7a890d2942c8b6f792325e6"; + sha512 = "889f5fc32f9e547c602011d9d5d0af411b8ed6e98830293003d28bd397aacbc1f5d61ac30e171b379c311371a6dac1dc9df3ae27c671f303d15cbd52e5363498"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/fy-NL/firefox-64.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "b3afff8338fdc2a93b3c3a848ddcb8ae2daf69954c577014d90bdf59255cec51deded49337ec5f44dab7d727364b4b58a1dc6b42bc50b8105d19123702646abe"; + sha512 = "5d038c764a8eb3f07be729dc1adb5f84dd7a94d8f84521f42ee4192f5f432eb1e181871ef7be3acdbb9f158bb605eb3d99f2f788c876c6441811064672ca82eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ga-IE/firefox-64.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "8a67d8e7fc0b1a5463f460858aae93b3837a8005f80c2bf63bc209e610d153dc4eaa849c1f41394a79334d38d9f028b4e1fc0b91780bab9b7552ea4a32bcbb36"; + sha512 = "01ab65cf6c3976aa305ade2ce5e04f5ff159289d2d808142e8dbbe537659de1d25a4da9cbafc6be839a50a63cffa6e8f3d2fd2d29feac8bfe5173ff42ddc8e9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gd/firefox-64.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "dd5824ab3d5934c3dba7d9ac98e0b9142a13b11f78d6530250fa0556b6e2fa2c4cd8df8519b245c8b2e50e74b67c8e983864aca8510a665b331d352f2ac6e623"; + sha512 = "23f4dca508152ba7fd6b13dc20409d6b14c714fd8860ddeb66ed94b88ccd48f0b64d839a6ce852c974bbd3f142758fed42aaa817abac23bd58854e7f2c07c8bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gl/firefox-64.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "765241eb0ae051adcfa6624c9a68f2546856c981125d6a3dd789b5fc391d55059af5b1e46b196cd7e536aee67878d63ed6a4afb86cdfa1d4d7352e901ba8f63c"; + sha512 = "ec7372f3fdd0e26f93d2251be0ded3b821dcf5927b6fc5a7a4b433d26f6900c775980b379a67a4414ba537443ce93523c2b6dec699401efcae0ab9c5d8e8bf90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gn/firefox-64.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "3b006caecfcafe9bfeafc2012b89326e219bf95a123aaaa4f3daeda2090754d6d33c8c7ff0f975042ac1ccd11737274e1f0582d4183bcb2ddc974355017ae1f4"; + sha512 = "4f3057757e35632ee9b108310df950b0279ca9f47562416e955112f484caf8314a80c8296c39dec71a6d7a10aac13160898b662b2528c08cee8e497803ca5bd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/gu-IN/firefox-64.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fddeadb90c65301992851150e778ac57fa2c2466acd88ca6fbdd13f92c31eade24d4298dd19e75f7a381a435d4af77ab994ab3455f755f95dfc9ce6dcdfb478c"; + sha512 = "4e1cb8376b86e68ebcffc42bf8b30cd78803df0e041371820db59de7eaeff8f982ff1222db88dc6f8c70f0dd2ed3491a9879c10d89ee1e4b98e9a266da538ba1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/he/firefox-64.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "88fbf1913ff9691593802d957b8b4477d66054f5c6e946f1384e7938d4e278c08a10a8b276e414a97fc95884667407528603424ac216242f59d55b3192541060"; + sha512 = "7b617bb361bc9eadb83ee7b86e256dc0168014dc59e425effb9a2bbb765690a7ba0a2e89341f1d80ab86cd167b9a6f983ea963f06002d138dc9789445abcd79d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hi-IN/firefox-64.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c7468faebc10827e741427658b6bad7e362ce3db6870bf262c52e715b0bdd58f797dd4f7d445d4e6f01ded022e0b352de4d0c81393e561247e6e37c972e4b60e"; + sha512 = "b42be8e9b1a9271cd445cb7c939450ac92e7ce298e819d848c19af36c0fb0188aa86ccbd63acdd5499485ff543eee8c125515105f3ac46523112710aefc245b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hr/firefox-64.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "58417ccdb0885b74be71734d4dfaafedb024f15d11533840b0a50222c31f0e3029be6e154ae652f12691e6e05784c7fcf423fd8c89bb2e43db8cfd17791c4f7e"; + sha512 = "51952b6eae0cb140653bac6130ad04f56d9e4325b872f3ae3bbe95fd7f151f58b3c67db294a1fb4919b8b184043c474bffd686208b7095ccfb7fa1574ab769c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hsb/firefox-64.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "b1103601e66b63ba0ab01daae4f97fe8f5e69557f01728d0071802074b8eb2f91afba848139c0f8268bfc7fef627d3ef819b01900d377d7a7f1ae85e7d754bb1"; + sha512 = "a2d414c1a227b5958571857ccd63a1a4c4a9bdb7fe73416c5040af71add3d8241d6edaf4529789961d170803463ac24c10e80da75352f8a1df77a47cf538fa8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hu/firefox-64.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "c1b30805a91e046cb606c5c51551f9b074b01fb03a822386d80c9c2dd5ffa468f755ca57baccb540e17125ae3a1d99e66d7dced48b739fdcc3626043876bb9fd"; + sha512 = "eea04e03d76172c840e1c41bef9a3052337e22e98077db17be869aa7f825acbff5851411ff83d38a16d2d44b445ed0ed708ee967cd1f33d2ebe45b4e50ba71a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/hy-AM/firefox-64.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "af29a30a9ac60fd744971e5a659b1fe9595b40be0f2427660ce9bcf6b504c11449410ed11c33eb750fc2397c1207d0b083cd0e448b0e068ebe9f5484c13415cb"; + sha512 = "de09a05251e51d66aed8855779977c9b1173bd69e43744af6e36c5a24042c063e0d9a46c80080e19c37027df9603767d21fed2da90363d029388f675f06a041b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ia/firefox-64.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "9fd96091f9eda42525842c324a8977ad7d5ad5c50e52503f50719db6e4120ac2054e316b700d3c4578ac2e86b5258e6c54c7ed97504dd481b8fe83595e78257c"; + sha512 = "0dcb346cfd2cbfa7f56e787eec952ed24e4621d0f265324c445423638239d954b60a82f7581f2f0afa913d7932577f16817795235efc9f8aac929e7c289e7ef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/id/firefox-64.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "2ccf109f956c82485b5dc3d93cbf11bbce8b4444c9c3cf823daa5510979c8ff10928d530422fa5e94f82903d464385ad1aeda67ccb675bc0234767d4cc4807e9"; + sha512 = "1ef2790d719d4ffd3bd9a7b8aa5202fdf3e380e7d040503890f74f29eda74405bd19c88e0440db399852330d168323ca94766b0409d33af25f6d42018531e072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/is/firefox-64.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "2bf59ce3fc5cff4b4e8d20d8f7ae83f4f12b1fffe891a737a21c1cb705e4b29d6cfde667716b10d665f7cfe04c2dc579977098edce6a2f321ff1c083bf94148e"; + sha512 = "0e32f06993b335588ed8a27869b6b12daeaf79c2606d329ad8df94fa54abe425c694d7c7c48168123bf1bd561648654a26b8c308e50e882de328ba281d764acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/it/firefox-64.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "52ee298ac6fd29ee68b0aa809253b7f35a583b305ba0effd03e4eb0e8087aff9614ccaf050b664bb0c136c196b7373b8f9507317c70df412bf9324bfd3845e1d"; + sha512 = "632a2de491d1d791498c0ff1282151d42259bfa808c6fb3c05fbb8454e8e256a6b42cc4bbc4d9999b8d2303880110168be2adb872cc9c4dffd95445288b98d6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ja/firefox-64.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "84a343da647255f25dec77be6225a47e5b129875e108a9ec41ac14fe4a006c6e1653114454595c5327f3c088073f44abb761b27abbb744bfc4163fd3208c827f"; + sha512 = "c23a99e8f1b8b895402100c00409f5ee0ea602f69c998d0d05a8358223303d9f20e33e7894b54de30ee9395ce1e484526cbbdc1e9ddc99e23902833abbe91a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ka/firefox-64.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "9d110814322e9fc20026af9c9954ce76c9a2d782d64874f63ea46034660cc86fc5ec0789e4c2508fb729704623043e0a0c05e755faa9c62f7bad2ae3501936fc"; + sha512 = "e6d6b1b9e5e44b002ffa7cf55cccf47cfe79d3056305443e891dec87e471b6be8f2bc4cb5c13d739f40ec9284588e62347c4c4a2e5b49839a4547aca2faf8a56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kab/firefox-64.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "ec9d23bf953f1f3c0bcec9fa1059aa7d08ed51a781c1983fe71811a4b56e4727248941675745e7b83eef6a84de36d93068f0c574ff1d3e42d39a02b3415b5699"; + sha512 = "b84b2505624f5356a6544ddd8279b6a77483a8d0574406b1e0f17b136895674b311fb57fd7025a0e1b2ee53577d57bb45b0f02ffb94ec1cedd3c93298589e7d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kk/firefox-64.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "c284fd70d033383e77faeb03afa658c0bc1be03e56b5b5d29db1bac6ec95c48d5150b17124cfefcd7a5ec04c016e68571c7d5624b89a58b185cab5c8cab9c1bf"; + sha512 = "82732dbfc100ffc987fba5a721d7ba2c04bde1a750e1966bf6579fb9e1e9d23f00ba5ec239b6af3198fa8f8f1dc8b7cd6fb80598b24e54ec2aee1ba488858077"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/km/firefox-64.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "fb838bf6f694ed93bdaef8a55f905daeec4ebdd7bbb57c133641ec017ed155b53452b6045dce7961283022605345a26f76e5e48f3b75bd056c2a69cf3662d741"; + sha512 = "8deddc2f4559506870bcf4e5c26b7de898b48cc2544469df92ca3f617f5d8ddf86e9f9e7a77fdb9727fe5e5e166ef2257dd70c7d10105bce59734a4289b927c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/kn/firefox-64.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "a14ddd39b083eff5530badfb709dc32c9b5690372ccf88f333ccf9e0f67c1e73fe5182d580423e4f6d8a10356221ca34888605b0445ab494e2933dc259a4580f"; + sha512 = "4d0e809945c3b5a874b72343be82484b99a10aaba0d70b85dffb3e6d7e3ebf6b8304b6b4dab648bf48c5c11722138e2275744295b86e4e1c2af07fad05b6960a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ko/firefox-64.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "b87aa42c208a3c71f874a0ab9e67e5b65b75749246f474efd9e5ed0f44873055810dec07c7674c69d197c5cd98c01ccf9af1d20c79563abb7415fd0e62b86d04"; + sha512 = "eea6b2534ed9a368abd8dad636ea3b0d4298a9262795d694bc20c27136b325653113d077b57d361213395e916c29522daa5c8e0e8c9d151ef2243215ef97fd88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lij/firefox-64.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0ca6688930361db90025a32b197f1f243bfd9c5e2231ac899f2ffd24278d6254fa498af67d4fcd11caf3422af814f5cf71897ff7bca885722e74bf2ffbaedb88"; + sha512 = "bd941e32b3517a599c7f5bac36f8a9feffbdbf93bcfcaf776d84ea9d5f0408a3973431e1b9b6feded677b48ac4af26e6b888800e5acface9da7c6cd37fd250bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lt/firefox-64.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ce71aa99ba12d9ed490e7241b4350cb7a4f0e6ae9275306f5362fab4ac51a2fb1d7cf42feff1a2c682f6ed8b1845fbcaee5194f487b4912720c27e43546e7c1f"; + sha512 = "efc4cdc50cda00b35d1f69033f76f1a9c0d4c530a08675c041423a8d0b4d5d24f3185a9d63cad594a5df6b7bde750cfa2fc13b9f7847944aa5243cc7b55f6d11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/lv/firefox-64.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "bb5988a33aff18e4e050be8113b143158390b28e4bb7cbabc4b9e806644bf42bc7a5f0f5174bb9aaa6c46756fe04ee0a2aa402f33e2403fcc3e6601cf31d0abb"; + sha512 = "8ad8ac07fa756b649a334f06f9795c3577e3e9128ca66b00541bc440711027d4ec8572eda71a0eaad38696e59031d3f23714f6372fe22e8ad38fb4029b322b28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mai/firefox-64.0b14.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "0541f86fce20e6bf565b84acd5bed5d954d1de412f0f584cf40ac2ba84b827fef95f7f055b3cb1a7cce824f5eeac3a905368c3c1f1d33202e091e7edb3537b14"; + sha512 = "8627f3afd45555cd254c571070bf5100a25770c306f63f091fe61501fa0eb6e37e7ccb5bd3b9378bc494ae6025d39c45ab6dbd20cf5f7d744eff8b3ac02e724d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mk/firefox-64.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6138dcf84a21235861750e0d615862581e205bbea71d61861dbb17fd74c0e61d6bd9f223acfcb8eb623864cbfa800062293cae68748a320db143e1f509f54b41"; + sha512 = "800cef931052b49ffe875464ec8756e96785d9d122aaf3b2dcc9397fcf524ed0375cd9cdc67681b99439e23556b0150b14bb02a5e9d7cbb6f3a806674b904030"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ml/firefox-64.0b14.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4befe6de671de14fbac4ebee28018cea0402a0931bc3140f89b2dfccfb23de0d106f6236670730df9460ced8056cdd234c401b7a8a37d6fe6e70c9c61eb4094c"; + sha512 = "ce8f90f83923cdfd0ed7cfcb63f4a225c7b5505f73671acdfeffe4dfd5d96dfd4b8746a6e956df22623b57f0ca2ef873f6508cd09c3335f460f8f87e5d0e4a94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/mr/firefox-64.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "24f85d8cfb190770b3feeb78f46779e303a8e3037db75515bf7b2c99e1c836591913ff0a0c4f882c0c17d077bfd29a9762b92692c99dd77727e1bea4439a1a49"; + sha512 = "df86766636cdec2dbf094f9a48e6b613df4a18371bb85862623a99a5cf095281f926c5bec51bba089183db363b14abd82ba771522dd4367ccca7ddafd532ea21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ms/firefox-64.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "90b81a464db5b992eccaeb08f7acaa383872f7d8e037eb53016b2db337658fb97a8afcb7a9fed9e39a9d6bb44bac0766656ce065e38a4485f5723ca6cc242cf6"; + sha512 = "9e20aa9964c2036beeb4b5598f57d8f066062fc514229bff088a36bbffb46a9b6131b4ab7af77d785b98e6544a5e102e84cafae581ce7a2ac0ae8e5223dc8aee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/my/firefox-64.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "afe60863fd0443e3a9069e0ca28025df53eef9b822be6b0a35144cc8ed3af1982bfce1c6e40c4aa17159f02836efceda6dfedb1a7bd7aa96d3de0eb348a60c38"; + sha512 = "65c94ffa537b72cc89c09342ddeb8915a7e3cc0164bc3191e3e289e8c5217b175190465e49afbf5adf0f21864c787ccbbfd8b5eb2975ce4917e8d5cd5aefbc08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nb-NO/firefox-64.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4007d3e7623488754b3f2f80c6590727d0595e240374c67a057da1fbd64f106553c1fc2f5a8a4cc6ffea753790e522de188dcf0ea4bb6eb40df05b4b822da86e"; + sha512 = "1ea09c94a276f6ea18b4f759d46197af94bbfcf313ddc3d60bf9b0b6c406fe4bca248ce13f6c54f9f0d01f54804ce13792be998b2bdf35db1fa39d0a1a4ce688"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ne-NP/firefox-64.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "3b0edf144a57e656a44e8d7ebf2c4967280557be024a844ec230dd4d2a184966463ba6b39828653df67c2a6715d6f02873f5c5349705446ad487c6640806cd43"; + sha512 = "b35addebf27849b8c9b7d486d73d8273b58f706e8bb23599628b973f558aa486c793446e3a4c05389fef1664b6a261460a47b2abc482ae5c7d8cca26963fa6b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nl/firefox-64.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8527ea936e66a182720ffa439d2893318c7af343ae5acf758f44d2293a3857dbc28f13d7147cc43e9644f4b174f73e8e4426c43c58038a582dc379a1e5e0f5ec"; + sha512 = "e5b514b4582ee116910875887f8cd47573c6b8d63b451ce0471bc02c2f93bae7f52ad8e03eff732005eb40f4807cd2d9e5dd088045f1c3c7a0644629b9fb6968"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/nn-NO/firefox-64.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "4a15662aa9aa8ca6b7a3f46868d4b7e3114fc644da9c4f141af0ee50fe4502ea1f37b7b007551460efb26cac9d788491615103cf442078ca678d4407b53d199a"; + sha512 = "caed8e08167575fd143679f72c4d48eac7238f168e335f56b813c2f6e55f31c781ba423cac018ccc6cb69b4b73ae5d3bf6a9af48e7e087af42286b436ec95b85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/oc/firefox-64.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "77436ff6c82f3356a0b092274fb26543da73ae7ecc4f4d8ec8dd1ba6d282114ad01c557f5be9b541b5d41059a40699d5da5f15178ac6f9cf65b110812925ddf0"; + sha512 = "6635eaa118bbc7f8f7945456c2fb8470f2398d68ae7a00266194e23d5a56c3c28dc4accfe0cd354c0d468229669c38547bd8cf0219db61ab21083163db3688bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/or/firefox-64.0b14.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "efe9b2b6237d2fa7ee679a535295ba3143ab00d226b611cd09bcf96934f55632b7f5498c03be50034c925c69a4fc25632b40c9ec5302dcdf43648542fddf4b5a"; + sha512 = "360b38e0c605a332cb0fbd66d6c61fd419dbedd2589655e019e62fc40bff6d6fbe8e40a59812f44b3cae1ca21dd5c69971b7e9501744d75392bc377e3d3e36a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pa-IN/firefox-64.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "e6879a8ad1d379a0562d9c5ab5cf521fbc3d195d5aae54bc5713f3f4fe4dedb42bd2d0b3c434ca77cb357f8665f03a32d5772a466f9ce802d0c1f123287e2557"; + sha512 = "5368aee673272ca741ce4589bb191f654df557d9a929091bd430d47179e8007590233cd671184efa7bdde57f4d9db20700b5828c7d39a562d421280047bf4a08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pl/firefox-64.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "ae362910b20f6c9dcc1ab56a9f14532d1bce343f009ecb1d71d1907e15c11e78d532e9a1dc477c3070f63e1d6d9b322b8b3c629b5d11d18207ddf61fecd257dd"; + sha512 = "557199b4c193d1bc6dbd09b84aad4a7c7a863725790c05ac3978bb393fdefa6dbb088a0c7a41415ec2e16bd8e355142b9956075f60d049db7a713b4d138053b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-BR/firefox-64.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "c6224a6a582ec2ba09de0c4f570a63ea79f03d34fcbc37adddded768758a5936ea9ac9661d429a0e500381ad7a9879d5afe222a6981fb45f5e23d15d5680271a"; + sha512 = "f5db4fe1ccb3ef02bbb32b180a59af92fcf124b6bfd2a8e9e95452a61fc5740ee6a1084b842383d38bd59620ee1a542df79344640e7ee5e776c58b83830f4be9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/pt-PT/firefox-64.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b275a56a93f5332b9ae1aab11c896c0b971d9fb4aa9f574668e0d43edf0fa19d013afca12cf2b82cb493dea47caf262b2a0c504d9d1906de203622334d55eb7f"; + sha512 = "f38d13ec454db404f40b2dbbebfc38c56e30f57ab586739e346d5a69da7fffb942ec2e9e1b76bf483f64c40dbd6641323fea3da3714926ca95d00b87847a5564"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/rm/firefox-64.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "76443d9234bf38a04820a25997a46fffcef58c3ed2593d50c7ab28280fae5c518dc353611a9b8b3070c337ca3815cf63b41826547ef673e6fbbd4037951e3c4a"; + sha512 = "668790acf5664b71df38ff060a6e830cf646b685a7dcb5452eb21fd545bebac5a9533d6b424fadae7f3cb875955e7213b034d5ad0ef078a8a9ebe3372a4130a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ro/firefox-64.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "bc7b68dc5d6a05c66cb7aa6d39ab56c3f28174539caf5e27dbd2b3fae500fe439b51084d0ecd16d7cd9ea52dad5bdadcd5ebaaaf7e03256d30bd2229e0c7f89c"; + sha512 = "bbf67517b93a28f6b5cb6ade1d0df2b6e89930ed172e56d76fff0b5d1ac0a8d30a2be46b4a7dc9300e3acb1fd69d79c2b757c79bb8746d25281970812e6bf70f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ru/firefox-64.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6daf35184d294395de7f4b203b38b0ef4071956fde1839f75265cf45b1f887640067e2eb17d5e5bfdb4f7cc0d4874579ea691ca8d5301f76ec2052c824d8331d"; + sha512 = "ecf73f6633b502c6b5fde6b8dcd22a1688edd881360f87c7f399d7594474c753c7b6df2d1fde652ae9ab9938c16dff44f01c47b33a5988c00ee636291cddcbbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/si/firefox-64.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "db7f827ed173044811b994a89b8625f37f0a92994e0bf748f18082e5ab842dc147184b6b552c5b7bdb888d9c3ef4e6ed8555074936263c49f0517686213dec21"; + sha512 = "7f3ed166ba6e8a9d223b881a26753fe255c441034b61f8ec06b0b67d83c20c08aadd28b86befe362a475f77ccbe26e9828eb81e116831d1e1251662163eb0d70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sk/firefox-64.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "e7dfb26f8f8d763d66b7d9f924fa30f55e55728cd9178602646504759c8d83864107f759983b95c5706d0438bcc534ee3020875ba2b06e161d669b7be2e38f0e"; + sha512 = "e1e08ca8a53395abbc26b428d82cdc763db39dbb45fda351f3815d770f696e6629969bbc2a15053d87a589ad3755ffea29fe897004aeedfeeb166cf206f75ac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sl/firefox-64.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c6a36cdbc579cef430ef91064c8c1fa6c1b63831701f5f0a416e0d41742f0e827e90cac66ad5684fca32e7bd69c8c40703b5a22055e84f83fde51ae1af3d60e7"; + sha512 = "5fb47da8d75472bcb36b958cdc604f8d9c5ee92ebad423c3adcfe362c7f0e2e9f2bdb08aa2bc5e8e93fc3c8a619e2ec1796fa40d0a6634fb2cc22b163d978758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/son/firefox-64.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "1cf6b1c9ffdb1862258e0e0f54543c36d90f1dee02507ac4cf6d8c8c4a1be18902403870642231a721398dc757267e41e411bdc221303b0fd081845b474b22fc"; + sha512 = "1020c0d63535096fe0c90907f5fc24753fc32d20fe53123c43ea58b4666f20486e4e1383a96f499e4b8abfa941a18d69f74d7f6fbf52f7b77201f19317bd8f2c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sq/firefox-64.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "4e628b5cf477fd18c4ce325ae356e35eab9b40a40a653428864b2e1e2ba80cbbfded05ce6e280aedee76eb92a113486a460f77b70cc52ede270c7d04bb7987b3"; + sha512 = "cbc20da6a33130b02683b8f5e3ee128f162f15728cfb40655c92ea94291dd614129e409a08d2a9d0def9557b48e8c548288ddf2d2b529855064ea17af3757844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sr/firefox-64.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "1b659513229e2f37bf797a703041c249d187ddf7bb3e239b67a49ffc42ecdf9d3affee300e3e3885c5961d1e57eb7590450f5bdf822503c8889cb782bd070457"; + sha512 = "7c27e12229cd86a74917f6eda2c6a43711e7e1a20610c169c0da65e4eb6b646236e5dd31be22d679d74391387aa3b375863c2f0d8875d8d9abd701fc14ed011a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/sv-SE/firefox-64.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "96317452a323db8fe04c4c83a40bb5112074f82f6a074e3b3a901bdd7d0e67f6bc3efaf230440e20d0f39fe27a6d2d2b14e6c5a34384b0c1aab11836af44432e"; + sha512 = "c564b2af8421990b0efb90f81f226aa63224275bc0b9ca614bcdbd0a95c3f85970b783d301b122d5198478ae8e7dc3ebe5f29fed417c0d5ea63e6a9e8b62a087"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ta/firefox-64.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "5c87b548553e34586a8f3bcec429735c4e7ac89027888b60be89e68710a79bdc2000787cc5000cbda771d0cb704c8e3edd404d4b4148f1aec87a9b5cf7e82754"; + sha512 = "9f7a8321bf8333992bb3888005646cc0af4362ad447ed3024196426c43289669ae791f24c09553e275ad184625f910de8e09345ccf28d231741b5dd2ff1b280e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/te/firefox-64.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "b75bd0e03305cff00d4ab904545b1d5b075abba9d1e27e4cbfb158c109506c72494242be9b3e5728c47d5f93a302efca3c8c9661c9e7fdec3dff3b6424009796"; + sha512 = "d53f9bcde30f9c884a67abe5d1d83f6fa9a33757b73fb026cc32535563a3fb4f97ad98f924054016e7102962eab3a858dd9004b171396b10b01535bc62771d4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/th/firefox-64.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "6df43a8e11ccef31995e7fc3ad47e8666c08a3663be3b3c055900896c9f0379e85066fc6387e35546a4ba73781cec631a73cc92a4e648cc0b31efec16c652ccf"; + sha512 = "0d122ecbd5c22cb3c1d05156fc446ec4bceebf63675bd7d2789972bfa9acef83fb247080172f04f7341be0c59d478606bfae73a1c73f55139788b40b7851a58e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/tr/firefox-64.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "9cbf8d659be4a7e32da95bc9d76b435b22e1e83e10a93771f247540eb313e0d476f231c436d1e39bba4ebb7264a1be4e5f1a677bee5b0af3fd83c42887cf173d"; + sha512 = "ff2165f42c5916cabe416804af8e0bf8c24f4da91ff5c30731e0c05c84aec3099e15abd02c9d4d37bb42b7d749b9bb50374c24d51b2fc83c3b22476dd2eff47c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uk/firefox-64.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "bf79b845f6ac4eccbeca2de07bc0f9668541ecf62f109919c15b6348428dab7b748de330861f2c77de6bec4609608a9927ccf7743446c879d8c7cd99ec021ee9"; + sha512 = "1dedde0a990ca3e32b2110d13a3c270bb615ce6609632ad6a2d014cc96a950690c795e8336b75b0c492f0577d0d4d43876d285ce1f2292fd8591d5d648a442a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/ur/firefox-64.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7609d8c93d71f20898d77d08066ff51a418d9cd7fe616c42669bb5879856dae2c1b40cf6a74ccd65d6360857369a96b5eb7e03ecc1babaef95d6baf9b52b85e6"; + sha512 = "1d2d39cd8db329b7f717cee5cab6e56be05e93091752a1ae02e4a3fe36bbfe9391cd6117775b63821540f0de708ddaae4dd1a1b998d755269568c7810c07fe86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/uz/firefox-64.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "342aac005ea6aaab04988133d27154c6a2c1d8404b9865413d07febc42325b3c63c2b85ab11cacb4120e74693c3a8e447b396b8fdff93ab913041b73ccb91372"; + sha512 = "83b17251083ac9790ce57a7d6ed62e7df86c97770b6ed4b6b3eb4d583f1edbba9ce06c3c3b10596e237f79b4afc11483cf926225a5834f7e1c4ab7ab27abdffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/vi/firefox-64.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5c44ce438816a7ebfee3e3eaac121845a53750439387b4d01c9a846bcc344a85cc95705d1bbe514de11297909be425f0d5134863be4f0901b963c7dfa552957e"; + sha512 = "3ee2013dc094b0b77533d88548fb5906f1a7ca1440a50a1585e04f09d1aa62c853f0837a6b218e1818ae93f0e838cbda1915f40b2030e10386a2642820fa9729"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/xh/firefox-64.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "21b9ac22d9167cf830f6594cce7b3b1deef155c6c7baf60ed74769bff792f57a58e3f2db351a1df41a479963cdc3dc81e120ff4d47d7aefeeb330994a98326cd"; + sha512 = "2bc8af3262deb7c3ee5087921f721066ebaef6cc9c93a36b1dfe8fb2b43afcb276a78a32d959d52cafc33b0a869860c0963d6f1389cd0f3860bc0c95963a916e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-CN/firefox-64.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "7b1a10588bb981006e0e28c8725e69c9acb9a029d8cc8e587fe47b59eb9021a3718bc4a2dee658b5cedf426051d23d55c4d6c4dfc0df0867fabc2a0fdd0fa874"; + sha512 = "b51a683f3a8f52c41d9ef0e8aada1007fcd3db95cff4c36b353698de3f406f232e78134e4095f3fe3f8b8b2445d095141fa2ac3a5186943db5d35027e63319a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/64.0b14/linux-i686/zh-TW/firefox-64.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "8a30a6cf262adf1a65dd4964c5970ef2d3641561ec1f085f8606b5492570f43e7e5a0e2562f4e873056c3a9a3b4b8377b2e85f952c2d382ca800576b64a3d866"; + sha512 = "811498331ce6e2c9b7297069f4b5990f092b7330ffd4ef296612bc542bbad0839180753d09cfbfefde965b6ccc6a8783ec1eee891817e665675f08bb4e8e3b0a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index 345082392a8e..20da9410999c 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 = "64.0b10"; + version = "65.0b1"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ach/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ach/firefox-65.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "3c3cef4660704180ee6a64266f476624db76887eec8b76fe38ee35d18305a19a3f73b4800fb02bf769f766edf28e86813a49a5190fac035dd20f996de39469e2"; + sha512 = "cda7c4c170db4b718493259e67b266851211754de4edda61957b1fd8d5491e3a0e2c17728d101e13ca03a999d2794f65b62798840103675a7e1e1ca76885f6e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/af/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/af/firefox-65.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "afe36e12ad85d036d98051d9a978770ca9a31e362c85a269a2e6ff9f69d0700084aa316200f15755811d0f80bc2182a7e56cbb208575805622ba9e3e4f775c69"; + sha512 = "695a5ccfb932bbd6a2d2257969076ad458e21b62ca3222b6614d63543bd71459bb133e53b88366915e2f874ae7490b80efec7682ff174a3e19d4827e3b73de3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/an/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/an/firefox-65.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "13fe8f2f15502429177e5f214ef80a4b7d696d3b5e67e1e0c4fe86d42ea99e462513a3058086533ceda0df6aa2a8e291021e3b1f669bf091e7a7fda1bf00d176"; + sha512 = "457ed14f27a2a502baea9d46a7b4b7e0fbdae13d90a84549d238a4fce62486f120ca61ebb137b33fa5df72d1b86d38bc27882a2055f6fd7c2d6d48976f476153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ar/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ar/firefox-65.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "9a8365b82a1d40333354774e562d7f67dd2992c6435f33c74a7aa4a119516bda257e70090805e17bdbb142901c213e50f6b964f3ee91473c480a9d1f89fbea4a"; + sha512 = "b859161c50a0e038912c7428cd8a0996d85dad299149caa1f97d8f9380e93395358c71f900b9dbde3061dc30f5a5dc1071e34981ea9678eb53a84a9498c5e7c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/as/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/as/firefox-65.0b1.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "1fcd7356cd69b408bab3c6aafb581b011ea4e0057571965df0d07e6a4a014c9c388f601fb071afe1247e8b2a060509a158a82fb3c454510fada1a0112e1f0c13"; + sha512 = "576f0ade4da85f351937cc71bd87020a917b1d6eaf82a406a5b657872e08d4b3120e42941a40b8625e248860888a2c197b0bf0a0ac97f07ea2ec7b26c302f7a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ast/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ast/firefox-65.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "e739b3fc62c05e87a9af900d2a62b12c591a382aa6029d70d09db3a2e9fa426ac424c3ce7a9e770a147fcb94e041484b334d4f1e9a912f329d2002bb8cca8fda"; + sha512 = "75504d6c5c990db69e10ddc99f8b5d464eddf45adde7607d7957b3c85979cb8f30a5476eb7a5ce1cd6d13d71c77c4951dbcb047492af5c2774f303787a872006"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/az/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/az/firefox-65.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "d7087037755b1dbdb347d397f0db9c4efb93c2ea858365dd5fc6598689890b62d5e8a969484d0d746be23598a5152d463893a49c89efc84ff4a870f41899bd0e"; + sha512 = "d89073193e0a4ac3d34313acea7debd4a4fef6947c0f8aac2f6f27518465ea7700c9cfe4b2f8d5873e22cc8e474e3f14267863aaf005b42313ecb5e7e7bae306"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/be/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/be/firefox-65.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9e50627425631d7c3f93cf176a157b45f23ce36c82f11139a4959f9d6b467d30ffe75b3aa62984be67d202fce9afe90685b76e2acf1a8300d82cc14654ad783c"; + sha512 = "cec23816cb37ba0a61a82c2667bd78fc546268e1cce79a81c311676ef2c5afed56021775bb93980abbe3f2af7509320d24618dccc5fedeb6afe05966f2a5da31"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bg/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bg/firefox-65.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "da8a76df26d0f4a252316e493f2fff8b3739b8c058628a9a9b0a618cb2e1d0b335df8a69fcc6a871d4ff570f9729359ee5172cbdffb21fb1c02d7ebca1846b14"; + sha512 = "3e791bfe134304a1dd25fffa6c4fae90bf3e8132e9a09eb15560b5a98d490cb7338c2edff625a1710339df1899122a18ab9f5154c3b9b387acae22dd4c864b86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-BD/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-BD/firefox-65.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "0f92c035bd9faa18f33abe421f4e2fc839a7e26b879bb1d9816f20551a186e2dfe362519049a52799908118c42c051a2a317a3aa38695e491df2a08562d58009"; + sha512 = "6305b0774042bd1b5e06e2aa261fe9fad21d484c79ef157d9e95b655301f4f847247006e933c090602f1bc5a5228178998f8f59fec598b44f12ff64c1689f763"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bn-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bn-IN/firefox-65.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "6f7bc819220cff36b267c8c9a16565c732ff6507e08559d154657ff6ada926d6fcdbbc85bec11592bc039a9cc668ec6771427fd1d9dea49d88d630adc20c6f63"; + sha512 = "ba3d09a95797ea28a13366ef743eff2fc55686d507ee9f8bc73f451efc4cae00e7d53c52b1d24e83b44a7d025a9c4222bd7935143f5b47d3f7ed909775fc719b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/br/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/br/firefox-65.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "701b4086ef0162555c7837179d398367e782b51a414ca8895cfe3c652c7dd021b0258249883c0219dad7398d875974a6f3567df48ffe2b54b84416c6a7297cbf"; + sha512 = "7e4f20e12e014a842eaa9f77e701466e00af93015c27be529e69673a87df2cd0f8b22dab0e006038ddf32f2cb4bcd2f7f6c64709c252580dba22ba538db1c744"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/bs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/bs/firefox-65.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f4669fdc026f7e348b086fff93d67be4c42dfc144d353c0673c9f72164db4857f61ff0a3eefd358f5459149378847dd761574f187861651261c76734d97145c0"; + sha512 = "106e874f0127ec73a92fce3733b200bd052c4205c6698044b82d60e42a042b1c5e5b71e9352e8ce0b470cc8c9bc39c28b2166654bb0729c966e1f44b5daf7207"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ca/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ca/firefox-65.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "17d6ef735aa464dc3fc77dda76d79fcc843f853be062824b431069609e4b0f86258533a14e995d5b98c77d09c4dc0d0627093df0f8cfd2f2f6f9de443bba1870"; + sha512 = "4615f72786085295e131437972c39382bffa4584e3829253795d9bc961df97cf87edc8e9ea1218914f444d1041819f8235b36e116abb2aa5867fd65c3284d76e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cak/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cak/firefox-65.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f6c75d0e67fe581360d1e32eab18fc2f5beb51581a9fc70cb926d972744c58d6e2b49f23a05ba2b8beb03b89a5553d96ab4c1774ef7568c9819f8a8837949cd6"; + sha512 = "acfbd95d08214f103dab546cf5087194d004e24a4163d41c82bb127d0c94375fbffc8c8ade0757f3e624fd2aac8fc9fa6519a6cf1b355c203afd5270847192f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cs/firefox-65.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "d51ac21807c945edd1e86b21bc06b0763687ba0573b0155e1c1f4c51767db36a17ed3f28223ed22b45ded1d1153bd8bb295e046598c7e1e54733e035d9630c72"; + sha512 = "c60bbeb2fb880eae5115f317dc30573adb6917eff8d49364b2ed34ef821b90f17d275b77cfeb2c081a80f4cdbeb1ac0e02c920cee1aaa45ddba855861f0955d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/cy/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/cy/firefox-65.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "678951cdf8efffb874203fb72df7c935f43547233bb0dd6285e777bc682ef3c0dc1af11f55b01726a70fdabe906f70e4cb2b574ab01f848a02295b4e97e88b11"; + sha512 = "5e5e90de26b784d81f5b68674714e8d14ff347b039e9664137ba8d94523d3f0c0fb0e0112b5961a56874aa6bbf30b4d3e7884bc46c9ab5818cd6aaac36047243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/da/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/da/firefox-65.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "e3183b137019761a30a32bddcb4842f8e6eeb55d9a32e58b7ecb1ee9048fe3ac983180ba2aa61bb53edf8d60bb56003cc536699747a9d00f77328ecf100a4ea6"; + sha512 = "66ae41f79975e00ad845b93f50fdd2d4eb8d11186ecc7dc786de856e47f44ab8fad6b5149a9ae8ca9ecc2b4020c92c07f7cae12ef0d9363184ac0e189c8650f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/de/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/de/firefox-65.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "189177c81f2fb31dc89aaf195c8b0d8dba1b14361b447a77f8da94d1d9f57a086779cb54282f9f37a50f230eda26ef8c07690c75abce03468f80c786f7a24013"; + sha512 = "37697c4868bd4b8e8becdc9ad8c6385a1b46bb9a09d35c2a56d99464de2def74ebb533a5914bf1689f778164e30be836ea0c88e1361f3f4028f02294f8248e28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/dsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/dsb/firefox-65.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9daf6db9091846f6c290d8dce3ac2f847e958305942d9c240bc81cff2c127e0d5be9c715fd13a30f7afb052f3c755705801eda8b3e0457cc2aeca3c687b257ad"; + sha512 = "e40cafc2e024af7265b6ffa6a8be0f16862b1f1eb7a001f3710b501fdd92dabdff78f1f0abff3d537bf9ab266a988c7892e87dae074d00430522fb64bccdc31a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/el/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/el/firefox-65.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "717de9d12655e306e8e494dca88901263d658556004b058948e008b66bac2cbf30f838ca26e90f0e65f7ede96d3d22931bbe36bcd33008236b3d9ca255d373d0"; + sha512 = "0f678f8a5a34072e0530c2086e749a696a88e23c0981b2ea0664865b3b127954a1121e026dcf403aef03e3d00ad76a0f95c98677cd5a89c95216e0659fdcbbd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-CA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-CA/firefox-65.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "a4f75e5501f63a7194e3d9a830d722baafe3fa1c0e592181e186cc810cc623ec1e7039e756d577fb7c82b7f6f8d0c8941a5ce36d07f291c8fa57c16e312d1b80"; + sha512 = "3c60f3542444c61846d94d0116b8478269fb347b57c1cb000274988c6adab1a19c22d7e8050d005a35df16943ad3efbcdd99bd9a7bf7b767886472f110bea20f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-GB/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-GB/firefox-65.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a739f826dceeb48c248098e94617e72565a0603dfb02b6cd2efb104f1151a81dbb3021f3bf302a582f8e5257dee6246251f6c67c5539bcb4a6fc64d20f058d94"; + sha512 = "e623be71b1c54f833d6dce20ad2ec8a5c51d5222f67550a8e4e5811d432d710f74bb8e7e3c3b6fd7e5bc6830ceb7392b28923885b232b1d642277c06e41a3fd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-US/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-US/firefox-65.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "3caee27ebcfb58a62c27bc6625e260a0a3c8e9d8ee410ac44a91ef32e3c6da2c9df36f95775ea13e8e40a4b682934a6c1f0c93adabf4bfd7452bed66792a30b9"; + sha512 = "da2205be3e9d672bf34e1055ee9a5eac461fd5172d2cb2dc9ba9eecab94e7559b6399eb904b2cc3483758cf3658f7b2554484e328491951632d81dcbfd84821a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/en-ZA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/en-ZA/firefox-65.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "ce0830bf8fd3d16e02eac457c5e9f4832e40595d663d12c7d3f91a92b33c81ce0546881cb01f11381a6b7b548cbd1a64b87d884885cd0e641922e91491ca4b62"; + sha512 = "4aeccb63a94809737155f85a9e83c15b8df49b3c28dddd7db547079b46f15b7a5eedef75881ac32337097175193b38bd7de3e47f30dd18b56f1ff31bb6d33aa7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eo/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eo/firefox-65.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "9db1efc26b2ece68803f9286ac6410541dd54bbcd94776f289d7af4d2f2ca31e1124344fecb4af6e22051f692f77e0ef9c39a8ff0aa39eec445fbd8365430ba6"; + sha512 = "d7984116570d78194c6820342f591ec17eebe9ba6abc6e81f34d8810a24329b236cc37a705e3df8acda8eba4d1627d4a2970e794de6bd6ef76fbf9e57028230e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-AR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-AR/firefox-65.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b216931ebaf590b04cbac239b9613d6af24f33b60c75ee36f344eb93c34e9a2087e06cc249ea1315fcc0bfca1c1e465b788ef1a82a6c9cc17035cc70a94ef8b8"; + sha512 = "b4e9d60707d70e94f2e4f1ed5d6a0994e431793c01c7d492afe72f5674a14bfe1524df6cc0d2a4e20897a5baf76b51e037fa96554f460a375eb281634001e518"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-CL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-CL/firefox-65.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "d4ec8ac2d765d8267aeab062a21185fe6a31228c00f2bf35fe4ee653a4fceb0f96cdeeff83c4b122976f1487a9159ea40689130fa9a9467f2b4a926c6db52258"; + sha512 = "2b8bc684e2f45f44f293a891b11d4d9bc0b43c55c12e6186d045ae0a6c618d1f96109680320506e913ad5425b19e22ad3004afb3b11dcadd7fe44133f4a40cec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-ES/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-ES/firefox-65.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "06a5a80a67217efd9ddc3f78853ab6bacef69398fcba3a6fc354351f4d83287f026a5cef72955c9ecb7b55c61e6de2b5ae40136b422ec6549fe444a91b1745bb"; + sha512 = "20294f5f5f88b000ddb8c9d9016c85ab49956fa34132b85417356985f14c2e5abeea7d96bb3dc6f636ab2baf68ce55507a6b6444e5b2bf6272344c0664ecf2db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/es-MX/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/es-MX/firefox-65.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "dc996ee1f21be35cb2dc7e18740c0657a126984d58a4bde84b67a3c28baaa22a0395124f71e06eb352e0218335ba2872bf5ffdf35588245bea55daf82ad6cdae"; + sha512 = "c8b66a1198dd6975a372fc5667b2d9bf38313096dee2a5c34ccd2ce775cb09bb38f6ed6f28a9834d636745e23534f994380250ab594d6e1d366c75dc1cad1501"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/et/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/et/firefox-65.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2c597a1802e45b3091396169c6f07404aeae7107d45188c8f3e8c214a316cd7e38c1b0cf06216b1882ca088222d1d00ecff84216ab3b545f644343049fd6868e"; + sha512 = "51bf60f606e202e641b1bd49b34412df1c3a33139b16771748aa9a8fb1cf6a8ceb2d09f2be9abd485cfdbdb6b6aafb01c762d9a05aab442eb5f86df936a731c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/eu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/eu/firefox-65.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "881d03053e21bf2024c8c0bc4737b5f9415c0cd5e07331c8aec0c958094d1b423f34c0abcf1a73ce794e0b5c3cbce343c7decbf4af812d90ec0dd7ea0f338a4a"; + sha512 = "92ac8a65623dbce8730627a2eb83104ecb91114db18813630aecd22144f79a3cff7e1a44910259d40006115150ccf0a64e2f300b9d7b5093c54af43fb4403953"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fa/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fa/firefox-65.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "2c185e7622308de487fe2bbe20cf2ee4c923c00d7824d0d61050cf0cbf23d6fbaecb8ebab25fd978f6db89bc7c3f45eb91003088a4f827870d21303ba79d374d"; + sha512 = "49201d2a1788e8a8916a8caa95bd350b6b157f410735f3ae33c6a2d3648b47590d72b6ea5a49e6080f6593687a1531d7ec2aa0dee820960be52ec56d3517aacd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ff/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ff/firefox-65.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b3f814dc04c57b15942ef08028111b19289ef77f48ff43a730c5840d3beca8ef1755185ffc54c8a0895ef7d734626162be73392899a2a08cec9cd6cbdebe78b3"; + sha512 = "ad097eb38f73cb79451a753ddbd2cf68a2871ecd37b16d2e2d2b58463631d6bceb5bb301c4a0cea85cd207a87e5447c3b8029e0fc8a0b0114186a562b7f4ceca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fi/firefox-65.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "1f728b5631fc2825f62f2af62c6dbd9e4bd5caf2079c476d6524c9033f2c397e734bd627e816cce25289565152221cb78ccd449650327c60ff9243096aee52f3"; + sha512 = "151d9f2bcda0e74a9a12eb27e5f550ae082a98092db4c7fd3537993783cc623149a5abcde16a9221b1c91fc968d6b84a0d0bcde1f170705cd5054a4bbe3dfb92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fr/firefox-65.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "038fc084b4f5e6c8817706a32ffbf9025555e4c37f530e8601ef4d72bd55f3f48f57f8b7efa5e1c825a89382a4e9fb15db54e24c88bd569e96d297855e4c339f"; + sha512 = "54ff2685bce6f1972b096c87e287ad3d612c0b7244e418344f0bedd72da2f69eceb0b913094e928668a3d750999213e2a5977a4362a6cbff7b78589cd5c9ca23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/fy-NL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/fy-NL/firefox-65.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "be74cbd160b366844e2fa955a4cd4beefb0d58ca4fd11fc40d8419df74653e29ee1e142f7e0d5bb970b90e0ef436b1bd4dc9e2b1d02db921bfc6f9f7d72242f8"; + sha512 = "c6d1e3f27a96486c0797eb1f5bf6936f6543456e31d56d0019879513e1c06511bca297ccfe76936ba0a550daca15521238c468aefe38e93a8f56d4e8f0fa049f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ga-IE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ga-IE/firefox-65.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "2e84652e80ea69b90aec87abeb14aa9d0188fc598b536c74c31c7d3dd63909a73a9395e221c51088b489465fc97139693e55a1a9f926f676d50caed4e7818878"; + sha512 = "22454e0f678e2905c55fd312e0d3a2be18e0ce9664bf6f6b3588bd63b9ca7452e532640a631f9721fb54aaa063975ac82b4b07caed139f44db9835c521ea38c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gd/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gd/firefox-65.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ed4799c7d68da7bfd663aa38c913f71bc3efcedd1f0363120d6fce1ceda0e3f0d9ffa8520681a563b6ded466c2fc80b695598be51316799752d528cbd0d6a174"; + sha512 = "7b11d439f5b8fa1bf5709d147abb3d1bb98a00a6573f4784a95ecc900b9a1a8942c9a06a227b9a3c11ef086b597ffd41314d07b7b3392a574c5d6043d1548d0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gl/firefox-65.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "9500394c6b8e65a6dcdbe8aaf76293b182a05b12f9d40b72f7c04e1c202665a15e80fbf306ab1e78cd0f8db0d308f2ced89bc7c4e5951416d23e662296b23cce"; + sha512 = "dfba4673003970e16be3b9c3cd729969c780403955f4c16d73b3b7f1360f6b30d91e59e8f5ba5088cb557dabac3349a8a6d8dd67af50814b5968312a7b694946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gn/firefox-65.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "cd11501f541e0aef2e40b4162f388e283028b0a08cfb4a3eac4f4f6ba18093f857fb9df4258a4e6f3a687d9df7ac04981b863537c1ad8eae0a05c8aae99629fd"; + sha512 = "adc62b0f457a981d8bec415c3812f904bce32086289a344d6f1f66fd4d9820b7a05358c10e039a16ce7a85dbf18a437aca880b53e83380c5159c5d4339399792"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/gu-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/gu-IN/firefox-65.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ad5f1954ab5a6a64023cafc47b7606d5692c062ea280832637f2d127c8e8ff04238abadfa40cbedd11c432aa7291b0aa5118ec63e6a0f3da5084b268989cf2cb"; + sha512 = "92ef72ea19e9202d5712278ea4fcd24f1fa24fa8c9adbe7468e2205d9464fb39488c32c6ee90731cddde9fa581dbc79e31df734a05489abec0be5fc8b99f831e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/he/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/he/firefox-65.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c8c29b03246cd65ebc621468d728682e7a901554073ce3969ae26f404cd6c6ddbf31a1e5848a24141f4e0b2163bf21f03ef0b5fd6450b8fb87e9a9312bad45f3"; + sha512 = "1760e4810ee267ebb1105873b8a6b273cba7973537d59d82c1199a3a719c910e0b98e101bc4609dfd9b26856816ac7079d771403f51f01262672d534456e30d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hi-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hi-IN/firefox-65.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8a9932f2fab24222955fb8d203d5deab727cd90cdaaff0e6081fa9f8501db5e9f3476a108bd4a277e0cf3527385dafee9463ddc72ea1dae34a44a5523a3d7507"; + sha512 = "51c28e5c04fe4cecd9e9f8aee5debeccb3d85cee0dc0c495e5a114c677d7c9110cfdf601be947f25b127a33caba24094bdf80fa8bbc76c659ea56271f321ceb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hr/firefox-65.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "03877fac5e6eb31257bed35dfd041d29879077b0a316bc9a0343e3d8981a2153e7287ab1edc31273c60a0fa04fb7725477ee0bad19cdaeea8cf36c7fdf64b291"; + sha512 = "0b270dfec2f9a7ef6a616f14929b230d8414239d00f690ab2e6966b6b8dd7aad2af9a70e2d764d70773dc7bc7591de7fef00bf07a44d9398ac65768c84269bf3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hsb/firefox-65.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "7fe05656c72ae73020e250c0b6f4a04987871d3711469efc592432d258fb12156d215b8a9837bbe3b34f82e0b8e514647e6da54d4c91af6400fe41515cf49512"; + sha512 = "0b51c0e6ebc7beb81a4fc57966e91f02accd5abe6b8ca4ab67b2d51798efb51797b26b17bcc28cd9200430c0415d9f9c506c35d2035497e4038f4ff97af7de5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hu/firefox-65.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "20aadbaf391fa747261abf9f799bc466a99b0cd790cc79a31f4df901b1cc283d52389a5dbefb7c0f0cb46dac5536cb87ef1f510a11cd0ab40cc65998575457b9"; + sha512 = "193a5e7eb8065ce4c17cf18ef3a268b00a7d1a0394761c8c22fc88ccb20abfac20dfed8cf32c9e128cb6a67af54c5519a48b789674ee0e24f05fec50a7428b8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/hy-AM/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/hy-AM/firefox-65.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "25a50d09cb463a8d74753d0339bee2650d47730964a57e564ae658c2f2f393c05da368afffe2a1f9040d946b3aa57c973133c5c4e0de1d4685d0965e176a96bd"; + sha512 = "78d87eb8c49b5e2df1d09ca8a31bf07f8e8e0bf0004ea0dd8d185f3412489fe66d2501e1feef51f788ae4c5c77e53255cc7adb15f0f5e20d0eb55fdf4a762fc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ia/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ia/firefox-65.0b1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "b47ba7414bf0667beee177b7fb5de0bd950aba7ce567cfbec628279cf9ac208431869e2c517b0dae4ada1ee93ac78601588b82d66febf5ba27deede92f1cd478"; + sha512 = "8653cafcb6b64abc2c6ed62487ad75331b236c6610bff79934d44882407fa1abd4b85fc53667ea14db4099626088cfd798aca495ec89c8a5bf14768e13ea7f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/id/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/id/firefox-65.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "2450045d7289a0952a62092f2563ab7bc250d996b11e94c5f7df0abc4bc7bcf34817d504627f29e951282f065e94f468214c4fb691c263d9db6ec14280ac0131"; + sha512 = "eb601d0e7aae1e322db14b9e769ee67331c2df0dba34d92693e50b6e0978e2a65c1fac06c1a28e2375d18618c0f582c45e5d9a82335e9e1d603d4dfcc7abb1e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/is/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/is/firefox-65.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "320fdc1373cb4838471beed72cfb03dd0268d5d629ee0cf77ccfd1bc39572b32f572bfc82a3a4e3cf174577a307c13c334cb182ec311c5e33e9ec7db158f1650"; + sha512 = "7a30389aa58df903d804916e0915179e3f19923c8e1fa153c168eacf7ea80a0321222dca15f7b65f329ee247da5d13c2f320397e4cfdc74f694ff9e2f851c9cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/it/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/it/firefox-65.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "d57c06ca6454cdfd637ccb1f08b2da5635ff6879f4eb6c7d1780b7bd11109f1bf8408208b0f36754eb7809a480567126a356c8fae2b18b1b9856011ef3097cbd"; + sha512 = "07559c0d26c17a16a54dbd255e7c92ab4503baf618c101de66fc3b4dc98f6ac36910bec5bde6d875c2d7d11afb213a9e2a3952a612219ae7c2a2be2b81bae597"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ja/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ja/firefox-65.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "ba93cfc2cad76d2c3c223c238b549ec9501c4e7387d756d3de5ecb35a6f03685cabb21ab31467270063c9ac74e905e5b08ea77f994451efde7590348de9fd959"; + sha512 = "ec626a9457822197c8cf01f0376990f2e27f8beb23d25d5667234a7c891642b9a7fabb5eae6add31856a1cd52dd1d71056a05ef8991bb4ed8f84ab41aca5a308"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ka/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ka/firefox-65.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "f42243d7503c0d587638ff7008b81dd2fe4080be0b2aef6a9dbaceb3c49cbb13bcb6d5da1d5415371b38491dad81fa0ce48bdb624a2542927078284b9952d683"; + sha512 = "f1a8149f87b741597bc626e81ee4cab7780ad61675c967680f1826ea1bbb55609afccb337f05291544fe2b330dfdb67c3a6bc20dfe6caa32272270a646eda6a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kab/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kab/firefox-65.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "92e0f22b3eb3c2e18f5f3a7eee6d9dc80da3851981b58db98a4fcee8693f7f4388159502e3a1497c2e8af4106284a09c7f074a1813219aac4c23a22520648300"; + sha512 = "82ac700a061935fc14a705b859d6f7fc985141f61b79ee41860a47396197f59b96b78e15340b376eebf61f3c7d47ab4293334e05c920b72f6aa8db63dc0cca85"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kk/firefox-65.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "2ce861ba5c3cc7a6812cda64ecf6b6ce1c2108a5aeb640efb761f535bd2896826d87d93a39f10cddd088e53733f85d5302ac2e4694faffcd24bf9974b1f96a9d"; + sha512 = "b26864a7f6734ed518709b4818ecd33318ce7bf2725e593f0dbd6fa5d8e70c70aa6828b8444fd7ab4b622540cab8296d9d10da1a8a14826201c7e878519f4514"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/km/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/km/firefox-65.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f56b968ce2e4cb6ce50f1caae0c2f9216585cd7ed1408cc87f477d76a3489938bc0875d3876f2eb67083db8e3d813a4f7601828a3d8ccd397c13e4f2bd21043c"; + sha512 = "a3777467d2f8962b598001e62ef9044bd3a1017da6a979fc5d616b8a3da0311cceea4a5d148b32fcf05d01e3d6df4489356291c84c54a97866fc69f8daec79e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/kn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/kn/firefox-65.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "151416a6d18d9270dd166746242a20c342aa999f3bb9886e171c529d5c1807aa9d11b73e1781ec23ab5c5ab2ba2e1ee5009d1c99f46a8d5a013d542d5f59d4b8"; + sha512 = "fa92ff8ca90be448c5c8cbde5539561079a78be30826fd5b29c322dea73e94d96acdd1b3e6eb2b13f4571450dc7492f663cbc85d7334db6e2d416a8f0aacedd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ko/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ko/firefox-65.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b5218b4e241703cbe8dd153fe0668b0342091f557eefc49e47bf0b492b9adf68aae5f8416ad2f95f2c378315e4fbfa96ed759c22676629a2ef91f2722835619a"; + sha512 = "6cd537b6f0eb3447bfb61a597e5e20756fb3477eeb21234262d933369e9bec15fa2198d23fe31479f62ab4ad0c458a50394b61da35c1c3d117925c7e449c733e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lij/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lij/firefox-65.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "4a68a37cff1cbb5cae25f0bc2c153fc6ecec25e99fb5c33242708ca3ffb59f2e5ce8a6c332d1e61a57cb6f1059c5e3e0233d572615a3c1a3d8fa8a2246754e3b"; + sha512 = "402eb28a107d8023ad2ce2c67e2481c246544d65f6f4a7fb83d19be35cb186e8cbd98d3a01045f74b9734488b72f8687bca5860d0f9b0d29958dcb51537a57ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lt/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lt/firefox-65.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2536ab847e7429e72924c0841447ce77ad46e597223c7f64805ded1398d0c9e780441cb29d7a27726af37da93fae98eb7f056e14da10e296239e2ed8f784a5c2"; + sha512 = "f7c0c9fbc3ad6c8f372ccee8f07e5e38e5d13829db76b502b0c373e89cce932766f6ed6efd89482b94db6e9298d2b58d31a758e0038d29a786397f593175abe3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/lv/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/lv/firefox-65.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "0e08f49334c0680e13fd0e654211b0cf314381b2cc20283210546f0415293d79e58f139ad2d68cd496598801c984b927a62dfef3da8d6763d122fbb0f7f24063"; + sha512 = "0bb31dda168b10f78e72c9a0a93ef75df4fd0a1bcb6e541a61b196eefe794016ebd823c299d4612c6a22eff1d269dce4f5f52eda85519d7a649991ec9ef83b5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mai/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mai/firefox-65.0b1.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "a398f409bf271766e722f1ee08a114521c69a013c418bd9f66fc2c0f9cfa510d38aa9db3fd0451aa59cdeae77a88ff24a31b58d5e7da4f76148fae0670fc2450"; + sha512 = "a18f3dbf5165bb62c43d6d11796829e4b503dc33188e6e7e765eb06eb6c66d648f4048f0a0561b0bc4e765b63736ee3ec37eb77bc90ad6c2adc73fc5013ceaa2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mk/firefox-65.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "4108e9ac76734d5103bb280b290f15f33da8dff1236f94fb5eec56634f38c2db6316fd522a05b01e7cd4afc3472b6baf700e25bfee08c0cc220af98d2b4cad17"; + sha512 = "c3ff6950da399b4dab29cdf95fd9337a011cbf3da59ae5c131714c88992957aff5c7b49bbe0939b7b4c3dab342ca47573287f998d10a2f69c5174b8ce28575e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ml/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ml/firefox-65.0b1.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "95e02f1e714eb3377b4c051e5f81add25b3850dec3c6b2f483ed3c5dbd95ca6e12096c3cdab466d988f29a132d6352a059866dfe1911ec5189fc157c9aa38a16"; + sha512 = "80df4ae299523a64ddbc92ef5cb551884eb34b60b6650abb127aec01780c14aa34c8687fb5061d7415a70a322e3ac4b2898061c42d7b658b216e226e2ded36a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/mr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/mr/firefox-65.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "9166a1ce2a937cf36cb6f045de32eb9d4866fc52606f457fb94364eb538b1d9dbb010e91d7888568cd99c71d6eef9f293842e7a5ae86f9967a83960ccf420ec9"; + sha512 = "194e9601e59652fb7150a6ed38abfe8aedd8255ce3c7619a8544ff0a8808955cb31353f2f07e5608364d5ff19ce02341dabfdf1e52ef5fdc13fecd7c47019faa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ms/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ms/firefox-65.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8b5298b78e0ff4e62101b5d7487dab830da78cb7029a71807cf75c68e50ca0f2f377b6b57cd4f7d47d08c615aee8e204e98dec0e5e7c73947004d971750d7962"; + sha512 = "ec924c815278196fe447c92e149dfb6c7189da4eadae65396e5b7b7db05d0e097654383ae0d5e9e849796b828e677cf54419b1f40a65833bd2533c33cb0fb321"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/my/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/my/firefox-65.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "9f58f606bddd65ef5d55d0bc051be063c152b3bbedd26677863f7d977e0d6e0e2b0f479f75be9181472d49aa07be504e60bd088306578133597546444cb44c44"; + sha512 = "3449c107e15a518de1ba8effc31e5503ff9ba50099fc43c6d318119c4f98d8968a710dc8d66ad5e9627a52a45e2f0db24db1a1278eaecbd6bb2fed9c0e605a0b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nb-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nb-NO/firefox-65.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "525d1f440cdf342e9efa301894257ec0a5e9d13360e7e07b95c9e8e1bbbfe8597892a301c90b8bb4f839bc8fc323baec7ec3f561f6ce90c578936cba01059068"; + sha512 = "0d4b065236569a477a5d2fc18a910c0d6518adffa8c656a342eb1ef40a3c55dd9fed9fc42c21e955c457a9ad26592cc1795ad2bca055286d839e39de8a364912"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ne-NP/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ne-NP/firefox-65.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "58aa6a429698aed87132195a0387360096cf1c6d67c3eccc3d27868337f28d06480232dc4814a48c8015a8186bd3123c00f777cd1af16d1d9463d5d6dce91a6a"; + sha512 = "6f2f63519ce28e7046337d6d75ae6acefd2081834566d9f8f7c659e4dec3b5f83e61485d12deac40ca1057f4952c6d03a86eefa6be9ef7aaea6986407343757c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nl/firefox-65.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "7c9164d293660a19e85a4a830be97f0b4ee1bfc61103739bb222bde4842d50b5ea881b20e4f28182dc7f8212c370635360ad11c7d0345f2540e519a4e17ddfb3"; + sha512 = "1a837eca4c23885a997183df9d71652b0401e283ef177b6982810443eabf9d91e2d50f5b51844f2409a028aab8091cfe79c10d45f884b15ba4f79aefe01e856f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/nn-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/nn-NO/firefox-65.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "a2bc6f7396ff0aa813400ac2f3fc853857d1b5be02ab221d81ae8409360cad67b0b6bcd1b25a6e764e9557227ba93bff8cbca75334715713ad7c27acdaf82a22"; + sha512 = "1066f0ee39628d9a1dd0112300f8ea4a76d832b1a3acb74fa19a2a022d0e064e7da316ba7b236b353edd2929003c287cfd229ca7921a3bcee77a890771157af9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/oc/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/oc/firefox-65.0b1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "dd52cb8db97e9b9f64b829b0cda319b572cfb98be8d317412e6f2cd2231402ff603517f9a9525dff5e5da7800d4d5380d8596987d9c46fbeed55b3a60625f33d"; + sha512 = "9f79b9ea86dd77bc4cf9caaa6571fab2cbe3688a25588fbcc2eecbf3857728dd7b787b8c27ced7b0df6a5750baf390f5ce0fdec7d52dc6cc51352493e8608116"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/or/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/or/firefox-65.0b1.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "afabd283000910637aa1fac59c3f57c033a50fad422d60f3266615b88b5a1c27f526d258516aebf8847e2a461da2447924321258a157f444a6c730f5b34d212c"; + sha512 = "a27ee9624c3c2997200d54e5ee51e156f654f71e802869f1063e47606d264773896b00890a882ac14481deb9558fe2f478f44cc54b333d820577b90d2a8c328c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pa-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pa-IN/firefox-65.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b92bde0e3125cff1474a219af74b8cc48e45835c2d3196f348ba352073e593c2e6ce4ac872a710e62921e9a234b333bbba1da9e0feffd1ad85fa5a78828ae89e"; + sha512 = "156888812946409904a1b94d11c6cbf17a6a4d76b5b17ebdb70542008375c529d328e2db9a7e473ca724295717890bb88a6ceba00b717ac08d13ead53d37f58e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pl/firefox-65.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "f371c37b6ccb97c7e9a6328423788c7de4fd75fb4a94dfb2097fb7246bd7368b3a55418fa6dbede6ca30454b13dcdd8d611f51183e5f319ceb0552a832216597"; + sha512 = "d0143f6995b0f7500fa603724600777006ea32946b5a43eaea8264cb0cf6a98619cb1ace100ccaa202d600d0b42ad13e3fd698312d8fe2a53abd30b37462294a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-BR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-BR/firefox-65.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f7b7296719eaf28b617d7489da2e035ae90db4e3d652c1f001c22e75755cfd2c2b17c362ec2178c1bdc96623cdf7faa0662db3f63bb2cde758d622940e62e1ff"; + sha512 = "c008136825a58b3af17567dc620454b95e432edace0e65bba11024eb3c6af1137dfd525cc9503aa798472d981d303c2c725c24471cd4b780c8d7db66e6917c4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/pt-PT/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/pt-PT/firefox-65.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "9833fb8596fab02aca7b884092f3e3834be1e1c3eba78abd51855fe532cb48d61238158286d3ee4fecffbb072b02964605d448a0b63c1cd8801978a7f2a23f79"; + sha512 = "37009c77c56dbf63ecb86cd96861494ec34a2c30aa4c73638699ee0484c55e9ecf5bcaed7559eb0e39424abaaa178d69932b9a25a50996389105f8defe6833c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/rm/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/rm/firefox-65.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "cbef477873b088e084d550e11396682945d484247e9802aca2dc5f998aff9091a2e0bda26d91a37cfd866089e06555ec26198b0bd2cbe04e16de8672c39f3109"; + sha512 = "819ba5cd77f959769906d6a9e6af62db57607cb2f7ec8d1c51231e02f5ffceb82e2198b6c77f362f3a30eea15a5e3cfef6796263d3c997d4f84de1f817a230fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ro/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ro/firefox-65.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "d32802332224688db99e42678fb777420fdb2f59bf676c40034e3ccbeb91967c4620acb03814835c5f538902d2aefc0d78f6152f62dfb574242511265baa196a"; + sha512 = "7092b0110429323a9dc8ad6a3f373267f70733d8dfe33f8f6a9e67baf4a6384d52271e5cc410948e9fce12f346eb182907cde5108f28608d8185380e867ad4de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ru/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ru/firefox-65.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "0c064afd0bb925eb49ea72287d50f979a90968bb43bd870740d01d9e3f9d7456a5043b07d6d850098f89eccea0985d79ef25f7e1d9b81cb33352c588f9dd03d8"; + sha512 = "7772ed2a4496dcde8039eb2dfe950690995d66fd6beb00733df5f2043d0e399d6078268f04da6397ddd4435cbd25438ef472dbdbc51f8310b2437638fff5907a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/si/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/si/firefox-65.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "48707f9682f02d7e9223f9a616b2946811015680b6d303180ae466b5465f1900ee7679cf0e45b9f9c1fec680259dacbc38775f01f294039a973de76415702196"; + sha512 = "41b66c25bc405233e5f62749b2f2e41092735bed8776a4777a31363ee333d1ea6fae860c854648b775ac07385657bf712319368dbd00374dfcccbd612cd81485"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sk/firefox-65.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "c3cf6de7e24fd2eda564a567f9eeb72eb913bf6d9bbcf2fac5ee5d22d550e75583f5ba530b40eb0474abd56799f0f97ce18f684d902bfb6cf906ab07094d81f2"; + sha512 = "208a550d3bd4695d9e90786cadacc7a268be00eb7ad5827693c6d14a7e755db44de5b07c1e925340a7786553972448a56ddd5f395778f86ad5784d62f9c7e48c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sl/firefox-65.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "1e7d596bd8afe38002b9d481ccc21a36e9b48b4b742ce7421097f56881502da5cd8f8a51a92a2d143aee196d6a495e01a782f624151b02878f8c6f9f081ebc52"; + sha512 = "d2834ffbd907372ab3d91d19a1377a3951501817c859a0cc4c7170ec0f9e51dc819f02f68a1e80c14cae70356957c36670df836bc9552aba15f6c3197b53067e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/son/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/son/firefox-65.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "86ccf241981b218569bc6b8df5d9283d3a1f92e690265a4af0580994ec0d415aaa4ae804f4443d3956578ba3dd94a7c7797acdac0d47d805f6b839766a48f233"; + sha512 = "5b7f646f5a1028636326f0057be5b73a7a9eef69fbf442abc8c786f43e3b531e0d03a7abfb3939d963cd5a5e6f9c04eea763e390143796f45b9a365aed7ef62a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sq/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sq/firefox-65.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "81bcc1d4f35d9fd920e7eb1b50ad1f2f2403ddb78b8df1ba553fd02e1c515d78b6dece16c44fd23e95104820c32a841e26e98db53d6f34d03b4775e66832ac03"; + sha512 = "6ff106a402b0369a2142a71a89b32b9e8d61b8bd1a9b6f07ece984bdff413e5122a5aa013da1af2be450c2aa94ba37cb6b547dcfedc298822ec1c302e14faccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sr/firefox-65.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "1f1f15ed62db5958cdd1c93b3eac914318ec57264351e288ba903bfbc6bd9aeebb2eed9dc1f34418b7ffdbc70b823f8ec75de28e06ae3c3ff43523571847238b"; + sha512 = "dbc1bb7ae7b82bfefbdf524339500f24afd79910374502cae586d020fec07dcfafe52859a7d117847fd05fe48d353f56eb415227708cd7b2be8ee19840a161ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/sv-SE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/sv-SE/firefox-65.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "eafe982f5b0d624472b4aae2a64677d3bc6475e815c4ae7e89328381e2869214b14aa11a8cfe2786386bea0dc63f9621346cbdb4b740b90e61490e453ec19803"; + sha512 = "3092c863530d31119b3ef15f12aa978d7c5ef38b1d1f363a87297fc29368ac2c2cd87a5c19d08c7dc053338f96b69cc741e1fd30324734772c190382ae2a3a12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ta/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ta/firefox-65.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "eed9814300fa97d2e7953220af3cb630f46097fe2df65455d5a18341a3c19f316fe1de5fa8da7637a88978eaab2ae87b929f377d97e787e5da6c7daa548085f5"; + sha512 = "e62b1863e42c3eec15b50355d54cbb7d656f15652e3560406badc61204406fcccc4f965cd6def14730eb9d16695d1e1b58d0618ca1a2693021f6e84b51f221d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/te/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/te/firefox-65.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "c6806cb7031fabe3d481964d89fc148375e6572e009737735f08a71887f035b8c77e49ee0b0a28cc6f2e49720db74244fc67198fa3dae5448a1f0c2f6863aba0"; + sha512 = "9b420f2f422b172730b167ed88d29c91b91f551cddda72de538c7682d15c36742122ae2e995b489688b95deebb7f8d8ba64662c7f4529c845ba454b79097f97e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/th/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/th/firefox-65.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "bcf9af67d3f95a99d921142edc3359968b2793e3cb8f6e55d2f8f446005e9cb7fa75789daa9570d2db8252064bf55a48f9714d54bb115c5bec9d0ba107670508"; + sha512 = "02349edaf181a2453832118d12764925f38db3837a06c212494a6da9d37f05efe5865a8d96f7a30ad1319a67f612ae0ee1113fd281380cab11c21be01218f13c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/tr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/tr/firefox-65.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "f40677e2e43401cf5114986768dbff121774e040fb1d4f2db02139a59e9386c15cfef440aa9d7d9b104652e574adae228e738b31cd2d40d78987d78454ef1aff"; + sha512 = "fc041e81769acd28f4004cc767fcca4f917b529f802d83b93da6a5565dc6f4257deda049883e22534fd29981271521e998f79ab70a6fe88b7ecce4a0dd660708"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uk/firefox-65.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "90f1746c50e6067de269326055c7d65c227ead04b1cff3168536c7071d9933f976d8b9c96e0319d6bfe790f80bc6506b6e554307d51285bc056fc80abcefd93d"; + sha512 = "fefb644cd87be568ccc161c99e974083241e31f42f6891f8db58a042115253c990070dd2bd12086beb2009bbd27805837126c09b72e7ad4ad2d2f1326bc70e52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/ur/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/ur/firefox-65.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "cd91b30e5f3ecbd7cb42637b1f0fa84013db48cb69449b386abec15d49f240b44a613b73f5ab816da781607f208a43355d1ecab3b0ea43d2b19b50925ccb1738"; + sha512 = "f426cf7dcb4a62b17d862f9929431bc37cf6de1eeda90547ecac1b989414d1b54f86c96a3a563d123af3d5a6d8647714a28b46398e1523c30fc590822d608e23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/uz/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/uz/firefox-65.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "fc6cc15b1989cee3fbf47acb0c3e81f9e5dc5bc5eadf81ab73fa91adc9729c80dfb82136d0c3caf31188d7f4ae437c837469a960adf18b5edeb918242895631d"; + sha512 = "2ca8011284ff7e46273ca7943213b4cd5687d7c949159e19ca373bd88b82a46cbb1681bd7834abe5b9dbe54f1b2ac13095109e4050a33e119795a6426af608fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/vi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/vi/firefox-65.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "9bf08bb17c5af72edc89cdda215bb22f891bb4014d29b06e40dcc4b18a1b91b03206c138d3259b23edef8a5e31e321b3bb20d440b67c2b536ff97768fdfdad9e"; + sha512 = "707d3a6872accfe300b067044a3972b56f8bf9fe71910b7e62ec51bddb19b1b6dc8f443fceb6209a09a605202a6dd170790cc3edc8f170ebbdad31e2ec193826"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/xh/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/xh/firefox-65.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "a5328e25807a9046268c1f682ef606f5bdd3452014f7f1b037c874c270234b62144cb695f6f381d72e2658f9ff6c50bfad2d501d6d07e4113a3f3c8323bc7498"; + sha512 = "6fe5e7302094c87a1a3191a1fcff7c6a33c04371104e7f1bf9a2415ce4523865d70c4d134c649ef68e56e3f1a2bd6e2acecf5cc972e01068eddb01c74344b374"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-CN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-CN/firefox-65.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "6d08fc1d2712ae44481648e7021aab1b8b56bf6b80915b98c0a577dbe537ec329c819e9fb83c8ece5a76b1cb33787fe8d93cf06229074f7c68c429a836bcfea0"; + sha512 = "388120ea1215c20166e54b5dc9c56f2ec5aaa5a00181381c66e9849f8bc750c6d201c46d2f5aafdcff3135cac67298ac092e06f2c2c245befefdd5a679d592ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-x86_64/zh-TW/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-x86_64/zh-TW/firefox-65.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "985017e2ed930e45fe7fb6db7df7c36d2f1deefb96f37ce8decdd04d031da9fc1484527ab3fbdd3eec3d47cc828c875223845b0a45552b1a8a12dec7a427b15f"; + sha512 = "566d1569ab0ba4d209be89b19f40fbdb589d465274d7187156344115f3eba279eee694df5f69ee2c04fcf2446e008d189dc9a0affe36e4e1ed990343d2ace5b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ach/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ach/firefox-65.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a7b359f01de7603af3c560b3bfaaf45d754865e0c5e792a5deb861a041dc555d5fe8285b5c50e4d2ac6e124f1922c684d49df00f2a97b622f97f4e50bb3cdccd"; + sha512 = "3cc0cbb120517187f2780b4845d43748c453804305b4c6e8b62fa0155c2c2d4ff158ad0758d21347ff031173e1830c08d948c0c9d41c14f9eee2985e0c59e881"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/af/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/af/firefox-65.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "116531c8814b03a23a524aa7612eaa7061453fc9beb7abc30f85b86dfed4150aa2bbb8bff25fbd759d9b869261619c0c002f2126a0f1cbf237a0c71b46d721b9"; + sha512 = "eac0829a50117d7c90af59939890ffbbe7cd11f2d67f5cc30787f911598bd83b56cf667c736ec8be69fcfdd5a8c7c282f17ca57c22e1a2b9be17fae25693696b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/an/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/an/firefox-65.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b89fed73ebd86a240a8078c402e738e099e4f7ddc6430455dc5035687ae601fe533a0eb3235266dcd3f36fb299456c24fd649321e1a63e417fd492b44b9bd7a5"; + sha512 = "8b6b20ba62e12b2ce6ab5beb70c01c381fe01711a27658a27ce925e759f308d4a43d1f1744fe8a5f21477d248e4d6e393c56f33e57d808456192693efe79dbb5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ar/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ar/firefox-65.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c52098d0947f60d8ac47d8b2794ca7eba03d41fb4fc66a31688818d796521367520f0ff57ae567bd3937ceb66420b484a84b25a88a346fc775ffd26f372c88ba"; + sha512 = "92ea6e4e5e36e22ebed46e52827624de8ffb0bfe48f64509abb0ed7c0439c5e1b809cca97cde758d6e6d30eade6c42ba2c4c272858f816f9332ce2e05a2284d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/as/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/as/firefox-65.0b1.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "98e5cb7a5122a4c2f4b687dcfba88e130b43e827d5ddefaf7161dfa7e0f9a86e52654d35bba1c729424562d8a5c0c0c1635b30da5f3c88d0e8f15667a7bdca06"; + sha512 = "7c39f29e805aaeed4901170bd1df52eb3db51200f152a877f7b9e50f37c0b2135b643c61c467702abdb456491be38bd209c7e8f263fe1587101c0d0b2731a493"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ast/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ast/firefox-65.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "91d6f617fc56b801dc4ddfeccd044bf1b4a89c9ad5d0f13ef185f9996b6fa41d08c092a4a9720f52f7f121aea1b6d5bd9ea99d15a9cd672b0f8534cb6f22c6da"; + sha512 = "9408c28407c7fb2946b43703dda3bf638f14bae6adf4cb215752e76497e8e01246095ac9989ef263152f366a9fa0c4cf7d79f7a4d86b6848331333f0e89e7ef8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/az/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/az/firefox-65.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "63bdad659ff4ec803b1e0f3367e17b21e2bcf7589fa3b96901e6c3453bf7a8770f0345b212f8c90a326702ac9ca6d16d87a60436ddef863022b70eea92e83a5b"; + sha512 = "4409eac53e43fe2e2233f1e7eec8f5cb50b74e15c4057b0816d0c26d8f2dbc01c3d3a578a0bc4351d0858280038bd20dbdf9943b5e9f429ff77755d8e69b67ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/be/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/be/firefox-65.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "ae2b8a34157a541245288e13b551c765ef583684921cb290b76d96c2ed62e07bf016af1e11db344464a46242c4ecc6871b88a585634ada53ab6d315f5dd79d9f"; + sha512 = "53739c8bcedcad5e04cc53d66efc81b8446232a60e2a4d0a3020099ad29a5a6f4ce41ed478a7b18bd8f4dc6c321d75f55f6333dde467eba97cc812be977c5bcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bg/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bg/firefox-65.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b0cec246ef1268bf7feefb966b92c971da8df711acdf7f12342af75f4da09ca982db4f3e71ddee362b05ccb61dbff043cd41f2f0147637d589f0e380c55e71dc"; + sha512 = "c94ddd32cf349c3a8ca858ce2c44fcbb1edce97449956ff7a88cf696f0acde7b9b8ece49e2f5d97d9e0096d1cb320915d72188cb08a96947938ac92773d4dea5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-BD/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-BD/firefox-65.0b1.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "ec449f40b88ca7479276c7f13eb42d5365c4358d39aa78d8c91185d516595a03b22839e143341236a712edbd35cc308fabc587bdfe2481a08abcb45d907ac1c7"; + sha512 = "afc2af989f5e645ccc021b450bf59c85e5a43797d149393c5e3405660ff2c788eac74376c6046e2eb5bdb4f95762743cb904c969c3ae8c96bea3887ad457c3ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bn-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bn-IN/firefox-65.0b1.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "4dc25dbfde5dcb4bd178f8574e273ec1081f1c12f59c0167aaaac1d4aae859bbdcc512ed50c9f6a6b6d4de94a559a8f223c4acdc124d84b647d6d96d5569cbad"; + sha512 = "2c8632e3f4a4fe3ef067c2634467091b62bfb6273aa04c54bee8c390463b22403141f578bc6418249fcedcae0fe990b37afb24b04b3c453cbaed4687bb8f9266"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/br/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/br/firefox-65.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4d0eada67a745a2dddfd6c961ea2afc45b8dd99247f04172b21e008111d698d3bed29ee078b2f38ef03518b712c9b7d91183ce543ace27e428d64588d3a97c4b"; + sha512 = "d0fc413bea97d4e012619be2cbefd4ad3fc357abefa365864301d2ba81a68e9bb940c55cd03127dc0ce50b4ee9556b570e96f40063ffaa8b53055d7b2be4b6a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/bs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/bs/firefox-65.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "b7b18935016966913504530c9dccda00ec1db5bcd21157308ff4312f9cc222b9622dc165335dbfeab1ac1ea60a6cc7d846414232394c9a398791a9c7ca2f9ee2"; + sha512 = "cd21a93cb26880c06d98c1ba5f4191825b45d63e4f432a99bcf956b1c144361889497d68d9e3102ede95f046926ea21e6649ab14906c183c147988914a64a705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ca/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ca/firefox-65.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "00da4706239c7d7014a68518a643b2c130e83fb0915c12008babc920a30c87db1a9b55e1245e39b63ddc366ed017f91c843d96ca4842c91083a32b629d3b0236"; + sha512 = "83fbc4f4880140c63c2f73900926083e97737d991e617d37335f4636eb9478547127a0a6e28d6f499cc5263a33f266a1608d2026630b66f59fd472e9c1f5b85c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cak/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cak/firefox-65.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "76ea69421e52b3d622d5f5b5d4d34df5defb4cc0c3f3c7c11f856e55287b591fbad642d3d30c255d655c4bc7db7869e2f639775c02fa1892e6ee4eb5f0a3cb6e"; + sha512 = "a2272d2f275b2481a12cc905e17f8602e2d2e8d2c11561fddc620dc35623f99687481e9d9ad7539644ff7de03a311a436234dcdbdd9f4c0dbc6cef4d466b9cdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cs/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cs/firefox-65.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "e69f0867f57fa8992276f4f49a2ae73159d3697d075bcdd30688905dd35d19ac5c7b2edf8670bdffa66fabe191ec7e736a6cfbd9731054166663ad954f2c285f"; + sha512 = "3835a2d1f041ea50ce8fb3437589be968842496b2b1c13631a8cf697e7d5a01da3d97a7b45fd76d29c84c1affaec72555cf66f366c260df491cfd453d273995f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/cy/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/cy/firefox-65.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "933b7c24011fdce95934b2bffe5f83dc2e914bb34d00a429bc63018bc54fd86d50f24f7e96f897bfabce1be76ab5772e260c5c8c5ef9599c43e2598fd817f956"; + sha512 = "a280eb112fb65d5979c6a9f8ad04ab5c2ae7fa03edd29e9363009f42776f38da2f82523c71b680bb988a40e089c6f2d58a24552a73d01311e00020d9cb87e518"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/da/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/da/firefox-65.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c1077013270973de929e6f5329701b44669fd0927f1b252c1858cdd20b8cee90e6d9986ce5ab2fa10a25eba19ddbb002fb205ec12c12dc91fc056675db2b057d"; + sha512 = "71e51583d018efcdf09f0472631ac2449fdfd748dd7d4467928fccd0d6e4bad6a2853b58a456ebd8e28997aa75c58bd22cf040bcab01e66d1635bc7948a93eef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/de/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/de/firefox-65.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1810d988548e4f1ab3949fdd22b0e83be08f187d937e03c89a8854657770a3ed598890c2143e2b6cf1c4ad19b22e365446d6a96df0aed3b424d2474694521e38"; + sha512 = "2b3204787d0423e7c967ea1c87e914719e1bf2106e8589119d9a50d447e6f0c8b1aa86e75b1ab92bc928fd4c90ea24600b4c8d2d44e5097296dcc5a494c369c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/dsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/dsb/firefox-65.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "61994d9c03695295cfee0f3e4749f58133651f14c77c61e14fb34b65055dca56ce598ff2a5b58e60e380423be6bd8d1c76a72ad6dfc2872e974de57dbe2fe120"; + sha512 = "36e0c839d63c974bd2659c3015c5608bb4781526a983519fb3920ec125476d07acd852ac674d8306a67afd194e100a10099191283e3a948ec58b08df20107c2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/el/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/el/firefox-65.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "176ca16c1982dacfbf0553dee54c4ba4f6d94b288469ed8426147786a63497837d02d5de3bd82e19e3d00362fae8c1eb7db75cd2f81c233bf8fc948afad93277"; + sha512 = "fe6277f05e013e8861bd9fa9b5e9d02f1224f0cca881159e1a5d0ac00bfa42887bcb3beda291845f716860ed9486e6ee58665895a160574772b76befb3177073"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-CA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-CA/firefox-65.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "f56cffce793283f25c617cd5ca59c17f33e63048a185c449340f4662a07f0c4194c334d149d3a3c5e0330441111a2127dd578d28cd0253ca06c901c295cf0e40"; + sha512 = "a10b55c655894d783b508f6b86c787e481e673f7b6c3df739f08ee815b89359c4101026cd2f7c063050a09e7f354cdfbaa7a450935ff0b03b7b629abeb074a98"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-GB/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-GB/firefox-65.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "10cfa09292210c52b3a644245a2857958e629ebe98f7bcd3ca8d5b6a8770febd371f70a9395d192de969ff0aeef4f6592d247a860ec2325cbd50bfde1a927673"; + sha512 = "f148b9dbaf378f6a8fe5a2225128828fdc5a6a695a324cab83841665d5f93cb8d8dfd1289aed93f66ad9bad45803641102ba8ad4e9fddb063cdd36be92957f65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-US/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-US/firefox-65.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "d8cdd41a807afc1fbeb9b200b6e5a94d9c5dd86eac99cce725173d349a392c12481d334289f86be4e0be4183d14a8bc13cd746c12931cd7d46a779e6260f5fae"; + sha512 = "b99326d15fcb6450f6af9d867959d71c68bda04a75d7d1fe1a7a0fb02593a2c418c27b8797c0eb50c56d482248b308834d0fa8bc136c7086edb9081708b9dfef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/en-ZA/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/en-ZA/firefox-65.0b1.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "cf3ca56846794f25586537ca70be0bfad4a5b8c29beb3c919308f8b6db0e8dd1311a1e2c0fb1c012f5bddeb738426a89a0daabe69ad578c4b9c8a9f0ddfae3c1"; + sha512 = "bb42a0c7b782bff3195d6fc128231180611ec5ac8d9e4a402c9e796b9780f0f0d16454e457761a91f1b3bd11b554b3c61e5cf586d369809981309f1d49921078"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eo/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eo/firefox-65.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "63fff38d293a7e2264f4dd5f4b7bd48dc8738deb9725dfabbd0b99af739b93ddef1559e977d64e8c480746e50fa3c070de6e10192405c6c1aff2fb7a28303c72"; + sha512 = "2d3e5babdcfd3b3b4f25e0a239103f6bbfe3da29d418eb8fa37e054cd9afd0425acf9239e05f8d1846461997fd20f56109f2f1f39b59a18f9be6cd494eba3a0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-AR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-AR/firefox-65.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "22d03829b66b5901b118745360040164fd1d34bd854154be96f2b4973498f3cb8a1c444c6fcdead536e60f266f7b047afaa27c37f00872e7ee9ccbd3a3e6d8b6"; + sha512 = "33d0aed1738cc8aa1768177cf6453afd8cba013024fad7b776a737ea1976d1319ad8b0cc76db7517230faea2367773446987fe7d1af0cde468f9ab35d37a2303"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-CL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-CL/firefox-65.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "52344a032ddc72413ecdcfffd5f9597b199acbb1d07b96f4850891a364a4ea34d28d250747eb85318a6a39aba670f57da8c4d328530def46ec1990baded90bd2"; + sha512 = "fe2b3e41e0da6e71a219eaec0024d19801f77113a10be2fd01c4b686395753cb31363b112fd1f8fbaaff756f2a5fefada53ff99fec4b8c09fcfba2a94ea2123d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-ES/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-ES/firefox-65.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "e1a10fc09ff5930777234777a2e2fa84011a9e734d271f425126d129d2b2fea5cd5cd6ab39c2527f175485be6d618db2c2ee21d3e2409bae806a986fe1bc0f82"; + sha512 = "7cabe427b241f383352bcb3cf723df921e8a7d955ccbe61f16a7b6fbff592623d8af08b00f2242fd96e58a8905159254a2252657ca0fceeb8f4619f027d4b461"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/es-MX/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/es-MX/firefox-65.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "2527ee035fb02778f048793a613765105bf4bb196fd2fce33a544c3af26a9b8d4bd02a090313bf93849f95d48949a0bed97766e5101bfacce87517844c529895"; + sha512 = "eb27a3bfb6e38d2e03d0c51e511a7b95cb178ff41854692c561fd864db7ebdba2e6067cc3fdd9317df880b32691c0ac71377c5aa36a1b82322267e00db432b83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/et/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/et/firefox-65.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "fc809cfe614006fa5a3b81ec9a662cd42359bef5d88a3575d13a1ea36c5a3d23d6a5893ccccd9442071ed7d144e48eb6ada694107bb3b76bf9e8ea88f1dfd679"; + sha512 = "119eac2350a278075586a12ecaa1438001625a65955a0746c9e789eedf6165c6697b3085dc47f346d7b992e675ebe5d7341ad7729d6ad396af6c4a7473b227d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/eu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/eu/firefox-65.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b8a46549965de608549d7fcdc69062491fab0de097ce23ac9f7bea9ac0c38a25391f3dd0d4eafbbecea37d55e72d5808338cd09358e4568ce0284b799fbca3ef"; + sha512 = "cca07a6932810e7c19445cc3e7a30a0fdf1b68669a82f732ee608a6542f24776c6a9ec2f2cda74c047264649b3a533c038f7ab908873a0f379fff829b92d827f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fa/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fa/firefox-65.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "77ad08efa48264ba99395a4f3b1c4db58029a8397877a85ea885d18d2c36c259e5b2af4d5ac7934fefbf0a7c0d6ef33fd98a75a16fb0f72f13aa7615640c2b0a"; + sha512 = "36d515f7bfc73eb2c90c16546e3c0bd596ddfde56bef6d3962f0ab178f2f7c2b34ebe07e9e7fee79fc626ba10eab9d94275e6df8564446292f7eda6be713529a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ff/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ff/firefox-65.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "16d91d5617d0166ea091a0f42445d87484b304d9b4e4a8ceefe7bf0131b8cd59ef53fdbe68c0e6603ecdd06b07ac4cd2bf662e836d8fbfec119e455ccd462f1d"; + sha512 = "bc5f41da9ffbf41e5f9c377916572b5ece5bde37cd4416cb18c147779a9a03cbeb600961db2f3c4c43999ad3e1a12e5d7d4a54ade4f45d5c92ac1c9f1a410bac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fi/firefox-65.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "5612cedeb45cb3dca94c9234ed378bc3debf52028bdf73258ad8c16688a5ce7cc39a0a4215079361aa95ea85615d911ae863be9eb760e630d790ac8efc8be326"; + sha512 = "1e9a19f0bede01bf06e38fc58ede4c8c011a4548b62a131a203e0269c295cda32a4f7b225bbf95f51c43a8a78cef6497412d94e29a2a75a5fc7a5abc865d29f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fr/firefox-65.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "2bd0ff7bdd0fbca3d8115c1682f68eed2db08c42918bf533d4bbe7a2f5a745caf6bc162249117feff75653142fb54a9d70b9d382277781e20e13c8fa3029398e"; + sha512 = "88fa160ff11e5b1e4910ec3c6d9534d5f48758820ef2f6944a4161670f7951b0a3219e292c47044c1192ae5d1955dda5886ad3031661c4cc810e72385529f33a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/fy-NL/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/fy-NL/firefox-65.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "757bfb2edaa0a595d7fe5079ac411a8ac03533bf824979debb48e81385d123b34dfe56aaeb2fabd7217daa7ae80015d9b0c8c533a5115653dfc992f14b8a5d5d"; + sha512 = "40f208ec0ed722a097ac4e7d4abb185386ee92707e34473679bf9dbee4d7b582eeb2a46aaeaee37b0be85439a664d8f8dedd41e22aba76035d3f79695a4a092c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ga-IE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ga-IE/firefox-65.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "f42ae917024b7d477a216935f50da34d4743fc7a6172a1a83ef0d8a68ee7009d5a4a29168f8a19371df8486dfa33d6251397ad55ddfa98cc5974680ec2eec100"; + sha512 = "da9a2ddb27d3207be7efdd4090adc871cd7f406dd15f6762c0026d14ecc4a9cfc1a5c9b4b85b265ed9422ff6444c13639ba3b7f8fe5585c3b475eea9e6c955a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gd/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gd/firefox-65.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "eef9f488b18bac4ba1f397d3b536dad457e7451c4e11d260889c91bc5de8ccf21293b95fd2c6a72c9b06a979af6f28aab4ad494f9c922a39ff9251a8f73b6e6e"; + sha512 = "205e331b4a037404311b8b1152ba2e8e0981d80a4b0bd3e82b725b6ddd5ce5672285959f550b3b116b34354c8fe770bf32d4dcf9e98c29764116160bbe140937"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gl/firefox-65.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "36def20afd4f55be6aeeec85d60a8b222f238c5654a7e7be2d1a2bbcbd92512a1819234a167afca3c8b01c48df9e32de1c36658f9ae64992ff418934eb7e27f1"; + sha512 = "b1904cf32581b444e37a10a8dae6aa4f39834b47e97b5b6e62b3bbaefe561e20f06ee69b66ba3afbc03996056fc6f3bdc62d4cd38d37e0c8cb49a52c1405a59c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gn/firefox-65.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "dbefa20dc4438fc3168f67498502c98d362c4e9771e6abe6f3e8185f5eb765d9fcffe40282979c3acddf91cc56cd5b950f444a824e40d88c3ebe145372496483"; + sha512 = "17b6eb77a7e204a7e4c345004832ad1377331e7f744ec7ce463e2ef1f44dc576da8a8de20761612d51110c975779fb9fee0b87709a2b7541f124fb03cc4df060"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/gu-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/gu-IN/firefox-65.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "24ff7f3c8a9d59d2e75d2fb68bf02ee3826807b5274dc0311e5dd1bfd747bee5ed0c38d7cd7de49fdc74ff2712b4bdbb431e4a3021ae5ecdf342c18aa2c43637"; + sha512 = "14fa5291fd952d03d4beda2e71184458ecd1737996133831aa6f8f15ea5e6feefcee3db753817b02e89f4747b2c879f818fd4a7781f277491d9977e1e519bfb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/he/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/he/firefox-65.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9c7bdcfa99e36f1d89e2a93e4bfe9878d0baef82a8983cb3ebd12a12e411b0b0eb733c94cae9844e023ce2024fc4f792640db4f81fa3e7d29aaa8c80c1973336"; + sha512 = "1079037838057e9d85bc3cb54d29958a4e2d21767c7c93afc70433363ac7aed314f520a502d3542abd231a59b503de3b768a2ef87d3f3ca2d17ad7deb1611c74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hi-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hi-IN/firefox-65.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e3398c0b14348dd90583e83c85918d260f110f40a0cb871bca90ed36722f8e5868fe99a1f2bc0ce5e3ed26c014c89f4cf07e16b9545c014869c9909167af0950"; + sha512 = "dd19fdf8f61fd2c4d804cb56158aca080c2faf4361585cbb93979401f024d9c1b23816c744eac3f6f788c39effe8a68f76e8d0891b97a14481bf1c68201e7a08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hr/firefox-65.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e0c20e717c6ac8127c3ccff295c81d9dfaa61e863fe4510bd9fa3aa9e05d6ed42b7a5a765c40a85181a15629ec6df2586728fd56152c2330c4a159e5316d1a79"; + sha512 = "f1280b55ce78be18e79a7ae504b2004c7b29eeec627f36e57891c6d1b73415ff3b5645805c5b126cc005aba1d206da76e56ca09f6649dc0f95f514a294fbad1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hsb/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hsb/firefox-65.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "8057d0ac64a1515ec642359a781fc97b0cdc591aa406cb7b4f7b5e5b39d4870e3516e9d89796d15cd4295da892d96bf1b0e19132912c99e077498be92a2c7906"; + sha512 = "85923f4036af41b64e3af27035fb988c8dcffa122560d10a21b78430f7f6e6fe5e05d4ec3fafab816f42957a998418d71a7514d88f738823a33fd79a238bc935"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hu/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hu/firefox-65.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "710a143c2c9f2e8ed9f36145c96cb014943149595e37619993de55a37b5a3df684221c6456dce57e73ee6747a2592656c5bb8ce00a77731f4b8d8e309d55e948"; + sha512 = "1016ef974fe2f5cedf56dd630fc495823d224e74d2de074beaa41648843a9627e572de5313d041d5df8175099b94c1936fb1b315c8c0f99bf2ce8059b452ef1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/hy-AM/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/hy-AM/firefox-65.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "02c9358ae18ee03433ac67a9b4222c0f26c9a99b71ba7d6f2ed5df3f035d81d6da38199c24cf9493b8942586e2d310bfa647d3d4d56c264fe8dc1075657f26b3"; + sha512 = "3dd288e5876ded4a57c1e95eb0967737734f65f713157a0dd56191b12e7223e2bd214547ef009400ea58aede455e01822a9e0c4ea9ad55601e04bc6712f71e7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ia/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ia/firefox-65.0b1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f82848adf8105b788ba4005a3fbb9495a3c37fe188e250e4eb72dbd18cc34179a82eab2ca2c5974a19d60170f47ad7a3641d2114036954344cd184496a420d3d"; + sha512 = "bc3d4c93ba501e63004478ab924fe8ac6e069a231bfe5f5234bb3ec7b5eb288d1a214bd7180802927f3a3cce08c2bd5711fc6f6c053fdbbd1daca637d5d32f1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/id/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/id/firefox-65.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "cb8b3cb9ca112c741b65c0ab54265dfb86a4b940a72d1646affbad5767bced811c0bc0088a1eeb09a453a555b437660c9b519527671ce704758b8e9b607b1e70"; + sha512 = "e0f9ca54a40e01f9a7e1092e567503579b215a691907c10c7f96d2ace1524512af0abf4ff7362fa6c49dc1868dd4115a4514759707e04e5780b00dd16cbd3684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/is/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/is/firefox-65.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "09b22d51f074ef2c821ebda310b59e60b02295583d737b7887b24d3b6d0617bb1efd9af835dfa75db8c2625020ac256504e7a1b446cdfad6fe4b59edafcf892c"; + sha512 = "6253ffd4a35abb04ecf1752e695278258e3450e7dd3dc335d43ae930fcc78b8ea9ff32927ff8dd8589eb491570ae050d5e36a366e95763a0421efc4703f9f2ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/it/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/it/firefox-65.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2df43ee959f65c9ed8870afbfd81ed6810d6fd9d9693e20b05629891848843b4211022899cf80fc94df9af65118bfe0d33723b93dcb4c2fcd41bbbe90dccda8d"; + sha512 = "5ff3a302273929b7052c6c26f7007fb389867e375f104bafd0b808540b771befd3b1328bc577767ae7efd1aa58237ad86a841e07af04f298e0debb461b0fc12d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ja/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ja/firefox-65.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "1a8a79e7f08489674f8f2893a4c8c9356baadb0782576063c722458d8bda467b26afe3bae0d83a0bfbd7fda5355a6aad8873cc1d76471b3322671d65b73d4ea1"; + sha512 = "f66962e71798e4df4d222a384a2ec5051c6cc30e65c90e28296412f1908f6c5ba17057ea97875e871a984d27e6f2678f011afe5e5c067340f673d45b0ab37023"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ka/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ka/firefox-65.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4a2b8bb0afd02fcf033f298fbfaa3ac6c7ad9e34a402e0f526dc54a2387197df9a88b057a787ecc7cad99f69bc87611a704439bbf433406fe1d22d748e7cd308"; + sha512 = "78f1873a745fd6627a7e6435833f687abd587421b4b711103e504fe1179406920c6bdf847d6fce5fbcd47b485baa77555d3ad25f2ff7fa4837f48308f8144d57"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kab/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kab/firefox-65.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "566062e5190676626a3d9e063740ce2a372e30bb8836d96b31434f2dd60595fe61ae20a3e51dbc24aa99fc136d9ed918f8ecbbdbac3a459ee0ab995cc555a97e"; + sha512 = "cee493500d868909d36744b53562a455ebc4542730f97e0011ab7fc52a320478201fa41a462f28ec1ebbd8b63a77784084f52b5439e48cea5935fe71b961bc47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kk/firefox-65.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "dd931453d5970d36f5b281c2aa61ce04aaa107a92309c9c276b5120d83dd900bf7e67875fab4d91230a6242872df59c2aa725ebb018253876a01b712b4731105"; + sha512 = "92d2a814bdd16f883ac46ae76a31d68fdf73bf8df409b6a54db9efa2b309d8c402be16593f314787a705d36d8a5b289d9fd4f2b950569bab4b5140711a1b6a90"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/km/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/km/firefox-65.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "839381f90c49fc4b392e8f503576a950051d113024df2b237d2cf34948164db741a9b1db9e13e9a7e79cbb3c5994ecf5801fa36fac5f2e541ef574c7c8c8496f"; + sha512 = "7ec953af4f564097c6586813db66c9a9d4adff946a3def098bd9ace1bb2ec5d765cbe34c5f2d4bb309283a3ea83c9a61b013257411dab2d1e6f0978761058ce7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/kn/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/kn/firefox-65.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "fc2ee47bcc2c6c8872d62327543ed4b54639aecb29d76ea211cc86933646bb8828c46d04ad71b639f7dc9dcb7d3ee30afd4025fae78d9bc4a865cfb2baaa8466"; + sha512 = "68d0ef81b194b16db975cc88af819a1021cb715a3ab9a24cb482e46e83219422f8db546be19667bd533835cc25caf0c8d13f7bf4cbed40cbff919bffc8b72066"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ko/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ko/firefox-65.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "de6d2ffb87d86da19c23fd276679babc56056a3e253ba468f2d8561aaa5450e2b0cdae0115325158577508649cb58d0417cb16ce89e6beb9f3ceb229270c43dc"; + sha512 = "36f857ff7808f6a5023afd6ab8e1679c93e77dcf6a239d3ce4bd66548d22c2fdccdbefa648438a73a833d5f2683e334a6c4ae641a009330ddcdb651e2327ef2d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lij/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lij/firefox-65.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "c269db1b59e36cca2d61ddc1ec43efb4c41223680c035d69d76290a26cb18f0ff72b514fcb34895ed336ab576cd2a61d5fa953e0e2d615870a60546fec5de6b8"; + sha512 = "2a2bc5d3d1c5f74468b8109995838c9a40c738727cb3e9d69236eb741f68de1862bcac12c4607aa65b6cac423deccf07b9d5e3f0b97ff38cb6ce90111ebe4c6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lt/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lt/firefox-65.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b75be33bf611d53eee0cf2d6112e52d40149ed052a10c32f8f958c025726751066dd48893622de33c400ab642394f5c68db4319178bb0d8547830db46f90dd09"; + sha512 = "0f3a3788acf2289732485097531817680d292662a70a3d7f5c3def8526e9bff444d0a3a7d8f7263048659f6df8a80a24744296b2f306e8b44cdbeb23e2b0f92b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/lv/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/lv/firefox-65.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "6a10fde8d72f01ad6b2e1aad56f229f57694ec2cca110d12a77a68f2eb30b4e92fe7529a9ee4589160443393cc3af61d86086058e4accc9e1f9bbf581a280e25"; + sha512 = "856aefb6989bb97f5525e0b0e2acf14a448ae8d316c9dea98513f74098d36d254057c23421a40ade7bb42a522540232920d7bd0e648857a93a58cebbbcb5ac69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mai/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mai/firefox-65.0b1.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "7340d5b9f93c7b06a09164d003b5c1fe7489e8a2e18aa1c89d093bc35e921acdf4f0dfc3b247b9c8de640153e98c8f7c271aa16c3a2e25b3730ddf2d9eea7ab9"; + sha512 = "e427c73b0774026d8346476b581dc84f087e7989ee1ae7c28e0155b8debf4e55f7169caae7d2cab13b6d8b46d747734ca50a6fca39f256a381349634a9d4fd13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mk/firefox-65.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c118ec46cd4da1af94a6e706c08f7c8d570b81b49545da8f255cdf922719c2a1158984293b18a2ea411615eef72e694dccf6474e7ec736a25cde5bd57e089f56"; + sha512 = "f715fbdc2619fa35391aab97245a96b8d60dc4f8db90fbde1336cdfe22f5dcd4e68b6e9d3c4e8a07e5aff4a8bbf92daab3ae1df454a5111a436831120b390cd3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ml/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ml/firefox-65.0b1.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "4ed6f9a71e515ed9eb2c9cfa71a10d9b3a3d827f635543d1638b81e9a67c38340dc9e4c910cc87d58bcd5ab551ce1b22ae8e7b7a1a82d8c68375a57234726df2"; + sha512 = "28e98cbdbb69eae96b78586e00ad8379d0140bd02a2e9ae64bcdd2648978c63393b0139cdbebff87d703e5211709dd500b5341ad25fa3a1d3f840b6dd8358029"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/mr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/mr/firefox-65.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "64300093406fa443bf8aec9c1125f2acb3a00843892ddc110c23bba4d78bac28d732848cce23c9bee7ad1ef03586fa02567bab7c9e423b09863256359e656698"; + sha512 = "64c008751c310ad50624563214f14a310accc9f3d68fdc740864b5df50891beb76e580e60789a0219e862ad66248d75268a981ba25f78d6218d3107c1c911186"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ms/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ms/firefox-65.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "ea6641f148b7fc00e0b934181ce86735573978e7d13368673de25a88709c5b930aecebd3f4e5cd83ad40b9b0a11f3bc27b4e24d68d3dbe476344b23e1dcfe087"; + sha512 = "d5eb1472e90ac506cb518f8cd18d9142673ee4f1289db35e7cb23df895c71a48671d17a468289c21938329a89c1dab5e23a8c1292f0a5de41c51b57091a5ea01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/my/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/my/firefox-65.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "c302c3c95303e6e9e8b2b13e997a99b6acf52364e2cd30f20ba27a48aeaa395268698b2aee043deb5464e4cdf123aefa8528833b5f3d5a52beda11a39f9a3e5a"; + sha512 = "79944df3288c8df2a105e53e36e253aec6990a48bda3169de579cd1b29176cf1b52b1ab8756a19ad06e1a028421f59a835fb69dde18394da0e10906a9c9d592d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nb-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nb-NO/firefox-65.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d09a982c4301228178161d1c7a0b00b9bd8ff71125571f54b214a0de2ad10f5efe331baaee3d849f3b06a59e52aae4c52437216476808046087800c5014a9322"; + sha512 = "bae4bbe321b54ebf36d1c0e978c9d18ebd8ce1b4dc82711c2504fa638eb29ee03e84935dc6a458cbda0a6ca0cb5b07f08e696b9cc2f5c035665f8636ceade660"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ne-NP/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ne-NP/firefox-65.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "0a00a6078024fdd4c03d1044d9f72df00eb8da3de3746fa78a86ed568f72d8c83719179951ce18f7c0d1dd109773c487d5159d7b6a913bc1cc8c6b2c00603fac"; + sha512 = "cdf8bec99e46d07915d5c5082390f168617910f9b43f7b983741acdd7f09d9b1798a2b122e3e7fb9ba1beea7e43592d488264ef428461a4b90ba4dda42b0cd11"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nl/firefox-65.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f87a55f30c1b9fa14a8c0d4c7187a5e36faef688ac8a3082bcaa576db11457886f97405bd2ab1c5a02b4ac1c94643f143c332a68f90ec36f3acbf42c73876dc9"; + sha512 = "61c5d39dff518e923c5a81b4af1a1129c41bcf71d76fc8e4a4326adf8c8c486aacc6a7144e234c48b67adea7a03405848a19a65a086d12050ae1ff611a0200fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/nn-NO/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/nn-NO/firefox-65.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "aada464208cfa7c18b126114e323b1e047148891a568a8088661ec313e8c04eaff4c9f0121d9b9df95584e502e1dc5311680a209b67667f8c1f7706381208a0d"; + sha512 = "ed4f2598b3ee286671a7dcbcafb3ac4c1babfd58221ac1d6e17ae88346124e41353a73be1eb61c458cfcf20ac4a3ee26f16dc55b05a999ec9d83a28aea4cf87b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/oc/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/oc/firefox-65.0b1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "fe9a5e94cbd328fe988e263b2036d3e3477ee792d01f5bf13df67d0d352489323ae4cdf76e2e559af7008fe36804461533efe96245870244ff653e2609d973cf"; + sha512 = "9bd6ad8359e8c7a4999e8f931b220e10dfdf3cf147cb683c5b3d2a8de775323df47117142d75612ca73c015f6b97cea271d0728225069da0f4c8359c5f5ebb82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/or/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/or/firefox-65.0b1.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "0992659dcd653f29b7dff511a0742352b9c47d4db5fbeb1b3fd123ceeb3dc7fdd0326f7fb9dfdb52cef128b16af21fa457f4c732f6ef421845d6de17ad8ca446"; + sha512 = "926f128bd5b7fd6d6c74883517d3c54ce5f7d917785f45ee062610c3d0389371a48f971c247984ada2dd62a0e7249350b9b32349225b6cef80f2d2c10e1b35df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pa-IN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pa-IN/firefox-65.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "81ca4d42d4bb2674fc3e8e3d9c699b0d0106ba99831f7d06d747e254e8a61a6e9c197586293e83f7ea34564964b4d2a1da587caffa1dd1e7915ee5ff7ae4617d"; + sha512 = "91757cde47223590be15cd74e3ce8f0466eae141ccca68f38000bd59c711298222d9951df1765f68ca03d2b8d15730a8ed73d142c1086ab2cf579213429ee581"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pl/firefox-65.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "d344dc5929671b193077429ce08a51f420a996b8fe84d2f85a27ef71da407ad063e8a5c07ff476b9c5a687bbce5c8882d8281ffaaa4f023ea8550a607fce504e"; + sha512 = "77cec103f6c2810f7cd3cdb036a590fb88007a86b1775178c64f81ed05ad92a8033bae5bcb753f3f9fbc39d10b32bf1d262599da0fd4a23f3a692c5941d23728"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-BR/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-BR/firefox-65.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "8073330318cadf83558b30914042b1ac2da6911f00e4aba3bda573a65f27c53301e1b926eda36465c6f5e484f2f6f5208a863f8b134442e29a5cc908885917c8"; + sha512 = "0078e18b65681ba521217f589bddd7b6c507a529e30fa524e83087e4d4837b8e771cd6db1e1cfb77e107ca28ba05c052b3b5b8c96c92b2eba63636b6a23c3999"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/pt-PT/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/pt-PT/firefox-65.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "0ec5b66761b10a6f9e33c9c4fb8551fb7fb8d33df560062c38e71e9e5f06c6d58a4ac954db650f0e9c3d12e39fe98d3bc3c9af2e67529892ac14a1b8e6187398"; + sha512 = "aa0b1f53bb6da5b64dc8ed0da0a46e4a28c0064c1ff03dc40afdf4e2daaaf9c7cf203bf6f66d3c5fcf0fdbf0c3aec3e71819d49ca901738be6e6d343bf44179f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/rm/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/rm/firefox-65.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2fa38cc4b068358faccf1e6637864556158f1cc704111f0ceab3384ad6f80df6e04731e3147f952d592a44e05e2c39794d9b6fc8da2fa0497f60c3d0329f4c07"; + sha512 = "aa1ead0607661103ff8d58e84cc7b6b2fb80422cd25ed670b9403236d5a702255f56033cc9ffaf5746153f70973f9d8c711783fa2a16ae1ebb55e8ab9a669b01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ro/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ro/firefox-65.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5ebc28061eede2b7e8fa82d7785af1d7ed573fa241f3bcd992973219827fe41d05fbf7e878e7fc4be0ca112389ece5088ce2da76b4ed81af25cbf77613ef1ae4"; + sha512 = "0bd2887af7ccb38d6ef931882c33c629443dbfc1204460bd41c4321bb36497083794fe7e7761484a400844194f39247b30f68c3d2d015141f472136dff3d2a53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ru/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ru/firefox-65.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d48ce34160d0cc06931478822ed668b56c0dbabcc36533ed89325606c7114beed2275fa65be627320913cf899d18a0c91af60420b0028e19ae7baed31ca528e4"; + sha512 = "3603a4998739e7a561f8e642ab1c41346abf5a05eb27b67fdb79f6025fca1a9868570bc1f68db6e04eaa12ff81aee6522fb2aa1bbd74aeb33e08c69b9f67fd8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/si/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/si/firefox-65.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b40f699b3832dd3fa31bcc70f237eed994f3ec2e7f405896595c7bf0a2bdfd935d483ea342f42c041f942613df5483aee93f47f154b999a032541a2a13e751cf"; + sha512 = "1664426cdadf570e4b1282f38015eff3436fe6c37f3aa0b9445f5099d3e4ea58d176364cf615c28f82cf37fe07134611ee405dd5dfe1df7d41f10b5aaf97251d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sk/firefox-65.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "ebad485939f64ef32016c7c410b09c80b55c40ff21f59caa3d5e73aa2c65581cf82cbadc2421be9e7f743ff7176f454908b2399b0c2d78ff1c81c4003bac84f3"; + sha512 = "d2144172be9383c32d2f66328f27ee5d9585959687efaa5bce1e7a9ed1726af58714a535aadf6dc42e31684f44f065775126e4ebd177c12610e40587c1094566"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sl/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sl/firefox-65.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "dd7812bb6b579db9961bca9056add99e5aa10b3309c9562ac1a30a3613fa2afdf5a3fbf0943783660671b38b35016efb8ed3b1caaa0d67edaa07dca05b3a30b8"; + sha512 = "624becd246d58a11b1353a4838e78ed5ec8362f356279581ae1f4376da40712b6aa388d5cf02eae6040139e34995254e1ee0c08971d3666e8a867cef1be38354"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/son/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/son/firefox-65.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "e78c803672aae2f6a26f7e9173adf7d8151d9d54866114e805d8143e46b20f5a08d4b2b944fe3e2b87f8cf342777c925ceda94592b746e101b62234141512756"; + sha512 = "0d2842e6dc3187608265c70d1b0648d8b31e5b790b734d1e09c9621f8910f015ec7c245d4be1ece26f5df171bb134afabff8af1de373185d6186cc4bead293ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sq/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sq/firefox-65.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "0bc01415b9701bc80f371fb4541bbad387caf74b25edb0b2d0ce91a840cf7a8bd012fc206486b724b5cdc694dde3d229ce8c074c5d4b8d6b2e9166354b5939b3"; + sha512 = "1539962902491f03cc0e5f5c730137a6c7649b02e3816042862a37f06982760d1119fd7721e5199b94f45a4c21f76797ffba6f84981f4ddf89f1791a06e55e3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sr/firefox-65.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "f59a095a8ee815f48e5bead71af079453df702e56874c8017df4fdfde51c4db81a83a6ddd2feb2c8385f0c2bba5f0f985bb9abb38cd9777f7234796eb014e621"; + sha512 = "0cf6b4c2db8c5fcbafdc207f38de436a25c4bf467589c69d2ef1c82cd91b8ecd19a562af8bcfdf9e867b9da2c54d1bf492a395a0e6c00712f7143cbef4b598ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/sv-SE/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/sv-SE/firefox-65.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "e9884e0ae32d721b4d67069c63b573dde120ebc4de91b886644d07d00def8e341ff1a224c8645c2c2cb5539af2eaee74ee8c835bfe7a36e96ac7a4383b9344eb"; + sha512 = "ddc9bc5a3b260570c5df6995857cfae69e426b745d5577b88dd6b1cb56794e3176ade22ea78437afc5a0d2e493c8d9281266ec5691cd9cd10743e6650df48478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ta/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ta/firefox-65.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "36d3424027236c38f271a9eb12db55f978ee4e59d58b7addcd40f92f41aff015616a1b1b43183ad550b62f347b0d1ae85c4df91227ad65b1710176be8152c5b2"; + sha512 = "ab60ae9f72751526b26b7bcd062293cecc30ec02464797788efe9610a57baa0c1deb3ecf7af6d5f2d1059e971e04e119b497e4223853047f73a924304b16ad68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/te/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/te/firefox-65.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d49d0896e38f22de374e4b7b2a28cf63619f7c8980dbe17efaa2078333f84e0df20cc636aece5c58fad4a792095dc11ad08e75912e77a6d00c55c63fd2085800"; + sha512 = "c1c31923c57ff1484dd7992a380cb812a5954dca248bc2af69ebb104cfe9f543a16b8447694a748d427f727a87dd07474cbd17d9a1eacdf0c51af0ff48e79137"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/th/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/th/firefox-65.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "e74e806bcbaf3206c4a95846110ce13659fca80a63126496a9b2d7f26d00e1b8e781288144cd22e278938a37f316463f2179cc0642ab6e852875d85b16eb4aab"; + sha512 = "060058a99916d0b851ab41e0a1c38a3ab8f15241a8f46d4fafe50d6a9dcc436e697a1e6f7ced819bfaaabff8335555afe236807877400aca1eff9749210d8d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/tr/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/tr/firefox-65.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3cb2de0f5a305de3ee8c4ba7b70db4dd882437e3030a1837b3e3cb1478d609616fc7e8c61c247bab0a03e6061fe8755191db0a2126b2d5b95576396e557a4457"; + sha512 = "a8e6d67cb49fee893600fda43ae4abe9ea3d49edea372db2ccf51589edc1cc4762eabf641ec51d1d5117ae0424122da08c0ca3cd339f7ea6e46ffb8f33fa254d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uk/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uk/firefox-65.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "c2cffd17e5704eb6dfc6e757f6e4f45440b9ce10baa410be779f02815b60017d5647df8d48cc183e6cae70e64de893f467e7edce8facc189bd50868e0824b56a"; + sha512 = "7000cb70414f2c7b0b3f4de5175584732acb5978aeaa77721f91016d31ec561986124a28cd8705abc57a562b1dee1b6ff0c270105ee0d1c6a3cf485b54c8184d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/ur/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/ur/firefox-65.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "55a3ba48586665ecc77223d44982ebc276f15f7ed2538a7917ea982968a888de8c4fded1a2239969f95b751f71a9e9c3d20a1d655ec80b8bc9f63de3b2f418b2"; + sha512 = "445ea8709ac7962cc9c2e5316453918d890fb3c6b453f97fba4a67dde6707bf509eeb3e8cff2d7789a4acbc9d138d1f7e8d4d493db55dd122c48deebb401e113"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/uz/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/uz/firefox-65.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "9f94a8cf73af3f96c06a8aab1f31183d940fdf55ba864661513e9facc5c40adf6cc1fb42170a49d702f305906711df9e13bcf97bfdb22e31f8f177a8468f3bef"; + sha512 = "acb46a2d398da472fd85f8a8d8e6498570b395445e21d4bac250146e7b68f9ae01c98747a67faceedbef3cddfdf3f12a7ba10ffbd9c5a20ba9fb8542bc310944"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/vi/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/vi/firefox-65.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "bdeca49540475316fb93326651f7c2ec54bda4d27ff16395f8ae8488855813bbe0b68f98d278d1e87724be4ee8c7c1ae5560900e9b1fd75ac861ecbc8c4e46bd"; + sha512 = "e3541f17bc38a48453e4a3b76e7b721b56dc8a3d41f16d23d7ce9698edbcac860c5956a1ba2db5050dd490eb8faef3c8d75ace0d878b77d0d54321712e9a2c80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/xh/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/xh/firefox-65.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "0dff6128be2a8493f8f93e91dcd9a74c1861739babe57bdf7c7505ccf657cd7b6d25461dbb8c478afdb1811ba4b5a1abe8ca7fb7947393b30923d47af37ecadc"; + sha512 = "958064d163f58f306f66de17f0b255cae1e315c707b70a1b19e0bd37c0ce8bf61c2b5cfa23cc605c76dc77061d17647f13a93577baff167bc9acd044d26f1232"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-CN/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-CN/firefox-65.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4589a428a78b532f888a7bd82167af84d85d7557a099e6a38cddcbf01db546241f12420f6a926540c55ad7092e00aa1ac8b622b3638a74ee97ec58f0cb0e85ab"; + sha512 = "b74a598177fcab1dc721e854135cbca2769a478a908adbfffb18d5ed7dd4d1e984a8413d11fe5b11235423962bc0adfe00fc4e3c48512909dda0c12663d01564"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/64.0b10/linux-i686/zh-TW/firefox-64.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/65.0b1/linux-i686/zh-TW/firefox-65.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f9b8bfe7609b7dc511b52ea937fbdd3f40b32c5aebaa2d9a68766efef0aaad6d9e33c0d0fcdef55a4953973df2b2695d4179f9ada33893ae13ebc8fcc05e8442"; + sha512 = "c7bee751ce40b7110f0f32263dc6e928d52e5b065ce1e0ad2770a43c44dbc6f1bf372df7aaad909eeedb8e4e48f045365f181b25aa8baa5ad738025a293b7c8e"; } ]; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 9aee9ef8c00e..96db22ecaba8 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,25 +74,25 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "31.0.0.153"; + version = "32.0.0.101"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_npapi_linux_debug.${arch}.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_npapi_linux_debug.${arch}.tar.gz" else "https://fpdownload.adobe.com/get/flashplayer/pdc/${version}/flash_player_npapi_linux.${arch}.tar.gz"; sha256 = if debug then if arch == "x86_64" then - "0d3ch1ksxra8hvbqnzj5fmbvlz6hq42b3rncx4vpjlwrcjd9ggy9" + "0383r5pl1jrspy06mpxq50kkip5q5v052kz9aymk4qylgy1dwpn2" else - "1qldcashv1x64cvpbx1741hz32rmc0dp7i3ayhpbi15rvf95qx8f" + "1vx2map0wlj6bj8dqyxxaymmz9awjjfhi6097knpmqp6j8dj7l5g" else if arch == "x86_64" then - "114n3kvdyfmn2w6w6zbijx29fz10x3cbjyy3ci05n0y07lhq1grc" + "003mr9mqkg0agj3zlmci5a1m3lnhj27mnvqswjaffdg5rlihvxyi" else - "0sxvjf3xylm4bmhianyfy54gzbm4gkq1i9q8gg4fn3nb3c0z7327"; + "1smmdsnnlsssakzqas5268svyv3rk717zr7kwpkj4rd5d1pqwcps"; }; 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 b1a22673d015..9713f7d69718 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,19 +50,19 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "31.0.0.153"; + version = "32.0.0.101"; src = fetchurl { url = if debug then - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux_debug.x86_64.tar.gz" + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux_debug.x86_64.tar.gz" else - "https://fpdownload.macromedia.com/pub/flashplayer/updaters/31/flash_player_sa_linux.x86_64.tar.gz"; + "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1k78nwrz5zbsj5jvn340n2y4dz1zxrcb7f7955d8dra15w0zax1k" + "1i59vfhxrlksxwmr3kj3dfbasfjgnx9aimmv400z07fw3zmdrbpw" else - "0ajg3p4c36xzvvjl2hpbzn2g3xwjgf2xy6x4478aq7fxfgb0vf6s"; + "0fz9zhp0qn9xda5pg37dfnvx04n8d7156h1qayf2l3la94apsacq"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 89dd6775719a..e3269f15ac63 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb"; - sha256 = "08x6abyz65vx4ycj8ys8sib9z1adb8ybmnrqjck69b30kbz78rj2"; + sha256 = "00rxp6rardxjg17g2b28y2rj8szqlainp4ga6c58z981zkxvdlls"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 0f232772f076..130ccdc83111 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go }: +{ stdenv, fetchFromGitHub, go, removeReferencesTo }: stdenv.mkDerivation rec { name = "cni-${version}"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "00ajs2r5r2z3l0vqwxrcwhjfc9px12qbcv5vnvs2mdipvvls1y2y"; }; - buildInputs = [ go ]; + buildInputs = [ removeReferencesTo go ]; + + GOCACHE = "off"; buildPhase = '' patchShebangs build.sh @@ -23,6 +25,10 @@ stdenv.mkDerivation rec { mv bin/cnitool $out/bin ''; + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + ''; + meta = with stdenv.lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 148e98ced80c..27e0a038310b 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, go }: +{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo }: stdenv.mkDerivation rec { name = "cni-plugins-${version}"; @@ -11,7 +11,9 @@ stdenv.mkDerivation rec { sha256 = "1sywllwnr6lc812sgkqjdd3y10r82shl88dlnwgnbgzs738q2vp2"; }; - buildInputs = [ go ]; + buildInputs = [ removeReferencesTo go ]; + + GOCACHE = "off"; buildPhase = '' patchShebangs build.sh @@ -23,6 +25,10 @@ stdenv.mkDerivation rec { mv bin/* $out/bin ''; + preFixup = '' + find $out/bin -type f -exec remove-references-to -t ${go} '{}' + + ''; + meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; homepage = https://github.com/containernetworking/plugins; diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix new file mode 100644 index 000000000000..8caa3cd75245 --- /dev/null +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kube-router-${version}"; + version = "0.2.3"; + rev = "v${version}"; + + goPackagePath = "github.com/cloudnativelabs/kube-router"; + + src = fetchFromGitHub { + inherit rev; + owner = "cloudnativelabs"; + repo = "kube-router"; + sha256 = "1dsr76dq6sycwgh75glrcb4scv52lrrd0aivskhc7mwq30plafcj"; + }; + + buildFlagsArray = '' + -ldflags= + -X + ${goPackagePath}/pkg/cmd.version=${version} + -X + ${goPackagePath}/pkg/cmd.buildDate=Nix + ''; + + meta = with stdenv.lib; { + homepage = "https://www.kube-router.io/"; + description = "All-in-one router, firewall and service proxy for Kubernetes"; + license = licenses.asl20; + maintainers = with maintainers; [ colemickens johanot ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix new file mode 100644 index 000000000000..708b59fce243 --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoPackage, fetchFromGitHub }: +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "terraform-docs"; + version = "0.5.0"; + + goPackagePath = "github.com/segmentio/${pname}"; + + src = fetchFromGitHub { + owner = "segmentio"; + repo = pname; + rev = "v${version}"; + sha256 = "12w2yr669hk5kxdb9rrzsn8hwvx8rzrc1rmn8hs9l8z1bkfhr4gg"; + }; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X main.version=${version}") + ''; + + meta = with lib; { + description = "A utility to generate documentation from Terraform modules in various output formats"; + homepage = "https://github.com/segmentio/terraform-docs/"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 8271346f25ea..a69229735f8b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -11,8 +11,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.23.0"; - sha256 = "14hs58lqlj9vkmr4bxbyga8yz4h6mrx6zla587sqwgj5bjrg5vld"; + version = "1.25.0"; + sha256 = "09f0vdzkifj2mk1qccacpnlqiihbhhb2sfd21rpxbqscmj6a7vj1"; }; archive = { @@ -39,8 +39,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.46.0"; - sha256 = "1xp02cwyl9sf8swl7x3wah3bg0ssm7y0svq8bkfki6632nfw9vzi"; + version = "1.51.0"; + sha256 = "1hx4zbmwcbaslq2pj01m3y8b44gipw9gg235jsv7454nrd3jhvhg"; }; azurerm = { @@ -137,8 +137,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.5.0"; - sha256 = "0wr44rqmg0hffgb2g4h03lk4pg9i244c13kyrc3m89b3biwdcydz"; + version = "1.6.0"; + sha256 = "16rp6kqax7i8fnl4id3sg0jmhjswx7wrnn1mp4z29gca46ji1nfh"; }; digitalocean = { @@ -235,8 +235,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - version = "1.5.0"; - sha256 = "135h811qh1l1kn66n371f00b422xi4zw15cgs3id866za5cavxf3"; + version = "1.6.0"; + sha256 = "19kax1l2l6vr8cwgy14ahhafnvlxgkw86xx2g9ajfg70d0q4zs3g"; }; helm = { @@ -270,8 +270,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-icinga2"; - version = "0.1.1"; - sha256 = "0z7lxrspm33j7bkkm2n7ac0jgyaz3y3lql3gd30p10nvpilrg07v"; + version = "0.2.0"; + sha256 = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0"; }; ignition = { @@ -291,8 +291,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - version = "1.3.0"; - sha256 = "0fhh0r92whcxqz4z2kb6qx9dyygms5mz7ifhb9c7s2r22jnfz1j3"; + version = "1.4.0"; + sha256 = "14bhqrpx0z4qn51xwcklafva46ipx05q6myy7xh5wf6wpjz69j9p"; }; librato = { @@ -305,8 +305,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - version = "1.2.0"; - sha256 = "1wnl48qi8lhrxnrdgnhw7cb7mqv6141g4i648wb7cni5vlqy3i5l"; + version = "1.3.0"; + sha256 = "1683nkpq7wnc67pphablcmaifq2l1pz3gc9y5y9jbslllphy92v5"; }; local = { @@ -396,8 +396,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - version = "3.7.0"; - sha256 = "10d8hvcr019cr8fh54klnr9xhi0y3l5w4nb2h9bny84nv2rznk38"; + version = "3.9.0"; + sha256 = "1mm6q9crn2izx1il6fk3mhi9is1zrrsy7rnldcj05bzyywnq3r97"; }; oneandone = { @@ -459,8 +459,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - version = "1.2.0"; - sha256 = "037mdcvpcpjj0dpwg0nny862j631ajhv472a847p2ajgk02bq1wf"; + version = "1.2.1"; + sha256 = "1b0fbzqalcxngnxk51afxkhs82bj68sjakvb28p0im0x1lblxj0n"; }; panos = { @@ -536,8 +536,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.7.0"; - sha256 = "0gsjvpwfw2sc6ncy8v3j6gs0aanq3b08j3gid43687mfd782f4gk"; + version = "1.8.0"; + sha256 = "1vr3im5jas7m3yn5529m6ghhx4lxf2lksqbznpwyi351sbsn4ji2"; + }; + selvpc = + { + owner = "terraform-providers"; + repo = "terraform-provider-selvpc"; + version = "0.3.0"; + sha256 = "1s1p0qa9x007hq26i4h0gcqpyx54jnwvg8d6ya044gm7gghhviz4"; }; softlayer = { @@ -592,8 +599,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - version = "0.3.0"; - sha256 = "125k1hgpzwlsgslnz2nwz4mc5yl3hqyg48xdcn7bxvmvaf6kw9gd"; + version = "0.4.0"; + sha256 = "02qvxc4ljb6s8bkw521wdsxhp53pmk7sbk3dyjbrwpz9xdg8dscn"; }; tls = { @@ -651,4 +658,11 @@ version = "0.0.1"; sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; }; + secret = + { + owner = "tweag"; + repo = "terraform-provider-secret"; + version = "0.0.1"; + sha256 = "1mqs1il8y97hf9havcmxdfwjcpkrxa1hpkifzzy4rjc88m2m4q9r"; + }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt index 16305b4b90c6..d5db0b91ae25 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.txt @@ -7,10 +7,13 @@ # <organisation>/<repo> - include only the named repository. # include all terraform-providers -terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\) +terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\|google-beta\\|skytap\\) # include terraform-provider-matchbox coreos/terraform-provider-matchbox # include terraform-provider-nixos tweag/terraform-provider-nixos + +# include terraform-provider-secret +tweag/terraform-provider-secret diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index d2cbf7bbdfc6..429429bc4117 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -14,13 +14,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-11-27"; + name = "dino-unstable-2018-11-29"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "141db9e40a3a81cfa3ad3587dc47f69c541d0fde"; - sha256 = "006r1x7drlz39jjxlfdnxgrnambw9amhl9jcgf6p1dx71h1x8221"; + rev = "680d28360c781ff29e810821801cfaba0493c526"; + sha256 = "1w08xc842p2nggdxf0dwqw8izhwsrqah10w3s0v1i7dp33yhycln"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/rambox/bare.nix b/pkgs/applications/networking/instant-messengers/rambox/bare.nix index 8f0f06c07cc4..29ed30dd27f6 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/bare.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/bare.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "rambox-bare-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "ramboxapp"; repo = "community-edition"; rev = version; - sha256 = "150vf62cp739l9dgpnksgpkffabs2wi15q217m3nai34irhwzk8m"; + sha256 = "1ghk29d0x6i3j8b1b4xxgyf961lp17qsvvhnilnkh1nhmvxpwmw5"; }; nativeBuildInputs = [ nodejs-8_x ruby sencha ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { inherit src; nodejs = nodejs-8_x; - sha256 = "0hbw47653wh159c34f0rlj3p7xy0lvsyp0wh2hl35kv3fnsfbbm0"; + sha256 = "03h1kfiaflwbrvcd8v0bsymn7n2dxi3yj4pxkwcigqg4jgcf56k6"; }; patches = [ ./isDev.patch ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index b5994d03bc68..6953b3bc6e8e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -13,8 +13,8 @@ let in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { - version = "1.4.7"; - sha256Hash = "00kjirikywdbigm4zdnm50s3wxfn9bw1yx13xz4k4ppz6amq9nrp"; + version = "1.4.8"; + sha256Hash = "0jn7nyvx5kmva418hi1x1awbycmhgk82gazx49kmdxspdd4nsrgj"; stable = false; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix index 7736c8b66bd1..900e0980e74c 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/generic.nix @@ -8,7 +8,15 @@ with lib; -mkDerivation rec { +let + # TODO: Not optimal (maybe we should only package the stable versions) + previewPatches = fetchFromGitHub { + owner = "primeos"; + repo = "nixpkgs-tdesktop-patches"; + rev = "b3c0cbce1b412443a8712c90069932bbcae87fb6"; + sha256 = "1bymrciaci6plghaz7a6qwsidjm8rg5fqdh158cdp70il4g7kmw9"; + }; +in mkDerivation rec { name = "telegram-desktop-${version}"; inherit version; @@ -29,7 +37,10 @@ mkDerivation rec { }; # TODO: libtgvoip.patch no-gtk2.patch - patches = [ "${archPatches}/tdesktop.patch" ] + patches = + (if stable + then [ "${archPatches}/tdesktop.patch" ] + else [ "${previewPatches}/tdesktop.patch" ]) # TODO: Only required to work around a compiler bug. # This should be fixed in GCC 7.3.1 (or later?) ++ [ ./fix-internal-compiler-error.patch ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 7ed237ce6aa2..d52d8b6b31e4 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -2,7 +2,6 @@ , ncurses, openssl, aspell, gnutls , zlib, curl, pkgconfig, libgcrypt , cmake, makeWrapper, libobjc, libresolv, libiconv -, writeScriptBin # for withPlugins , asciidoctor # manpages , guileSupport ? true, guile , luaSupport ? true, lua5 @@ -11,8 +10,6 @@ , rubySupport ? true, ruby , tclSupport ? true, tcl , extraBuildInputs ? [] -, configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } -, runCommand, buildEnv }: let @@ -27,7 +24,7 @@ let ]; enabledPlugins = builtins.filter (p: p.enabled) plugins; - weechat = + in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { version = "2.3"; @@ -82,72 +79,4 @@ let maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny lheckemann ma27 ]; platforms = stdenv.lib.platforms.unix; }; - }; -in if configure == null then weechat else - let - perlInterpreter = perl; - availablePlugins = let - simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; - in rec { - python = { - pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; - withPackages = pkgsFun: (python // { - extraEnv = '' - export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" - ''; - }); - }; - perl = (simplePlugin "perl") // { - extraEnv = '' - export PATH="${perlInterpreter}/bin:$PATH" - ''; - withPackages = pkgsFun: (perl // { - extraEnv = '' - ${perl.extraEnv} - export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)} - ''; - }); - }; - tcl = simplePlugin "tcl"; - ruby = simplePlugin "ruby"; - guile = simplePlugin "guile"; - lua = simplePlugin "lua"; - }; - - config = configure { inherit availablePlugins; }; - - plugins = config.plugins or (builtins.attrValues availablePlugins); - - pluginsDir = runCommand "weechat-plugins" {} '' - mkdir -p $out/plugins - for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do - ln -s $plugin $out/plugins - done - ''; - - init = let - init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or ""); - - mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}"); - - scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) - [ ] (config.scripts or [])); - in "${scripts};${init}"; - - mkWeechat = bin: (writeScriptBin bin '' - #!${stdenv.shell} - export WEECHAT_EXTRA_LIBDIR=${pluginsDir} - ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} - exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} - '') // { - inherit (weechat) name meta; - unwrapped = weechat; - }; - in buildEnv { - name = "weechat-bin-env-${weechat.version}"; - paths = [ - (mkWeechat "weechat") - (mkWeechat "weechat-headless") - ]; - meta = weechat.meta; - } + } diff --git a/pkgs/applications/networking/irc/weechat/wrapper.nix b/pkgs/applications/networking/irc/weechat/wrapper.nix new file mode 100644 index 000000000000..1e371bb8e223 --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/wrapper.nix @@ -0,0 +1,80 @@ +{ stdenv, lib, runCommand, writeScriptBin, buildEnv +, pythonPackages, perl, perlPackages +}: + +weechat: + +let + wrapper = { + configure ? { availablePlugins, ... }: { plugins = builtins.attrValues availablePlugins; } + }: + + let + perlInterpreter = perl; + availablePlugins = let + simplePlugin = name: {pluginFile = "${weechat.${name}}/lib/weechat/plugins/${name}.so";}; + in rec { + python = { + pluginFile = "${weechat.python}/lib/weechat/plugins/python.so"; + withPackages = pkgsFun: (python // { + extraEnv = '' + export PYTHONHOME="${pythonPackages.python.withPackages pkgsFun}" + ''; + }); + }; + perl = (simplePlugin "perl") // { + extraEnv = '' + export PATH="${perlInterpreter}/bin:$PATH" + ''; + withPackages = pkgsFun: (perl // { + extraEnv = '' + ${perl.extraEnv} + export PERL5LIB=${lib.makeFullPerlPath (pkgsFun perlPackages)} + ''; + }); + }; + tcl = simplePlugin "tcl"; + ruby = simplePlugin "ruby"; + guile = simplePlugin "guile"; + lua = simplePlugin "lua"; + }; + + config = configure { inherit availablePlugins; }; + + plugins = config.plugins or (builtins.attrValues availablePlugins); + + pluginsDir = runCommand "weechat-plugins" {} '' + mkdir -p $out/plugins + for plugin in ${lib.concatMapStringsSep " " (p: p.pluginFile) plugins} ; do + ln -s $plugin $out/plugins + done + ''; + + init = let + init = builtins.replaceStrings [ "\n" ] [ ";" ] (config.init or ""); + + mkScript = drv: lib.flip map drv.scripts (script: "/script load ${drv}/share/${script}"); + + scripts = builtins.concatStringsSep ";" (lib.foldl (scripts: drv: scripts ++ mkScript drv) + [ ] (config.scripts or [])); + in "${scripts};${init}"; + + mkWeechat = bin: (writeScriptBin bin '' + #!${stdenv.shell} + export WEECHAT_EXTRA_LIBDIR=${pluginsDir} + ${lib.concatMapStringsSep "\n" (p: lib.optionalString (p ? extraEnv) p.extraEnv) plugins} + exec ${weechat}/bin/${bin} "$@" --run-command ${lib.escapeShellArg init} + '') // { + inherit (weechat) name meta; + unwrapped = weechat; + }; + in buildEnv { + name = "weechat-bin-env-${weechat.version}"; + paths = [ + (mkWeechat "weechat") + (mkWeechat "weechat-headless") + ]; + meta = weechat.meta; + }; + +in lib.makeOverridable wrapper diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 01aaa2219bf3..3d65b7a621b3 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, openssh, -makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon }: +{ stdenv, fetchgit, cups, libssh, libXpm, nxproxy, openldap, openssh +, makeWrapper, qtbase, qtsvg, qtx11extras, qttools, phonon, pkgconfig }: stdenv.mkDerivation rec { - name = "x2goclient-${version}"; - version = "4.1.2.1"; + pname = "x2goclient"; + version = "unstable-2018-11-30"; - src = fetchurl { - url = "https://code.x2go.org/releases/source/x2goclient/${name}.tar.gz"; - sha256 = "1bzjzz2m9bqqndnk1p9p522cfapsqgkb0wllvqj9d4ir18grh60w"; + src = fetchgit { + url = "git://code.x2go.org/x2goclient.git"; + rev = "659655675f11ffd361ab9fb48fa77a01a1536fe8"; + sha256 = "05gfs11m259bchy3k0ihqpwg9wf8lp94rbca5dzla9fjzrb7pyy4"; }; buildInputs = [ cups libssh libXpm nxproxy openldap openssh - qtbase qtsvg qtx11extras qttools phonon ]; + qtbase qtsvg qtx11extras qttools phonon pkgconfig ]; nativeBuildInputs = [ makeWrapper ]; - patches = [ ./qt511.patch ]; - postPatch = '' substituteInPlace Makefile \ --replace "SHELL=/bin/bash" "SHELL=$SHELL" \ diff --git a/pkgs/applications/networking/remote/x2goclient/qt511.patch b/pkgs/applications/networking/remote/x2goclient/qt511.patch deleted file mode 100644 index 8f02cd62277d..000000000000 --- a/pkgs/applications/networking/remote/x2goclient/qt511.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/printwidget.cpp b/src/printwidget.cpp -index 58a8af7..131d340 100644 ---- a/src/printwidget.cpp -+++ b/src/printwidget.cpp -@@ -23,6 +23,7 @@ - #include "x2gosettings.h" - #include "x2gologdebug.h" - #include <QDir> -+#include <QButtonGroup> - #ifdef Q_OS_WIN - #include "wapi.h" - #endif --- -2.17.1 - diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 3e6a057c422b..5ac50da649d9 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.7"; + version = "6.2.8"; name = "seafile-client-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "16ikl6vkp9v16608bq2sfg48idn2p7ik3q8n6j866zxkmgdvkpsg"; + sha256 = "1y57cw789cmssgl39kj94q259kba08v5i1yc1cmx7qxyigrpwyv6"; }; nativeBuildInputs = [ pkgconfig cmake makeWrapper ]; diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index d689b17fe325..289d1dffc961 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, gd, ncurses }: +{ stdenv, fetchurl, gd, ncurses, sqlite }: stdenv.mkDerivation rec { name = "vnstat-${version}"; - version = "1.18"; + version = "2.1"; src = fetchurl { - sha256 = "1mc7qqvrnl0zyhgh8n7wx1g1cbwq74xpvbz8rfjmyi77p693a6fp"; + sha256 = "0yk0x6bg9f36dsslhayyyi8fg04yvzjzqkjmlrcsrv6nnggchb6i"; url = "https://humdi.net/vnstat/${name}.tar.gz"; }; - buildInputs = [ gd ncurses ]; + buildInputs = [ gd ncurses sqlite ]; postPatch = '' substituteInPlace src/cfg.c --replace /usr/local $out diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 740224b15b3d..3f4953fc12a7 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -5,12 +5,12 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.4.1"; + version = "3.5.0"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5"; + sha256 = "051qjdpwif06x7qspnb4pfwdhb8nnmz99yqcp4kla5hv0n3jh0w9"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux @@ -29,13 +29,6 @@ buildPythonApplication rec { makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" "--set CHARSET en_us.UTF-8" ]; - patches = [ - (fetchpatch { - url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch"; - sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag"; - }) - ]; - preCheck = '' # Remove one failing test that only checks whether the command line works rm tests/test_main.py diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 65e12125801a..ef3a0ba40f28 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,8 +7,8 @@ let in stdenv.mkDerivation rec { - srcVersion = "nov18a"; - version = "20181101_a"; + srcVersion = "dec18a"; + version = "20181201_a"; name = "gildas-${version}"; src = fetchurl { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # source code of the previous release to a different directory urls = [ "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz" "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.gz" ]; - sha256 = "1dl2v8y6vrwaxm3b7nf6dv3ipzybhlhy2kxwnwgc7gqz5704251v"; + sha256 = "f295b5b7f999c0d746a52b307af7b7bdbed0d9b3d87100a6a102e0cc64f3a9bd"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 8ee43dc16c1d..3af24ffe7596 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; buildGoPackage rec { name = "gitea-${version}"; - version = "1.5.3"; + version = "1.6.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "1f8cbsd3kn4v2a6c57rwh9slgvss7gnxs96yhcy2ddwyycf6i04d"; + sha256 = "01nqf8pnpa0n72brqh499z15rys6f0ck7l2cnpbiqgg3kir8b21p"; # Required to generate the same checksum on MacOS due to unicode encoding differences # More information: https://github.com/NixOS/nixpkgs/pull/48128 extraPostFetch = '' diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 8a871cfeb51a..16fe748c3e5c 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -3,7 +3,7 @@ # Contact: stdenv.lib.maintainers.fuuzetsu { stdenv, Agda, glibcLocales -, writeScriptBin +, writeShellScriptBin , extension ? (self: super: {}) }: @@ -77,8 +77,8 @@ let buildInputs = let # Makes a wrapper available to the user. Very useful in # nix-shell where all dependencies are -i'd. - agdaWrapper = writeScriptBin "agda" '' - ${self.agdaWithArgs} "$@" + agdaWrapper = writeShellScriptBin "agda" '' + exec ${self.agdaWithArgs} "$@" ''; in [agdaWrapper] ++ self.buildDepends; }; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 890f64a9d3b1..f16cb7cec13a 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -188,22 +188,27 @@ rec { # Use the name and tag to get the parent ID field. parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ < image/repositories) + + cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list + else + touch layer-list fi # Unpack all of the parent layers into the image. lowerdir="" - while [[ -n "$parentID" ]]; do - echo "Unpacking layer $parentID" - mkdir -p image/$parentID/layer - tar -C image/$parentID/layer -xpf image/$parentID/layer.tar - rm image/$parentID/layer.tar + extractionID=0 + for layerTar in $(cat layer-list); do + echo "Unpacking layer $layerTar" + extractionID=$((extractionID + 1)) + + mkdir -p image/$extractionID/layer + tar -C image/$extractionID/layer -xpf $layerTar + rm $layerTar - find image/$parentID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; + find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; # Get the next lower directory and continue the loop. - lowerdir=$lowerdir''${lowerdir:+:}image/$parentID/layer - parentID=$(cat image/$parentID/json \ - | (jshon -e parent -u 2>/dev/null || true)) + lowerdir=$lowerdir''${lowerdir:+:}image/$extractionID/layer done mkdir work @@ -673,6 +678,9 @@ rec { if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." tar -C image -xpf "$fromImage" + + cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list + # Do not import the base image configuration and manifest chmod a+w image image/*.json rm -f image/*.json @@ -690,6 +698,8 @@ rec { for l in image/*/layer.tar; do ls_tar $l >> baseFiles done + else + touch layer-list fi chmod -R ug+rw image @@ -742,17 +752,23 @@ rec { # Use the temp folder we've been working on to create a new image. mv temp image/$layerID + # Add the new layer ID to the beginning of the layer list + ( + # originally this used `sed -i "1i$layerID" layer-list`, but + # would fail if layer-list was completely empty. + echo "$layerID/layer.tar" + cat layer-list + ) | ${pkgs.moreutils}/bin/sponge layer-list + # Create image json and image manifest imageJson=$(cat ${baseJson} | jq ". + {\"rootfs\": {\"diff_ids\": [], \"type\": \"layers\"}}") manifestJson=$(jq -n "[{\"RepoTags\":[\"$imageName:$imageTag\"]}]") - currentID=$layerID - while [[ -n "$currentID" ]]; do - layerChecksum=$(sha256sum image/$currentID/layer.tar | cut -d ' ' -f1) + + for layerTar in $(cat ./layer-list); do + layerChecksum=$(sha256sum image/$layerTar | cut -d ' ' -f1) imageJson=$(echo "$imageJson" | jq ".history |= [{\"created\": \"$(jq -r .created ${baseJson})\"}] + .") imageJson=$(echo "$imageJson" | jq ".rootfs.diff_ids |= [\"sha256:$layerChecksum\"] + .") - manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$currentID/layer.tar\"] + .") - - currentID=$(cat image/$currentID/json | (jshon -e parent -u 2>/dev/null || true)) + manifestJson=$(echo "$manifestJson" | jq ".[0].Layers |= [\"$layerTar\"] + .") done imageJsonChecksum=$(echo "$imageJson" | sha256sum | cut -d ' ' -f1) diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 003e7429a81b..090bfafa0855 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -156,5 +156,24 @@ rec { name = "layered-image"; tag = "latest"; config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + contents = [ pkgs.hello pkgs.bash pkgs.coreutils ]; + }; + + # 11. Create an image on top of a layered image + layered-on-top = pkgs.dockerTools.buildImage { + name = "layered-on-top"; + tag = "latest"; + fromImage = layered-image; + extraCommands = '' + mkdir ./example-output + chmod 777 ./example-output + ''; + config = { + Env = [ "PATH=${pkgs.coreutils}/bin/" ]; + WorkingDir = "/example-output"; + Cmd = [ + "${pkgs.bash}/bin/bash" "-c" "echo hello > foo; cat foo" + ]; + }; }; } diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index ff04ba6a8173..7630c6471dcd 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -73,6 +73,7 @@ in '' export CARGO_PKG_VERSION_PATCH=${builtins.elemAt version 2} export NUM_JOBS=1 export RUSTC="rustc" + export RUSTDOC="rustdoc" if [[ -n "${versionPre}" ]]; then export CARGO_PKG_VERSION_PRE="${versionPre}" fi diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index ae8d358164f4..5043e031c08f 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -2,11 +2,14 @@ let mkNoto = { name, weights, sha256, }: - let version = "2017-10-24-phase3-second-cleanup"; in + let + version = "2018-11-30"; + ref = "85e78f831469323c85847e23f95026c894159135"; + in fetchzip { name = "${name}-${version}"; inherit sha256; - url = "https://github.com/googlei18n/noto-fonts/archive/v${version}.zip"; + url = "https://github.com/googlei18n/noto-fonts/archive/${ref}.zip"; postFetch = '' unzip $downloadedFile mkdir -p $out/share/fonts/noto @@ -47,12 +50,12 @@ rec { noto-fonts = mkNoto { name = "noto-fonts"; weights = "{Regular,Bold,Light,Italic,BoldItalic,LightItalic}"; - sha256 = "1dmarbsfank6xzzx31h5jdv6n99rzblqyb1iqjkpll6dl3627pnb"; + sha256 = "0kvq5ldip2ra2njlxg9fxj46nfqzq5l3n359d3kwfbsld7hixm2d"; }; noto-fonts-extra = mkNoto { name = "noto-fonts-extra"; weights = "{Black,Condensed,Extra,Medium,Semi,Thin}*"; - sha256 = "1lih49bqmsmblczvbl7qb1bhn0bq8v5xkr991b3gjghpdkx584bc"; + sha256 = "0l94aiy1b3qirg2mmbagbr0014vqk32za79pzck1acy2hgy716kq"; }; noto-fonts-cjk = let version = "1.004"; in fetchzip { name = "noto-fonts-cjk-${version}"; diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix new file mode 100644 index 000000000000..d8918a6567bb --- /dev/null +++ b/pkgs/data/fonts/open-sans/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitLab }: + +stdenv.mkDerivation rec { + pname = "open-sans"; + version = "1.11"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "fonts-team"; + repo = "fonts-open-sans"; + rev = "debian%2F1.11-1"; # URL-encoded form of "debian/1.11-1" tag + sha256 = "077hkvpmk3ghbqyb901w43b2m2a27lh8ddasyx1x7pdwyr2bjjl2"; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + description = "Open Sans fonts"; + longDescription = '' + Open Sans is a humanist sans serif typeface designed by Steve Matteson, + Type Director of Ascender Corp. + ''; + homepage = https://www.opensans.com; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.worldofpeace ]; + }; +} diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix deleted file mode 100644 index 6f3762c971c9..000000000000 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchzip}: - -fetchzip { - name = "opensans-ttf-20140617"; - - url = "http://web.archive.org/web/20150801161609/https://hexchain.org/pub/archlinux/ttf-opensans/opensans.tar.gz"; - - postFetch = '' - tar -xzf $downloadedFile - mkdir -p $out/share/fonts/truetype - cp *.ttf $out/share/fonts/truetype - ''; - - sha256 = "0zpzqw5y9g5jk7xjcxa12ds60ckvxmpw8p7bnkkmad53s94yr5wf"; - - meta = { - description = "Open Sans fonts"; - longDescription = '' - Open Sans is a humanist sans serif typeface designed by Steve Matteson, - Type Director of Ascender Corp. - ''; - homepage = https://en.wikipedia.org/wiki/Open_Sans; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; - }; -} diff --git a/pkgs/data/icons/elementary-icon-theme/default.nix b/pkgs/data/icons/elementary-icon-theme/default.nix index 75847041ce6b..4c3beaaef2b0 100644 --- a/pkgs/data/icons/elementary-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-icon-theme/default.nix @@ -2,17 +2,22 @@ stdenv.mkDerivation rec { name = "elementary-icon-theme-${version}"; - version = "5.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "146s26q4bb5sag35iv42hrnbdciam2ajl7s5s5jayli5vp8bw08w"; + sha256 = "1rw924b3ixfdff368dpv4vgsykwncmrvj9a6yfss0cf236xnvr9b"; }; nativeBuildInputs = [ meson ninja python3 gtk3 ]; + # Disable installing gimp and inkscape palette files + mesonFlags = [ + "-Dpalettes=false" + ]; + postPatch = '' chmod +x meson/symlink.py patchShebangs . diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 6024bdc1ad71..893ad997c11b 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/95366a34cd5c9b47444ac819562fff2f23d7d753.tar.gz"; - sha256 = "184qrgb7jl1s79v4z1jz9ywihilf60jh93xhwf0n75vnxb4ibnfd"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/56099dd4eb61f963da8edefdd19fd6a2e4371d95.tar.gz"; + sha256 = "1byz5rp1n682bcm7wcdm6jxabgq1nx660bf51g11fyni1b5fr9ax"; } diff --git a/pkgs/development/compilers/ghc/8.6.3.nix b/pkgs/development/compilers/ghc/8.6.3.nix new file mode 100644 index 000000000000..b29b7facd1f4 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.6.3.nix @@ -0,0 +1,232 @@ +{ stdenv, targetPackages + +# build-tools +, bootPkgs +, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx + +, libiconv ? null, ncurses + +, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.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. + buildLlvmPackages, llvmPackages + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms), gmp + +, # If enabled, use -fPIC when compiling static libs. + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + +, # Whether to build dynamic libs for the standard library (on the target + # platform). Static libs are always built. + enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt + +, # Whetherto build terminfo. + enableTerminfo ? !stdenv.targetPlatform.isWindows + +, # What flavour to build. An empty string indicates no + # specific flavour and falls back to ghc default values. + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (stdenv) buildPlatform hostPlatform targetPlatform; + + inherit (bootPkgs) ghc; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; + + buildMK = '' + BuildFlavour = ${ghcFlavour} + ifneq \"\$(BuildFlavour)\" \"\" + include mk/flavours/\$(BuildFlavour).mk + endif + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} + INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + CrossCompilePrefix = ${targetPrefix} + HADDOCK_DOCS = NO + BUILD_SPHINX_HTML = NO + BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' + GhcLibHcOpts += -fPIC + GhcRtsHcOpts += -fPIC + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + EXTRA_CC_OPTS += -std=gnu99 + ''; + + # Splicer will pull out correct variations + libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; + + toolsForTarget = + if hostPlatform == buildPlatform then + [ targetPackages.stdenv.cc ] ++ stdenv.lib.optional useLLVM llvmPackages.llvm + else assert targetPlatform == hostPlatform; # build != host == target + [ stdenv.cc ] ++ stdenv.lib.optional useLLVM buildLlvmPackages.llvm; + + targetCC = builtins.head toolsForTarget; + +in +stdenv.mkDerivation (rec { + version = "8.6.3"; + name = "${targetPrefix}ghc-${version}"; + + src = fetchurl { + url = "https://downloads.haskell.org/~ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "08vzq0dpg4a39bs61j6rq4z0n7jby5mc69h4m25xhd8rjyvkg7lz"; + }; + + enableParallelBuilding = true; + + outputs = [ "out" "doc" ]; + + patches = [(fetchpatch rec { # https://phabricator.haskell.org/D5123 + url = "http://tarballs.nixos.org/sha256/${sha256}"; + name = "D5123.diff"; + sha256 = "0nhqwdamf2y4gbwqxcgjxs0kqx23w9gv5kj0zv6450dq19rji82n"; + })]; + + postPatch = "patchShebangs ."; + + # GHC is a bit confused on its cross terminology. + preConfigure = '' + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do + export "''${env#TARGET_}=''${!env}" + done + # GHC is a bit confused on its cross terminology, as these would normally be + # the *host* tools. + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" + export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx" + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${stdenv.lib.optionalString targetPlatform.isAarch32 ".gold"}" + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" + export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + + echo -n "${buildMK}" > mk/build.mk + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt '' + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets + '' + stdenv.lib.optionalString targetPlatform.isMusl '' + echo "patching llvm-targets for musl targets..." + echo "Cloning these existing '*-linux-gnu*' targets:" + grep linux-gnu llvm-targets | sed 's/^/ /' + echo "(go go gadget sed)" + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets + echo "llvm-targets now contains these '*-linux-musl*' targets:" + grep linux-musl llvm-targets | sed 's/^/ /' + + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) + for x in configure aclocal.m4; do + substituteInPlace $x \ + --replace '*-android*|*-gnueabi*)' \ + '*-android*|*-gnueabi*|*-musleabi*)' + done + ''; + + # TODO(@Ericson2314): Always pass "--target" and always prefix. + configurePlatforms = [ "build" "host" ] + ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target"; + # `--with` flags for libraries needed for RTS linker + configureFlags = [ + "--datadir=$doc/share/doc/ghc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ + "--enable-bootstrap-with-devel-snapshot" + ] ++ stdenv.lib.optionals (targetPlatform.isAarch32) [ + "CFLAGS=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" + ] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + "--disable-large-address-space" + ]; + + # Make sure we never relax`$PATH` and hooks support for compatability. + strictDeps = true; + + nativeBuildInputs = [ + perl autoconf automake m4 python3 sphinx + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour + ]; + + # For building runtime libs + depsBuildTarget = toolsForTarget; + + buildInputs = [ perl ] ++ (libDeps hostPlatform); + + propagatedBuildInputs = [ targetPackages.stdenv.cc ] + ++ stdenv.lib.optional useLLVM llvmPackages.llvm; + + depsTargetTarget = map stdenv.lib.getDev (libDeps targetPlatform); + depsTargetTargetPropagated = map (stdenv.lib.getOutput "out") (libDeps targetPlatform); + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; + + postInstall = '' + for bin in "$out"/lib/${name}/bin/*; do + isELF "$bin" || continue + paxmark m "$bin" + done + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + passthru = { + inherit bootPkgs targetPrefix; + + inherit llvmPackages; + inherit enableShared; + + # Our Cabal compiler name + haskellCompilerName = "ghc-8.6.3"; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { + dontStrip = true; + dontPatchELF = true; + noAuditTmpdir = true; +}) diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 2d6c060e89e0..ce863ef9c915 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: stdenv.mkDerivation rec { - name = "scala-2.12.7"; + name = "scala-2.12.8"; src = fetchurl { url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "116i6sviziynbm7yffakkcnzb2jmrhvjrnbqbbnhyyi806shsnyn"; + sha256 = "18w0vdbsp0q5rxglgalwlgkggld926bqi1fxc598rn4gh46a03j4"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 283d036d412c..af9ddb872f9c 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchFromGitHub, boost, cmake, z3 }: let - version = "0.5.0"; - rev = "1d4f565a64988a3400847d2655ca24f73f234bc6"; - sha256 = "0phzk2whvgrrf8xpl5pz886glhd5s40y1hbbvq9q3fxf6vc3lisy"; + version = "0.5.1"; + rev = "c8a2cb62832afb2dc09ccee6fd42c1516dfdb981"; + sha256 = "0d6mfnixlr9m5yr3r4p6cv6vwrrivcamyar5d0f9rvir9w9ypzrr"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -28,11 +28,6 @@ stdenv.mkDerivation { echo >commit_hash.txt "${rev}" substituteInPlace cmake/jsoncpp.cmake \ --replace "${jsoncppURL}" ${jsoncpp} - - # To allow non-standard CMAKE_INSTALL_LIBDIR (fixed in upstream, not yet released) - substituteInPlace cmake/jsoncpp.cmake \ - --replace "\''${CMAKE_INSTALL_LIBDIR}" "lib" \ - --replace "# Build static lib but suitable to be included in a shared lib." "-DCMAKE_INSTALL_LIBDIR=lib" ''; cmakeFlags = [ @@ -42,7 +37,7 @@ stdenv.mkDerivation { ]; doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform; - checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:$LD_LIBRARY_PATH " + + checkPhase = "LD_LIBRARY_PATH=./libsolc:./libsolidity:./liblll:./libevmasm:./libdevcore:./libyul:./liblangutil:$LD_LIBRARY_PATH " + "./test/soltest -p -- --no-ipc --no-smt --testpath ../test"; nativeBuildInputs = [ cmake ]; @@ -56,7 +51,7 @@ stdenv.mkDerivation { homepage = https://github.com/ethereum/solidity; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ dbrock akru ]; + maintainers = with maintainers; [ dbrock akru lionello ]; inherit version; }; } diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch index 70162bfbcb6a..fa30655e04e8 100644 --- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch +++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch @@ -2,11 +2,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c05208f..8893648e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -48,6 +48,20 @@ add_subdirectory(libevmasm) +@@ -48,6 +48,25 @@ add_subdirectory(libevmasm) add_subdirectory(libsolidity) add_subdirectory(libsolc) -+ +install(DIRECTORY libdevcore/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libdevcore + FILES_MATCHING PATTERN "*.h") @@ -16,6 +15,12 @@ index 0c05208f..8893648e 100644 +install(DIRECTORY libsolidity/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libsolidity + FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY libyul/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libyul ++ FILES_MATCHING PATTERN "*.h") ++install(DIRECTORY liblangutil/ ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblangutil ++ FILES_MATCHING PATTERN "*.h") +install(DIRECTORY liblll/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/liblll + FILES_MATCHING PATTERN "*.h") @@ -57,8 +62,23 @@ index 0bdec4b4..e876177e 100644 @@ -29,6 +29,7 @@ endif() add_library(solidity ${sources} ${headers}) - target_link_libraries(solidity PUBLIC evmasm devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) + target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) +install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) if (${Z3_FOUND}) target_link_libraries(solidity PUBLIC ${Z3_LIBRARY}) +--- a/libyul/CMakeLists.txt ++++ b/libyul/CMakeLists.txt +@@ -42,3 +42,4 @@ endif() + optimiser/VarDeclPropagator.cpp + ) +-target_link_libraries(yul PUBLIC devcore) ++target_link_libraries(yul PUBLIC evmasm devcore langutil) ++install(TARGETS yul LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +--- a/liblangutil/CMakeLists.txt ++++ b/liblangutil/CMakeLists.txt +@@ -11,3 +11,4 @@ endif() + + add_library(langutil ${sources}) + target_link_libraries(langutil PUBLIC devcore) ++install(TARGETS langutil LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 82542e6ac028..0d0eee11d5c5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1195,4 +1195,7 @@ self: super: { # The test suite tries to mess with ALSA, which doesn't work in the build sandbox. xmobar = dontCheck super.xmobar; + # https://github.com/mgajda/json-autotype/issues/25 + json-autotype = dontCheck super.json-autotype; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 53776037f2b2..94ac1244ffa7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -46,7 +46,7 @@ self: super: { # LTS-12.x versions do not compile. base-orphans = self.base-orphans_0_8; - brick = self.brick_0_42; + brick = self.brick_0_42_1; cassava-megaparsec = doJailbreak super.cassava-megaparsec; config-ini = doJailbreak super.config-ini; # https://github.com/aisamanra/config-ini/issues/18 contravariant = self.contravariant_1_5; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c85cc3a422c3..4c2673589ae6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7240,8 +7240,8 @@ self: { }: mkDerivation { pname = "HCL"; - version = "1.7"; - sha256 = "0f61kj9c58s06w882zxmv0s5yc0zxh3f5nx7gnx2dx8p7d3f4y34"; + version = "1.7.1"; + sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -15289,8 +15289,8 @@ self: { ({ mkDerivation, base, binary, bytestring, hspec }: mkDerivation { pname = "RLP"; - version = "1.0.0"; - sha256 = "15m872ys5jzn21psqccgz24f5zchvj5hcz1kll18v0pivh2c4hd0"; + version = "1.0.1"; + sha256 = "0xxhd2whz8q3zxrk37pwbhjayfhq9dv89068q0qlfwwg6aby0k6s"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec ]; description = "RLP serialization as defined in Ethereum Yellow Paper"; @@ -21619,6 +21619,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "advent-of-code-api" = callPackage + ({ mkDerivation, base, containers, curl, deepseq, directory + , filepath, finite-typelits, mtl, taggy, text, time, uri-encode + }: + mkDerivation { + pname = "advent-of-code-api"; + version = "0.1.0.0"; + sha256 = "15dn78scm0hj1dqcd4xm4gmdvbmjd7afkrh64pnwfbldy74smfxy"; + libraryHaskellDepends = [ + base containers curl deepseq directory filepath finite-typelits mtl + taggy text time uri-encode + ]; + description = "Advent of Code REST API bindings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aern2-mp" = callPackage ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens , mixed-types-num, QuickCheck, regex-tdfa, rounded @@ -28533,8 +28549,8 @@ self: { }: mkDerivation { pname = "arbor-monad-metric"; - version = "0.0.2"; - sha256 = "0c8734nf8zgkwqgjphdqb0fa6p3qvc6cj0n16k22v8ri5ziyha76"; + version = "0.0.4"; + sha256 = "1g5d5a0lcx255002a02i0zc987pyimhm34h0vrbqaibapbp98yi0"; libraryHaskellDepends = [ base containers generic-lens lens mtl resourcet stm transformers ]; @@ -28542,28 +28558,31 @@ self: { arbor-datadog base bytestring containers generic-lens hedgehog hspec hw-hspec-hedgehog lens mtl network resourcet stm transformers ]; + description = "Core metric library for publishing metrics"; license = stdenv.lib.licenses.mit; }) {}; "arbor-monad-metric-datadog" = callPackage ({ mkDerivation, arbor-datadog, arbor-monad-metric, base - , bytestring, containers, generic-lens, hedgehog, hspec - , hw-hspec-hedgehog, lens, mtl, network, resourcet, stm, text - , transformers + , bytestring, containers, exceptions, fast-logger, generic-lens + , hedgehog, hspec, hw-hspec-hedgehog, lens, monad-logger, mtl + , network, resourcet, stm, text, transformers }: mkDerivation { pname = "arbor-monad-metric-datadog"; - version = "0.0.1"; - sha256 = "0padn66j6hxpndnakkd1hvf2jkhab1djr20c2hvp1m9kim5c3cz9"; + version = "0.0.3"; + sha256 = "0dqidvn3nblnnnsiq0zqhg3d9b09bv1ksnrfyyibyi75mhvx3d3r"; libraryHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers generic-lens lens mtl network resourcet stm text transformers ]; testHaskellDepends = [ arbor-datadog arbor-monad-metric base bytestring containers - generic-lens hedgehog hspec hw-hspec-hedgehog lens mtl network - resourcet stm text transformers + exceptions fast-logger generic-lens hedgehog hspec + hw-hspec-hedgehog lens monad-logger mtl network resourcet stm text + transformers ]; + description = "Metric library backend for datadog"; license = stdenv.lib.licenses.mit; }) {}; @@ -32730,8 +32749,8 @@ self: { }: mkDerivation { pname = "b9"; - version = "0.5.50"; - sha256 = "1wsspzkcydad9akqj6n8s9xpm7id49dll5h12vv3xbmgjgj0pdhr"; + version = "0.5.51"; + sha256 = "1mjylfxw7ivmxma7kskjs7plcd9wxknfd9slxb7zjgawzksdv3bq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33589,6 +33608,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base64-bytestring_1_0_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , HUnit, QuickCheck, split, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "base64-bytestring"; + version = "1.0.0.2"; + sha256 = "13305brzlac24pifiqd5a2z10c6k6amhpdy9cc0z5ryrkgnm8dhr"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring containers HUnit QuickCheck split test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq + ]; + description = "Fast base64 encoding and decoding for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base64-bytestring-type" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , binary, bytestring, cereal, deepseq, hashable, QuickCheck, tasty @@ -39562,7 +39603,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_42" = callPackage + "brick_0_42_1" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, directory, dlist, filepath, microlens , microlens-mtl, microlens-th, QuickCheck, stm, template-haskell @@ -39570,8 +39611,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.42"; - sha256 = "1hrfw10zy1450slj79d432zi6wiy11jr1ciz3xh0fx27zns4yqyy"; + version = "0.42.1"; + sha256 = "1ckisdvq0n5j35abz8as36jhp872yp3vjyxq1wbpf4lc1bnplw8k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45570,6 +45611,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chan_0_0_4_1" = callPackage + ({ mkDerivation, async, base, stm }: + mkDerivation { + pname = "chan"; + version = "0.0.4.1"; + sha256 = "1ks74njh8fj9dh8qhydwjyqdx8lrdj5fif455cxfshvdbwhcnvwj"; + libraryHaskellDepends = [ async base stm ]; + testHaskellDepends = [ async base stm ]; + description = "Some extra kit for Chans"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chan-split" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -67501,14 +67555,15 @@ self: { }) {}; "drmaa" = callPackage - ({ mkDerivation, base, directory, drmaa, inline-c }: + ({ mkDerivation, base, c2hs, directory, drmaa, exceptions }: mkDerivation { pname = "drmaa"; - version = "0.2.0"; - sha256 = "0hmyzlwqdj3cjnhjc4bk35wzxzzknl0fapqz119yahc03jrpcpg6"; - libraryHaskellDepends = [ base directory inline-c ]; + version = "0.3.0"; + sha256 = "1x1r3m1gqikm6n5m006zy3c9z106qa4ykl7qa90pa29wg03475z5"; + libraryHaskellDepends = [ base directory exceptions ]; librarySystemDepends = [ drmaa ]; - description = "A minimal Haskell bindings to DRMAA C library"; + libraryToolDepends = [ c2hs ]; + description = "A Haskell bindings to the DRMAA C library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {drmaa = null;}; @@ -85653,8 +85708,8 @@ self: { ({ mkDerivation, base, transformers }: mkDerivation { pname = "ghcjs-perch"; - version = "0.3.3.2"; - sha256 = "1ng6wpx6kp8rxmxwf0ns0q0jas2gl2s2mv1dlq59xbsikdly3km7"; + version = "0.3.3.3"; + sha256 = "0b3hj0gm9gcgwpg8f7vxy87fasgpgn27ciyafhmy6b4fnnmn41kn"; libraryHaskellDepends = [ base transformers ]; description = "GHCJS version of Perch library"; license = stdenv.lib.licenses.mit; @@ -101200,8 +101255,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.8.2"; - sha256 = "1scd87ivzmrf8ar44wkijcgpr40c996dvq5rx1py2bxw0zdd1ibq"; + version = "0.8.4"; + sha256 = "0hpabz26wyxvpkvc2xv1xscmbvn0yfj2nnd41ysaf4xgfnh4c9sw"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite entropy hashable memory mtl murmur3 network @@ -101210,7 +101265,7 @@ self: { ]; testHaskellDepends = [ aeson base bytestring cereal containers hspec HUnit mtl QuickCheck - safe split string-conversions text vector + safe split string-conversions text unordered-containers vector ]; testToolDepends = [ hspec-discover ]; description = "Bitcoin & Bitcoin Cash library for Haskell"; @@ -101322,8 +101377,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.9.0"; - sha256 = "0351kjfykh94lpf6kpdw18vzpdn13k0zak99n72hl2ybpy8d1yk6"; + version = "0.9.1"; + sha256 = "099fng9wy9qhcxn14m1mlpq004bl51xas3rk6jkspqv32d4rr6zs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102039,6 +102094,8 @@ self: { pname = "hasmin"; version = "1.0.2.1"; sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb"; + revision = "1"; + editedCabalFile = "05naxdaglbz8grzz399dkra9y3f1k75661397flbgrwbxkyadz2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104305,6 +104362,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_9" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, stm, test-framework, test-framework-hunit + , text, time, tls, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.10.9"; + sha256 = "0y64h61w78pn3yn2hi3q41bbp5zwjlycjz2w23x6sh2w5b2xphw3"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -127341,8 +127423,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "3.0.0"; - sha256 = "1ryk896kg2bs0w430zsg235h861nf43qn9hl1r285dh53jgj6mnw"; + version = "3.0.1"; + sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132344,7 +132426,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-puppet_1_4_1" = callPackage + "language-puppet_1_4_2" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, filecache, filepath, formatting, Glob @@ -132358,8 +132440,8 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.4.1"; - sha256 = "1az4lalx2qb9wf0n99zjd9agy20x8369f80411mhj11rcnnl1a66"; + version = "1.4.2"; + sha256 = "0bdi51cjl8m48clkqj6lb9vyxdagx2a4q6f48a1q4b50mpinx5qq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -139204,8 +139286,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.5.0.1"; - sha256 = "0rswd308ngrl2ii13j2pl09cddh6pycm7skiyilsk54j395wy2ky"; + version = "0.5.0.2"; + sha256 = "0g5kw8y59bdyzj7zzwif1810q7wk87d7q53idpw250g6s4dwycxa"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -141827,15 +141909,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "massiv_0_2_4_1" = callPackage + "massiv_0_2_5_0" = callPackage ({ mkDerivation, base, bytestring, data-default, data-default-class , deepseq, ghc-prim, hspec, primitive, QuickCheck, safe-exceptions , vector }: mkDerivation { pname = "massiv"; - version = "0.2.4.1"; - sha256 = "198xik64fw3n4wk3gy1rrxl2l3jwzn8b8h1yskg71mlvpv598lwk"; + version = "0.2.5.0"; + sha256 = "0r7556mxsqzxg1kp4hrbv3c07xzkf08sycaqbfyy2xrzzczgiy9z"; libraryHaskellDepends = [ base bytestring data-default-class deepseq ghc-prim primitive vector @@ -141903,6 +141985,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "matchable" = callPackage + ({ mkDerivation, base, containers, doctest, doctest-discover, Glob + , hashable, hspec, tagged, unordered-containers, vector + }: + mkDerivation { + pname = "matchable"; + version = "0.1.1.1"; + sha256 = "0sd661pp54hyg6igkr90cdjlnx8widl2yxkf0ggyqfna6ak5ml53"; + libraryHaskellDepends = [ + base containers hashable tagged unordered-containers vector + ]; + testHaskellDepends = [ + base containers doctest doctest-discover Glob hashable hspec tagged + unordered-containers vector + ]; + description = "A type class for Matchable Functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "matcher" = callPackage ({ mkDerivation, base, base-prelude, profunctors, success, text , transformers @@ -142262,30 +142363,31 @@ self: { "matterhorn" = callPackage ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat , brick, brick-skylighting, bytestring, cheapskate, checkers - , config-ini, connection, containers, directory, filepath, gitrev - , hashable, Hclip, mattermost-api, mattermost-api-qc - , microlens-platform, mtl, process, quickcheck-text, random - , semigroups, skylighting-core, stm, stm-delay, strict - , string-conversions, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-zipper, time, timezone-olson - , timezone-series, transformers, Unique, unix, unordered-containers - , utf8-string, uuid, vector, vty, word-wrap, xdg-basedir + , config-ini, connection, containers, data-clist, directory + , filepath, gitrev, hashable, Hclip, mattermost-api + , mattermost-api-qc, microlens-platform, mtl, process + , quickcheck-text, random, semigroups, skylighting-core, stm + , stm-delay, strict, string-conversions, tasty, tasty-hunit + , tasty-quickcheck, temporary, text, text-zipper, time + , timezone-olson, timezone-series, transformers, Unique, unix + , unordered-containers, utf8-string, uuid, vector, vty, word-wrap + , xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "50200.0.0"; - sha256 = "07zbkkbn5cn8rcbc0xznlldcflhfp4szx6phlh7xpgf2hrcyc3g6"; + version = "50200.1.0"; + sha256 = "02rwxq42my7347p1wb0jh50z1m6fqkifgxg2hd2vrxiwzblyz0qc"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ aeson aspell-pipe async base base-compat brick brick-skylighting - bytestring cheapskate config-ini connection containers directory - filepath gitrev hashable Hclip mattermost-api microlens-platform - mtl process random semigroups skylighting-core stm stm-delay strict - temporary text text-zipper time timezone-olson timezone-series - transformers unix unordered-containers utf8-string uuid vector vty - word-wrap xdg-basedir + bytestring cheapskate config-ini connection containers data-clist + directory filepath gitrev hashable Hclip mattermost-api + microlens-platform mtl process random semigroups skylighting-core + stm stm-delay strict temporary text text-zipper time timezone-olson + timezone-series transformers unix unordered-containers utf8-string + uuid vector vty word-wrap xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -142310,8 +142412,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.0.1"; - sha256 = "1snb51nw71cqjxanaf443dixz8b8vk99a8a4b1yya1xvikvdxf7c"; + version = "50200.1.0"; + sha256 = "1adqh3s34zw74x4idjy1ln8qq9qlqq146kb9b4gd2lijrr8zrjn7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -142335,8 +142437,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.0.1"; - sha256 = "02ashys70857a5s7zx26zx6vdlybsdk9bil2bqawfkf6xcjhwq13"; + version = "50200.1.0"; + sha256 = "1rlzq0dqpqqnwzz1sknf8zfnsbqpz1w51ik9k4hi8qydkpbf3sdz"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -153897,8 +153999,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "1.6.1"; - sha256 = "1nzhfarz42b6arqndynp4zp4sq87g8ya9xh3zpyhsw8a3wz5idr0"; + version = "1.6.2"; + sha256 = "1wvh33raci7s4hczcfn5sj2kk1g61ry6xwn3lg7g3yy5bn7azv73"; libraryHaskellDepends = [ async base binary bytestring deepseq monad-loops template-haskell unix @@ -153913,8 +154015,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools"; - version = "0.3.2.0"; - sha256 = "12c1g6712v8m6mnysiq9pm5g4178vmrxq3j4v50fm02njj4rdpnb"; + version = "0.3.3.0"; + sha256 = "06bi9vzq8alb4wylmq9npisnnpsc0r96srbmq68hmy6pjrva6rlg"; libraryHaskellDepends = [ aeson base binary bytestring ngx-export safe template-haskell ]; @@ -159564,6 +159666,8 @@ self: { pname = "pandoc"; version = "2.5"; sha256 = "0bi26r2qljdfxq26gaxj1xnhrawrfndfavs3f3g098x0g3dwazfm"; + revision = "1"; + editedCabalFile = "15jzrlf1qnn3qkzy1zk5f300y7748qdz8yk0zg0zy7ygi36b403v"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -183267,19 +183371,19 @@ self: { "ron" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , containers, criterion, data-default, deepseq, Diff, directory - , errors, extra, filepath, hashable, mtl, network-info, safe - , stringsearch, template-haskell, text, time, unordered-containers + , errors, extra, filepath, hashable, hedn, mtl, network-info, safe + , template-haskell, text, time, transformers, unordered-containers , vector }: mkDerivation { pname = "ron"; - version = "0.2"; - sha256 = "1dv1lfz9v31k817cby0252jy08sd9c01l1jrlhqf243w25a6zp41"; + version = "0.3"; + sha256 = "09mpv535rahaclj5yppzkg4n083d0rpqkr3r2zrmj1ywg5nw5h0i"; libraryHaskellDepends = [ aeson attoparsec base binary bytestring containers data-default - deepseq Diff directory errors extra filepath hashable mtl - network-info safe stringsearch template-haskell text time - unordered-containers vector + Diff directory errors extra filepath hashable hedn mtl network-info + safe template-haskell text time transformers unordered-containers + vector ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "RON, RON-RDT, and RON-Schema"; @@ -184039,8 +184143,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.17"; - sha256 = "0g40krmbjy4irrxs3iabbr296l8hr98driz75j3s0dhqqzdxv4vm"; + version = "0.2.36"; + sha256 = "0gvkah51mnqpy20v2f3n1gvad1abmbkxljm4pz3yh3x9mkscnc2m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190423,6 +190527,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ruby_0_9_0_0" = callPackage + ({ mkDerivation, base, casing, doctest, QuickCheck, servant-foreign + , text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.9.0.0"; + sha256 = "1x1746k97i3y836mr5h29l70ldzrg8akhfmg2qicwbwz6qs7hy33"; + libraryHaskellDepends = [ base casing servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -192047,8 +192166,8 @@ self: { }: mkDerivation { pname = "shake"; - version = "0.17.2"; - sha256 = "1wl837d89b0zl0fzhh51y718p9dv99qid0gr3rkqyvbvhayj5dcm"; + version = "0.17.3"; + sha256 = "0k0r44csgrlw9y80m88npvanw5ddqm634799qjiab39gvbd3p6kw"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -202729,15 +202848,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_28_0" = callPackage + "stratosphere_0_28_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.28.0"; - sha256 = "1rb138h9w34qvdjc3zddz4gm169ddiv690cwq0mpbfwv28v6j1fg"; + version = "0.28.1"; + sha256 = "1brypavqh8049adidzgsjsrfd2sxbv387cckwxl4kkm4s49zrx18"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232363,8 +232482,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.29"; - sha256 = "136sqbfcwp1l7ynmmayihar25qa5kn04axy4mwzf7a6nc5b3zzxf"; + version = "0.29.1"; + sha256 = "0q8ssd51r1bdm6rr5frlq0v00c4af8xgc3zgs4sa23yy3yf9gzrm"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" diff --git a/pkgs/development/interpreters/python/build-python-package.nix b/pkgs/development/interpreters/python/build-python-package.nix index b55d6d874bbb..391086a662ec 100644 --- a/pkgs/development/interpreters/python/build-python-package.nix +++ b/pkgs/development/interpreters/python/build-python-package.nix @@ -12,6 +12,8 @@ , namePrefix , bootstrapped-pip , flit +, writeScript +, update-python-libraries }: let @@ -20,7 +22,8 @@ let wheel-specific = import ./build-python-package-wheel.nix { }; common = import ./build-python-package-common.nix { inherit python bootstrapped-pip; }; mkPythonDerivation = import ./mk-python-derivation.nix { - inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook toPythonModule namePrefix; + inherit lib config python wrapPython setuptools unzip ensureNewerSourcesForZipFilesHook; + inherit toPythonModule namePrefix writeScript update-python-libraries; }; in diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 63ffdbb8c0ac..eb913e1a3752 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -10,6 +10,8 @@ # Whether the derivation provides a Python module or not. , toPythonModule , namePrefix +, writeScript +, update-python-libraries }: { name ? "${attrs.pname}-${attrs.version}" @@ -64,7 +66,7 @@ if disabled then throw "${name} not supported for interpreter ${python.executable}" else -toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ +let self = toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ "disabled" "checkInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" ] // { @@ -106,4 +108,14 @@ toPythonModule (python.stdenv.mkDerivation (builtins.removeAttrs attrs [ platforms = python.meta.platforms; isBuildPythonPackage = python.meta.platforms; } // meta; -})) +})); + +passthru = { + updateScript = let + filename = builtins.head (lib.splitString ":" self.meta.position); + in writeScript "update-python" '' + #!${python.stdenv.shell} + ${update-python-libraries} ${filename} + ''; +}; +in lib.extendDerivation true passthru self diff --git a/pkgs/development/interpreters/python/update-python-libraries/default.nix b/pkgs/development/interpreters/python/update-python-libraries/default.nix new file mode 100644 index 000000000000..762ca2bdd34b --- /dev/null +++ b/pkgs/development/interpreters/python/update-python-libraries/default.nix @@ -0,0 +1,12 @@ +{ python3, runCommand, git }: + +runCommand "update-python-libraries" { + buildInputs = [ + (python3.withPackages(ps: with ps; [ packaging requests toolz ])) + git + ]; +} '' + cp ${./update-python-libraries.py} $out + patchShebangs $out + substituteInPlace $out --replace 'GIT = "git"' 'GIT = "${git}/bin/git"' +'' \ No newline at end of file diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py new file mode 100755 index 000000000000..9292a9307030 --- /dev/null +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -0,0 +1,362 @@ +#!/usr/bin/env python3 + +""" +Update a Python package expression by passing in the `.nix` file, or the directory containing it. +You can pass in multiple files or paths. + +You'll likely want to use +`` + $ ./update-python-libraries ../../pkgs/development/python-modules/* +`` +to update all libraries in that folder. +""" + +import argparse +import logging +import os +import re +import requests +import toolz +from concurrent.futures import ThreadPoolExecutor as Pool +from packaging.version import Version as _Version +from packaging.version import InvalidVersion +from packaging.specifiers import SpecifierSet +import collections +import subprocess + +INDEX = "https://pypi.io/pypi" +"""url of PyPI""" + +EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl'] +"""Permitted file extensions. These are evaluated from left to right and the first occurance is returned.""" + +PRERELEASES = False + +GIT = "git" + +import logging +logging.basicConfig(level=logging.INFO) + + +class Version(_Version, collections.abc.Sequence): + + def __init__(self, version): + super().__init__(version) + # We cannot use `str(Version(0.04.21))` because that becomes `0.4.21` + # https://github.com/avian2/unidecode/issues/13#issuecomment-354538882 + self.raw_version = version + + def __getitem__(self, i): + return self._version.release[i] + + def __len__(self): + return len(self._version.release) + + def __iter__(self): + yield from self._version.release + + +def _get_values(attribute, text): + """Match attribute in text and return all matches. + + :returns: List of matches. + """ + regex = '{}\s+=\s+"(.*)";'.format(attribute) + regex = re.compile(regex) + values = regex.findall(text) + return values + +def _get_unique_value(attribute, text): + """Match attribute in text and return unique match. + + :returns: Single match. + """ + values = _get_values(attribute, text) + n = len(values) + if n > 1: + raise ValueError("found too many values for {}".format(attribute)) + elif n == 1: + return values[0] + else: + raise ValueError("no value found for {}".format(attribute)) + +def _get_line_and_value(attribute, text): + """Match attribute in text. Return the line and the value of the attribute.""" + regex = '({}\s+=\s+"(.*)";)'.format(attribute) + regex = re.compile(regex) + value = regex.findall(text) + n = len(value) + if n > 1: + raise ValueError("found too many values for {}".format(attribute)) + elif n == 1: + return value[0] + else: + raise ValueError("no value found for {}".format(attribute)) + + +def _replace_value(attribute, value, text): + """Search and replace value of attribute in text.""" + old_line, old_value = _get_line_and_value(attribute, text) + new_line = old_line.replace(old_value, value) + new_text = text.replace(old_line, new_line) + return new_text + +def _fetch_page(url): + r = requests.get(url) + if r.status_code == requests.codes.ok: + return r.json() + else: + raise ValueError("request for {} failed".format(url)) + + +SEMVER = { + 'major' : 0, + 'minor' : 1, + 'patch' : 2, +} + + +def _determine_latest_version(current_version, target, versions): + """Determine latest version, given `target`. + """ + current_version = Version(current_version) + + def _parse_versions(versions): + for v in versions: + try: + yield Version(v) + except InvalidVersion: + pass + + versions = _parse_versions(versions) + + index = SEMVER[target] + + ceiling = list(current_version[0:index]) + if len(ceiling) == 0: + ceiling = None + else: + ceiling[-1]+=1 + ceiling = Version(".".join(map(str, ceiling))) + + # We do not want prereleases + versions = SpecifierSet(prereleases=PRERELEASES).filter(versions) + + if ceiling is not None: + versions = SpecifierSet(f"<{ceiling}").filter(versions) + + return (max(sorted(versions))).raw_version + + +def _get_latest_version_pypi(package, extension, current_version, target): + """Get latest version and hash from PyPI.""" + url = "{}/{}/json".format(INDEX, package) + json = _fetch_page(url) + + versions = json['releases'].keys() + version = _determine_latest_version(current_version, target, versions) + + try: + releases = json['releases'][version] + except KeyError as e: + raise KeyError('Could not find version {} for {}'.format(version, package)) from e + for release in releases: + if release['filename'].endswith(extension): + # TODO: In case of wheel we need to do further checks! + sha256 = release['digests']['sha256'] + break + else: + sha256 = None + return version, sha256 + + +def _get_latest_version_github(package, extension, current_version, target): + raise ValueError("updating from GitHub is not yet supported.") + + +FETCHERS = { + 'fetchFromGitHub' : _get_latest_version_github, + 'fetchPypi' : _get_latest_version_pypi, + 'fetchurl' : _get_latest_version_pypi, +} + + +DEFAULT_SETUPTOOLS_EXTENSION = 'tar.gz' + + +FORMATS = { + 'setuptools' : DEFAULT_SETUPTOOLS_EXTENSION, + 'wheel' : 'whl' +} + +def _determine_fetcher(text): + # Count occurences of fetchers. + nfetchers = sum(text.count('src = {}'.format(fetcher)) for fetcher in FETCHERS.keys()) + if nfetchers == 0: + raise ValueError("no fetcher.") + elif nfetchers > 1: + raise ValueError("multiple fetchers.") + else: + # Then we check which fetcher to use. + for fetcher in FETCHERS.keys(): + if 'src = {}'.format(fetcher) in text: + return fetcher + + +def _determine_extension(text, fetcher): + """Determine what extension is used in the expression. + + If we use: + - fetchPypi, we check if format is specified. + - fetchurl, we determine the extension from the url. + - fetchFromGitHub we simply use `.tar.gz`. + """ + if fetcher == 'fetchPypi': + try: + src_format = _get_unique_value('format', text) + except ValueError as e: + src_format = None # format was not given + + try: + extension = _get_unique_value('extension', text) + except ValueError as e: + extension = None # extension was not given + + if extension is None: + if src_format is None: + src_format = 'setuptools' + elif src_format == 'flit': + raise ValueError("Don't know how to update a Flit package.") + extension = FORMATS[src_format] + + elif fetcher == 'fetchurl': + url = _get_unique_value('url', text) + extension = os.path.splitext(url)[1] + if 'pypi' not in url: + raise ValueError('url does not point to PyPI.') + + elif fetcher == 'fetchFromGitHub': + raise ValueError('updating from GitHub is not yet implemented.') + + return extension + + +def _update_package(path, target): + + # Read the expression + with open(path, 'r') as f: + text = f.read() + + # Determine pname. + pname = _get_unique_value('pname', text) + + # Determine version. + version = _get_unique_value('version', text) + + # First we check how many fetchers are mentioned. + fetcher = _determine_fetcher(text) + + extension = _determine_extension(text, fetcher) + + new_version, new_sha256 = FETCHERS[fetcher](pname, extension, version, target) + + if new_version == version: + logging.info("Path {}: no update available for {}.".format(path, pname)) + return False + elif Version(new_version) <= Version(version): + raise ValueError("downgrade for {}.".format(pname)) + if not new_sha256: + raise ValueError("no file available for {}.".format(pname)) + + text = _replace_value('version', new_version, text) + text = _replace_value('sha256', new_sha256, text) + + with open(path, 'w') as f: + f.write(text) + + logging.info("Path {}: updated {} from {} to {}".format(path, pname, version, new_version)) + + result = { + 'path' : path, + 'target': target, + 'pname': pname, + 'old_version' : version, + 'new_version' : new_version, + #'fetcher' : fetcher, + } + + return result + + +def _update(path, target): + + # We need to read and modify a Nix expression. + if os.path.isdir(path): + path = os.path.join(path, 'default.nix') + + # If a default.nix does not exist, we quit. + if not os.path.isfile(path): + logging.info("Path {}: does not exist.".format(path)) + return False + + # If file is not a Nix expression, we quit. + if not path.endswith(".nix"): + logging.info("Path {}: does not end with `.nix`.".format(path)) + return False + + try: + return _update_package(path, target) + except ValueError as e: + logging.warning("Path {}: {}".format(path, e)) + return False + + +def _commit(path, pname, old_version, new_version, **kwargs): + """Commit result. + """ + + msg = f'python: {pname}: {old_version} -> {new_version}' + + try: + subprocess.check_call([GIT, 'add', path]) + subprocess.check_call([GIT, 'commit', '-m', msg]) + except subprocess.CalledProcessError as e: + subprocess.check_call([GIT, 'checkout', path]) + raise subprocess.CalledProcessError(f'Could not commit {path}') from e + + return True + + +def main(): + + parser = argparse.ArgumentParser() + parser.add_argument('package', type=str, nargs='+') + parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major') + parser.add_argument('--commit', action='store_true', help='Create a commit for each package update') + + args = parser.parse_args() + target = args.target + + packages = list(map(os.path.abspath, args.package)) + + logging.info("Updating packages...") + + # Use threads to update packages concurrently + with Pool() as p: + results = list(p.map(lambda pkg: _update(pkg, target), packages)) + + logging.info("Finished updating packages.") + + # Commits are created sequentially. + if args.commit: + logging.info("Committing updates...") + list(map(lambda x: _commit(**x), filter(bool, results))) + logging.info("Finished committing updates") + + count = sum(map(bool, results)) + logging.info("{} package(s) updated".format(count)) + + + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index efe7a5820b53..9e38398dfad1 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "0lk8knip4xk6qzksdkn7085mmgm4ixfczdyyjw656c193y3rgnvc"; }; - configureFlags = stdenv.lib.optionals stdenv.hostPlatform.isWindows [ "--disable-shared" "--enable-static" ]; - meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; homepage = https://c-ares.haxx.se; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 52d0f6f05cce..e713eb7f8918 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -28,8 +28,11 @@ in stdenv.mkDerivation (rec { sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.buildPlatform != stdenv.hostPlatform) '' ln -s lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-gnueabihf.h - '' + lib.optionalString stdenv.hostPlatform.isMusl '' + '' + lib.optionalString (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isMusl) '' ln -s lock-obj-pub.x86_64-pc-linux-musl.h src/syscfg/lock-obj-pub.linux-musl.h + '' + lib.optionalString (stdenv.hostPlatform.isAarch32 && stdenv.hostPlatform.isMusl) '' + ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.arm-unknown-linux-musleabihf.h + ln -s src/syscfg/lock-obj-pub.arm-unknown-linux-gnueabi.h src/syscfg/lock-obj-pub.linux-musleabihf.h ''; outputs = [ "out" "dev" "info" ]; diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix new file mode 100644 index 000000000000..c498ef3460ac --- /dev/null +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchgit, autoreconfHook, autoconf-archive, pkgconfig, kmod, enable-tools ? true }: + +stdenv.mkDerivation rec { + name = "libgpiod-unstable-${version}"; + version = "2018-10-07"; + + src = fetchgit { + url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git"; + rev = "4bf402d3a49336eacd33654441d575bd267780b8"; + sha256 = "01f3jzb133z189sxdiz9qiy65p0bjqhynfllidbpxdr0cxkyyc1d"; + }; + + buildInputs = [ kmod ]; + nativeBuildInputs = [ + autoconf-archive + pkgconfig + autoreconfHook + ]; + + configureFlags = [ + "--enable-tools=${if enable-tools then "yes" else "no"}" + "--enable-bindings-cxx" + "--prefix=$(out)" + ]; + + meta = with stdenv.lib; { + description = "C library and tools for interacting with the linux GPIO character device"; + longDescription = '' + Since linux 4.8 the GPIO sysfs interface is deprecated. User space should use + the character device instead. This library encapsulates the ioctl calls and + data structures behind a straightforward API. + ''; + homepage = https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/; + license = licenses.lgpl2; + maintainers = [ maintainers.expipiplus1 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix new file mode 100644 index 000000000000..4ca0849447f3 --- /dev/null +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, pkgconfig, libopus }: + +let + version = "0.2.1"; +in +stdenv.mkDerivation rec { + name = "libopusenc-${version}"; + + src = fetchurl { + url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"; + sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642"; + }; + + outputs = [ "out" "dev" ]; + + doCheck = true; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libopus ]; + + meta = with stdenv.lib; { + description = "Library for encoding .opus audio files and live streams"; + license = licenses.bsd3; + homepage = http://www.opus-codec.org/; + platforms = platforms.unix; + maintainers = with maintainers; [ pmiddend ]; + }; +} diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index fbee81ab677a..4aa06c0cd704 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; homepage = http://pqxx.org/development/libpqxx/; - license = lib.licenses.postgresql; + license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; }; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 7db78af340cb..815db76d5ac3 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -4,6 +4,7 @@ , mouseSupport ? false , unicode ? true , enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt +, enableShared ? !enableStatic , withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt , gpm @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { setOutputFlags = false; # some aren't supported configureFlags = [ - "--with-shared" + (lib.withFeature enableShared "shared") "--without-debug" "--enable-pc-files" "--enable-symlinks" diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index 79ed37dd2a9a..26386e0c42c4 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia }: +{ stdenv, fetchFromGitHub, qtbase, qtquick1, qmake, qtmultimedia, utmp }: stdenv.mkDerivation rec { version = "0.1.0"; @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0ca500mzcqglkj0i6km0z512y3a025dbm24605xyv18l6y0l2ny3"; }; - buildInputs = [ qtbase qtquick1 qtmultimedia ]; + buildInputs = [ qtbase qtquick1 qtmultimedia ] + ++ stdenv.lib.optional stdenv.isDarwin utmp; nativeBuildInputs = [ qmake ]; patchPhase = '' @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { description = "A QML port of qtermwidget"; homepage = https://github.com/Swordfish90/qmltermwidget; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; } diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index fe1c275aeda5..3a5638b22814 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,6 +1,7 @@ { stdenv , fetchurl -, static ? false +, static ? true +, shared ? true }: stdenv.mkDerivation (rec { @@ -24,13 +25,15 @@ stdenv.mkDerivation (rec { --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"' ''; - outputs = [ "out" "dev" "static" ]; + outputs = [ "out" "dev" ] + ++ stdenv.lib.optional (shared && static) "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - configureFlags = stdenv.lib.optional (!static) "--shared"; + configureFlags = stdenv.lib.optional shared "--shared" + ++ stdenv.lib.optional (static && !shared) "--static"; - postInstall = '' + postInstall = stdenv.lib.optionalString (shared && static) '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on @@ -64,7 +67,7 @@ stdenv.mkDerivation (rec { "PREFIX=${stdenv.cc.targetPrefix}" ] ++ stdenv.lib.optionals (stdenv.hostPlatform.libc == "msvcrt") [ "-f" "win32/Makefile.gcc" - ] ++ stdenv.lib.optionals (!static) [ + ] ++ stdenv.lib.optionals shared [ "SHARED_MODE=1" ]; diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix new file mode 100644 index 000000000000..713aff0ea405 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-jpeg.nix @@ -0,0 +1,25 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-jpeg''; + version = ''20170630-git''; + + description = ''A self-contained baseline JPEG codec implementation''; + + deps = [ ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz''; + sha256 = ''1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0''; + }; + + packageName = "cl-jpeg"; + + asdFilesToKeep = ["cl-jpeg.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-jpeg DESCRIPTION + A self-contained baseline JPEG codec implementation SHA256 + 1wwzn2valhh5ka7qkmab59pb1ijagcj296553fp8z03migl0sil0 URL + http://beta.quicklisp.org/archive/cl-jpeg/2017-06-30/cl-jpeg-20170630-git.tgz + MD5 b6eb4ca5d893f428b5bbe46cd49f76ad NAME cl-jpeg FILENAME cl-jpeg DEPS NIL + DEPENDENCIES NIL VERSION 20170630-git SIBLINGS NIL PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix new file mode 100644 index 000000000000..babdf04e3ec2 --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-pdf.nix @@ -0,0 +1,27 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-pdf''; + version = ''20170830-git''; + + description = ''Common Lisp PDF Generation Library''; + + deps = [ args."iterate" args."uiop" args."zpb-ttf" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz''; + sha256 = ''1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s''; + }; + + packageName = "cl-pdf"; + + asdFilesToKeep = ["cl-pdf.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-pdf DESCRIPTION Common Lisp PDF Generation Library SHA256 + 1x4zk6l635f121p1anfd7d807iglyrlhsnmygydw5l49m3h6n08s URL + http://beta.quicklisp.org/archive/cl-pdf/2017-08-30/cl-pdf-20170830-git.tgz + MD5 f865503aff50c0a4732a7a4597bdcc25 NAME cl-pdf FILENAME cl-pdf DEPS + ((NAME iterate FILENAME iterate) (NAME uiop FILENAME uiop) + (NAME zpb-ttf FILENAME zpb-ttf)) + DEPENDENCIES (iterate uiop zpb-ttf) VERSION 20170830-git SIBLINGS + (cl-pdf-parser) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix new file mode 100644 index 000000000000..358666877a6d --- /dev/null +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-typesetting.nix @@ -0,0 +1,28 @@ +args @ { fetchurl, ... }: +rec { + baseName = ''cl-typesetting''; + version = ''20170830-git''; + + description = ''Common Lisp Typesetting system''; + + deps = [ args."cl-pdf" args."iterate" args."zpb-ttf" ]; + + src = fetchurl { + url = ''http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz''; + sha256 = ''1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3''; + }; + + packageName = "cl-typesetting"; + + asdFilesToKeep = ["cl-typesetting.asd"]; + overrides = x: x; +} +/* (SYSTEM cl-typesetting DESCRIPTION Common Lisp Typesetting system SHA256 + 1mkdr02qikzij3jiyrqy0dldzy8wsnvgcpznfha6x8p2xap586z3 URL + http://beta.quicklisp.org/archive/cl-typesetting/2017-08-30/cl-typesetting-20170830-git.tgz + MD5 e12b9f249c60c220c5dc4a0939eb3343 NAME cl-typesetting FILENAME + cl-typesetting DEPS + ((NAME cl-pdf FILENAME cl-pdf) (NAME iterate FILENAME iterate) + (NAME zpb-ttf FILENAME zpb-ttf)) + DEPENDENCIES (cl-pdf iterate zpb-ttf) VERSION 20170830-git SIBLINGS + (xml-render cl-pdf-doc) PARASITES NIL) */ diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt index 3b10d610d272..e78ec34a0a96 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt +++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt @@ -28,12 +28,14 @@ cl-fuse cl-fuse-meta-fs cl-html-parse cl-html5-parser +cl-jpeg cl-json cl-l10n cl-libuv cl-mysql closer-mop closure-html +cl-pdf cl-ppcre cl-ppcre-template cl-ppcre-unicode @@ -50,6 +52,7 @@ cl-syntax-annot cl-syntax-anonfun cl-syntax-markup cl-test-more +cl-typesetting cl-unicode cl-unification cl-utilities diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix index 8a126d4fd986..e904f0041d13 100644 --- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix +++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix @@ -278,14 +278,6 @@ let quicklisp-to-nix-packages = rec { })); - "zpb-ttf" = buildLispPackage - ((f: x: (x // (f x))) - (qlOverrides."zpb-ttf" or (x: {})) - (import ./quicklisp-to-nix-output/zpb-ttf.nix { - inherit fetchurl; - })); - - "cl-store" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-store" or (x: {})) @@ -359,6 +351,14 @@ let quicklisp-to-nix-packages = rec { "cl-ppcre-test" = quicklisp-to-nix-packages."cl-ppcre"; + "zpb-ttf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."zpb-ttf" or (x: {})) + (import ./quicklisp-to-nix-output/zpb-ttf.nix { + inherit fetchurl; + })); + + "puri" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."puri" or (x: {})) @@ -1907,6 +1907,17 @@ let quicklisp-to-nix-packages = rec { })); + "cl-typesetting" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-typesetting" or (x: {})) + (import ./quicklisp-to-nix-output/cl-typesetting.nix { + inherit fetchurl; + "cl-pdf" = quicklisp-to-nix-packages."cl-pdf"; + "iterate" = quicklisp-to-nix-packages."iterate"; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + "cl-test-more" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-test-more" or (x: {})) @@ -2103,6 +2114,17 @@ let quicklisp-to-nix-packages = rec { })); + "cl-pdf" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-pdf" or (x: {})) + (import ./quicklisp-to-nix-output/cl-pdf.nix { + inherit fetchurl; + "iterate" = quicklisp-to-nix-packages."iterate"; + "uiop" = quicklisp-to-nix-packages."uiop"; + "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf"; + })); + + "closure-html" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."closure-html" or (x: {})) @@ -2190,6 +2212,14 @@ let quicklisp-to-nix-packages = rec { })); + "cl-jpeg" = buildLispPackage + ((f: x: (x // (f x))) + (qlOverrides."cl-jpeg" or (x: {})) + (import ./quicklisp-to-nix-output/cl-jpeg.nix { + inherit fetchurl; + })); + + "cl-html5-parser" = buildLispPackage ((f: x: (x // (f x))) (qlOverrides."cl-html5-parser" or (x: {})) diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 065c5a650b84..8b0b70cae60e 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchzip, buildDunePackage, configurator, cppo, lablgtk }: +{ lib, fetchzip, buildDunePackage, configurator, cppo, lablgtk }: buildDunePackage rec { pname = "camlimages"; - version = "5.0.0"; + version = "5.0.1"; src = fetchzip { url = "https://bitbucket.org/camlspotter/${pname}/get/${version}.tar.gz"; - sha256 = "00qvwxkfnhv93yi1iq7vy3p5lxyi9xigxcq464s4ii6bmp32d998"; + sha256 = "1figrgzsdrrxzfza0bhz0225g1rwawdf5x2m9lw2kzrdb815khs5"; }; buildInputs = [ configurator cppo lablgtk ]; - meta = with stdenv.lib; { + meta = with lib; { branch = "5.0"; homepage = https://bitbucket.org/camlspotter/camlimages; description = "OCaml image processing library"; diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index e5330789e262..39ec4c011f85 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -1,37 +1,38 @@ -{ lib, buildOcaml, fetchurl, ocaml }: +{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, ocaml, findlib }: -if lib.versionAtLeast ocaml.version "4.06" -then throw "FrontC is not available for OCaml ${ocaml.version}" -else +let + meta_file = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META; + sha256 = "0s2wsinycldk8y5p09xd0hsgbhckhy7bkghzl63bph6mwv64kq2d"; + }; +in -buildOcaml rec { - name = "FrontC"; - version = "3.4"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-FrontC-${version}"; + version = "3.4.1"; - src = fetchurl { - url = "http://www.irit.fr/recherches/ARCHI/MARCH/frontc/Frontc-${version}.tgz"; - sha256 = "16dz153s92dgbw1rrfwbhscy73did87kfmjwyh3qpvs748h1sc4g"; + src = fetchFromGitHub { + owner = "BinaryAnalysisPlatform"; + repo = "FrontC"; + rev = "V_3_4_1"; + sha256 = "1dq5nks0c9gsbr1m8k39m1bniawr5hqcy1r8x5px7naa95ch06ak"; }; + buildInputs = [ ocaml findlib ]; + meta = with lib; { - homepage = https://www.irit.fr/recherches/ARCHI/MARCH/rubrique.php3?id_rubrique=61; + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; description = "C Parsing Library"; license = licenses.lgpl21; maintainers = [ maintainers.maurer ]; }; - meta_file = fetchurl { - url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/META; - sha256 = "1flhvwr01crn7d094kby0418s1m4198np85ymjp3b4maz0n7m2mx"; - }; - - opam_patch = fetchurl { - url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/opam.patch; - sha256 = "0xf83ixx0mf3mznwpwp2mjflii0njdzikhhfxpnms7vhnnmlfzy5"; - }; - - patches = [ opam_patch ]; - patchFlags = "-p4"; + patches = [ (fetchpatch { + url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch; + sha256 = "0v4f6740jbj1kxg1y03dzfa3x3gsrhv06wpzdj30gl4ki5fvj4hs"; + }) + ]; makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)"; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 6e533092dc64..dde86bf3e526 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, ocaml, findlib, camlp4 +{ stdenv, fetchzip, which, ocaml, findlib, camlp4 , camlzip, camomile, extlib }: @@ -8,15 +8,14 @@ else let pname = "javalib"; - webpage = "http://sawja.inria.fr/"; in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.3.5"; + version = "3.0"; - src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37655/javalib-2.3.5.tar.bz2"; - sha256 = "1gks12ghcmv9lm8j4diw8bvjqxfl7xwk0sxbi227saxg9irpwwkd"; + src = fetchzip { + url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz"; + sha256 = "02zgn1z1wj3rbg9xqmbagys91bnsy27iwrngkivzhlykyaw9vf6n"; }; buildInputs = [ which ocaml findlib camlp4 ]; @@ -30,17 +29,11 @@ stdenv.mkDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = "true"; - preBuild = '' - make ptrees; - make installptrees; - export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH; - ''; - propagatedBuildInputs = [ camlzip camomile extlib ]; meta = with stdenv.lib; { description = "A library that parses Java .class files into OCaml data structures"; - homepage = "${webpage}"; + homepage = https://javalib-team.github.io/javalib/; license = licenses.lgpl3; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix index 92d9cef351bf..94120f2f8b9d 100644 --- a/pkgs/development/ocaml-modules/sawja/default.nix +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -4,7 +4,7 @@ assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; let pname = "sawja"; - version = "1.5.3"; + version = "1.5.6"; webpage = "http://sawja.inria.fr/"; in stdenv.mkDerivation rec { @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-${pname}-${version}"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37403/sawja-1.5.3.tar.bz2; - sha256 = "17vfknr126vfhpmr14j75sg8r47xz7pw7fba4nsdw3k7rq43vcn2"; + url = https://gforge.inria.fr/frs/download.php/file/37819/sawja-1.5.6.tar.bz2; + sha256 = "0dkfdc8h94r7kj4p8q57fz7fssypgmjrix8xff0va7x1nya5sdp3"; }; buildInputs = [ which perl ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/zmq/default.nix b/pkgs/development/ocaml-modules/zmq/default.nix index fe6a17e876b6..bb16ac46f991 100644 --- a/pkgs/development/ocaml-modules/zmq/default.nix +++ b/pkgs/development/ocaml-modules/zmq/default.nix @@ -1,9 +1,16 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, czmq, stdint }: +{ stdenv, fetchFromGitHub, ocaml, findlib, dune, czmq, stdint }: -buildDunePackage rec { - pname = "zmq"; - version = "20180726"; +if !stdenv.lib.versionAtLeast ocaml.version "4.03" +then throw "zmq is not available for OCaml ${ocaml.version}" +else + +let __dune = dune; in +let dune = __dune.override { ocamlPackages = { inherit ocaml findlib; }; }; +in +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-zmq-${version}"; + version = "20180726"; src = fetchFromGitHub { owner = "issuu"; repo = "ocaml-zmq"; @@ -15,13 +22,19 @@ buildDunePackage rec { ./ocaml-zmq-issue43.patch ]; - buildInputs = [ czmq ]; + buildInputs = [ ocaml findlib dune czmq ]; + propagatedBuildInputs = [ stdint ]; + buildPhase = "dune build -p zmq"; + + inherit (dune) installPhase; + meta = with stdenv.lib; { description = "ZeroMQ bindings for OCaml"; license = licenses.mit; maintainers = with maintainers; [ akavel ]; inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 862564dbcd15..78cd2fca8376 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -1,13 +1,12 @@ { gui ? true, buildPythonPackage, fetchFromGitHub, lib, - sphinx_1_2, lxml, isodate, numpy, pytest, - tkinter ? null, py3to2, isPy3k, + sphinx, lxml, isodate, numpy, pytest, openpyxl, + tkinter ? null, py3to2, isPy3k, python, ... }: buildPythonPackage rec { - pname = "arelle-${version}${lib.optionalString (!gui) "-headless"}"; - version = "2017-08-24"; - name = pname + "-" + version; + pname = "arelle${lib.optionalString (!gui) "-headless"}"; + version = "18.3"; disabled = !isPy3k; @@ -16,8 +15,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Arelle"; repo = "Arelle"; - rev = "cb24e35d57b562a864ae3dd4542c4d9fcf3865fe"; - sha256 = "1sbvhb3xlfnyvf1xj9dxwpcrfiaf7ikkdwvvap7aaxfxgiz85ip2"; + rev = "edgr${version}"; + sha256 = "12a94ipdp6xalqyds7rcp6cjwps6fbj3byigzfy403hlqc9n1g33"; }; outputs = ["out" "doc"]; patches = [ @@ -25,7 +24,7 @@ buildPythonPackage rec { ]; postPatch = "rm testParser2.py"; buildInputs = [ - sphinx_1_2 + sphinx pytest py3to2 ]; @@ -33,6 +32,7 @@ buildPythonPackage rec { lxml isodate numpy + openpyxl ] ++ lib.optional gui [ tkinter ]; @@ -40,6 +40,12 @@ buildPythonPackage rec { # arelle-gui is useless without gui dependencies, so delete it when !gui. postInstall = lib.optionalString (!gui) '' find $out/bin -name "*arelle-gui*" -delete + '' + + # By default, not the entirety of the src dir is copied. This means we don't + # copy the `images` dir, which is needed for the gui version. + lib.optionalString (gui) '' + targetDir=$out/${python.sitePackages} + cp -vr $src/arelle $targetDir ''; # Documentation @@ -49,11 +55,14 @@ buildPythonPackage rec { doCheck = if gui then true else false; - meta = { - description = "An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a python or REST API" + lib.optionalString gui " and a graphical user interface"; + meta = with lib; { + description = '' + An open source facility for XBRL, the eXtensible Business Reporting + Language supporting various standards, exposed through a Python or + REST API'' + lib.optionalString gui " and a graphical user interface"; homepage = http://arelle.org/; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ roberth ]; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ roberth ]; }; } diff --git a/pkgs/development/python-modules/arelle/tests.patch b/pkgs/development/python-modules/arelle/tests.patch index 3e4aa0cd94a7..e34cda99b251 100644 --- a/pkgs/development/python-modules/arelle/tests.patch +++ b/pkgs/development/python-modules/arelle/tests.patch @@ -3,7 +3,7 @@ index a64bb1b..dc0299d 100644 --- c/arelle/CntlrProfiler.py +++ i/arelle/CntlrProfiler.py @@ -1,5 +1,6 @@ - + -import Cntlr, ModelManager, FileSource, time +from arelle import Cntlr, ModelManager, FileSource +import time @@ -12,21 +12,3 @@ index a64bb1b..dc0299d 100644 import gettext diff --git c/arelle/ValidateFilingText.py i/arelle/ValidateFilingText.py index 12dbbbb..c0e98c3 100644 ---- c/arelle/ValidateFilingText.py -+++ i/arelle/ValidateFilingText.py -@@ -16,7 +16,7 @@ XMLdeclaration = re.compile(r"<\?xml.*\?>", re.DOTALL) - XMLpattern = re.compile(r".*(<|<|<|<)[A-Za-z_]+[A-Za-z0-9_:]*[^>]*(/>|>|>|/>).*", re.DOTALL) - CDATApattern = re.compile(r"<!\[CDATA\[(.+)\]\]") - #EFM table 5-1 and all &xxx; patterns --docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\m\f]") # won't match &#nnn; -+docCheckPattern = re.compile(r"&\w+;|[^0-9A-Za-z`~!@#$%&\*\(\)\.\-+ \[\]\{\}\|\\:;\"'<>,_?/=\t\n\r\f]") # won't match &#nnn; - namedEntityPattern = re.compile("&[_A-Za-z\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]" - r"[_\-\.:" - "\xB7A-Za-z0-9\xC0-\xD6\xD8-\xF6\xF8-\xFF\u0100-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD\u0300-\u036F\u203F-\u2040]*;") -@@ -904,4 +904,4 @@ def referencedFiles(modelXbrl, localFilesOnly=True): - # footnote or other elements - for elt in modelXbrl.modelDocument.xmlRootElement.iter("{http://www.w3.org/1999/xhtml}a", "{http://www.w3.org/1999/xhtml}img"): - addReferencedFile(elt, elt) -- return referencedFiles -\ No newline at end of file -+ return referencedFiles diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index d773c08e189a..4cef66a5c2e9 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "astroid"; - version = "2.0.4"; + version = "2.1.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "c7013d119ec95eb626f7a2011f0b63d0c9a095df9ad06d8507b37084eada1a8d"; + sha256 = "08hz675knh4294bancdapql392fmbjyimhbyrmfkz1ka7l035c1m"; }; # From astroid/__pkginfo__.py diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 68b1924e5a86..abaabb24b4d9 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -1,18 +1,28 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy3k +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, fetchpatch , cairocffi, cssselect2, defusedxml, pillow, tinycss2 , pytestrunner, pytestcov, pytest-flake8, pytest-isort }: buildPythonPackage rec { pname = "CairoSVG"; - version = "2.1.3"; + version = "2.2.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "e512f555f576b6462b04b585c4ba4c09a43f3a8fec907b60ead21d7d00c550e9"; + sha256 = "93c5b3204478c4e20c4baeb33807db5311b4420c21db2f21034a6deda998cb14"; }; + patches = [ + # Fix tests. Remove with the next release + (fetchpatch { + url = https://github.com/Kozea/CairoSVG/commit/1f403ad229f0e2782d6427a79f0fbeb6b76148b6.patch; + sha256 = "1dxpj5zh8wmx9f8pj11hrixd5jlaqq5xlcdnbl462bh29zj18l26"; + }) + ]; + + LC_ALL="en_US.UTF-8"; + propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; checkInputs = [ pytestrunner pytestcov pytest-flake8 pytest-isort ]; diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index d29ad1d64745..b0e9fee93d4c 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, blessings, mock, nose, pyte, wcwidth, typing }: +{ stdenv, buildPythonPackage, fetchPypi, fetchpatch, pythonOlder, blessings, mock, nose, pyte, wcwidth, typing }: buildPythonPackage rec { pname = "curtsies"; @@ -8,7 +8,16 @@ buildPythonPackage rec { sha256 = "89c802ec051d01dec6fc983e9856a3706e4ea8265d2940b1f6d504a9e26ed3a9"; }; - propagatedBuildInputs = [ blessings wcwidth typing ]; + patches = [ + # Fix dependency on typing. Remove with the next release + (fetchpatch { + url = https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch; + sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs"; + }) + ]; + + propagatedBuildInputs = [ blessings wcwidth ] + ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ mock pyte nose ]; @@ -18,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Curses-like terminal wrapper, with colored strings!"; - homepage = https://pypi.python.org/pypi/curtsies; + homepage = https://github.com/bpython/curtsies; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/fedpkg-buildfix.diff b/pkgs/development/python-modules/fedpkg-buildfix.diff deleted file mode 100644 index b9d46d7c7417..000000000000 --- a/pkgs/development/python-modules/fedpkg-buildfix.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- a/setup.py 2014-02-04 16:12:37.021993713 +0100 -+++ b/setup.py 2014-02-04 16:11:42.653995607 +0100 -@@ -13,8 +13,8 @@ - package_dir = {'': 'src'}, - packages = ['fedpkg'], - scripts = ['src/bin/fedpkg'], -- data_files = [('/etc/bash_completion.d', ['src/fedpkg.bash']), -- ('/etc/rpkg', ['src/fedpkg.conf']), -- ('/usr/libexec/', ['src/fedpkg-fixbranches.py']), -+ data_files = [('etc/bash_completion.d', ['src/fedpkg.bash']), -+ ('etc/rpkg', ['src/fedpkg.conf']), -+ ('libexec/', ['src/fedpkg-fixbranches.py']), - ] - ) diff --git a/pkgs/development/python-modules/fedpkg/default.nix b/pkgs/development/python-modules/fedpkg/default.nix deleted file mode 100644 index 0230466e6e36..000000000000 --- a/pkgs/development/python-modules/fedpkg/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber }: - -buildPythonPackage rec { - pname = "fedpkg"; - version = "1.29"; - name = "${pname}-${version}"; - - disabled = isPy3k; - - src = fetchurl { - url = "https://releases.pagure.org/fedpkg/${name}.tar.bz2"; - sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631"; - }; - - #patches = [ ../development/python-modules/fedpkg-buildfix.diff ]; - propagatedBuildInputs = [ rpkg offtrac urlgrabber ]; - - doCheck = false; # requires fedora_cert which isn't used anymore - - meta = with stdenv.lib; { - description = "Subclass of the rpkg project for dealing with rpm packaging"; - homepage = https://pagure.io/fedpkg; - license = licenses.gpl2; - maintainers = with maintainers; [ ]; - }; -} diff --git a/pkgs/development/python-modules/flake8-future-import/default.nix b/pkgs/development/python-modules/flake8-future-import/default.nix index eaed804245fa..c9cf3fe4ca84 100644 --- a/pkgs/development/python-modules/flake8-future-import/default.nix +++ b/pkgs/development/python-modules/flake8-future-import/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonPackage, flake8, six }: +{ lib, fetchFromGitHub, buildPythonPackage, fetchpatch, flake8, six }: buildPythonPackage rec { pname = "flake8-future-import"; @@ -12,6 +12,14 @@ buildPythonPackage rec { sha256 = "00fpxa6g8cabybnciwnpsbg60zhgydc966jgwyyggw1pcg0frdqr"; }; + patches = [ + # Add Python 3.7 support. Remove with the next release + (fetchpatch { + url = https://github.com/xZise/flake8-future-import/commit/cace194a44d3b95c9c1ed96640bae49183acca04.patch; + sha256 = "17pkqnh035j5s5c53afs8bk49bq7lnmdwqp5k7izx7sw80z73p9r"; + }) + ]; + propagatedBuildInputs = [ flake8 six ]; meta = { diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index 1a01666d799d..d466a78a6811 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -1,15 +1,13 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pythonAtLeast +{ stdenv, buildPythonPackage, fetchPypi, pythonAtLeast , flask, blinker, nose, mock, semantic-version }: buildPythonPackage rec { pname = "Flask-Login"; version = "0.4.1"; - src = fetchFromGitHub { - owner = "maxcountryman"; - repo = "flask-login"; - rev = version; - sha256 = "1rj0qwyxapxnp84fi4lhmvh3d91fdiwz7hibw77x3d5i72knqaa9"; + src = fetchPypi { + inherit pname version; + sha256 = "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8"; }; checkInputs = [ nose mock semantic-version ]; diff --git a/pkgs/development/python-modules/parsimonious/default.nix b/pkgs/development/python-modules/parsimonious/default.nix index 13fabd4cbf90..69e6d1d2bb2c 100644 --- a/pkgs/development/python-modules/parsimonious/default.nix +++ b/pkgs/development/python-modules/parsimonious/default.nix @@ -1,22 +1,21 @@ { stdenv , buildPythonPackage -, fetchFromGitHub +, fetchPypi , nose , six }: buildPythonPackage rec { - version = "0.7.0"; + version = "0.8.1"; pname = "parsimonious"; - src = fetchFromGitHub { - repo = "parsimonious"; - owner = "erikrose"; - rev = version; - sha256 = "087npc8ccryrxabmqifcz56w4wd0hzmv0mc91wrbhc1sil196j0a"; + src = fetchPypi { + inherit pname version; + sha256 = "3add338892d580e0cb3b1a39e4a1b427ff9f687858fdd61097053742391a9f6b"; }; - propagatedBuildInputs = [ nose six ]; + checkInputs = [ nose ]; + propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { homepage = "https://github.com/erikrose/parsimonious"; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 4f4eb3cfc731..d5eec0f73bd1 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pylint"; - version = "2.1.1"; + version = "2.2.2"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "31142f764d2a7cd41df5196f9933b12b7ee55e73ef12204b648ad7e556c119fb"; + sha256 = "14klyan9lqanyi8qhrbn65k7bgv9p7i7ply662r2lr27wydf57b8"; }; checkInputs = [ pytest pytestrunner pyenchant ]; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index 872fffb7576a..dbfde18a8741 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, fontconfig, python, freefont_ttf, makeFontsConf }: +{ lib, buildPythonPackage, fetchPypi, fontconfig, python, cython, freefont_ttf, makeFontsConf }: let fontsConf = makeFontsConf { @@ -14,6 +14,11 @@ in buildPythonPackage rec { }; buildInputs = [ fontconfig ]; + nativeBuildInputs = [ cython ]; + + preBuild = '' + ${python.interpreter} setup.py build_ext -i + ''; checkPhase = '' export FONTCONFIG_FILE=${fontsConf}; diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 429159d05d7d..39c7b2055c1b 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { ${python.interpreter} tests/launch_tests.py ''; + LC_ALL="en_US.UTF-8"; + meta = { description = "A Python module to visualise quantum circuit"; homepage = https://github.com/nelimeee/qasm2image; diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 79e03acd3599..1772e8794ffd 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -3,23 +3,30 @@ , fetchPypi , setuptools , pyparsing +, pytest }: buildPythonPackage rec { pname = "svgwrite"; - version = "1.1.6"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8"; + extension = "zip"; + sha256 = "72ef66c9fe367989823cb237ab7f012ac809dd3ba76c1b5ebd9aa61580e2e75e"; }; buildInputs = [ setuptools ]; propagatedBuildInputs = [ pyparsing ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { description = "A Python library to create SVG drawings"; - homepage = https://bitbucket.org/mozman/svgwrite; + homepage = https://github.com/mozman/svgwrite; license = licenses.mit; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 428d6c60546e..27b38138f6dc 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -950,6 +950,18 @@ let preConfigure = "patchShebangs configure"; }); + littler = old.littler.overrideAttrs (attrs: with pkgs; { + buildInputs = [ pcre lzma zlib bzip2 icu which ] ++ attrs.buildInputs; + postInstall = '' + install -d $out/bin $out/share/man/man1 + ln -s ../library/littler/bin/r $out/bin/r + ln -s ../library/littler/bin/r $out/bin/lr + ln -s ../../../library/littler/man-page/r.1 $out/share/man/man1 + # these won't run without special provisions, so better remove them + rm -r $out/library/littler/script-tests + ''; + }); + }; in self diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index 8ad3a103c93a..5cbedf403d21 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -1,15 +1,15 @@ -{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }: +{ lib, runCommand, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }: let - qtVersion = with stdenv.lib.versions; "${major qtbase.version}.${minor qtbase.version}"; + qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}"; in -stdenv.mkDerivation rec { +runCommand (rstudio.name + "-wrapper") { + preferLocalBuild = true; + allowSubstitutes = false; - name = rstudio.name + "-wrapper"; + nativeBuildInputs = [makeWrapper]; - buildInputs = [makeWrapper R rstudio] ++ recommendedPackages ++ packages; - - unpackPhase = ":"; + buildInputs = [R rstudio] ++ recommendedPackages ++ packages; # rWrapper points R to a specific set of packages by using a wrapper # (as in https://nixos.org/nixpkgs/manual/#r-packages) which sets @@ -20,18 +20,14 @@ stdenv.mkDerivation rec { # into an R file (fixLibsR) which achieves the same effect, then # uses R_PROFILE_USER to load this code at startup in RStudio. fixLibsR = "fix_libs.R"; - installPhase = '' - mkdir $out - echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/${fixLibsR} - echo -n ".libPaths(c(.libPaths(), \"" >> $out/${fixLibsR} - echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR} - echo -n "\"))" >> $out/${fixLibsR} - echo >> $out/${fixLibsR} - makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR} \ - --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins - ''; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; } +'' +mkdir $out +echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR +echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR +echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/$fixLibsR +echo -n "\"))" >> $out/$fixLibsR +echo >> $out/$fixLibsR +makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/$fixLibsR \ + --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins +'' diff --git a/pkgs/development/r-modules/wrapper.nix b/pkgs/development/r-modules/wrapper.nix index d77c24e913d3..76e819501a57 100644 --- a/pkgs/development/r-modules/wrapper.nix +++ b/pkgs/development/r-modules/wrapper.nix @@ -1,25 +1,21 @@ -{ stdenv, R, makeWrapper, recommendedPackages, packages }: +{ runCommand, R, makeWrapper, recommendedPackages, packages }: -stdenv.mkDerivation { - name = R.name + "-wrapper"; +runCommand (R.name + "-wrapper") { + preferLocalBuild = true; + allowSubstitutes = false; - buildInputs = [makeWrapper R] ++ recommendedPackages ++ packages; + buildInputs = [R] ++ recommendedPackages ++ packages; - # Make the list of recommended R packages accessible to other packages such as rpy2 - passthru.recommendedPackages = recommendedPackages; - - unpackPhase = ":"; + nativeBuildInputs = [makeWrapper]; - installPhase = '' - mkdir -p $out/bin - cd ${R}/bin - for exe in *; do - makeWrapper ${R}/bin/$exe $out/bin/$exe \ - --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" - done - ''; - - meta = { - platforms = stdenv.lib.platforms.unix; - }; + # Make the list of recommended R packages accessible to other packages such as rpy2 + passthru = { inherit recommendedPackages; }; } +'' +mkdir -p $out/bin +cd ${R}/bin +for exe in *; do + makeWrapper ${R}/bin/$exe $out/bin/$exe \ + --prefix "R_LIBS_SITE" ":" "$R_LIBS_SITE" +done +'' diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index d0782513c759..45be83f6ebee 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -6,13 +6,13 @@ buildRubyGem rec { name = "${gemName}-${version}"; gemName = "bundix"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "manveru"; repo = "bundix"; rev = version; - sha256 = "1lq8nday6031mj7ivnk2wd47v2smz6frnb8xh2yhyhpld045v1rz"; + sha256 = "175qmv7dj7v50v71b78dzn5pb4a35ml6p15asks9q1rrlkz0n4gn"; }; buildInputs = [ ruby bundler ]; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 175114017f30..9457e88ed834 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ocamlPackages, cf-private, CoreServices }: stdenv.mkDerivation rec { - version = "0.86.0"; + version = "0.87.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0sxg066bfkgqyq2fcjkff4jbhpxrzsqgz53h2b4wscxr076r9bjp"; + sha256 = "10f7rwkgh40wl8z3wgcsvyzm65zsf3zd143q4nv6q6g3m9izh40k"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index e8bec4184b8d..55bae2740cc2 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -90,17 +90,17 @@ in { #<generated> # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "20299"; - gittap = "3.1.2"; - gittip = "b453df6acc6742d709bd238cd9cd63ede2534b1b"; - rev = "3.1.2"; - version = "3.1.2"; - sha256 = "1cvfkxp8vj8f6ghhin71lynvq3zpc311y5b9c2sg9g7h4j3647nq"; + version_commit = "20315"; + gittap = "3.1.3"; + gittip = "57dd0b4e7ec70cc95f859651b1b63b076b8df7a7"; + rev = "3.1.3"; + version = "3.1.3"; + sha256 = "17bd7i9lbr0nxa3llw354mppx44xi7bjwif7g7wxw0zcjlfxnk5d"; cs_tip = "f01c267f889e932b069a559ce0c604c1ae986c0a"; cs_sha256 = "15ifnql2gi2f9g8j60hc4hbxbvi2qn1r110ry32qmlz55svxh67y"; }; r2-for-cutter = generic { - version_commit = "20299"; + version_commit = "20315"; gittap = "2.9.0-310-gcb62c376b"; gittip = "cb62c376bef6c7427019a7c28910c33c364436dd"; rev = "cb62c376bef6c7427019a7c28910c33c364436dd"; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index 50b1d09ef933..c53ff2b505fd 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -2,7 +2,7 @@ let baseName = "bloop"; - version = "1.0.0"; + version = "1.1.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -16,12 +16,12 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0dgllwv9rjvpzvlbwwiynmfp15j2x48al7cb5rlmhq0an3q81hbh"; + outputHash = "0w2gk9ladkzm3mx3qsmjqjakj94g7s4s3xfzl6yny1h4dg1456n6"; }; in stdenv.mkDerivation rec { name = "${baseName}-${version}"; - nailgunCommit = "0c8b937b"; + nailgunCommit = "6992a3bf"; buildInputs = [ jdk makeWrapper deps ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 7a401f88be31..ecfdc1b027c1 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "2.138.3"; + version = "2.150.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0z8yfnqg43vqhhnp27wb28686zq9kqkyicqn0162hr9h5pd4sglm"; + sha256 = "0sb6mzynw1vg6s43mpd7b0dz1clbf8akga09i14q66isb9nmhf3s"; }; buildCommand = '' diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix new file mode 100644 index 000000000000..5548b20de83c --- /dev/null +++ b/pkgs/development/tools/fedpkg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, buildPythonApplication, buildPythonPackage, isPy3k, fetchurl, rpkg, offtrac, urlgrabber, pyopenssl, python_fedora }: + +let + fedora_cert = buildPythonPackage rec { + name = "fedora-cert"; + version = "0.6.0.2"; + format = "other"; + + src = fetchurl { + url = "https://releases.pagure.org/fedora-packager/fedora-packager-${version}.tar.bz2"; + sha256 = "02f22072wx1zg3rhyfw6gbxryzcbh66s92nb98mb9kdhxixv6p0z"; + }; + propagatedBuildInputs = [ python_fedora pyopenssl ]; + doCheck = false; + }; +in buildPythonApplication rec { + pname = "fedpkg"; + version = "1.29"; + + disabled = isPy3k; + + src = fetchurl { + url = "https://releases.pagure.org/fedpkg/${pname}-${version}.tar.bz2"; + sha256 = "1cpy5p1rp7w52ighz3ynvhyw04z86y8phq3n8563lj6ayr8pw631"; + }; + patches = [ ./fix-paths.patch ]; + propagatedBuildInputs = [ rpkg offtrac urlgrabber fedora_cert ]; + + meta = with stdenv.lib; { + description = "Subclass of the rpkg project for dealing with rpm packaging"; + homepage = https://pagure.io/fedpkg; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/tools/fedpkg/fix-paths.patch b/pkgs/development/tools/fedpkg/fix-paths.patch new file mode 100644 index 000000000000..1831337a5851 --- /dev/null +++ b/pkgs/development/tools/fedpkg/fix-paths.patch @@ -0,0 +1,16 @@ +--- orig/setup.py ++++ new/setup.py +@@ -27,10 +27,10 @@ + 'bin/fedpkg', + 'bin/fedpkg-stage', + ], +- data_files=[(bash_completion_dir(), ['conf/bash-completion/fedpkg.bash']), +- ('/etc/rpkg', ['conf/etc/rpkg/fedpkg.conf', ++ data_files=[('share/bash-completion/completions', ['conf/bash-completion/fedpkg.bash']), ++ ('etc/rpkg', ['conf/etc/rpkg/fedpkg.conf', + 'conf/etc/rpkg/fedpkg-stage.conf']), +- ('/usr/share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']), ++ ('share/zsh/site-functions', ['conf/zsh-completion/_fedpkg']), + ], + + tests_require=['nose', 'mock'], diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index 440b5e2eb0b7..152b619966c9 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "govers-${version}"; - version = "20150109-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "3b5f175f65d601d06f48d78fcbdb0add633565b9"; + version = "20160623-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "77fd787551fc5e7ae30696e009e334d52d2d3a43"; goPackagePath = "github.com/rogpeppe/govers"; src = fetchgit { inherit rev; url = "https://github.com/rogpeppe/govers"; - sha256 = "0din5a7nff6hpc4wg0yad2nwbgy4q1qaazxl8ni49lkkr4hyp8pc"; + sha256 = "12w83vyi8mgn48fwdm2js693qcydimxapg8rk0yf01w0ab03r5wn"; }; dontRenameImports = true; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 69b20dd3a179..b28bf24892c2 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "gox-${version}"; - version = "0.4.0"; + version = "20181025"; goPackagePath = "github.com/mitchellh/gox"; src = fetchFromGitHub { owner = "mitchellh"; repo = "gox"; - rev = "v${version}"; - sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r"; + rev = "9cc487598128d0963ff9dcc51176e722788ec645"; + sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index bdf4d8614667..51a5f52d3759 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "elfinfo-${version}"; - version = "0.7.4"; + version = "0.7.5"; goPackagePath = "github.com/xyproto/elfinfo"; src = fetchFromGitHub { rev = version; owner = "xyproto"; repo = "elfinfo"; - sha256 = "12n86psri9077v7s6b4j7djg5kijf9gybd80f9sfs0xmgkbly3gv"; + sha256 = "0b6zyfq0yhpbf03h52q2lgf6ff086gcsbnhm6chx18h0q1g17m96"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/profiling/pyflame/default.nix b/pkgs/development/tools/profiling/pyflame/default.nix index 31ecbcaacbf0..ede8499694d3 100644 --- a/pkgs/development/tools/profiling/pyflame/default.nix +++ b/pkgs/development/tools/profiling/pyflame/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, autoreconfHook, coreutils, pkgconfig # pyflame needs one python version per ABI -# are currently supported +# are currently supported # * 2.6 or 2.7 for 2.x ABI # * 3.4 or 3.5 for 3.{4,5} ABI # * 3.6 for 3.6+ ABI # if you want to disable support for some ABI, make the corresponding argument null -, python2, python35, python36 +, python2, python35, python36, python3 }: stdenv.mkDerivation rec { pname = "pyflame"; - version = "1.6.7"; + version = "1.6.7"; src = fetchFromGitHub { owner = "uber"; repo = "pyflame"; @@ -25,6 +25,14 @@ stdenv.mkDerivation rec { # some tests will fail in the sandbox substituteInPlace tests/test_end_to_end.py \ --replace 'skipif(IS_DOCKER' 'skipif(True' + + # don't use patchShebangs here to be explicit about the python version + substituteInPlace utils/flame-chart-json \ + --replace '#!usr/bin/env python' '#!${python3.interpreter}' + ''; + + postInstall = '' + install -D utils/flame-chart-json $out/bin/flame-chart-json ''; doCheck = true; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 9689ff33cd3c..11de0bec425b 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.18.0"; - # rev is the 0.18.0 commit, mainly for skaffold version command output - rev = "34651689be78b2c6bcfbace5072b00b93661f895"; + version = "0.19.0"; + # rev is the 0.19.0 commit, mainly for skaffold version command output + rev = "9eb0dfc1bf634b97462c66b4dfb80e4cea378ade"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0an3g4jqch7a6ckh8yhia7lykpvb5lvz4kd5kqfmw9479kygv9sa"; + sha256 = "0s7dyfdmgslwnmbkzyqvf2622gj5d7vx9igwz3bf6dpaz382mk6h"; }; meta = { diff --git a/pkgs/development/tools/tradcpp/aarch64.patch b/pkgs/development/tools/tradcpp/aarch64.patch new file mode 100644 index 000000000000..ef7ad9828ace --- /dev/null +++ b/pkgs/development/tools/tradcpp/aarch64.patch @@ -0,0 +1,12 @@ +diff a/config.h b/config.h +--- a/config.h ++++ b/config.h +@@ -124,6 +124,8 @@ + #define CONFIG_CPU "__ppc64__" + #elif defined(__ARM__) + #define CONFIG_CPU "__ARM__" ++#elif defined(__aarch64__) ++#define CONFIG_CPU "__aarch64__" + #else + /* let it go */ + #endif diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index 64a97ad00873..7f395174bb41 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -11,7 +11,10 @@ stdenv.mkDerivation { # tradcpp only comes with BSD-make Makefile; the patch adds configure support buildInputs = [ autoconf ]; preConfigure = "autoconf"; - patches = [ ./tradcpp-configure.patch ]; + patches = [ + ./tradcpp-configure.patch + ./aarch64.patch + ]; meta = with stdenv.lib; { description = "A traditional (K&R-style) C macro preprocessor"; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 6f742bb64f79..71e885a04d34 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { # master branch has legacy (1.2.0.2) protocol 1201 and gcc 6 fix. pname = "assaultcube"; - version = "01052017"; - name = "${pname}-${version}"; + version = "unstable-2017-05-01"; meta = { description = "Fast and fun first-person-shooter based on the Cube fps"; diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix new file mode 100644 index 000000000000..c1238b7b3bbb --- /dev/null +++ b/pkgs/games/leela-zero/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, fetchFromGitHub, cmake, boost, eigen +, opencl-headers, ocl-icd, qtbase , zlib }: + +stdenv.mkDerivation rec { + name = "leela-zero-${version}"; + version = "0.16"; + + src = fetchFromGitHub { + owner = "gcp"; + repo = "leela-zero"; + rev = "v${version}"; + sha256 = "1px7wqvlv414gklzgrmppp8wzc2mkskinm1p75j4snbqr8qpbn5s"; + fetchSubmodules = true; + }; + + buildInputs = [ boost opencl-headers ocl-icd qtbase zlib ]; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Go engine modeled after AlphaGo Zero"; + homepage = https://github.com/gcp/leela-zero; + license = licenses.gpl3; + maintainers = [ maintainers.averelld ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index f87f8eab9849..94cf4a774569 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optional udevSupport pkgs.udev ++ lib.optional vulkanSupport pkgs.vulkan-loader + ++ lib.optional sdlSupport pkgs.SDL2 ++ lib.optionals gstreamerSupport (with pkgs.gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav ]) ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 91323ab6de7f..6ecca6c25032 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -42,6 +42,7 @@ xineramaSupport ? false, xmlSupport ? false, vulkanSupport ? false, + sdlSupport ? false, }: let wine-build = build: release: @@ -53,7 +54,7 @@ let wine-build = build: release: netapiSupport cursesSupport vaSupport pcapSupport v4lSupport saneSupport gsmSupport gphoto2Support ldapSupport fontconfigSupport alsaSupport pulseaudioSupport xineramaSupport gtkSupport openclSupport xmlSupport tlsSupport - openglSupport gstreamerSupport udevSupport vulkanSupport; + openglSupport gstreamerSupport udevSupport vulkanSupport sdlSupport; }; }); diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index b446363d7f3b..afe8c0b7b676 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -9,10 +9,10 @@ }: let - version = "1.3"; + version = "1.5"; prebuilt_server = fetchurl { - url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}.jar"; - sha256 = "1ha04wfmghblwr9ajfl96cswacfgrk0b7klq2ixfvw1kgwhmm6hg"; + url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}-fixversion/scrcpy-server-v${version}.jar"; + sha256 = "1pi47khfrs9pygs32l9rj8l927z0sdm8bhkrzzkk6ki9c1psnynr"; }; in stdenv.mkDerivation rec { @@ -21,10 +21,23 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "Genymobile"; repo = "scrcpy"; - rev = "v${version}"; - sha256 = "02szi8w3w0lacyz42hlayxififi863qpm63yg9qir3jcl2vs7vdk"; + rev = "v${version}-fixversion"; + sha256 = "0magmc44pahw1f4jhzkhjlfc31mk3qq43hzn9513idcl4kh4sb8i"; }; + # postPatch: + # screen.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly. + # This can happen when running on non-NixOS because then scrcpy seems to have a hard time using the host OpenGL-supporting hardware. + # It would be better to fix the OpenGL problem, but that seems much more intrusive. + # + # command.c: When copying over the prebuilt binary to mobile, it also copies the permissions of the nix store, and thus it cannot delete normally. + postPatch = '' + substituteInPlace app/src/screen.c \ + --replace "SDL_RENDERER_ACCELERATED" "SDL_RENDERER_ACCELERATED || SDL_RENDERER_SOFTWARE" + substituteInPlace app/src/command.c \ + --replace 'const char *const adb_cmd[] = {"shell", "rm", path};' 'const char *const adb_cmd[] = {"shell", "rm", "-f", path};' + ''; + nativeBuildInputs = [ makeWrapper meson ninja pkgconfig ]; buildInputs = [ ffmpeg SDL2 ]; @@ -34,6 +47,7 @@ stdenv.mkDerivation rec { echo -n > server/meson.build ''; + mesonFlags = ["-Doverride_server_path=${prebuilt_server}"]; postInstall = '' mkdir -p "$out/share/scrcpy" ln -s "${prebuilt_server}" "$out/share/scrcpy/scrcpy-server.jar" diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 2cff1edfc51e..a1f695641664 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.7"; + version = "6.2.8"; name = "seafile-shared-${version}"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0f8h7x6q830q4pw6f6bbykiyj3lkdlgvjzg2sdaqm4bhj2c4k1n0"; + sha256 = "1sgrsj60gy4pqxjz1rxn4nyzmc67x3kx16kd2vmwbzr44hasnp46"; }; nativeBuildInputs = [ pkgconfig which autoreconfHook vala intltool ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index ea5a59536062..0532c88b66b9 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -15,7 +15,7 @@ appleDerivation { (lib.enableFeature enableShared "shared") ]; - postInstall = lib.optionalString (!enableStatic) '' + postInstall = lib.optionalString enableShared '' mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib ${stdenv.cc.bintools.targetPrefix}install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index b3bf590bf268..713847313c2c 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "skhd-${version}"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = "skhd"; rev = "v${version}"; - sha256 = "0mn6svz2mqbpwlx510r447vflfcxryykpin6h6429dlz0wjlipa8"; + sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl"; }; buildInputs = [ Carbon ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 008c23ee9af9..a493ae359f7b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.85"; + version = "4.14.86"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kpgdwf8rcw913dfgj9c6wcvc4z54m756s2fplczm86v2gs186g4"; + sha256 = "0a3f4rn9aixmx6ssqw0yqcr37js790qvb28v40rpg49b0aln14ns"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ccdb95b14115..d432680d4459 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.6"; + version = "4.19.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hq9iyx2k6ff6yxsgkd4xvk5al3jw5nxk49zq72w04b2nsz62kk4"; + sha256 = "1lm2s9yhzyqra1f16jrjwd66m3jl43n5k7av2r9hns8hdr1smmw4"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 013282501863..d05eead7f7f1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.142"; + version = "4.9.143"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "01n4v0gpf8xyz8hzc70mhjha7kanz9pv248ypsmab7zpzgd7wjil"; + sha256 = "1grcmh85n6ya8h2v0qx2pxryjxx3501kjbknz3a5yrwnlrj69dqf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 37f1362e14ea..bd25dc65ec85 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -1,31 +1,32 @@ -{ stdenv, lib, fetchFromGitHub }: +{ stdenv, lib, fetchFromGitHub, python2 }: stdenv.mkDerivation rec { - version = "0.6.2"; + version = "0.7.0"; name = "reptyr-${version}"; + src = fetchFromGitHub { owner = "nelhage"; repo = "reptyr"; rev = "reptyr-${version}"; - sha256 = "0yfy1p0mz05xg5gzp52vilfz0yl1sjjsvwn0z073mnr4wyam7fg8"; + sha256 = "1hnijfz1ab34j2h2cxc3f43rmbclyihgn9x9wxa7jqqgb2xm71hj"; }; - # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror. - postPatch = '' - sed 1i'#include <sys/sysmacros.h>' -i platform/linux/linux.c - ''; + makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ]; - # Needed with GCC 7 - NIX_CFLAGS_COMPILE = "-Wno-error=format-truncation"; + checkInputs = [ (python2.withPackages (p: [ p.pexpect ])) ]; + doCheck = true; - makeFlags = ["PREFIX=$(out)"]; meta = { platforms = [ "i686-linux" "x86_64-linux" "i686-freebsd" "x86_64-freebsd" - ] ++ lib.platforms.arm; + "armv5tel-linux" + "armv6l-linux" + "armv7l-linux" + "aarch64-linux" + ]; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.mit; description = "Reparent a running program to a new terminal"; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 52bb166f401c..348a9a88566b 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -29,9 +29,14 @@ let sha256 = "13vg0wm2fsd06pfw05m4bhcgbjmb2bmd4i31zfs48w0f7hjc8qf2"; }; "2.0" = { - kafkaVersion = "2.0.0"; + kafkaVersion = "2.0.1"; scalaVersion = "2.12"; - sha256 = "0mbrp8rafv1bra9nrdicpxy6w59ixanaj50c9pkgdrih82f57wdm"; + sha256 = "0i62q3542cznf711kiskaa30l06gq9ckszlxja4k1vs1flxz5khl"; + }; + "2.1" = { + kafkaVersion = "2.1.0"; + scalaVersion = "2.12"; + sha256 = "11jgxyqxsw4hc85ba2czc8wdzlnywyb4ab8qd5f2y27mhak482x7"; }; }; in diff --git a/pkgs/servers/foundationdb/default.nix b/pkgs/servers/foundationdb/default.nix index 8af94d4f2d92..7e4babbb979b 100644 --- a/pkgs/servers/foundationdb/default.nix +++ b/pkgs/servers/foundationdb/default.nix @@ -167,7 +167,7 @@ let description = "Open source, distributed, transactional key-value store"; homepage = https://www.foundationdb.org; license = licenses.asl20; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; }; }; @@ -187,8 +187,8 @@ in with builtins; { }; foundationdb60 = makeFdb rec { - version = "6.0.15"; + version = "6.0.17"; branch = "release-6.0"; - sha256 = "1z8104nj1qn738bs1zjiq1mdn8dnj4vksb3fh503mf3ygl54mjbw"; + sha256 = "00m6dkv2nm51zhiq049fiivnz8hpc8w21y024lykhn16kyjdnfhs"; }; } diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8c0ba2a49242..30fe7354f65b 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.82.1"; + version = "0.83.3"; components = { "abode" = ps: with ps; [ ]; "ads" = ps: with ps; [ ]; @@ -21,6 +21,7 @@ "alarm_control_panel.homematicip_cloud" = ps: with ps; [ ]; "alarm_control_panel.ialarm" = ps: with ps; [ ]; "alarm_control_panel.ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; + "alarm_control_panel.lupusec" = ps: with ps; [ ]; "alarm_control_panel.manual" = ps: with ps; [ ]; "alarm_control_panel.manual_mqtt" = ps: with ps; [ paho-mqtt ]; "alarm_control_panel.mqtt" = ps: with ps; [ paho-mqtt ]; @@ -48,6 +49,7 @@ "arduino" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ]; "asterisk_mbox" = ps: with ps; [ ]; + "asuswrt" = ps: with ps; [ ]; "august" = ps: with ps; [ ]; "auth" = ps: with ps; [ aiohttp-cors ]; "auth.indieauth" = ps: with ps; [ ]; @@ -95,6 +97,7 @@ "binary_sensor.envisalink" = ps: with ps; [ ]; "binary_sensor.ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; "binary_sensor.ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; + "binary_sensor.fibaro" = ps: with ps; [ ]; "binary_sensor.flic" = ps: with ps; [ ]; "binary_sensor.fritzbox" = ps: with ps; [ ]; "binary_sensor.gc100" = ps: with ps; [ ]; @@ -110,6 +113,7 @@ "binary_sensor.knx" = ps: with ps; [ ]; "binary_sensor.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "binary_sensor.linode" = ps: with ps; [ linode-api ]; + "binary_sensor.lupusec" = ps: with ps; [ ]; "binary_sensor.maxcube" = ps: with ps; [ ]; "binary_sensor.modbus" = ps: with ps; [ ]; "binary_sensor.mqtt" = ps: with ps; [ paho-mqtt ]; @@ -124,6 +128,7 @@ "binary_sensor.openuv" = ps: with ps; [ ]; "binary_sensor.pilight" = ps: with ps; [ ]; "binary_sensor.ping" = ps: with ps; [ ]; + "binary_sensor.point" = ps: with ps; [ ]; "binary_sensor.qwikswitch" = ps: with ps; [ ]; "binary_sensor.rachio" = ps: with ps; [ ]; "binary_sensor.raincloud" = ps: with ps; [ ]; @@ -156,6 +161,7 @@ "binary_sensor.verisure" = ps: with ps; [ ]; "binary_sensor.volvooncall" = ps: with ps; [ ]; "binary_sensor.vultr" = ps: with ps; [ vultr ]; + "binary_sensor.w800rf32" = ps: with ps; [ ]; "binary_sensor.wemo" = ps: with ps; [ ]; "binary_sensor.wink" = ps: with ps; [ ]; "binary_sensor.wirelesstag" = ps: with ps; [ ]; @@ -250,6 +256,7 @@ "climate.toon" = ps: with ps; [ ]; "climate.touchline" = ps: with ps; [ ]; "climate.tuya" = ps: with ps; [ ]; + "climate.velbus" = ps: with ps; [ ]; "climate.venstar" = ps: with ps; [ ]; "climate.vera" = ps: with ps; [ ]; "climate.wink" = ps: with ps; [ ]; @@ -260,6 +267,7 @@ "cloud.const" = ps: with ps; [ ]; "cloud.http_api" = ps: with ps; [ ]; "cloud.iot" = ps: with ps; [ ]; + "cloud.prefs" = ps: with ps; [ ]; "cloudflare" = ps: with ps; [ ]; "coinbase" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; @@ -286,6 +294,7 @@ "cover.command_line" = ps: with ps; [ ]; "cover.deconz" = ps: with ps; [ ]; "cover.demo" = ps: with ps; [ ]; + "cover.fibaro" = ps: with ps; [ ]; "cover.garadget" = ps: with ps; [ ]; "cover.gogogate2" = ps: with ps; [ ]; "cover.group" = ps: with ps; [ ]; @@ -339,6 +348,7 @@ "device_tracker.fritz" = ps: with ps; [ fritzconnection ]; "device_tracker.geofency" = ps: with ps; [ aiohttp-cors ]; "device_tracker.google_maps" = ps: with ps; [ ]; + "device_tracker.googlehome" = ps: with ps; [ ]; "device_tracker.gpslogger" = ps: with ps; [ aiohttp-cors ]; "device_tracker.hitron_coda" = ps: with ps; [ ]; "device_tracker.huawei_lte" = ps: with ps; [ ]; @@ -356,8 +366,7 @@ "device_tracker.mysensors" = ps: with ps; [ ]; "device_tracker.netgear" = ps: with ps; [ ]; "device_tracker.nmap_tracker" = ps: with ps; [ ]; - "device_tracker.owntracks" = ps: with ps; [ libnacl paho-mqtt ]; - "device_tracker.owntracks_http" = ps: with ps; [ aiohttp-cors libnacl ]; + "device_tracker.owntracks" = ps: with ps; [ aiohttp-cors libnacl ]; "device_tracker.ping" = ps: with ps; [ ]; "device_tracker.quantum_gateway" = ps: with ps; [ ]; "device_tracker.ritassist" = ps: with ps; [ ]; @@ -370,6 +379,7 @@ "device_tracker.tile" = ps: with ps; [ ]; "device_tracker.tomato" = ps: with ps; [ ]; "device_tracker.tplink" = ps: with ps; [ ]; + "device_tracker.traccar" = ps: with ps; [ ]; "device_tracker.trackr" = ps: with ps; [ ]; "device_tracker.ubus" = ps: with ps; [ ]; "device_tracker.unifi" = ps: with ps; [ pyunifi ]; @@ -417,6 +427,7 @@ "fan.zwave" = ps: with ps; [ ]; "feedreader" = ps: with ps; [ feedparser ]; "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; + "fibaro" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; "foursquare" = ps: with ps; [ aiohttp-cors ]; "freedns" = ps: with ps; [ ]; @@ -427,6 +438,7 @@ "geo_location.demo" = ps: with ps; [ ]; "geo_location.geo_json_events" = ps: with ps; [ ]; "geo_location.nsw_rural_fire_service_feed" = ps: with ps; [ ]; + "geofency" = ps: with ps; [ aiohttp-cors ]; "goalfeed" = ps: with ps; [ ]; "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ aiohttp-cors ]; @@ -534,6 +546,7 @@ "light.elkm1" = ps: with ps; [ ]; "light.enocean" = ps: with ps; [ ]; "light.eufy" = ps: with ps; [ ]; + "light.fibaro" = ps: with ps; [ ]; "light.flux_led" = ps: with ps; [ ]; "light.futurenow" = ps: with ps; [ ]; "light.greenwave" = ps: with ps; [ ]; @@ -563,6 +576,7 @@ "light.mysensors" = ps: with ps; [ ]; "light.mystrom" = ps: with ps; [ ]; "light.nanoleaf_aurora" = ps: with ps; [ nanoleaf ]; + "light.niko_home_control" = ps: with ps; [ ]; "light.opple" = ps: with ps; [ ]; "light.osramlightify" = ps: with ps; [ ]; "light.piglow" = ps: with ps; [ ]; @@ -574,6 +588,7 @@ "light.sensehat" = ps: with ps; [ ]; "light.sisyphus" = ps: with ps; [ ]; "light.skybell" = ps: with ps; [ ]; + "light.switch" = ps: with ps; [ ]; "light.tellduslive" = ps: with ps; [ ]; "light.tellstick" = ps: with ps; [ ]; "light.template" = ps: with ps; [ ]; @@ -622,6 +637,10 @@ "logger" = ps: with ps; [ ]; "logi_circle" = ps: with ps; [ ]; "lovelace" = ps: with ps; [ ]; + "luftdaten" = ps: with ps; [ luftdaten ]; + "luftdaten.config_flow" = ps: with ps; [ ]; + "luftdaten.const" = ps: with ps; [ ]; + "lupusec" = ps: with ps; [ ]; "lutron" = ps: with ps; [ ]; "lutron_caseta" = ps: with ps; [ ]; "mailbox" = ps: with ps; [ aiohttp-cors ]; @@ -671,6 +690,7 @@ "media_player.nadtcp" = ps: with ps; [ ]; "media_player.onkyo" = ps: with ps; [ onkyo-eiscp ]; "media_player.openhome" = ps: with ps; [ ]; + "media_player.panasonic_bluray" = ps: with ps; [ ]; "media_player.panasonic_viera" = ps: with ps; [ wakeonlan ]; "media_player.pandora" = ps: with ps; [ pexpect ]; "media_player.philips_js" = ps: with ps; [ ]; @@ -707,6 +727,7 @@ "mqtt.const" = ps: with ps; [ ]; "mqtt.discovery" = ps: with ps; [ ]; "mqtt.server" = ps: with ps; [ aiohttp-cors hbmqtt ]; + "mqtt.subscription" = ps: with ps; [ ]; "mqtt_eventstream" = ps: with ps; [ paho-mqtt ]; "mqtt_statestream" = ps: with ps; [ paho-mqtt ]; "mychevy" = ps: with ps; [ ]; @@ -715,6 +736,8 @@ "mysensors.const" = ps: with ps; [ ]; "mysensors.device" = ps: with ps; [ ]; "mysensors.gateway" = ps: with ps; [ ]; + "mysensors.handler" = ps: with ps; [ ]; + "mysensors.helpers" = ps: with ps; [ ]; "namecheapdns" = ps: with ps; [ ]; "neato" = ps: with ps; [ ]; "nest" = ps: with ps; [ ]; @@ -779,6 +802,7 @@ "notify.syslog" = ps: with ps; [ ]; "notify.telegram" = ps: with ps; [ python-telegram-bot ]; "notify.tibber" = ps: with ps; [ ]; + "notify.tplink_lte" = ps: with ps; [ ]; "notify.twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "notify.twitter" = ps: with ps; [ ]; @@ -795,11 +819,16 @@ "openuv" = ps: with ps; [ ]; "openuv.config_flow" = ps: with ps; [ ]; "openuv.const" = ps: with ps; [ ]; + "owntracks" = ps: with ps; [ aiohttp-cors libnacl ]; + "owntracks.config_flow" = ps: with ps; [ ]; "panel_custom" = ps: with ps; [ aiohttp-cors ]; "panel_iframe" = ps: with ps; [ aiohttp-cors ]; "persistent_notification" = ps: with ps; [ ]; "pilight" = ps: with ps; [ ]; "plant" = ps: with ps; [ ]; + "point" = ps: with ps; [ aiohttp-cors ]; + "point.config_flow" = ps: with ps; [ ]; + "point.const" = ps: with ps; [ ]; "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "proximity" = ps: with ps; [ ]; "python_script" = ps: with ps; [ ]; @@ -808,6 +837,8 @@ "rainbird" = ps: with ps; [ ]; "raincloud" = ps: with ps; [ ]; "rainmachine" = ps: with ps; [ ]; + "rainmachine.config_flow" = ps: with ps; [ ]; + "rainmachine.const" = ps: with ps; [ ]; "raspihats" = ps: with ps; [ ]; "recorder" = ps: with ps; [ sqlalchemy ]; "recorder.const" = ps: with ps; [ ]; @@ -864,6 +895,7 @@ "sensor.arest" = ps: with ps; [ ]; "sensor.arlo" = ps: with ps; [ ]; "sensor.arwn" = ps: with ps; [ paho-mqtt ]; + "sensor.asuswrt" = ps: with ps; [ ]; "sensor.bbox" = ps: with ps; [ ]; "sensor.bh1750" = ps: with ps; [ ]; "sensor.bitcoin" = ps: with ps; [ ]; @@ -922,6 +954,7 @@ "sensor.fail2ban" = ps: with ps; [ ]; "sensor.fastdotcom" = ps: with ps; [ ]; "sensor.fedex" = ps: with ps; [ ]; + "sensor.fibaro" = ps: with ps; [ ]; "sensor.fido" = ps: with ps; [ ]; "sensor.file" = ps: with ps; [ ]; "sensor.filesize" = ps: with ps; [ ]; @@ -929,6 +962,7 @@ "sensor.fints" = ps: with ps; [ ]; "sensor.fitbit" = ps: with ps; [ aiohttp-cors ]; "sensor.fixer" = ps: with ps; [ ]; + "sensor.flunearyou" = ps: with ps; [ ]; "sensor.folder" = ps: with ps; [ ]; "sensor.foobot" = ps: with ps; [ ]; "sensor.fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; @@ -973,6 +1007,7 @@ "sensor.kwb" = ps: with ps; [ ]; "sensor.lacrosse" = ps: with ps; [ ]; "sensor.lastfm" = ps: with ps; [ pylast ]; + "sensor.launch_library" = ps: with ps; [ ]; "sensor.linky" = ps: with ps; [ ]; "sensor.linux_battery" = ps: with ps; [ batinfo ]; "sensor.logi_circle" = ps: with ps; [ ]; @@ -982,7 +1017,6 @@ "sensor.luftdaten" = ps: with ps; [ luftdaten ]; "sensor.lyft" = ps: with ps; [ ]; "sensor.magicseaweed" = ps: with ps; [ ]; - "sensor.melissa" = ps: with ps; [ ]; "sensor.meteo_france" = ps: with ps; [ ]; "sensor.metoffice" = ps: with ps; [ ]; "sensor.mfi" = ps: with ps; [ ]; @@ -1026,6 +1060,7 @@ "sensor.pilight" = ps: with ps; [ ]; "sensor.plex" = ps: with ps; [ ]; "sensor.pocketcasts" = ps: with ps; [ ]; + "sensor.point" = ps: with ps; [ ]; "sensor.pollen" = ps: with ps; [ numpy ]; "sensor.postnl" = ps: with ps; [ ]; "sensor.pushbullet" = ps: with ps; [ pushbullet ]; @@ -1045,6 +1080,7 @@ "sensor.ripple" = ps: with ps; [ ]; "sensor.rmvtransport" = ps: with ps; [ ]; "sensor.rtorrent" = ps: with ps; [ ]; + "sensor.ruter" = ps: with ps; [ ]; "sensor.sabnzbd" = ps: with ps; [ ]; "sensor.scrape" = ps: with ps; [ beautifulsoup4 ]; "sensor.season" = ps: with ps; [ ephem ]; @@ -1052,6 +1088,7 @@ "sensor.sensehat" = ps: with ps; [ ]; "sensor.serial" = ps: with ps; [ ]; "sensor.serial_pm" = ps: with ps; [ ]; + "sensor.seventeentrack" = ps: with ps; [ ]; "sensor.shodan" = ps: with ps; [ ]; "sensor.sht31" = ps: with ps; [ ]; "sensor.sigfox" = ps: with ps; [ ]; @@ -1068,12 +1105,13 @@ "sensor.speedtest" = ps: with ps; [ speedtest-cli ]; "sensor.spotcrime" = ps: with ps; [ ]; "sensor.sql" = ps: with ps; [ sqlalchemy ]; + "sensor.srp_energy" = ps: with ps; [ ]; "sensor.starlingbank" = ps: with ps; [ ]; "sensor.startca" = ps: with ps; [ xmltodict ]; "sensor.statistics" = ps: with ps; [ ]; "sensor.steam_online" = ps: with ps; [ ]; "sensor.supervisord" = ps: with ps; [ ]; - "sensor.swiss_hydrological_data" = ps: with ps; [ xmltodict ]; + "sensor.swiss_hydrological_data" = ps: with ps; [ ]; "sensor.swiss_public_transport" = ps: with ps; [ ]; "sensor.syncthru" = ps: with ps; [ ]; "sensor.synologydsm" = ps: with ps; [ ]; @@ -1082,6 +1120,7 @@ "sensor.tado" = ps: with ps; [ ]; "sensor.tahoma" = ps: with ps; [ ]; "sensor.tank_utility" = ps: with ps; [ ]; + "sensor.tautulli" = ps: with ps; [ ]; "sensor.tcp" = ps: with ps; [ ]; "sensor.ted5000" = ps: with ps; [ xmltodict ]; "sensor.teksavvy" = ps: with ps; [ ]; @@ -1188,6 +1227,7 @@ "switch.elkm1" = ps: with ps; [ ]; "switch.enocean" = ps: with ps; [ ]; "switch.eufy" = ps: with ps; [ ]; + "switch.fibaro" = ps: with ps; [ ]; "switch.flux" = ps: with ps; [ ]; "switch.fritzbox" = ps: with ps; [ ]; "switch.fritzdect" = ps: with ps; [ ]; @@ -1208,6 +1248,7 @@ "switch.konnected" = ps: with ps; [ aiohttp-cors netdisco ]; "switch.linode" = ps: with ps; [ linode-api ]; "switch.litejet" = ps: with ps; [ ]; + "switch.lupusec" = ps: with ps; [ ]; "switch.lutron_caseta" = ps: with ps; [ ]; "switch.mfi" = ps: with ps; [ ]; "switch.mochad" = ps: with ps; [ ]; @@ -1285,6 +1326,7 @@ "tibber" = ps: with ps; [ ]; "timer" = ps: with ps; [ ]; "toon" = ps: with ps; [ ]; + "tplink_lte" = ps: with ps; [ ]; "tradfri" = ps: with ps; [ ]; "tradfri.config_flow" = ps: with ps; [ ]; "tradfri.const" = ps: with ps; [ ]; @@ -1325,6 +1367,7 @@ "verisure" = ps: with ps; [ ]; "volvooncall" = ps: with ps; [ ]; "vultr" = ps: with ps; [ vultr ]; + "w800rf32" = ps: with ps; [ ]; "wake_on_lan" = ps: with ps; [ wakeonlan ]; "water_heater" = ps: with ps; [ ]; "water_heater.demo" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index c09aeb0f33f1..88b824530631 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -34,10 +34,10 @@ let "8d10113ca826a4c29d5b85b2c4e045ffa8bad74fb525ee0eceb1d38d4c70dfd6") (mkOverride "cryptography_vectors" "2.3.1" # required by cryptography==2.3.1 "bf4d9b61dce69c49e830950aa36fad194706463b0b6dfe81425b9e0bc6644d46") - (mkOverride "requests" "2.20.0" - "99dcfdaaeb17caf6e526f32b6a7b780461512ab3f1d992187801694cba42770c") - (mkOverride "ruamel_yaml" "0.15.72" - "97652b9e3a76958cf6684d5d963674adf345d8cc192ddd95e2a21b22cda29f40") + (mkOverride "requests" "2.20.1" + "ea881206e59f41dbd0bd445437d792e43906703fff75ca8ff43ccdb11f33f263") + (mkOverride "ruamel_yaml" "0.15.78" + "85793c5fe321e9202eba521b0bb3e6303bcb61f6e56378f59e874ca36a7e9d5f") (mkOverride "voluptuous" "0.11.5" "567a56286ef82a9d7ae0628c5842f65f516abcb496e74f3f59f1d7b28df314ef") (mkOverride "voluptuous-serialize" "2.0.0" @@ -85,7 +85,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.82.1"; + hassVersion = "0.83.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -100,7 +100,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0d53xp5miz1vm1b5qfznzx33qzxcxi65plp412dyk4r1ag7rh38v"; + sha256 = "1lv9ixv0qd97xpcpb9zzhn82jsgiq4kmcfnfraksq60xwzzqkwar"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index c51a6f0472f4..1695a6eb95d6 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "home-assistant-frontend"; - version = "20181103.3"; + version = "20181121.1"; src = fetchPypi { inherit pname version; - sha256 = "b1b598f637ffc4c37a3d35aa3b912216f0340cb43fa6c50f4617536669d19499"; + sha256 = "9cedc4dc4258823b084b9d7634995ab038be109fea4c087e38412b9ef1cb6433"; }; propagatedBuildInputs = [ user-agents ]; diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index e69d9e61eb98..f4cb22a38f61 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.14.1"; - sha256 = "19542jxcjf4dvrqvgb5vr36mhbzcjrxc3v0xh451rm60610rf2dz"; + version = "1.14.2"; + sha256 = "15wppq12qmq8acjs35xfj61czhf9cdc0drnl5mm8hcg3aihryb80"; }) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3f6fed1e0a03..ecd3a5e5c9bf 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nextcloud-${version}"; - version = "14.0.3"; + version = "14.0.4"; src = fetchurl { url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; - sha256 = "1vykmvkqds1mjz9hl0xapi70s5s66xd8ysw0sczgavir7092gl6p"; + sha256 = "1s20dds4sci3g981ql8kp9d1ynss5sa2y3dsbzqx4jv9f5dd2pag"; }; patches = [ (fetchpatch { diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index dd397598c97b..074b19724d28 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ''; - NIX_CFLAGS_LINK = [ "-lsystemd" ] ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; + NIX_CFLAGS_LINK = lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed; meta = with stdenv.lib; { homepage = https://uwsgi-docs.readthedocs.org/en/latest/; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 671306f6e6f2..850785cd881f 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -32,13 +32,15 @@ rec { # Return a modified stdenv that tries to build statically linked # binaries. makeStaticBinaries = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_LINK = "-static"; + { mkDerivation = args: + if stdenv.hostPlatform.isDarwin + then throw "Cannot build fully static binaries on Darwin/macOS" + else stdenv.mkDerivation (args // { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + "-static"; configureFlags = (args.configureFlags or []) ++ [ "--disable-shared" # brrr... ]; }); - isStatic = true; }; diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index daa9f66615c9..a6063049a3ad 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -1,11 +1,14 @@ { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] }: let bootStages = import ../. { inherit lib localSystem overlays; - crossSystem = null; + + crossSystem = localSystem; + crossOverlays = []; + # Ignore custom stdenvs when cross compiling for compatability config = builtins.removeAttrs config [ "replaceStdenv" ]; }; @@ -33,7 +36,8 @@ in lib.init bootStages ++ [ # Run Packages (buildPackages: { - inherit config overlays; + inherit config; + overlays = overlays ++ crossOverlays; selfBuild = false; stdenv = buildPackages.stdenv.override (old: rec { buildPlatform = localSystem; @@ -48,7 +52,7 @@ in lib.init bootStages ++ [ cc = if crossSystem.useiOSPrebuilt or false then buildPackages.darwin.iosSdkPkgs.clang - else if crossSystem.useAndroidPrebuilt + else if crossSystem.useAndroidPrebuilt or false then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc else buildPackages.gcc; @@ -56,6 +60,7 @@ in lib.init bootStages ++ [ ++ lib.optionals (hostPlatform.isLinux && !buildPlatform.isLinux) [ buildPackages.patchelf buildPackages.paxctl ] + ++ lib.optional hostPlatform.isDarwin buildPackages.clang ++ lib.optional (let f = p: !p.isx86 || p.libc == "musl"; in f hostPlatform && !(f buildPlatform)) buildPackages.updateAutotoolsGnuConfigScriptsHook diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix index b6ea8685f8e6..e86face95195 100644 --- a/pkgs/stdenv/custom/default.nix +++ b/pkgs/stdenv/custom/default.nix @@ -2,7 +2,7 @@ , localSystem, crossSystem, config, overlays }: -assert crossSystem == null; +assert crossSystem == localSystem; let bootStages = import ../. { diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 5fb410b64ebd..b7d8e3ba5236 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -1,5 +1,5 @@ { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let @@ -16,7 +16,7 @@ } }: -assert crossSystem == null; +assert crossSystem == localSystem; let inherit (localSystem) system platform; diff --git a/pkgs/stdenv/darwin/portable-libsystem.sh b/pkgs/stdenv/darwin/portable-libsystem.sh new file mode 100644 index 000000000000..f50ccc8d32ee --- /dev/null +++ b/pkgs/stdenv/darwin/portable-libsystem.sh @@ -0,0 +1,12 @@ +# Make /nix/store/...-libSystem “portable” for static built binaries. +# This just rewrites everything in $1/bin to use the +# /usr/lib/libSystem.B.dylib that is provided on every macOS system. + +fixupOutputHooks+=('fixLibsystemRefs $prefix') + +fixLibsystemRefs() { + if [ -d "$1/bin" ]; then + find "$1/bin" -exec \ + install_name_tool -change @libsystem@ /usr/lib/libSystem.B.dylib {} \; + fi +} diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index 210e0439c0b8..c0bbe24e5219 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -7,7 +7,7 @@ { # Args just for stdenvs' usage lib # Args to pass on to the pkgset builder, too -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] } @ args: let @@ -36,7 +36,7 @@ let # Select the appropriate stages for the platform `system'. in - if crossSystem != null then stagesCross + if crossSystem != localSystem || crossOverlays != [] then stagesCross else if config ? replaceStdenv then stagesCustom else { # switch "i686-linux" = stagesLinux; diff --git a/pkgs/stdenv/freebsd/default.nix b/pkgs/stdenv/freebsd/default.nix index b3a6cedad841..dbb4a0564558 100644 --- a/pkgs/stdenv/freebsd/default.nix +++ b/pkgs/stdenv/freebsd/default.nix @@ -2,7 +2,7 @@ , localSystem, crossSystem, config, overlays }: -assert crossSystem == null; +assert crossSystem == localSystem; let inherit (localSystem) system; in diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 978beea692c6..6d793999d904 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -4,7 +4,7 @@ # compiler and linker that do not search in default locations, # ensuring purity of components produced by it. { lib -, localSystem, crossSystem, config, overlays +, localSystem, crossSystem, config, overlays, crossOverlays ? [] , bootstrapFiles ? let table = { @@ -32,7 +32,7 @@ in files }: -assert crossSystem == null; +assert crossSystem == localSystem; let inherit (localSystem) system platform; diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 37795b11f6dd..810cf16301f4 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -2,7 +2,7 @@ , localSystem, crossSystem, config, overlays }: -assert crossSystem == null; +assert crossSystem == localSystem; let inherit (localSystem) system; diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix index ffff8bdf51d4..a8311f49609a 100644 --- a/pkgs/stdenv/nix/default.nix +++ b/pkgs/stdenv/nix/default.nix @@ -1,10 +1,10 @@ { lib -, crossSystem, config, overlays +, crossSystem, localSystem, config, overlays , bootStages , ... }: -assert crossSystem == null; +assert crossSystem == localSystem; bootStages ++ [ (prevStage: { diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index 42f3bbdb0194..1a7fc91311e5 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - version = "0.3.0"; + version = "0.5.1"; name = "grobi-${version}"; goPackagePath = "github.com/fd0/grobi"; src = fetchFromGitHub { - rev = "78a0639ffad765933a5233a1c94d2626e24277b8"; + rev = "5ddc167b9e4f84755a515828360abda15c54b7de"; owner = "fd0"; repo = "grobi"; - sha256 = "16q7vnhb1p6ds561832sfdszvlafww67bjn3lc0d18v7lyak2l3i"; + sha256 = "0iyxidq60pf6ki52f8fffplf10nl8w9jx1b7igg98csnc6iqxh89"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 252f25ad8fa8..8f3d41e8f4e9 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "4.19"; + version = "4.19.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0jd3bsg3117ysr82n03w33sqw1g9z1ciixcxrwgp90yghvjzp4fm"; + sha256 = "1f7gpk9206ph081fr0af8k57i58zjb03xwd8k69177a7rzsjmn04"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix new file mode 100644 index 000000000000..d2fb32319bf7 --- /dev/null +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }: + +stdenv.mkDerivation rec { + pname = "kodi-cli"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "nawar"; + repo = pname; + rev = version; + sha256 = "0f9wdq2fg8hlpk3qbjfkb3imprxkvdrhxfkcvr3dwfma0j2yfwam"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -a kodi-cli $out/bin + wrapProgram $out/bin/kodi-cli --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash ]} + cp -a playlist_to_kodi $out/bin + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${stdenv.lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/nawar/kodi-cli; + description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = [ maintainers.pstn ]; + }; +} diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index acb88d9773c8..501ab664f83f 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -1,23 +1,17 @@ { stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage { - name = "loop-unstable-2018-10-02"; + name = "loop-unstable-2018-12-04"; src = fetchFromGitHub { owner = "Miserlou"; repo = "Loop"; - rev = "d6ef3c5a0ecd4f533908abee5e481419a1a6eeae"; - sha256 = "1fhihm32v77rj6r3scwmnvzsivky50g7a1644qrn8pafpjs4zwx5"; + rev = "598ccc8e52bb13b8aff78b61cfe5b10ff576cecf"; + sha256 = "0f33sc1slg97q1aisdrb465c3p7fgdh2swv8k3yphpnja37f5nl4"; }; cargoSha256 = "1ccf8dkswwdbwf9diy0l4vc4i2g05ynhi3w1jg3b2ldrvj0j9m9s"; - cargoPatches = [ - # Upstream includes mismatched Cargo.lock file. - # See https://github.com/Miserlou/Loop/pull/40 - ./fix_cargo_lock.patch - ]; - meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; homepage = https://github.com/Miserlou/Loop; diff --git a/pkgs/tools/misc/loop/fix_cargo_lock.patch b/pkgs/tools/misc/loop/fix_cargo_lock.patch deleted file mode 100644 index f991a604f336..000000000000 --- a/pkgs/tools/misc/loop/fix_cargo_lock.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -107,7 +107,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "loop-rs" --version = "0.3.5" -+version = "0.4.0" - dependencies = [ - "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix new file mode 100644 index 000000000000..ee7b2623b1dd --- /dev/null +++ b/pkgs/tools/misc/rig/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl } : + +stdenv.mkDerivation rec { + version = "1.11"; + name = "rig-${version}"; + + src = fetchurl { + url = "https://ayera.dl.sourceforge.net/project/rig/rig/${version}/rig-${version}.tar.gz"; + sha256 = "1f3snysjqqlpk2kgvm5p2icrj4lsdymccmn3igkc2f60smqckgq0"; + }; + + # Note: diff modified from Debian: Norbert Veber <nveber@debian.org> + # http://deb.debian.org/debian/pool/main/r/rig/rig_1.11-1.diff.gz + patches = [ ./rig_1.11-1.diff ]; + + meta = { + homepage = http://rig.sourceforge.net/; + description = "Random identity generator"; + longDescription = '' + RIG (Random Identity Generator) is a free replacement for a shareware + program out there called 'fake'. It generates random, yet real-looking, + personal data. It is useful if you need to feed a name to a Web site, + BBS, or real person, and are too lazy to think of one yourself. Also, + if the Web site/BBS/person you are giving the information to tries to + cross-check the city, state, zip, or area code, it will check out. + ''; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ tomberek ]; + platforms = with stdenv.lib.platforms; all; + }; +} diff --git a/pkgs/tools/misc/rig/rig_1.11-1.diff b/pkgs/tools/misc/rig/rig_1.11-1.diff new file mode 100644 index 000000000000..301cf78b5a9b --- /dev/null +++ b/pkgs/tools/misc/rig/rig_1.11-1.diff @@ -0,0 +1,39 @@ +--- rig-1.11.orig/Makefile ++++ rig-1.11/Makefile +@@ -1,20 +1,21 @@ +-PREFIX=/usr/local ++PREFIX=${out} + BINDIR=${PREFIX}/bin + MANDIR=${PREFIX}/man + DATADIR=${PREFIX}/share/rig ++CXX=g++ + + all: rig rig.6 + rig: rig.cc +- g++ -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" ++ ${CXX} -O2 -g rig.cc -o rig -Wall -DDATADIR="\"$(DATADIR)\"" + + rig.6: rig.6.in + sed s@DATADIR@"$(DATADIR)"@g < rig.6.in > rig.6 + + install: rig rig.6 +- install -g 0 -m 755 -o 0 -s rig $(BINDIR) +- install -g 0 -m 644 -o 0 rig.6 $(MANDIR)/man6/rig.6 +- install -g 0 -m 755 -o 0 -d $(DATADIR) +- install -g 0 -m 644 -o 0 data/*.idx $(DATADIR) ++ install -m 755 -d $(DESTDIR)$(DATADIR) ++ install -m 755 -d $(DESTDIR)$(BINDIR) ++ install -m 755 rig $(DESTDIR)$(BINDIR)/rig ++ install -m 644 data/*.idx $(DESTDIR)$(DATADIR) + + clean: + rm -rf *~ *.rej *.orig *.o rig rig.6 +--- rig-1.11.orig/rig.cc ++++ rig-1.11/rig.cc +@@ -26,6 +26,7 @@ + #include <time.h> + #include <errno.h> + #include <assert.h> ++#include <string.h> + + using namespace std; diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index 65b1f71194ac..33af6a9d67b6 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -2,21 +2,17 @@ python3.pkgs.buildPythonApplication rec { pname = "termtosvg"; - version = "0.3.0"; + version = "0.6.0"; # tests are not available when fetching from pypi src = fetchFromGitHub { owner = "nbedos"; repo = pname; rev = version; - sha256 = "09hw0467pyfj5gwn3768b3rvs5ch3wb1kaax7zsqjd7mw2qh0cjw"; + sha256 = "07d9ashxph16phhawypm99wlx82975hqk08v1n56hxr0nr4f7nd2"; }; - propagatedBuildInputs = with python3.pkgs; [ svgwrite pyte ]; - - checkInputs = [ python3.pkgs.mock ]; - preCheck = "export HOME=$(mktemp -d)"; - postCheck = "unset HOME"; + propagatedBuildInputs = with python3.pkgs; [ lxml pyte ]; meta = with lib; { homepage = https://github.com/nbedos/termtosvg; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index adb43c4aa086..16e87d2a5c97 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -1,11 +1,12 @@ { buildGoPackage , fetchFromGitHub +, fetchpatch , lib }: buildGoPackage rec { name = "amass-${version}"; - version = "2.8.3"; + version = "2.8.5"; goPackagePath = "github.com/OWASP/Amass"; @@ -13,17 +14,19 @@ buildGoPackage rec { owner = "OWASP"; repo = "Amass"; rev = version; - sha256 = "1pidi7bpg5z04l6ryfd7rqxshayvkqmgav0f6f1fxz4jwrmx9nnc"; + sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy"; }; - # NOTE: this must be removed once amass > 2.8.3 is released. This version has - # a broken import caused by the project migrating to a new home. - preBuild = '' - sed -e 's:github.com/caffix/amass/amass/core:github.com/OWASP/Amass/amass/core:g' -i "go/src/${goPackagePath}/cmd/amass.netdomains/main.go" - ''; + outputs = [ "bin" "out" "wordlists" ]; goDeps = ./deps.nix; + postInstall = '' + mkdir -p $wordlists + cp -R $src/wordlists/*.txt $wordlists + gzip $wordlists/*.txt + ''; + meta = with lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' @@ -33,6 +36,9 @@ buildGoPackage rec { uses the IP addresses obtained during resolution to discover associated netblocks and ASNs. All the information is then used to build maps of the target networks. + + Amass ships with a set of wordlist (to be used with the amass -w flag) + that are found under the wordlists output. ''; homepage = https://www.owasp.org/index.php/OWASP_Amass_Project; license = licenses.asl20; diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix index 711d64fd313e..e9b5acf618e2 100644 --- a/pkgs/tools/networking/amass/deps.nix +++ b/pkgs/tools/networking/amass/deps.nix @@ -94,8 +94,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "93218def8b18e66adbdab3eca8ec334700329f1f"; - sha256 = "0v0zdnsi0vw03dcfir7b228g02ag7jr7mgbgv6lnjwbbccxv07pz"; + rev = "ec83556a53fe16b65c452a104ea9d1e86a671852"; + sha256 = "1ijlbyn5gs8g6z2pjlj5h77lg7wrljqxdls4xlcfqxmghxiyci2f"; }; } ] diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix new file mode 100644 index 000000000000..581405f63c05 --- /dev/null +++ b/pkgs/tools/networking/qr-filetransfer/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "qr-filetransfer-unstable-${version}"; + version = "2018-10-22"; + + goPackagePath = "github.com/claudiodangelis/qr-filetransfer"; + + src = fetchFromGitHub { + rev = "b1e5b91aa2aa469f870c62074e879d46e353edae"; + owner = "claudiodangelis"; + repo = "qr-filetransfer"; + sha256 = "04cl3v6bzpaxp1scpsa42xxa1c1brbplq408bb7nixa98bacj4x1"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/claudiodangelis/qr-filetransfer; + description = "Transfer files over wifi by scanning a QR code from your terminal"; + longDescription = '' + qr-filetransfer binds a web server to the address of your Wi-Fi network + interface on a random port and creates a handler for it. The default + handler serves the content and exits the program when the transfer is + complete. + ''; + license = licenses.mit; + maintainers = with maintainers; [ fgaz ]; + }; +} diff --git a/pkgs/tools/networking/qr-filetransfer/deps.nix b/pkgs/tools/networking/qr-filetransfer/deps.nix new file mode 100644 index 000000000000..a15dd9689433 --- /dev/null +++ b/pkgs/tools/networking/qr-filetransfer/deps.nix @@ -0,0 +1,66 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "efa589957cd060542a26d2dd7832fd6a6c6c3ade"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "3fb116b820352b7f0c281308a4d6250c22d94e27"; + sha256 = "084hplr4n4g5nvp70clljk428hc963460xz0ggcj3xdi4w7hhsvv"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7"; + sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw"; + }; + } + { + goPackagePath = "github.com/mdp/qrterminal"; + fetch = { + type = "git"; + url = "https://github.com/mdp/qrterminal"; + rev = "6967d3624af633162b77160078e12a4c14174470"; + sha256 = "1f2zrdv9sw2a6ni1712d27cayr3f8whqagx6f0yglc5gdd9f3i2n"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a5c9d58dba9a56f97aaa86f55e638b718c5a6c42"; + sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; + }; + } + { + goPackagePath = "gopkg.in/cheggaaa/pb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/cheggaaa/pb.v1"; + rev = "007b75a044e968336a69a6c0c617251ab62ac14c"; + sha256 = "0l8m5cy6fbir7nrsk985ap7dxp9qlfmh8r73g7j9zg7pfq3lkhad"; + }; + } + { + goPackagePath = "rsc.io/qr"; + fetch = { + type = "git"; + url = "https://github.com/rsc/qr"; + rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe"; + sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3"; + }; + } +] diff --git a/pkgs/tools/package-management/appimage-run/default.nix b/pkgs/tools/package-management/appimage-run/default.nix index e744b897f46a..af42b579a423 100644 --- a/pkgs/tools/package-management/appimage-run/default.nix +++ b/pkgs/tools/package-management/appimage-run/default.nix @@ -66,6 +66,7 @@ buildFHSUserEnv { dbus-glib libav atk + at-spi2-atk libudev0-shim networkmanager098 diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix index f69687e512b8..96d79a8daceb 100644 --- a/pkgs/tools/security/pass/extensions/default.nix +++ b/pkgs/tools/security/pass/extensions/default.nix @@ -12,4 +12,5 @@ with pkgs; pass-otp = callPackage ./otp.nix {}; pass-tomb = callPackage ./tomb.nix {}; pass-update = callPackage ./update.nix {}; + pass-genphrase = callPackage ./genphrase.nix {}; } diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix new file mode 100644 index 000000000000..0413234bad2a --- /dev/null +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -0,0 +1,32 @@ +{ stdenv, pass, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "pass-genphrase-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "congma"; + repo = "pass-genphrase"; + rev = "${version}"; + sha256 = "0vcg3b79n1r949qfn8ns85bq2mfsmbf4jw2dlzif8425n8ppfsgd"; + }; + + dontBuild = true; + + installTargets = "globalinstall"; + + installFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + substituteInPlace $out/lib/password-store/extensions/genphrase.bash \ + --replace '$EXTENSIONS' "$out/lib/password-store/extensions/" + ''; + + meta = with stdenv.lib; { + description = "Pass extension that generates memorable passwords"; + homepage = https://github.com/congma/pass-genphrase; + license = licenses.gpl3; + maintainers = with maintainers; [ seqizz ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 84c35bd36a65..ac79fc8d464c 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "vault-${version}"; - version = "0.11.5"; + version = "1.0.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1skf9l3a4gwag9gp2vwmniajk8rb05g93s15q5xfwqb6sg6zplfw"; + sha256 = "0wqqf9mif6icfl888w2izvml7vqs4hkd5hrq4dhzcyig5w1bp0if"; }; nativeBuildInputs = [ go gox removeReferencesTo ]; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index d75be0ff5bce..63e135075b9c 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -1,6 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch -, talloc, docutils -, enableStatic ? true }: +, talloc, docutils }: ({ version, rev, sha256, patches }: stdenv.mkDerivation { name = "proot-${version}"; @@ -12,17 +11,13 @@ owner = "cedric-vincent"; }; - buildInputs = [ talloc ] ++ stdenv.lib.optional enableStatic stdenv.cc.libc.static; + buildInputs = [ talloc ]; nativeBuildInputs = [ docutils ]; enableParallelBuilding = true; inherit patches; - preBuild = stdenv.lib.optionalString enableStatic '' - export LDFLAGS="-static" - ''; - makeFlags = [ "-C src" ]; postBuild = '' diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index bcc69c7b223e..e49707256c31 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { name = "tectonic-${version}"; - version = "0.1.9"; + version = "0.1.11"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "v${version}"; - sha256 = "1prrw1npmmqjx966dxrr4jll16scf0cv24nnc70zlbwwb15zhgiq"; + sha256 = "1j98qxlq74vs8nf2jsn2xw9iyrf8kih4v0hrvznkhcab6bpibp2x"; }; - cargoSha256 = "00hcs9k9x23xy1pgf8skgb6i5kjwgipy8c0d27nniaxa3dpy5daq"; + cargoSha256 = "1zgav5zxfvdnrr7himykj5ha20cb5ldxpcpl8y6d19dirxvcmpc6"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix index 919c14d86ecf..73a8f5184778 100644 --- a/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , buildPythonApplication , bash +, bashInteractive , systemd , utillinux , boto @@ -25,7 +26,7 @@ buildPythonApplication rec { for file in $(find google_compute_engine -type f); do substituteInPlace "$file" \ --replace /bin/systemctl "${systemd}/bin/systemctl" \ - --replace /bin/bash "${bash}/bin/bash" \ + --replace /bin/bash "${bashInteractive}/bin/bash" \ --replace /sbin/hwclock "${utillinux}/bin/hwclock" # SELinux tool ??? /sbin/restorecon diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 02971c5dcff6..e33d9bccafb6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -209,6 +209,7 @@ mapAliases ({ opencl-icd = ocl-icd; # added 2017-01-20 openexr_ctl = ctl; # added 2018-04-25 openjpeg_2_1 = openjpeg_2; # added 2018-10-25 + opensans-ttf = open-sans; # added 2018-12-04 openssh_with_kerberos = openssh; # added 2018-01-28 owncloudclient = owncloud-client; # added 2016-08 p11_kit = p11-kit; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c5852e2217f..8cdbff37956f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3312,6 +3312,8 @@ in hiera-eyaml = callPackage ../tools/system/hiera-eyaml { }; + hivemind = callPackage ../applications/misc/hivemind { }; + hfsprogs = callPackage ../tools/filesystems/hfsprogs { }; highlight = callPackage ../tools/text/highlight ({ @@ -3488,9 +3490,7 @@ in buildGoPackage = buildGo110Package; }; - ipmitool = callPackage ../tools/system/ipmitool { - static = false; - }; + ipmitool = callPackage ../tools/system/ipmitool { }; ipmiutil = callPackage ../tools/system/ipmiutil {}; @@ -3675,6 +3675,8 @@ in kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; + kube-router = callPackage ../applications/networking/cluster/kube-router { }; + kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; peruse = libsForQt5.callPackage ../tools/misc/peruse { }; @@ -3983,8 +3985,6 @@ in libiberty = callPackage ../development/libraries/libiberty { }; - libiberty_static = libiberty.override { staticBuild = true; }; - libxc = callPackage ../development/libraries/libxc { }; libxcomp = callPackage ../development/libraries/libxcomp { }; @@ -4902,7 +4902,9 @@ in plowshare = callPackage ../tools/misc/plowshare { }; pngcheck = callPackage ../tools/graphics/pngcheck { - zlib = zlibStatic; + zlib = zlib.override { + static = true; + }; }; pngcrush = callPackage ../tools/graphics/pngcrush { }; @@ -5021,6 +5023,8 @@ in remarshal = callPackage ../development/tools/remarshal { }; + rig = callPackage ../tools/misc/rig { }; + rocket = libsForQt5.callPackage ../tools/graphics/rocket { }; rtaudio = callPackage ../development/libraries/audio/rtaudio { }; @@ -5060,6 +5064,8 @@ in qshowdiff = callPackage ../tools/text/qshowdiff { }; + qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; + qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; quickserve = callPackage ../tools/networking/quickserve { }; @@ -5210,7 +5216,7 @@ in routino = callPackage ../tools/misc/routino { }; rq = callPackage ../development/tools/rq { - v8 = v8_static; + v8 = v8.override { static = true; }; }; rsnapshot = callPackage ../tools/backup/rsnapshot { }; @@ -7528,10 +7534,11 @@ in lua = lua5_1; }; - teyjus = callPackage ../development/compilers/teyjus { - inherit (ocaml-ng.ocamlPackages_4_02) ocaml; - omake = omake_rc1; - }; + teyjus = callPackage ../development/compilers/teyjus ( + with ocaml-ng.ocamlPackages_4_02; { + inherit ocaml; + omake = omake_rc1; + }); thrust = callPackage ../development/tools/thrust { gconf = pkgs.gnome2.GConf; @@ -7909,6 +7916,8 @@ in python37Packages = recurseIntoAttrs python37.pkgs; pypyPackages = pypy.pkgs; + update-python-libraries = callPackage ../development/interpreters/python/update-python-libraries { }; + # Should eventually be moved inside Python interpreters. python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { }; @@ -8028,7 +8037,9 @@ in tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { }; tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { }; - proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { }; + proglodyte-wasm = callPackage ../development/interpreters/proglodyte-wasm { + v8_static = v8.override { static = true; }; + }; wasm-gc = callPackage ../development/interpreters/wasm-gc { }; @@ -8170,13 +8181,14 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_0; + apacheKafka = apacheKafka_2_1; apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; apacheKafka_0_11 = callPackage ../servers/apache-kafka { majorVersion = "0.11"; }; apacheKafka_1_0 = callPackage ../servers/apache-kafka { majorVersion = "1.0"; }; apacheKafka_1_1 = callPackage ../servers/apache-kafka { majorVersion = "1.1"; }; apacheKafka_2_0 = callPackage ../servers/apache-kafka { majorVersion = "2.0"; }; + apacheKafka_2_1 = callPackage ../servers/apache-kafka { majorVersion = "2.1"; }; kt = callPackage ../tools/misc/kt {}; @@ -8449,7 +8461,9 @@ in lattice-diamond = callPackage ../development/tools/lattice-diamond { }; - distcc = callPackage ../development/tools/misc/distcc { }; + distcc = callPackage ../development/tools/misc/distcc { + libiberty_static = libiberty.override { staticBuild = true; }; + }; # distccWrapper: wrapper that works as gcc or g++ # It can be used by setting in nixpkgs config like this, for example: @@ -8551,6 +8565,8 @@ in jdepend = callPackage ../development/tools/analysis/jdepend { }; + fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { }; + flex_2_5_35 = callPackage ../development/tools/parsing/flex/2.5.35.nix { }; flex = callPackage ../development/tools/parsing/flex { }; @@ -8800,15 +8816,15 @@ in omake = callPackage ../development/tools/ocaml/omake { }; - inherit (ocamlPackages) omake_rc1; - omniorb = callPackage ../development/tools/omniorb { }; opengrok = callPackage ../development/tools/misc/opengrok { }; openocd = callPackage ../development/tools/misc/openocd { }; - oprofile = callPackage ../development/tools/profiling/oprofile { }; + oprofile = callPackage ../development/tools/profiling/oprofile { + libiberty_static = libiberty.override { staticBuild = true; }; + }; pahole = callPackage ../development/tools/misc/pahole {}; @@ -10787,6 +10803,8 @@ in libgphoto2 = callPackage ../development/libraries/libgphoto2 { }; + libgpiod = callPackage ../development/libraries/libgpiod { }; + libgpod = callPackage ../development/libraries/libgpod { inherit (pkgs.pythonPackages) mutagen; monoSupport = false; @@ -11107,6 +11125,8 @@ in libopus = callPackage ../development/libraries/libopus { }; + libopusenc = callPackage ../development/libraries/libopusenc { }; + libosinfo = callPackage ../development/libraries/libosinfo { inherit (gnome3) libsoup; }; @@ -12109,7 +12129,9 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; - qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; + qmltermwidget = callPackage ../development/libraries/qmltermwidget { + inherit (darwin.apple_sdk.libs) utmp; + }; qmlbox2d = libsForQt59.callPackage ../development/libraries/qmlbox2d { }; qscintilla = callPackage ../development/libraries/qscintilla { @@ -12390,10 +12412,13 @@ in soapybladerf soapyhackrf soapyremote + soapyrtlsdr soapyuhd ]; }; + soapyrtlsdr = callPackage ../applications/misc/soapyrtlsdr { }; + soapyuhd = callPackage ../applications/misc/soapyuhd { }; socket_wrapper = callPackage ../development/libraries/socket_wrapper { }; @@ -12709,8 +12734,6 @@ in stdenv = overrideCC stdenv gcc6; }); - v8_static = lowPrio (res.v8.override { static = true; }); - vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; @@ -12945,10 +12968,6 @@ in zlog = callPackage ../development/libraries/zlog { }; - zlibStatic = lowPrio (appendToName "static" (zlib.override { - static = true; - })); - zeromq3 = callPackage ../development/libraries/zeromq/3.x.nix {}; zeromq4 = callPackage ../development/libraries/zeromq/4.x.nix {}; zeromq = zeromq4; @@ -15507,7 +15526,7 @@ in open-dyslexic = callPackage ../data/fonts/open-dyslexic { }; - opensans-ttf = callPackage ../data/fonts/opensans-ttf { }; + open-sans = callPackage ../data/fonts/open-sans { }; orbitron = callPackage ../data/fonts/orbitron { }; @@ -17070,6 +17089,7 @@ in lcms = lcms2; inherit (gnome3) gexiv2; inherit (darwin.apple_sdk.frameworks) AppKit Cocoa; + inherit (darwin) cf-private; }; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { @@ -17362,7 +17382,7 @@ in jackline = callPackage ../applications/networking/instant-messengers/jackline { }; slack = callPackage ../applications/networking/instant-messengers/slack { }; - slack-dark = self.slack.override { darkMode = true; }; + slack-dark = pkgs.slack.override { darkMode = true; }; slack-cli = callPackage ../tools/networking/slack-cli { }; @@ -17866,6 +17886,8 @@ in lua = lua5_1; }; + luppp = callPackage ../applications/audio/luppp { }; + lv2bm = callPackage ../applications/audio/lv2bm { }; lynx = callPackage ../applications/networking/browsers/lynx { }; @@ -19731,12 +19753,16 @@ in webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; - weechat = callPackage ../applications/networking/irc/weechat { + wrapWeechat = callPackage ../applications/networking/irc/weechat/wrapper.nix { }; + + weechat-unwrapped = callPackage ../applications/networking/irc/weechat { inherit (darwin) libobjc; inherit (darwin) libresolv; guile = guile_2_0; }; + weechat = wrapWeechat weechat-unwrapped { }; + weechatScripts = callPackage ../applications/networking/irc/weechat/scripts { }; westonLite = weston.override { @@ -19937,6 +19963,8 @@ in kodi = kodiPlain; }; + kodi-cli = callPackage ../tools/misc/kodi-cli { }; + kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; @@ -20510,6 +20538,8 @@ in kobodeluxe = callPackage ../games/kobodeluxe { }; + leela-zero = libsForQt5.callPackage ../games/leela-zero { }; + lgogdownloader = callPackage ../games/lgogdownloader { }; liberal-crime-squad = callPackage ../games/liberal-crime-squad { }; @@ -20605,7 +20635,9 @@ in openspades = callPackage ../games/openspades { }; openttd = callPackage ../games/openttd { - zlib = zlibStatic; + zlib = zlib.override { + static = true; + }; }; opentyrian = callPackage ../games/opentyrian { }; @@ -22655,6 +22687,8 @@ in callPackage ../applications/networking/cluster/terraform-providers {} ); + terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; + terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory {}; terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape {}; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index da7fc1bed34c..dcd443a1c29e 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -22,9 +22,8 @@ # `*Platform`s. localSystem -, # The system packages will ultimately be run on. Null if the two should be the - # same. - crossSystem ? null +, # The system packages will ultimately be run on. + crossSystem ? localSystem , # Allow a configuration attribute set to be passed in as an argument. config ? {} @@ -32,6 +31,9 @@ , # List of overlays layers used to extend Nixpkgs. overlays ? [] +, # List of overlays to apply to target packages only. + crossOverlays ? [] + , # A function booting the final package set for a specific standard # environment. See below for the arguments given to that function, the type of # list it returns. @@ -61,7 +63,8 @@ in let builtins.intersectAttrs { platform = null; } config // args.localSystem); - crossSystem = lib.mapNullable lib.systems.elaborate crossSystem0; + crossSystem = if crossSystem0 == null then localSystem + else lib.systems.elaborate crossSystem0; # A few packages make a new package set to draw their dependencies from. # (Currently to get a cross tool chain, or forced-i686 package.) Rather than @@ -91,7 +94,7 @@ in let boot = import ../stdenv/booter.nix { inherit lib allPackages; }; stages = stdenvStages { - inherit lib localSystem crossSystem config overlays; + inherit lib localSystem crossSystem config overlays crossOverlays; }; pkgs = boot stages; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 357ab21fba1f..af9ca77d9d21 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -68,6 +68,12 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; + ghc863 = callPackage ../development/compilers/ghc/8.6.3.nix { + bootPkgs = packages.ghc822; + inherit (buildPackages.python3Packages) sphinx; + buildLlvmPackages = buildPackages.llvmPackages_6; + llvmPackages = pkgs.llvmPackages_6; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -130,6 +136,11 @@ in { ghc = bh.compiler.ghc862; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; }; + ghc863 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc863; + ghc = bh.compiler.ghc863; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghcHEAD; ghc = bh.compiler.ghcHEAD; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4bcc7f4d32c7..c7c19f49cfc2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9117,6 +9117,19 @@ let }; }; + MailSender = buildPerlPackage rec { + name = "Mail-Sender-0.903"; + src = fetchurl { + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/${name}.tar.gz"; + sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf"; + }; + meta = { + homepage = https://github.com/Perl-Email-Project/Mail-Sender; + description = "(DEPRECATED) module for sending mails with attachments through an SMTP server"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MailSendmail = buildPerlPackage rec { name = "Mail-Sendmail-0.80"; src = fetchurl { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ff6217ad342..1c1956fc3d44 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1655,8 +1655,6 @@ in { then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}"; - fedpkg = callPackage ../development/python-modules/fedpkg { }; - flit = callPackage ../development/python-modules/flit { }; flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; @@ -3904,18 +3902,6 @@ in { sphinx = callPackage ../development/python-modules/sphinx { }; - sphinx_1_2 = self.sphinx.overridePythonAttrs rec { - name = "sphinx-1.2.3"; - version = "1.2.3"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/sphinx/sphinx-1.2.3.tar.gz"; - sha256 = "94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04"; - }; - postPatch = ''''; - # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this: - doCheck = false; - }; - sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { }; hieroglyph = callPackage ../development/python-modules/hieroglyph { }; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 276350e56e60..6ca370e0b9b7 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -174,6 +174,22 @@ let # Prefer appendOverlays if used repeatedly. extend = f: self.appendOverlays [f]; + # Fully static packages. + # Currently uses Musl on Linux (couldn’t get static glibc to work). + pkgsStatic = nixpkgsFun ({ + crossOverlays = [ (import ./static.nix) ]; + } // lib.optionalAttrs stdenv.hostPlatform.isLinux { + crossSystem = { + parsed = stdenv.hostPlatform.parsed // { + abi = { + "gnu" = lib.systems.parse.abis.musl; + "gnueabi" = lib.systems.parse.abis.musleabi; + "gnueabihf" = lib.systems.parse.abis.musleabihf; + }.${stdenv.hostPlatform.parsed.abi.name} + or lib.systems.parse.abis.musl; + }; + }; + }); }; # The complete chain of package set builders, applied from top to bottom. diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix new file mode 100644 index 000000000000..687e38dcc3aa --- /dev/null +++ b/pkgs/top-level/static.nix @@ -0,0 +1,150 @@ +# Overlay that builds static packages. + +# Not all packages will build but support is done on a +# best effort basic. +# +# Note on Darwin/macOS: Apple does not provide a static libc +# so any attempts at static binaries are going to be very +# unsupported. +# +# Basic things like pkgsStatic.hello should work out of the box. More +# complicated things will need to be fixed with overrides. + +self: super: let + inherit (super.stdenvAdapters) makeStaticBinaries + overrideInStdenv + makeStaticLibraries; + inherit (super.lib) foldl optional flip id optionalAttrs composeExtensions; + inherit (super) makeSetupHook; + + # Best effort static binaries. Will still be linked to libSystem, + # but more portable than Nix store binaries. + makeStaticDarwin = stdenv: stdenv // { + mkDerivation = args: stdenv.mkDerivation (args // { + NIX_CFLAGS_LINK = toString (args.NIX_CFLAGS_LINK or "") + + " -static-libgcc"; + nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ (makeSetupHook { + substitutions = { + libsystem = "${stdenv.cc.libc}/lib/libSystem.B.dylib"; + }; + } ../stdenv/darwin/portable-libsystem.sh) ]; + }); + }; + + staticAdapters = [ makeStaticLibraries ] + + # Apple does not provide a static version of libSystem or crt0.o + # So we can’t build static binaries without extensive hacks. + ++ optional (!super.stdenv.hostPlatform.isDarwin) makeStaticBinaries + + ++ optional super.stdenv.hostPlatform.isDarwin makeStaticDarwin + + # Glibc doesn’t come with static runtimes by default. + # ++ optional (super.stdenv.hostPlatform.libc == "glibc") ((flip overrideInStdenv) [ self.stdenv.glibc.static ]) + ; + + # Force everything to link statically. + haskellStaticAdapter = self: super: { + mkDerivation = attrs: super.mkDerivation (attrs // { + enableSharedLibraries = false; + enableSharedExecutables = false; + enableStaticLibraries = true; + }); + }; + +in { + stdenv = foldl (flip id) super.stdenv staticAdapters; + + haskell = super.haskell // { + packageOverrides = composeExtensions + (super.haskell.packageOverrides or (_: _: {})) + haskellStaticAdapter; + }; + + ncurses = super.ncurses.override { + enableStatic = true; + }; + libxml2 = super.libxml2.override { + enableShared = false; + enableStatic = true; + }; + zlib = super.zlib.override { + static = true; + shared = false; + + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; + xz = super.xz.override { + enableStatic = true; + }; + busybox = super.busybox.override { + enableStatic = true; + }; + v8 = super.v8.override { + static = true; + }; + libiberty = super.libiberty.override { + staticBuild = true; + }; + ipmitool = super.ipmitool.override { + static = true; + }; + neon = super.neon.override { + static = true; + shared = false; + }; + libjpeg = super.libjpeg.override { + static = true; + }; + gifsicle = super.gifsicle.override { + static = true; + }; + bzip2 = super.bzip2.override { + linkStatic = true; + }; + optipng = super.optipng.override { + static = true; + }; + openssl = super.openssl.override { + static = true; + + # Don’t use new stdenv for openssl because it doesn’t like the + # --disable-shared flag + stdenv = super.stdenv; + }; + boost = super.boost.override { + enableStatic = true; + enableShared = false; + }; + gmp = super.gmp.override { + withStatic = true; + }; + cdo = super.cdo.override { + enable_all_static = true; + }; + gsm = super.gsm.override { + staticSupport = true; + }; + parted = super.parted.override { + enableStatic = true; + }; + libiconvReal = super.libiconvReal.override { + enableShared = false; + enableStatic = true; + }; + perl = super.perl.override { + # Don’t use new stdenv zlib because + # it doesn’t like the --disable-shared flag + stdenv = super.stdenv; + }; + + darwin = super.darwin // { + libiconv = super.darwin.libiconv.override { + enableShared = false; + enableStatic = true; + }; + }; + +} diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index 8ff2d46c24e0..3a81a3d99bce 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -25,6 +25,7 @@ rec { udevSupport = true; xineramaSupport = true; xmlSupport = true; + sdlSupport = true; }; full = base.override { |