diff options
Diffstat (limited to 'pkgs/applications')
298 files changed, 5693 insertions, 4023 deletions
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 25f223d57441..24bc3875dd5e 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.16.1"; + version = "0.16.2"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "1zkqp93yircd3pbxczxfnibkpq0sgcv5r7wg6d196b9pwgr9zd39"; + sha256 = "1n07qykx5hc0ph8fwn7hfrbsrjv19fdzvs5h0nysq4wfgn5wa40r"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 9f1763087de2..f4a49e79f6ad 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -86,6 +86,7 @@ rec { }; parity = callPackage ./parity { }; + parity-beta = callPackage ./parity/beta.nix { }; parity-ui = callPackage ./parity-ui { }; particl-core = callPackage ./particl/particl-core.nix { boost = boost165; miniupnpc = miniupnpc_2; }; diff --git a/pkgs/applications/altcoins/go-ethereum.nix b/pkgs/applications/altcoins/go-ethereum.nix index 73aa4452c0f0..02e0412449a0 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.11"; + version = "1.8.13"; goPackagePath = "github.com/ethereum/go-ethereum"; # Fix for usb-related segmentation faults on darwin @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "ethereum"; repo = "go-ethereum"; rev = "v${version}"; - sha256 = "1b4za0hszb95jnj97g4xkrgcl0bydllznm0wj6rpi6cwmdr0h8na"; + sha256 = "123jkyb293z7ww3sa9ji5rw7xd229isi03k4ayyh5p7rr0dg8al0"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix index 9af37ff0bca6..93f9faf833a1 100644 --- a/pkgs/applications/altcoins/namecoin.nix +++ b/pkgs/applications/altcoins/namecoin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode +{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode, hexdump , withGui }: with stdenv.lib; @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig + hexdump ]; buildInputs = [ @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { libqrencode ]; + enableParallelBuilding = true; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix new file mode 100644 index 000000000000..fe58579e6b57 --- /dev/null +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -0,0 +1,7 @@ +let + version = "2.0.1"; + sha256 = "0rfq0izpswfwbyvr5kb6zjyf6sd7l1706c0sp7ccy6ykdfb4v6zs"; + cargoSha256 = "1ij17bfwvikqi5aj71j1nwf3jhkf3y9a0kwydajviwal47p9grl9"; + patches = [ ./patches/vendored-sources-2.0.patch ]; +in + import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index a41488c48b50..993bc3615aa8 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,7 +1,7 @@ let - version = "1.10.9"; - sha256 = "1irfksx887vvvdf97q26qacn22kmyj8fgb3ghh9wv5qnzrn3564g"; - cargoSha256 = "0rzhabyhprmcg0cdmibbb8zgqf6z4izsdq8m060mppkkv675x0lf"; - patches = [ ./patches/vendored-sources-1.10.patch ]; + version = "1.11.8"; + sha256 = "0qk5vl8ql3pr9pz5iz7whahwqi1fcbsf8kphn6z4grgc87id7b19"; + cargoSha256 = "0p2idd36cyzp2ax81k533bdma4hz0ws2981qj2s7jnhvmj4941l8"; + patches = [ ./patches/vendored-sources-1.11.patch ]; in import ./parity.nix { inherit version sha256 cargoSha256 patches; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix index 9c9d1d4293e0..55665034ccf9 100644 --- a/pkgs/applications/altcoins/parity/parity.nix +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -10,6 +10,8 @@ , pkgconfig , openssl , systemd +, cmake +, perl }: rustPlatform.buildRustPackage rec { @@ -18,12 +20,15 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "paritytech"; - repo = "parity"; + repo = "parity-ethereum"; rev = "v${version}"; inherit sha256; }; - buildInputs = [ pkgconfig systemd.lib systemd.dev openssl openssl.dev ]; + buildInputs = [ + pkgconfig cmake perl + systemd.lib systemd.dev openssl openssl.dev + ]; # Some checks failed doCheck = false; diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch index e59858442c9e..733f6880ad9d 100644 --- a/pkgs/applications/altcoins/parity/patches/vendored-sources-1.10.patch +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-1.11.patch @@ -1,5 +1,5 @@ diff --git a/.cargo/config b/.cargo/config -index 72652ad2f..b21c6aa7b 100644 +index 72652ad2f..57c5c2f8f 100644 --- a/.cargo/config +++ b/.cargo/config @@ -1,3 +1,108 @@ @@ -52,19 +52,19 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hidapi-rs"] -+git = "https://github.com/paritytech/hidapi-rs" ++[source."https://github.com/paritytech/daemonize"] ++git = "https://github.com/paritytech/daemonize" +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/paritytech/hyper"] -+git = "https://github.com/paritytech/hyper" ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" +branch = "master" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/jsonrpc.git"] +git = "https://github.com/paritytech/jsonrpc.git" -+branch = "parity-1.10" ++branch = "parity-1.11" +replace-with = "vendored-sources" + +[source."https://github.com/paritytech/libusb-rs"] @@ -77,6 +77,11 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + ++[source."https://github.com/paritytech/ring"] ++git = "https://github.com/paritytech/ring" ++branch = "master" ++replace-with = "vendored-sources" ++ +[source."https://github.com/paritytech/rust-ctrlc.git"] +git = "https://github.com/paritytech/rust-ctrlc.git" +branch = "master" @@ -102,13 +107,7 @@ index 72652ad2f..b21c6aa7b 100644 +branch = "master" +replace-with = "vendored-sources" + -+[source."https://github.com/tailhook/rotor"] -+git = "https://github.com/tailhook/rotor" -+branch = "master" -+replace-with = "vendored-sources" -+ +[source."https://github.com/tomusdrw/ws-rs"] +git = "https://github.com/tomusdrw/ws-rs" +branch = "master" +replace-with = "vendored-sources" -+ diff --git a/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch new file mode 100644 index 000000000000..9af64559d971 --- /dev/null +++ b/pkgs/applications/altcoins/parity/patches/vendored-sources-2.0.patch @@ -0,0 +1,98 @@ +diff --git a/.cargo/config b/.cargo/config +index 72652ad2f..3c0eca89a 100644 +--- a/.cargo/config ++++ b/.cargo/config +@@ -1,3 +1,93 @@ + [target.x86_64-pc-windows-msvc] + # Link the C runtime statically ; https://github.com/paritytech/parity/issues/6643 + rustflags = ["-Ctarget-feature=+crt-static"] ++ ++[source."https://github.com/alexcrichton/mio-named-pipes"] ++git = "https://github.com/alexcrichton/mio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/parity-tokio-ipc"] ++git = "https://github.com/nikvolf/parity-tokio-ipc" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/nikvolf/tokio-named-pipes"] ++git = "https://github.com/nikvolf/tokio-named-pipes" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/app-dirs-rs"] ++git = "https://github.com/paritytech/app-dirs-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/bn"] ++git = "https://github.com/paritytech/bn" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/daemonize"] ++git = "https://github.com/paritytech/daemonize" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/hidapi-rs"] ++git = "https://github.com/paritytech/hidapi-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/jsonrpc.git"] ++git = "https://github.com/paritytech/jsonrpc.git" ++branch = "parity-1.11" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-rs"] ++git = "https://github.com/paritytech/libusb-rs" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/libusb-sys"] ++git = "https://github.com/paritytech/libusb-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/parity-common"] ++git = "https://github.com/paritytech/parity-common" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/ring"] ++git = "https://github.com/paritytech/ring" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-ctrlc.git"] ++git = "https://github.com/paritytech/rust-ctrlc.git" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-rocksdb"] ++git = "https://github.com/paritytech/rust-rocksdb" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-secp256k1"] ++git = "https://github.com/paritytech/rust-secp256k1" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/rust-snappy"] ++git = "https://github.com/paritytech/rust-snappy" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/paritytech/trezor-sys"] ++git = "https://github.com/paritytech/trezor-sys" ++branch = "master" ++replace-with = "vendored-sources" ++ ++[source."https://github.com/tomusdrw/ws-rs"] ++git = "https://github.com/tomusdrw/ws-rs" ++branch = "master" ++replace-with = "vendored-sources" diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index d21c3fd5efbd..ed7a8481f693 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, python, alsaUtils, timidity }: +{ stdenv, fetchurl, makeWrapper, python3, alsaUtils, timidity }: stdenv.mkDerivation rec { version = "16.06"; @@ -9,7 +9,7 @@ sha256 = "1g4gvc0nr0qjc0fyqrnx037zpaasgymgmrm5s7cdxqnld9wqw8ww"; }; - buildInputs = [ makeWrapper python alsaUtils timidity ]; + buildInputs = [ makeWrapper python3 alsaUtils timidity ]; patchPhase = '' sed -i 's@/usr/bin/aplaymidi@/${alsaUtils}/bin/aplaymidi@g' mma-splitrec @@ -18,7 +18,7 @@ sed -i 's@/usr/bin/arecord@/${alsaUtils}/bin/arecord@g' util/mma-splitrec.py sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' mma-splitrec sed -i 's@/usr/bin/timidity@/${timidity}/bin/timidity@g' util/mma-splitrec.py - find . -type f | xargs sed -i 's@/usr/bin/env python@${python}/bin/python@g' + find . -type f | xargs sed -i 's@/usr/bin/env python@${python3.interpreter}@g' ''; installPhase = '' diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index bc72c3e13144..7858631f7973 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchFromGitHub, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python3 }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo fftw gtkmm2 lv2 lvtk python ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk ]; - configurePhase = "python waf configure --prefix=$out"; + configurePhase = "${python3.interpreter} waf configure --prefix=$out"; - buildPhase = "python waf"; + buildPhase = "${python3.interpreter} waf"; - installPhase = "python waf install"; + installPhase = "${python3.interpreter} waf install"; meta = with stdenv.lib; { description = "An LV2 port of the internal modules found in Alsa Modular Synth"; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix index 5d9fe0edece5..829bb4c67caa 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio2.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "2.3.2"; + version = "2.3.5"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "10ji4jqnnlhv4bgvhqwysprax6jcjk4759jskr9imwj6qjnj3vzn"; + sha256 = "1v62z08hqla8fz5m7hl9ynf2hpr0j0arm0nb5lpd99qrv36ibrsc"; }; buildInputs = bitwig-studio1.buildInputs ++ [ ffmpeg ]; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix new file mode 100644 index 000000000000..87dbb3109958 --- /dev/null +++ b/pkgs/applications/audio/cadence/default.nix @@ -0,0 +1,65 @@ +{ stdenv +, fetchurl +, pkgconfig +, qtbase +, makeWrapper +, jack2Full +, python3Packages +, a2jmidid +}: + + stdenv.mkDerivation rec { + version = "0.9.0"; + name = "cadence"; + + src = fetchurl { + url = "https://github.com/falkTX/Cadence/archive/v${version}.tar.gz"; + sha256 = "07z1mnb0bmldb3i31bgw816pnvlvr9gawr51rpx3mhixg5wpiqzb"; + }; + + buildInputs = [ + makeWrapper + pkgconfig + qtbase + ]; + + apps = [ + "cadence" + "cadence-jacksettings" + "cadence-pulse2loopback" + "claudia" + "cadence-aloop-daemon" + "cadence-logs" + "cadence-render" + "catarina" + "claudia-launcher" + "cadence-pulse2jack" + "cadence-session-start" + "catia" + ]; + + makeFlags = '' + PREFIX="" + DESTDIR=$(out) + ''; + + propagatedBuildInputs = with python3Packages; [ pyqt5 ]; + + postInstall = '' + # replace with our own wrappers. + for app in $apps; do + rm $out/bin/$app + makeWrapper ${python3Packages.python.interpreter} $out/bin/$app \ + --set PYTHONPATH "$PYTHONPATH:$out/share/cadence" \ + --add-flags "-O $out/share/cadence/src/$app.py" + done + ''; + + meta = { + homepage = https://github.com/falkTX/Cadence/; + description = "Collection of tools useful for audio production"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ genesis ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 35214502e09a..e379072b7e76 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "2.2.0"; + version = "2.3.2"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -42,18 +42,9 @@ in stdenv.mkDerivation rec { owner = "CDrummond"; repo = "cantata"; rev = "v${version}"; - sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6"; + sha256 = "11hjday5vj0wzkc8yb5wbs05jwa8mvgxswd5qvhpci0zkl975yzn"; }; - patches = [ - # patch is needed for 2.2.0 with qt 5.10 (doesn't harm earlier versions) - (fetchpatch { - url = "https://github.com/CDrummond/cantata/commit/4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a.patch"; - sha256 = "1z21ax3542z7hm628xv110lmplaspb407jzgfk16xkphww5qyphj"; - name = "fix_qt_510.patch"; - }) - - ]; buildInputs = [ vlc qtbase qtmultimedia qtsvg ] ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ] ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ] diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 65df1b89430e..389db3d548d6 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool gtk2 alsaLib libglade ]; - configureFlags = "--disable-jack"; + configureFlags = [ "--disable-jack" ]; meta = { description = "Not a Guitar-Only tuner"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 3a77c7bbbf24..88b636679cbd 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pkgconfig libpulseaudio makeWrapper ]; - configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; + configureFlags = [ "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa" ]; postInstall = '' wrapProgram $out/bin/mhwaveedit \ diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix new file mode 100644 index 000000000000..a4cd0c944dc2 --- /dev/null +++ b/pkgs/applications/audio/mimic/default.nix @@ -0,0 +1,35 @@ +{ stdenv, autoreconfHook, fetchFromGitHub, pkgconfig +, alsaLib, libtool, icu +, pulseaudioSupport ? true, libpulseaudio }: + +stdenv.mkDerivation rec { + name = "mimic-${version}"; + version = "1.2.0.2"; + + src = fetchFromGitHub { + rev = version; + repo = "mimic"; + owner = "MycroftAI"; + sha256 = "1wkpbwk88lsahzkc7pzbznmyy0lc02vsp0vkj8f1ags1gh0lc52j"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + alsaLib + libtool + icu + ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + + meta = { + description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; + homepage = https://mimic.mycroft.ai/; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.noneucat ]; + }; +} + diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 40ae38fda5c2..01d7befddd67 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.23.0"; + version = "3.23.2"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1zhd82mzbzc9jx7xhglgq0giyy214ypq1rw5kmhp5zswv71hf2j0"; + sha256 = "1zf4ck19z3nh1x9a847ay1qnkyvi6s6866kp6q6dh1xpn7i9rmx7"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 5f95a60237f2..23ba3582ce61 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,21 +1,16 @@ -{ fetchurl, stdenv, pkgconfig, pulseaudioFull, gtkmm2, libglademm -, dbus-glib, GConf, gconfmm, intltool }: +{ fetchurl, stdenv, meson, ninja, gettext, pkgconfig, pulseaudioFull, gtkmm3, dbus-glib, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "paprefs-0.9.10"; + name = "paprefs-1.0"; src = fetchurl { url = "https://freedesktop.org/software/pulseaudio/paprefs/${name}.tar.xz"; - sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; + sha256 = "0y77i9gaaassvvjrpwb4xbgqcmr51zmj5rh4z8zm687i5izf84md"; }; - buildInputs = [ pulseaudioFull gtkmm2 libglademm dbus-glib gconfmm ]; + nativeBuildInputs = [ meson ninja gettext pkgconfig wrapGAppsHook ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - propagatedUserEnvPkgs = [ GConf ]; - - configureFlags = [ "--disable-lynx" ]; + buildInputs = [ pulseaudioFull gtkmm3 dbus-glib ]; meta = with stdenv.lib; { description = "PulseAudio Preferences"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index e21815574d1e..1518ed9b7942 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { homepage = http://6xq.net/projects/pianobar/; platforms = platforms.linux; license = licenses.mit; # expat version - maintainers = with maintainers; [ eduarrrd ]; }; } diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 0ee63c204851..313f737cd422 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -29,6 +29,7 @@ , zam-plugins , rubberband , mda_lv2 +, hicolor-icon-theme }: let @@ -42,13 +43,13 @@ let ]; in stdenv.mkDerivation rec { name = "pulseeffects-${version}"; - version = "4.2.3"; + version = "4.2.8"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "0s3lc0xkr48wzk0b6akq4yw19n0iwfi9jyji8bpdgj5y7kjg5mqm"; + sha256 = "0ckl0640n6lhk0gcmnmwngajkf46rrd8bxfh7xy5sq6qmm01dhdd"; }; nativeBuildInputs = [ @@ -79,6 +80,7 @@ in stdenv.mkDerivation rec { boost fftwFloat zita-convolver + hicolor-icon-theme ]; postPatch = '' diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 73f50e45d3df..6aca7e9ce226 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -15,13 +15,12 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib libjack2 fftw ]; - configureFlags = '' - --enable-alsa - --enable-jack - --enable-fftw - --disable-portaudio - - ''; + configureFlags = [ + "--enable-alsa" + "--enable-jack" + "--enable-fftw" + "--disable-portaudio" + ]; # https://github.com/pure-data/pure-data/issues/188 # --disable-oss diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 09249f7fbeaa..83608014f142 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.5.2"; + version = "0.5.3"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "0nqr5f82lry3i4if8wdmrqsw84m45ijyj4psll30plxx5732zzaz"; + sha256 = "0x08af8m5l8qy9av3dlldsg58ny9nc69h1s4i6hqkvj24jwy6fw1"; }; buildInputs = [ diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 19255dce6b0c..8ad251652d0e 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "qsampler-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "mirror://sourceforge/qsampler/${name}.tar.gz"; - sha256 = "18j4cwmn7waih9x5b66cba2aa85spqqp507bf19ahsb5gl358yhh"; + sha256 = "0xb0j57k03pkdl7yl5mcv1i21ljnxcq6b9h3zp6mris916lj45zq"; }; nativeBuildInputs = [ autoconf automake libtool pkgconfig qttools ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index f98547ed46f2..26adc6394349 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { name = "qsynth-${version}"; - version = "0.5.1"; + version = "0.5.2"; src = fetchurl { url = "mirror://sourceforge/qsynth/${name}.tar.gz"; - sha256 = "0kpk1rnhbifbvm4xvw8i0d4ksk78pf505qvg08k89kqkg32494ap"; + sha256 = "1rfkaxq1pyc4hv3l0i6wicianbcbm1wp53kh9i5d4jsljgisd1dv"; }; # cmake is looking for qsynth.desktop.in and fails if it doesn't find it - # seems like a bug and can presumable go in the next version after 0.5.1 + # seems like a bug and can presumable go in the next version after 0.5.2 postPatch = '' mv src/qsynth.desktop src/qsynth.desktop.in ''; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix new file mode 100644 index 000000000000..28aaf8a5354f --- /dev/null +++ b/pkgs/applications/audio/reaper/default.nix @@ -0,0 +1,81 @@ +{ stdenv, fetchurl, autoPatchelfHook, makeWrapper +, alsaLib, xorg +, fetchFromGitHub, pkgconfig, gnome3 +, gnome2, gdk_pixbuf, cairo, glib, freetype +, libpulseaudio +}: + +let + libSwell = stdenv.mkDerivation { + name = "libSwell"; + + src = fetchFromGitHub { + owner = "justinfrankel"; + repo = "WDL"; + rev = "e87f5bdee7327b63398366fde6ec0a3f08bf600d"; + sha256 = "147idjqc6nc23w9krl8a9w571k5jx190z3id6ir6cr8zsx0lakdb"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnome3.gtk ]; + + buildPhase = '' + cd WDL/swell + make + ''; + + installPhase = '' + mv libSwell.so $out + ''; + }; + +in stdenv.mkDerivation rec { + name = "reaper-${version}"; + version = "5.94"; + + src = fetchurl { + url = "https://www.reaper.fm/files/${stdenv.lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; + sha256 = "16g5q12wh1cfbl9wq03vb7vpsd870k7i7883z0wn492x7y9syz8z"; + }; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = [ + alsaLib + stdenv.cc.cc.lib + + xorg.libX11 + xorg.libXi + + gnome3.gtk + gdk_pixbuf + gnome2.pango + cairo + glib + freetype + ]; + + dontBuild = true; + + installPhase = '' + ./install-reaper.sh --install $out/opt + rm $out/opt/REAPER/uninstall-reaper.sh + + cp ${libSwell.out} $out/opt/REAPER/libSwell.so + + wrapProgram $out/opt/REAPER/reaper \ + --prefix LD_LIBRARY_PATH : ${libpulseaudio}/lib + + mkdir $out/bin + ln -s $out/opt/REAPER/reaper $out/bin/ + ln -s $out/opt/REAPER/reamote-server $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Digital audio workstation"; + homepage = https://www.reaper.fm/; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 22786304faa9..ab1a6e387383 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { export ac_cv_prog_ac_ct_WINDRES= ''; - configureFlags = "--enable-dependency-tracking"; + configureFlags = [ "--enable-dependency-tracking" ]; buildInputs = [ alsaLib python SDL ]; diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 4d8435454239..905de343117d 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "setbfree-${version}"; - version = "0.8.5"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/pantherb/setBfree/archive/v${version}.tar.gz"; - sha256 = "0qfccny0hh9lq54272mzmxvfz2jmzcgigjkjwn6v9h6n00gi5bw4"; + sha256 = "07s320r67cz0cdjdsbcwn0fw3xs0wz7lgrybqpws2skvkbls228q"; }; patchPhase = '' diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 272d4b6592ac..7c96fd364c18 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-18.5"; + name = "snd-18.6"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1m2rw1p9xr9428p9drd3w5irsi12lz23m605lzgk9gjamq9paywy"; + sha256 = "1jyqkkz2a6zw0jn9y15xd3027r8glkpw794fjk6hd3al1byjhz2z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index b8495465db55..04bdff3c8135 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,13 +1,18 @@ -{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype +{ fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome3 }: let - # Please update the stable branch! - # Latest version number can be found at: - # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ - # Be careful not to pick the testing version. - version = "1.0.80.480.g51b03ac3-13"; + # "rev" decides what is actually being downloaded + version = "1.0.80.474.gef6b503e-7"; + # To get the latest stable revision: + # curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=stable' | jq '.download_url,.version,.last_updated' + # To get general information: + # curl -H 'Snap-Device-Series: 16' 'https://api.snapcraft.io/v2/snaps/info/spotify' | jq '.' + # More exapmles of api usage: + # https://github.com/canonical-websites/snapcraft.io/blob/master/webapp/publisher/snaps/views.py + rev = "16"; + deps = [ alsaLib @@ -49,12 +54,20 @@ in stdenv.mkDerivation { name = "spotify-${version}"; + # fetch from snapcraft instead of the debian repository most repos fetch from. + # That is a bit more cumbersome. But the debian repository only keeps the last + # two versions, while snapcraft should provide versions indefinately: + # https://forum.snapcraft.io/t/how-can-a-developer-remove-her-his-app-from-snap-store/512 + + # This is the next-best thing, since we're not allowed to re-distribute + # spotify ourselves: + # https://community.spotify.com/t5/Desktop-Linux/Redistribute-Spotify-on-Linux-Distributions/td-p/1695334 src = fetchurl { - url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "e32f4816ae79dbfa0c14086e76df3bc83d526402aac1dbba534127fc00fe50ea"; + url = "https://api.snapcraft.io/api/v1/snaps/download/pOBIoZ2LrCB3rDohMxoYGnbN14EHOgD7_${rev}.snap"; + sha512 = "45b7ab574b30fb368e0b6f4dd60addbfd1ddc02173b4f98b31c524eed49073432352a361e75959ce8e2f752231e93c79ca1b538c4bd295c935d1e2e0585d147f"; }; - buildInputs = [ dpkg makeWrapper ]; + buildInputs = [ squashfsTools makeWrapper ]; doConfigure = false; doBuild = false; @@ -63,7 +76,23 @@ stdenv.mkDerivation { unpackPhase = '' runHook preUnpack - dpkg-deb -x $src . + unsquashfs "$src" '/usr/share/spotify' '/usr/bin/spotify' '/meta/snap.yaml' + cd squashfs-root + if ! grep -q 'grade: stable' meta/snap.yaml; then + # Unfortunately this check is not reliable: At the moment (2018-07-26) the + # latest version in the "edge" channel is also marked as stable. + echo "The snap package is marked as unstable:" + grep 'grade: ' meta/snap.yaml + echo "You probably chose the wrong revision." + exit 1 + fi + if ! grep -q '${version}' meta/snap.yaml; then + echo "Package version differs from version found in snap metadata:" + grep 'version: ' meta/snap.yaml + echo "While the nix package specifies: ${version}." + echo "You probably chose the wrong revision or forgot to update the nix version." + exit 1 + fi runHook postUnpack ''; @@ -75,6 +104,8 @@ stdenv.mkDerivation { mkdir -p $libdir mv ./usr/* $out/ + cp meta/snap.yaml $out + # Work around Spotify referring to a specific minor version of # OpenSSL. diff --git a/pkgs/applications/audio/spotify/update.sh b/pkgs/applications/audio/spotify/update.sh new file mode 100644 index 000000000000..114245f6d46c --- /dev/null +++ b/pkgs/applications/audio/spotify/update.sh @@ -0,0 +1,49 @@ +channel="stable" # stable/candidate/edge +nixpkgs="$(git rev-parse --show-toplevel)" +spotify_nix="$nixpkgs/pkgs/applications/audio/spotify/default.nix" + + + +# create bash array from snap info +snap_info=($( + curl -H 'X-Ubuntu-Series: 16' \ + "https://api.snapcraft.io/api/v1/snaps/details/spotify?channel=$channel" \ + | jq --raw-output \ + '.revision,.download_sha512,.version,.last_updated' +)) + +revision="${snap_info[0]}" +sha512="${snap_info[1]}" +version="${snap_info[2]}" +last_updated="${snap_info[3]}" + +# find the last commited version +version_pre=$( + git grep 'version\s*=' HEAD "$spotify_nix" \ + | sed -Ene 's/.*"(.*)".*/\1/p' +) + +if [[ "$version_pre" = "$version" ]]; then + echo "Spotify is already up ot date" + exit 0 +fi + +echo "Updating from ${version_pre} to ${version}, released on ${last_updated}" + +# search-andreplace revision, hash and version +sed --regexp-extended \ + -e 's/rev\s*=\s*"[0-9]+"\s*;/rev = "'"${revision}"'";/' \ + -e 's/sha512\s*=\s*".{128}"\s*;/sha512 = "'"${sha512}"'";/' \ + -e 's/version\s*=\s*".*"\s*;/version = "'"${version}"'";/' \ + -i "$spotify_nix" + +if ! nix-build -A spotify "$nixpkgs"; then + echo "The updated spotify failed to build." + exit 1 +fi + +git add "$spotify_nix" +# show diff for review +git diff HEAD +# prepare commit message, but allow edit +git commit --edit --message "spotify: $version_pre -> $version" diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index f47c8fa2eec7..d7d5b65375e9 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -10,9 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ flac lame zlib libjpeg libvorbis libtheora libxml2 lzo libdvdread pkgconfig x264 libmpeg2 xvidcore ]; - configureFlags = "--disable-ffmpeg --disable-libavcodec --disable-libavformat - --enable-lzo --enable-ogg --enable-vorbis --enable-theora --enable-libxml2 - --enable-x264 --enable-libmpeg2 --enable-xvid"; + configureFlags = [ + "--disable-ffmpeg" "--disable-libavcodec" "--disable-libavformat" + "--enable-lzo" "--enable-ogg" "--enable-vorbis" "--enable-theora" "--enable-libxml2" + "--enable-x264" "--enable-libmpeg2" "--enable-xvid" + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 3540869f3616..cb581bc83033 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20180320"; + version = "20180803"; name = "x42-plugins-${version}"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "167ly9nxqq3g0j35i9jv9rvd8qp4i9ncfcjxmg972cp6q8ak8mdl"; + sha256 = "1v7p6vnkcbzyvmcysabhmn603cndzx9mwzaw5dppy4wd687vhgis"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index 3227151ce21e..7ae854cee3cc 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lightdm exo intltool makeWrapper ] + buildInputs = [ lightdm exo intltool makeWrapper hicolor-icon-theme ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); configureFlags = [ diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 5e583049190c..c9fd4f9c4ab9 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -62,5 +62,6 @@ in mkDerivation rec { homepage = https://github.com/sddm/sddm; maintainers = with maintainers; [ abbradar ttuegel ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix index 12e3dad9c79c..e504c09e43e6 100644 --- a/pkgs/applications/display-managers/slim/default.nix +++ b/pkgs/applications/display-managers/slim/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { meta = { homepage = https://sourceforge.net/projects/slim.berlios/; # berlios shut down; I found no replacement yet platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 8a536bad9c48..cd031ce5ac8c 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -1,4 +1,5 @@ -{ pname, version, build, sha256Hash, meta }: +{ channel, pname, version, build, sha256Hash }: + { bash , buildFHSUserEnv , coreutils @@ -36,8 +37,9 @@ }: let + drvName = "android-studio-${channel}-${version}"; androidStudio = stdenv.mkDerivation { - name = "${pname}-${version}"; + name = drvName; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; @@ -115,17 +117,32 @@ let # (e.g. `mksdcard`) have `/lib/ld-linux.so.2` set as the interpreter. An FHS # environment is used as a work around for that. fhsEnv = buildFHSUserEnv { - name = "${pname}-fhs-env"; + name = "${drvName}-fhs-env"; multiPkgs = pkgs: [ pkgs.ncurses5 ]; }; in writeTextFile { - name = "${pname}-${version}"; + name = "${drvName}-wrapper"; + # TODO: Rename preview -> beta (and add -stable suffix?): destination = "/bin/${pname}"; executable = true; text = '' #!${bash}/bin/bash - ${fhsEnv}/bin/${pname}-fhs-env ${androidStudio}/bin/studio.sh + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh ''; - } // { inherit meta; } + } // { + meta = with stdenv.lib; { + description = "The Official IDE for Android (${channel} channel)"; + longDescription = '' + Android Studio is the official IDE for Android app development, based on + IntelliJ IDEA. + ''; + homepage = if channel == "stable" + then https://developer.android.com/studio/index.html + else https://developer.android.com/studio/preview/index.html; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ primeos ]; + }; + } diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index bd0c412efa53..54373ef50dd6 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,64 +8,43 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.1.3.0"; # "Android Studio 3.1.3" - build = "173.4819257"; - sha256Hash = "196yaswbxh2nd83gimjxr8ggr5xkdxq7n3xlh6ax73v59pj4hryq"; + version = "3.1.4.0"; # "Android Studio 3.1.4" + build = "173.4907809"; + sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; }; - latestVersion = { - version = "3.3.0.2"; # "Android Studio 3.3 Canary 3" - build = "181.4884283"; - sha256Hash = "0r93yzw87cgzz60p60gknij5vaqmv1a1kyd4cr9gx8cbxw46lhwh"; + betaVersion = { + version = "3.2.0.22"; # "Android Studio 3.2 Beta 5" + build = "181.4913314"; + sha256Hash = "016nyn1pqviy089hg0dq7m4cqb39fdxdcy4zknkaq7dmgv1dj6x9"; + }; + latestVersion = { # canary & dev + version = "3.3.0.4"; # "Android Studio 3.3 Canary 5" + build = "182.4928781"; + sha256Hash = "110gh5ylgf1p8z0rdnvc6clkq3v721v6pjvll66a8v4zgz9ay8b4"; }; in rec { # Old alias preview = beta; - # Attributes are named by the corresponding release channels + # Attributes are named by their corresponding release channels stable = mkStudio (stableVersion // { + channel = "stable"; pname = "android-studio"; - #pname = "android-studio-stable"; # TODO: Rename and provide symlink - - meta = with stdenv.lib; { - description = "The Official IDE for Android (stable channel)"; - longDescription = '' - Android Studio is the official IDE for Android app development, based on - IntelliJ IDEA. - ''; - homepage = https://developer.android.com/studio/index.html; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ primeos ]; - }; }); - beta = mkStudio (latestVersion // { + beta = mkStudio (betaVersion // { + channel = "beta"; pname = "android-studio-preview"; - #pname = "android-studio-beta"; # TODO: Rename and provide symlink - version = "3.2.0.21"; # "Android Studio 3.2 Beta 4" - build = "181.4886486"; - sha256Hash = "1n4lcy0ng87fv45qjlpdb2zn3zl5lg6jwkbaijhbsm2rh4ljisr3"; - - meta = stable.meta // { - description = "The Official IDE for Android (beta channel)"; - homepage = https://developer.android.com/studio/preview/index.html; - }; }); dev = mkStudio (latestVersion // { + channel = "dev"; pname = "android-studio-dev"; - - meta = beta.meta // { - description = "The Official IDE for Android (dev channel)"; - }; }); canary = mkStudio (latestVersion // { + channel = "canary"; pname = "android-studio-canary"; - - meta = beta.meta // { - description = "The Official IDE for Android (canary channel)"; - }; }); } diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 4078efa6783b..bc3f8baf5108 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -1,17 +1,32 @@ -{ stdenv, pkgs, fetchurl, makeWrapper, gvfs, atomEnv}: +{ stdenv, pkgs, fetchurl, makeWrapper, wrapGAppsHook, gvfs, gtk3, atomEnv }: let - common = pname: {version, sha256}: stdenv.mkDerivation rec { - name = "${pname}-${version}"; - inherit version; + common = pname: {version, sha256, beta ? null}: + let fullVersion = version + stdenv.lib.optionalString (beta != null) "-beta${toString beta}"; + name = "${pname}-${fullVersion}"; + in stdenv.mkDerivation { + inherit name; + version = fullVersion; src = fetchurl { - url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; + url = "https://github.com/atom/atom/releases/download/v${fullVersion}/atom-amd64.deb"; name = "${name}.deb"; inherit sha256; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + + buildInputs = [ + gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix "PATH" : "${gvfs}/bin" \ + ) + ''; buildCommand = '' mkdir -p $out/usr/ @@ -22,9 +37,6 @@ let rm -r $out/share/lintian rm -r $out/usr/ sed -i "s/${pname})/.${pname}-wrapped)/" $out/bin/${pname} - # sed -i "s/'${pname}'/'.${pname}-wrapped'/" $out/bin/${pname} - wrapProgram $out/bin/${pname} \ - --prefix "PATH" : "${gvfs}/bin" fixupPhase @@ -61,12 +73,13 @@ let }; in stdenv.lib.mapAttrs common { atom = { - version = "1.28.2"; - sha256 = "07lz4lj07dbfz952l3q9vplvg41pxl1cx89gzy8bzzr3ay7kn6za"; + version = "1.29.0"; + sha256 = "0f0qpn8aw2qlqk8ah71xvk4vcmwsnsf2f3g4hz0rvaqnhb9ri9fz"; }; atom-beta = { - version = "1.29.0-beta1"; - sha256 = "121y716pnq4vpjrymr505prskvi5a2lnn8hw79q8b4hf7yz0j6rb"; + version = "1.30.0"; + beta = 1; + sha256 = "0ygqj81xlwhzmmci0d0rd2q7xfskxd1k7h6db3zvvjdxjcnyqp1z"; }; } diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index b9bd529930f2..078b8a03b5d9 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { done ''; - configureFlags = "--ioctl=termios"; + configureFlags = [ "--ioctl=termios" ]; meta = { homepage = http://elvis.vi-editor.org/; diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix index 0ab11b5bf204..689bcfc9adfd 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./install-infodir.patch ]; buildInputs = [emacs texinfo ctags]; - configureFlags = "--with-package-dir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-package-dir=$$out/share/emacs/site-lisp" ]; preInstall = "mkdir -p $out/info"; installTargets = "install-pkg texinfo"; postInstall = '' diff --git a/pkgs/applications/editors/emacs-modes/maude/default.nix b/pkgs/applications/editors/emacs-modes/maude/default.nix index 70693d039c58..9b737a938a12 100644 --- a/pkgs/applications/editors/emacs-modes/maude/default.nix +++ b/pkgs/applications/editors/emacs-modes/maude/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; buildInputs = [emacs]; - configureFlags = "--with-lispdir=$$out/share/emacs/site-lisp"; + configureFlags = [ "--with-lispdir=$$out/share/emacs/site-lisp" ]; meta = { description = "Emacs mode for the programming language Maude"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 56b17a865df8..a420c5425565 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -52,19 +52,9 @@ self: # part of a larger package caml = dontConfigure super.caml; - # part of a larger package - # upstream issue: missing package version - cmake-mode = markBroken (dontConfigure super.cmake-mode); - # Expects bash to be at /bin/bash company-rtags = markBroken super.company-rtags; - # upstream issue: missing file header - connection = markBroken super.connection; - - # upstream issue: missing file header - dictionary = markBroken super.dictionary; - easy-kill-extras = super.easy-kill-extras.override { inherit (self.melpaPackages) easy-kill; }; @@ -79,6 +69,17 @@ self: inherit (self.melpaPackages) ess ctable popup; }; + evil-magit = super.evil-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + # missing dependencies + evil-search-highlight-persist = super.evil-search-highlight-persist.overrideAttrs (attrs: { + packageRequires = with self; [ evil highlight ]; + }); + # missing OCaml flycheck-ocaml = markBroken super.flycheck-ocaml; @@ -108,6 +109,11 @@ self: # upstream issue: missing file header initsplit = super.initsplit; + # tries to write a log file to $HOME + insert-shebang = super.insert-shebang.overrideAttrs (attrs: { + HOME = "/tmp"; + }); + # Expects bash to be at /bin/bash ivy-rtags = markBroken super.ivy-rtags; @@ -115,9 +121,6 @@ self: jsfmt = markBroken super.jsfmt; # upstream issue: missing file header - link = markBroken super.link; - - # upstream issue: missing file header maxframe = markBroken super.maxframe; magit = @@ -131,6 +134,18 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # missing OCaml merlin = markBroken super.merlin; @@ -154,8 +169,10 @@ self: (attrs.nativeBuildInputs or []) ++ [ external.git ]; })); - # upstream issue: truncated file - powershell = markBroken super.powershell; + # tries to write to $HOME + php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { + HOME = "/tmp"; + }); # upstream issue: mismatched filename processing-snippets = markBroken super.processing-snippets; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 01eaac7be5d1..0a304fabe600 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,11 +1,12 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux -, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO +, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf +, systemd ? null , withX ? !stdenv.isDarwin , withGTK2 ? false, gtk2 ? null , withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null -, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null +, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: @@ -16,7 +17,7 @@ assert withGTK2 -> withX || stdenv.isDarwin; assert withGTK3 -> withX || stdenv.isDarwin; assert withGTK2 -> !withGTK3 && gtk2 != null; assert withGTK3 -> !withGTK2 && gtk3 != null; -assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null; +assert withXwidgets -> withGTK3 && webkitgtk != null; let toolkit = @@ -52,14 +53,14 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] - ++ lib.optionals stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] + imagemagick gconf m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2 ++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ] ++ lib.optional (stdenv.isDarwin && withX) cairo - ++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ]; + ++ lib.optionals (withX && withXwidgets) [ webkitgtk ]; propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; diff --git a/pkgs/applications/editors/ghostwriter/default.nix b/pkgs/applications/editors/ghostwriter/default.nix index 29c0b665aa35..36259593463d 100644 --- a/pkgs/applications/editors/ghostwriter/default.nix +++ b/pkgs/applications/editors/ghostwriter/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ghostwriter"; - version = "1.7.2"; + version = "1.7.3"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "wereturtle"; repo = pname; rev = "v${version}"; - sha256 = "1zhzibn4g79i98mjfqspf3iac2biz3r18jf29g0izq5snn7xj0fc"; + sha256 = "1xkxd59rw2dn6xphgcl06zzmfgs1zna2w0pxrk0f49ywffvkvs72"; }; nativeBuildInputs = [ qmake pkgconfig ]; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix new file mode 100644 index 000000000000..db2d07db31e7 --- /dev/null +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -0,0 +1,155 @@ +{ stdenv +, desktop-file-utils +, docbook_xsl +, docbook_xml_dtd_43 +, fetchpatch +, fetchurl +, flatpak +, glibcLocales +, gnome3 +, gobjectIntrospection +, gspell +, gtk-doc +, gtk3 +, gtksourceview3 +, hicolor-icon-theme +, json-glib +, jsonrpc-glib +, libdazzle +, libxml2 +, meson +, ninja +, ostree +, pcre +, pkgconfig +, python3 +, sysprof +, template-glib +, vala +, webkitgtk +, wrapGAppsHook +}: +let + version = "3.28.4"; + pname = "gnome-builder"; +in stdenv.mkDerivation { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${pname}-${version}.tar.xz"; + sha256 = "0ibb74jlyrl5f6rj1b74196zfg2qaf870lxgi76qzpkgwq0iya05"; + }; + + nativeBuildInputs = [ + #appstream-glib # tests fail if these tools are available + desktop-file-utils + docbook_xsl + docbook_xml_dtd_43 + glibcLocales # for Meson's gtkdochelper + gobjectIntrospection + gtk-doc + hicolor-icon-theme + meson + ninja + pkgconfig + python3.pkgs.wrapPython + wrapGAppsHook + ]; + + buildInputs = [ + flatpak + gnome3.devhelp + gnome3.libgit2-glib + gnome3.libpeas + gnome3.vte + gspell + gtk3 + gtksourceview3 + json-glib + jsonrpc-glib + libdazzle + libxml2 + ostree + pcre + python3 + sysprof + template-glib + vala + webkitgtk + ]; + + outputs = [ "out" "devdoc" ]; + + prePatch = '' + patchShebangs build-aux/meson/post_install.py + ''; + + patches = [ + (fetchpatch { + name = "absolute-shared-library-path.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/1011cabc519fd7322e2d695c79bfce3e18ff6200.patch"; + sha256 = "1g12zziidzrphp527aa8sklfaln4qpjprkz73f0c9w5ph6k252fw"; + }) + (fetchpatch { + name = "python-libprefix.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/43494ce83a347f369ed4cfb8dd71d3b93452736b.patch"; + sha256 = "0kgi3n3g13n1j4xa61ln9xiahcfdc43bxi5mw4yva2d5px445msf"; + }) + (fetchpatch { + name = "ostree-dependency.patch"; + url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/8b11773b65c95f464a0de16b91318c1ca73deeae.patch"; + sha256 = "18r4hd90id0w6r0lzqpw83bcj45nm9jhr46a0ffi1mcayb18mgbk"; + }) + ]; + + mesonFlags = [ + "-Dpython_libprefix=${python3.libPrefix}" + "-Dwith_docs=true" + + # Making the build system correctly detect clang header and library paths + # is difficult. Somebody should look into fixing this. + "-Dwith_clang=false" + ]; + + # Some tests fail due to being unable to find the Vte typelib, and I don't + # understand why. Somebody should look into fixing this. + doCheck = false; + + preInstall = '' + export LC_ALL="en_US.utf-8" + ''; + + pythonPath = with python3.pkgs; requiredPythonModules [ pygobject3 ]; + + preFixup = '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=( + --prefix PYTHONPATH : "$program_PYTHONPATH" + ) + + # Ensure that all plugins get their interpreter paths fixed up. + find $out/lib -name \*.py -type f -print0 | while read -d "" f; do + chmod a+x "$f" + done + ''; + + passthru.updateScript = gnome3.updateScript { packageName = pname; }; + + meta = with stdenv.lib; { + description = "An IDE for writing GNOME-based software"; + longDescription = '' + Global search, auto-completion, source code map, documentation + reference, and other features expected in an IDE, but with a focus + on streamlining GNOME-based development projects. + + This package does not pull in the dependencies needed for every + plugin. If you find that a plugin you wish to use doesn't work, we + currently recommend running gnome-builder inside a nix-shell with + appropriate dependencies loaded. + ''; + homepage = https://wiki.gnome.org/Apps/Builder; + license = licenses.gpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index de1e5e4c64bc..e59def88de55 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,26 +1,22 @@ { avahiSupport ? false # build support for Avahi in libinfinity -, gnomeSupport ? false # build support for Gnome(gnome-vfs) -, stdenv, fetchurl, pkgconfig -, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool -, gnome_vfs ? null}: +, stdenv, fetchurl, fetchFromGitHub, autoconf, automake, pkgconfig, wrapGAppsHook +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; - in stdenv.mkDerivation rec { - - name = "gobby-0.5.0"; - src = fetchurl { - url = "http://releases.0x539.de/gobby/${name}.tar.gz"; - sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; + name = "gobby-unstable-2018-04-03"; + src = fetchFromGitHub { + owner = "gobby"; + repo = "gobby"; + rev = "ea4df27c9b6b885434797b0071ce198b23f9f63b"; + sha256 = "0q7lq64yn16lxvj4jphs8y9194h0xppj8k7y9x8b276krraak2az"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] - ++ stdenv.lib.optional gnomeSupport gnome_vfs; - - configureFlags = '' - ''; + nativeBuildInputs = [ autoconf automake pkgconfig intltool itstool gnome3.yelp-tools wrapGAppsHook ]; + buildInputs = [ gtkmm3 gsasl gtksourceview3 libxmlxx libinf ]; + + preConfigure = "./autogen.sh"; meta = with stdenv.lib; { homepage = http://gobby.0x539.de/; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index d77f8f2e7a6a..676514a614a6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -249,12 +249,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "08kjlmldnd6rnk8m12klfp9vbkbvcsgaknpi55r248nzglnbx9gz"; /* updated by script */ + sha256 = "16fr5760nkzgx8785x6hh7s96x097y6vdx7w1f9ipg71vv25cscq"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion Release"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -262,12 +262,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "1byf46vni8s6qf3wlsnscxipgndl6ic48nizwiaqasnhhszqssxs"; /* updated by script */ + sha256 = "1jfkxr790wr8ffn7ph694hfzahs2akjcfk4rfsvjv1dccqb0167k"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip 2018.2"; @@ -275,12 +275,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "0z7a06892c3hcq5zxvkfnyf0ablwq51710x1f12v6r297l4mfra0"; /* updated by script */ + sha256 = "0k96v00cbxkgxs9xby5m4dxl4w2kkm2lii54z1hqjwqmc9kxa2ia"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand Release"; @@ -288,12 +288,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0r5fsai77w74vhfs449yff56pi4vynl8w25amn23k6hddlqxph2s"; /* updated by script */ + sha256 = "04dqyzkkrwvcdy1raard77v2315d44h29cpc9p98bjidvjd6bhsx"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; @@ -301,12 +301,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "1xq97dcf7xcs8fsrjsqqrzxf2gnrll8bbqkzrpg85bqxap0hvb45"; /* updated by script */ + sha256 = "0ydidg9pk8bqf5jb1z0fw2m88v6mi38b4ddgmh5c9d9p44g6mddv"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; @@ -314,12 +314,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "15czwk15c1gnf7xrgm423xafsw55083dd6g15g69zs0l9psrss31"; /* updated by script */ + sha256 = "042qhdkl4v5q4cdbqfbiwj6s3acivdb5kmbyn4jix8pg8r37yfnm"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm 2018.2"; @@ -327,12 +327,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0a5dsr2piw0vgm9lvc2k18sdnvii55xdyi90z95hzg5syhsm1a94"; /* updated by script */ + sha256 = "14vnwqk0x0anvzmdv2ddc3qc9g5fll2ql02mi12k425j30fl2z2q"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm Release"; @@ -340,12 +340,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "0azjrbxpwank09i7riflbkgrgm23f0q6hgisca6d14ldcbr933aj"; /* updated by script */ + sha256 = "1h4f9l577w2ps0y79x79yhpbrsv3j5nwr1lr1890phmp6zri6wyf"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm Release"; @@ -366,12 +366,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0la83cqf3aknrc62ddpij0gg50rws5l2g4iasyrvfhn4wnmj6n4q"; /* updated by script */ + sha256 = "1gwcadjgs4cw5i3h1xn92ng415vzr5cxyrpgckr1qy37d5f4bhqg"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine 2018.2"; @@ -379,12 +379,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2018.2"; /* updated by script */ + version = "2018.2.1"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "024schngx26ik8cvmkijfzzmpkajckl2dbyz31ajnmixpn07pwi6"; /* updated by script */ + sha256 = "1jbzkp13qn4n58kbcsszm2gfnywjma2yvn48g0vi14v7x6zihhxd"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm Release"; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 83598bd7eb17..ad408081e1fd 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-unstable-${version}"; - version = "2018-05-21"; + version = "2018-08-05"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "878d2a4bdb674a5e7703a66e530520f48efba641"; - sha256 = "0pwy6ilsb62s1792gjyvhvq8shj60l8lx26b58zvpfb54an4s6rk"; + rev = "ae75032936ed9ffa2bf14589fef115d3d684a7c6"; + sha256 = "1qm6i8vzr4wjxxdvhr54pan0ysxq1sn880bz8p2w9y6qa91yd3m3"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses asciidoc docbook_xsl libxslt ]; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 96a9cea09c76..86134687ba31 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -32,11 +32,11 @@ in stdenv.mkDerivation rec { outputs = [ "out" "info" ]; - configureFlags = '' - --sysconfdir=/etc - ${optionalString (!enableNls) "--disable-nls"} - ${optionalString enableTiny "--enable-tiny"} - ''; + configureFlags = [ + "--sysconfdir=/etc" + (stdenv.lib.enableFeature enableNls "nls") + (stdenv.lib.enableFeature enableTiny "tiny") + ]; postInstall = '' cp ${nixSyntaxHighlight}/nix.nanorc $out/share/nano/ diff --git a/pkgs/applications/editors/nedit/default.nix b/pkgs/applications/editors/nedit/default.nix index 39d96775ebcd..6fff6df8cdda 100644 --- a/pkgs/applications/editors/nedit/default.nix +++ b/pkgs/applications/editors/nedit/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/nedit; platforms = with platforms; linux ++ darwin; + license = licenses.gpl2; }; } diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index a6f454deaf5c..ef0d98455f27 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { name = "sigil-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { - sha256 = "01pvc7k54mx5c7h1qiw92d4j459psv7n9xg94qbinf8vmpvkrcbw"; + sha256 = "11r7043kbqv67z1aqk929scsg6yllldpl8icl32dw3dai7f1c658"; rev = version; repo = "Sigil"; owner = "Sigil-Ebook"; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 7a700e0956b8..3711b3cdcee4 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -6,6 +6,7 @@ args@{ source ? "default", callPackage, fetchurl, stdenv, ncurses, pkgconfig, ge , libICE , vimPlugins , makeWrapper +, wrapGAppsHook # apple frameworks , CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private @@ -73,15 +74,6 @@ in stdenv.mkDerivation rec { src = builtins.getAttr source { "default" = common.src; # latest release - - "vim-nox" = - { - # vim nox branch: client-server without X by uing sockets - # REGION AUTO UPDATE: { name="vim-nox"; type="hg"; url="https://code.google.com/r/yukihironakadaira-vim-cmdsrv-nox/"; branch="cmdsrv-nox"; } - src = (fetchurl { url = "http://mawercer.de/~nix/repos/vim-nox-hg-2082fc3.tar.bz2"; sha256 = "293164ca1df752b7f975fd3b44766f5a1db752de6c7385753f083499651bd13a"; }); - name = "vim-nox-hg-2082fc3"; - # END - }.src; }; patches = [ ./cflags-prune.diff ] ++ stdenv.lib.optional ftNixSupport ./ft-nix-support.patch; @@ -131,6 +123,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional wrapPythonDrv makeWrapper ++ stdenv.lib.optional nlsSupport gettext ++ stdenv.lib.optional perlSupport perl + ++ stdenv.lib.optional (guiSupport == "gtk3") wrapGAppsHook ; buildInputs = [ ncurses libX11 libXext libSM libXpm libXt libXaw libXau @@ -161,6 +154,10 @@ in stdenv.mkDerivation rec { ln -sfn '${nixosRuntimepath}' "$out"/share/vim/vimrc '' + stdenv.lib.optionalString wrapPythonDrv '' wrapProgram "$out/bin/vim" --prefix PATH : "${python}/bin" + '' + stdenv.lib.optionalString (guiSupport == "gtk3") '' + rm "$out/bin/gvim" + echo -e '#!${stdenv.shell}\n"'"$out/bin/vim"'" -g "$@"' > "$out/bin/gvim" + chmod a+x "$out/bin/gvim" ''; preInstall = '' diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 7f16ce3596d9..33a02c62fbce 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -2,7 +2,7 @@ gtk2, makeWrapper, libXScrnSaver, libxkbfile, libsecret }: let - version = "1.25.1"; + version = "1.26.1"; channel = "stable"; plat = { @@ -12,9 +12,9 @@ let }.${stdenv.system}; sha256 = { - "i686-linux" = "1qljnajk4h9ki5gvydh1b557fvhvcryvkrvypvz0pr804lpdqsmg"; - "x86_64-linux" = "0f1lpwyxfchmbymzzxv97w9cy1z5pdljhwm49mc5v84aygmvnmjq"; - "x86_64-darwin" = "1dgda1drij1c114xzv4hs44k7rx4x1vzghlxgii0h2rg641n6pbn"; + "i686-linux" = "1g7kqbz6mrf8ngx2bnwpi9fifq5rjznxgsgwjb532z3nh92ypa8n"; + "x86_64-linux" = "02yldycakn5zxj1ji4nmhdyazqlkjqpzdj3g8j501c3j28pgiwjy"; + "x86_64-darwin" = "0pnsfkh20mj7pzqw7wlfd98jqc6a1mnsq1iira15n7fafqgj8zpl"; }.${stdenv.system}; archive_fmt = if stdenv.system == "x86_64-darwin" then "zip" else "tar.gz"; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index f9220e107f3c..8f06a659f60c 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.20"; + name = "qgis-2.18.22"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags pkgconfig ] @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "0bm9sv268lc3v48zjypsjjs62xnyb7zabzrms4jsy020waz6sk9g"; + sha256 = "00b3a2hfn3i7bdx7x96vz2nj0976vpkhid4ss7n8c33fdvw3k82a"; }; # CMAKE_FIND_FRAMEWORK=never stops the installer choosing system diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix new file mode 100644 index 000000000000..0d6b538b1072 --- /dev/null +++ b/pkgs/applications/graphics/animbar/default.nix @@ -0,0 +1,40 @@ +{ stdenv, lib, fetchurl, cmake, qt4, file, gcc }: + +stdenv.mkDerivation rec { + pname = "animbar"; + version = "1.2"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; + sha256 = "0836nwcpyfdrapyj3hbg3wh149ihc26pc78h01adpc7c0r7d9pr9"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt4 file ]; + + installPhase = '' + mkdir -p $out/bin $out/share/pixmaps + cp src/animbar $out/bin + cp ../icon/* $out/share/pixmaps + ''; + + meta = with lib; { + description = "Create your own animation on paper and transparancy"; + longDescription = '' + Animbar lets you easily create your own animation on paper and + transparancy. From a set of input images two output images are + computed, that are printed one on paper and one on + transparency. By moving the transparency over the paper you + create a fascinating animation effect. This kind of animation + technique is hundreds of years old and known under several + names: picket fence animation, barrier grid animation, Moiré + animation, to name a few. + ''; + homepage = http://animbar.mnim.org; + maintainers = with maintainers; [ leenaars ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index ac44a1e875c0..51a401d4b8c8 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -3,7 +3,7 @@ , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkgconfig, sqlite, libxslt , openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 -, ocl-icd +, ocl-icd, pcre, gtk-mac-integration }: stdenv.mkDerivation rec { @@ -18,24 +18,32 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; buildInputs = [ - cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libX11 libexif + cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - colord colord-gtk libwebp libsecret gnome3.adwaita-icon-theme - osm-gps-map ocl-icd - ]; - + libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre + ] ++ stdenv.lib.optionals stdenv.isLinux [ + colord colord-gtk libX11 ocl-icd + ] ++ stdenv.lib.optional stdenv.isDarwin gtk-mac-integration; + cmakeFlags = [ "-DBUILD_USERMANUAL=False" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DUSE_COLORD=OFF" + "-DUSE_KWALLET=OFF" ]; + # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the # binaries can't find libdarktable.so, so change LD_LIBRARY_PATH in # the wrappers: - preFixup = '' + preFixup = let + libPathEnvVar = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; + libPathPrefix = "$out/lib/darktable" + stdenv.lib.optionalString stdenv.isLinux ":${ocl-icd}/lib"; + in '' gappsWrapperArgs+=( - --prefix LD_LIBRARY_PATH ":" "$out/lib/darktable:${ocl-icd}/lib" + --prefix ${libPathEnvVar} ":" "${libPathPrefix}" ) ''; @@ -43,7 +51,7 @@ stdenv.mkDerivation rec { description = "Virtual lighttable and darkroom for photographers"; homepage = https://www.darktable.org; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ goibhniu rickynils flosse mrVanDalo ]; }; } diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 949dce7132be..4780c823697a 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { preConfigure = '' NOCONFIGURE=1 ./autogen.sh # autoreconfHook is not enough ''; - configureFlags = stdenv.lib.optionalString withGNOME "--enable-gnome"; + configureFlags = stdenv.lib.optional withGNOME "--enable-gnome"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index 69d09cd429c1..d45d6c3a62e3 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,4 +1,4 @@ -{ pythonPackages, fetchFromGitHub }: +{ stdenv, pythonPackages, fetchFromGitHub }: pythonPackages.buildPythonApplication rec { pname = "dosage"; @@ -23,5 +23,6 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; homepage = https://dosage.rocks/; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index f120f8b13d40..9c81fe32b513 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -37,5 +37,6 @@ in pythonPackages.buildPythonApplication rec { homepage = http://manatlan.com/jbrout/; description = "Photo manager"; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index eaaabe8fd395..bd5dea8014d6 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,10 +1,13 @@ -{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: +{ fetchFromGitHub, libGLU, llvmPackages, qtbase, qtscript, qtxmlpatterns }: let - meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; - vcglibRev = "a8e87662b63ee9f4ded5d4699b28d74183040803"; + meshlabRev = "d596d7c086c51fbdfb56050f9c30b55dd0286d4c"; + vcglibRev = "6c3c940e34327322507c703889f9f1cfa73ab183"; + # ^ this should be the latest commit in the vcglib devel branch at the time of the meshlab revision + + stdenv = llvmPackages.stdenv; # only building with clang seems to be tested upstream in stdenv.mkDerivation { - name = "meshlab-2016.12"; + name = "meshlab-20180627-beta"; srcs = [ @@ -12,31 +15,32 @@ in stdenv.mkDerivation { owner = "cnr-isti-vclab"; repo = "meshlab"; rev = meshlabRev; - sha256 = "0srrp7zhi86dsg4zsx1615gr26barz38zdl8s03zq6vm1dgzl3cc"; + sha256 = "0xi7wiyy0yi545l5qvccbqahlcsf70mhx829gf7bq29640si4rax"; name = "meshlab-${meshlabRev}"; }) (fetchFromGitHub { owner = "cnr-isti-vclab"; repo = "vcglib"; rev = vcglibRev; - sha256 = "0jh8jc8rn7rci8qr3q03q574fk2hsc3rllysck41j8xkr3rmxz2f"; + sha256 = "0jfgjvf21y9ncmyr7caipy3ardhig7hh9z8miy885c99b925hhwd"; name = "vcglib-${vcglibRev}"; }) ]; sourceRoot = "meshlab-${meshlabRev}"; - patches = [ ./fix-2016.02.patch ]; - hardeningDisable = [ "format" ]; enableParallelBuilding = true; + patches = [ ./fix-20180627-beta.patch ]; + buildPhase = '' # MeshLab has ../vcglib hardcoded everywhere, so move the source dir mv ../vcglib-${vcglibRev} ../vcglib cd src export NIX_LDFLAGS="-rpath $out/opt/meshlab $NIX_LDFLAGS" + export QMAKESPEC="linux-clang" pushd external qmake -recursive external.pro @@ -53,7 +57,7 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; + buildInputs = [ libGLU llvmPackages.openmp qtbase qtscript qtxmlpatterns ]; meta = { description = "A system for processing and editing 3D triangular meshes."; @@ -61,6 +65,5 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; - broken = true; # 2018-04-11 }; } diff --git a/pkgs/applications/graphics/meshlab/fix-2016.02.patch b/pkgs/applications/graphics/meshlab/fix-2016.02.patch deleted file mode 100644 index ebccccc00a29..000000000000 --- a/pkgs/applications/graphics/meshlab/fix-2016.02.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 0fd17cd2b6d57e8a2a981a70115c2565ee076d0f Mon Sep 17 00:00:00 2001 -From: Marco Callieri <callieri@isti.cnr.it> -Date: Mon, 9 Jan 2017 16:06:14 +0100 -Subject: [PATCH 1/3] resolved ambiguity for abs overloads - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index 364d53bf..ef3d4a2d 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -83,7 +83,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = abs(newPos.x()-pos().x()); -+ qreal handleOffset = std::fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits<float>::epsilon()) - { --- -2.15.0 - - -From 33cfd5801e59b6c9e34360c75112e6dcb88d807b Mon Sep 17 00:00:00 2001 -From: Marco Callieri <callieri@isti.cnr.it> -Date: Tue, 10 Jan 2017 10:05:05 +0100 -Subject: [PATCH 2/3] again, fabs ambiguity - - -diff --git a/src/meshlabplugins/edit_quality/eqhandle.cpp b/src/meshlabplugins/edit_quality/eqhandle.cpp -index ef3d4a2d..d29f8c45 100644 ---- a/src/meshlabplugins/edit_quality/eqhandle.cpp -+++ b/src/meshlabplugins/edit_quality/eqhandle.cpp -@@ -30,6 +30,7 @@ FIRST RELEASE - #include "eqhandle.h" - #include <QMouseEvent> - #include <QGraphicsSceneMouseEvent> -+#include <math.h> - - EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position, - EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox, -@@ -83,7 +84,7 @@ void EqHandle::mouseMoveEvent(QGraphicsSceneMouseEvent *event) - setCursor(Qt::OpenHandCursor); - - QPointF newPos = event->scenePos(); -- qreal handleOffset = std::fabs(newPos.x()-pos().x()); -+ qreal handleOffset = fabs(newPos.x()-pos().x()); - - if (handleOffset >= std::numeric_limits<float>::epsilon()) - { --- -2.15.0 - - -From d717e44f4134ebee03322a6a2a56fce626084a3c Mon Sep 17 00:00:00 2001 -From: Patrick Chilton <chpatrick@gmail.com> -Date: Mon, 4 Dec 2017 21:27:23 +0100 -Subject: [PATCH 3/3] io_TXT -> io_txt - - -diff --git a/src/meshlab_full.pro b/src/meshlab_full.pro -index 6ea7f1db..2a95c127 100644 ---- a/src/meshlab_full.pro -+++ b/src/meshlab_full.pro -@@ -16,7 +16,7 @@ SUBDIRS = common \ - meshlabplugins/io_x3d \ - meshlabplugins/io_expe \ - meshlabplugins/io_pdb \ -- plugins_experimental/io_TXT \ -+ plugins_experimental/io_txt \ - # Filter plugins - meshlabplugins/filter_aging \ - meshlabplugins/filter_ao \ -diff --git a/src/plugins_experimental/io_TXT/io_txt.cpp b/src/plugins_experimental/io_txt/io_txt.cpp -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.cpp -rename to src/plugins_experimental/io_txt/io_txt.cpp -diff --git a/src/plugins_experimental/io_TXT/io_txt.h b/src/plugins_experimental/io_txt/io_txt.h -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.h -rename to src/plugins_experimental/io_txt/io_txt.h -diff --git a/src/plugins_experimental/io_TXT/io_txt.pro b/src/plugins_experimental/io_txt/io_txt.pro -similarity index 100% -rename from src/plugins_experimental/io_TXT/io_txt.pro -rename to src/plugins_experimental/io_txt/io_txt.pro --- -2.15.0 - diff --git a/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch new file mode 100644 index 000000000000..177b8e90c574 --- /dev/null +++ b/pkgs/applications/graphics/meshlab/fix-20180627-beta.patch @@ -0,0 +1,25 @@ +diff --git a/src/meshlabplugins/edit_paint/paintbox.cpp b/src/meshlabplugins/edit_paint/paintbox.cpp +index 2097a5b..6bcd1a4 100644 +--- a/src/meshlabplugins/edit_paint/paintbox.cpp ++++ b/src/meshlabplugins/edit_paint/paintbox.cpp +@@ -23,6 +23,7 @@ + + #include "paintbox.h" + #include <QFileDialog> ++#include <QAction> + + Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags) + { +diff --git a/src/meshlabplugins/render_gdp/shaderDialog.h b/src/meshlabplugins/render_gdp/shaderDialog.h +index a62d3b5..7eb1594 100644 +--- a/src/meshlabplugins/render_gdp/shaderDialog.h ++++ b/src/meshlabplugins/render_gdp/shaderDialog.h +@@ -32,6 +32,8 @@ + #include "shaderStructs.h" + #include "ui_shaderDialog.h" + #include <QMap> ++#include <QSlider> ++#include <QLineEdit> + + class QGLWidget; + diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 01affbbbd94c..7571bb29bec9 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/graphics/processing3/default.nix b/pkgs/applications/graphics/processing3/default.nix index 6916ef4ad7aa..5575c56b7fd0 100644 --- a/pkgs/applications/graphics/processing3/default.nix +++ b/pkgs/applications/graphics/processing3/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fetchurl, xmlstarlet, makeWrapper, ant, jdk, rsync, javaPackages, libXxf86vm, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - version = "3.3.7"; + version = "3.4"; name = "processing3-${version}"; src = fetchFromGitHub { owner = "processing"; repo = "processing"; - rev = "processing-0264-3.3.7"; - sha256 = "0a20z19lmc4xarfnr7xshcmlv3xkc2dgjxknis0iv79gxnwlqhpq"; + rev = "processing-0265-${version}"; + sha256 = "12wpxgn2wd5vbasx9584w5yb1s319smq1zh8m7dvp7gkqw9plwp4"; }; nativeBuildInputs = [ ant rsync makeWrapper ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { url = http://download.processing.org/reference.zip; - sha256 = "104zig026y8vbl4qksmscjq0bms8mi2jmri1ijdlbkxcqnv9bnlf"; + sha256 = "0dli1bdgw8hsx7g7b048ap81v2za9maa6pfcwdqm3qkfypr8q7pr"; } } ./java/reference.zip diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index 4f31a10c2d1b..d47f08c90b9c 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -6,11 +6,11 @@ python3Packages.buildPythonApplication rec { pname = "rapid-photo-downloader"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "https://launchpad.net/rapid/pyqt/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "193l55wdxwxmammyxwzp90sg0qw5r316443la3m9611sdpcmy8w3"; + sha256 = "1i0lfj9gnfya49gxx59ls364z651fqagd4krnz9jhg9m0l48ljdf"; }; # Disable version check and fix install tests diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 9a21d457a83f..99e250e9e4d7 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -12,14 +12,14 @@ let }; in stdenv.mkDerivation rec { - version = "1.0"; + version = "1.1"; name = "renderdoc-${version}"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "0l7pjxfrly4llryjnwk42dzx65n78wc98h56qm4yh04ja8fdbx2y"; + sha256 = "0kb9m1dm0mnglqyh1srvl0f1bgjghxzbqarn0xfqw49wphqwhmcd"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index 4542de2d42fa..56388a8a2555 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; - configureFlags = "--disable-svnversion"; + configureFlags = [ "--disable-svnversion" ]; patches = map fetchurl (import ./debian-patches.nix); diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index d5818614b9e0..a44ce2d8b4c2 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { name = "1password-${version}"; - version = "0.4.1"; + version = "0.5.1"; src = if stdenv.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "1yzzh1f6hx7vwdgzp0znsjarjiw4xqmmrkc5xwywgjpg81qqpl8c"; + sha256 = "08kzjilxpkvlwqjyxnic1n6xiy6gkndijwxdksm59k7c56mdawsz"; stripRoot = false; } else if stdenv.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "0dgj1zqmpdbnsz2v2j7nqm232cdgyp9wagc089dxi4hbzkmfcvzx"; + sha256 = "1bsbzaqws0z991r6rkjrxay74fj4g5ld4d748ygr0950zwi1m3h7"; stripRoot = false; } else if stdenv.system == "x86_64-darwin" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.zip"; - sha256 = "116bvyfg38npdhlzaxan5y47cbw7jvj94q5w6v71kxsjzxk9l44a"; + sha256 = "1dhr8m9icip27v802gxl1vhl9rf0jq5awirdm72lqmlypj86df0g"; stripRoot = false; } else throw "Architecture not supported"; @@ -34,13 +34,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "1Password command-line tool"; - homepage = [ - "https://blog.agilebits.com/2017/09/06/announcing-the-1password-command-line-tool-public-beta/" - "https://app-updates.agilebits.com/product_history/CLI" - ]; - maintainers = with maintainers; [ joelburget ]; - license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + description = "1Password command-line tool"; + homepage = https://support.1password.com/command-line/; + downloadPage = https://app-updates.agilebits.com/product_history/CLI; + maintainers = with maintainers; [ joelburget ]; + license = licenses.unfree; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 30b8a435f906..f21438dfcec5 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -pythonPackages.buildPythonApplication rec { - name = "antfs-cli-unstable-2017-02-11"; +python3Packages.buildPythonApplication rec { + pname = "antfs-cli"; + version = "unstable-2017-02-11"; meta = with stdenv.lib; { homepage = https://github.com/Tigge/antfs-cli; @@ -17,5 +18,5 @@ pythonPackages.buildPythonApplication rec { sha256 = "0v8y64kldfbs809j1g9d75dd1vxq7mfxnp4b45pz8anpxhjf64fy"; }; - propagatedBuildInputs = [ pythonPackages.openant ]; + propagatedBuildInputs = [ python3Packages.openant ]; } diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0a98f387ff86..15d894b0413d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "3.28.0"; + version = "3.29.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "0b3vv03c6m6972sk8zj3zc5sq6b9837irnfgjlqhv9z5i75m0414"; + sha256 = "1r29vi8j51r0nnzpjbg34ryvizzkn31sq1iz7z748wjfgr87wmyh"; }; patches = [ diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index acd38d74dca4..ee3e2a955d32 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { xorg.libX11 xorg.libXext xorg.libXinerama jansson ]; configureScript = "./autogen.sh"; - configureFlags = "--enable-scrypt --enable-opencl"; + configureFlags = [ "--enable-scrypt" "--enable-opencl" ]; NIX_LDFLAGS = "-lgcc_s -lX11 -lXext -lXinerama"; preConfigure = '' diff --git a/pkgs/applications/misc/cointop/default.nix b/pkgs/applications/misc/cointop/default.nix index 2ac335759ce4..23d76afff0ce 100644 --- a/pkgs/applications/misc/cointop/default.nix +++ b/pkgs/applications/misc/cointop/default.nix @@ -26,5 +26,6 @@ buildGoPackage rec { homepage = https://cointop.sh; platforms = stdenv.lib.platforms.linux; # cannot test others maintainers = [ ]; + license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index fd14bba282c4..b8eff972ebdd 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { name = "dbeaver-ce-${version}"; - version = "5.1.4"; + version = "5.1.5"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "14i7b3l89rkhqq4zgsdbvcs9pp60djv0rjbm86fpk2wi4zkrlzi5"; + sha256 = "17ai2gxnz1wj5m282sib9qhvy3665km2ig1ixxdklmk8apgdl1xr"; }; installPhase = '' diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 6cbdc8ece0ca..eeb7a8ccf526 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -20,6 +20,5 @@ stdenv.mkDerivation { description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.eduarrrd ]; }; } diff --git a/pkgs/applications/misc/doing/Gemfile b/pkgs/applications/misc/doing/Gemfile new file mode 100644 index 000000000000..2706a85e9d89 --- /dev/null +++ b/pkgs/applications/misc/doing/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'doing', '1.0.10pre' diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/applications/misc/doing/Gemfile.lock new file mode 100644 index 000000000000..4d266827415f --- /dev/null +++ b/pkgs/applications/misc/doing/Gemfile.lock @@ -0,0 +1,25 @@ +GEM + remote: https://rubygems.org/ + specs: + chronic (0.10.2) + deep_merge (1.2.1) + doing (1.0.10pre) + chronic (~> 0.10, >= 0.10.2) + deep_merge + gli (~> 2.17.1) + haml (= 4.0.3) + json (~> 1.8.1) + gli (2.17.1) + haml (4.0.3) + tilt + json (1.8.6) + tilt (2.0.8) + +PLATFORMS + ruby + +DEPENDENCIES + doing (= 1.0.10pre) + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix new file mode 100644 index 000000000000..0286e38a0edf --- /dev/null +++ b/pkgs/applications/misc/doing/default.nix @@ -0,0 +1,25 @@ +{ lib, bundlerEnv, ruby +}: + +# Bundix: +# nix-shell -p bundix zlib +bundlerEnv rec { + pname = "doing"; + version = (import ./gemset.nix).doing.version; + + inherit ruby; + gemdir = ./.; + + meta = with lib; { + description = "A command line tool for keeping track of what you’re doing and tracking what you’ve done."; + longDescription = '' + doing is a basic CLI for adding and listing "what was I doing" reminders + in a TaskPaper-formatted text file. It allows for multiple + sections/categories and flexible output formatting. + ''; + homepage = http://brettterpstra.com/projects/doing/; + license = licenses.mit; + maintainers = with maintainers; [ ktf ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/doing/gemset.nix b/pkgs/applications/misc/doing/gemset.nix new file mode 100644 index 000000000000..b30a124bb58b --- /dev/null +++ b/pkgs/applications/misc/doing/gemset.nix @@ -0,0 +1,60 @@ +{ + chronic = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn"; + type = "gem"; + }; + version = "0.10.2"; + }; + deep_merge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q3picw7zx1xdkybmrnhmk2hycxzaa0jv4gqrby1s90dy5n7fmsb"; + type = "gem"; + }; + version = "1.2.1"; + }; + doing = { + dependencies = ["chronic" "deep_merge" "gli" "haml" "json"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y42yc7h45sz9hqj3g1dd77ipx58l7v64i7mrsj3is2f5rszd1rv"; + type = "gem"; + }; + version = "1.0.10pre"; + }; + gli = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g7g3lxhh2b4h4im58zywj9vcfixfgndfsvp84cr3x67b5zm4kaq"; + type = "gem"; + }; + version = "2.17.1"; + }; + haml = { + dependencies = ["tilt"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l9zhfdk9z7xjfdp108r9fw4xa55hflin7hh3lpafbf9bdz96knr"; + type = "gem"; + }; + version = "4.0.3"; + }; + json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qmj7fypgb9vag723w1a49qihxrcf5shzars106ynw2zk352gbv5"; + type = "gem"; + }; + version = "1.8.6"; + }; + tilt = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + type = "gem"; + }; + version = "2.0.8"; + }; +} \ No newline at end of file diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix new file mode 100644 index 000000000000..b8bd0a59bea2 --- /dev/null +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchzip, fltk, zlib, xdg_utils, xorg, libjpeg, libGL }: + +stdenv.mkDerivation rec { + name = "eureka-editor-${version}"; + version = "1.21"; + shortver = "121"; + + src = fetchzip { + url = "mirror://sourceforge/eureka-editor/Eureka/${version}/eureka-${shortver}-source.tar.gz"; + sha256 = "0fpj13aq4wh3f7473cdc5jkf1c71jiiqmjc0ihqa0nm3hic1d4yv"; + }; + + buildInputs = [ fltk zlib xdg_utils libjpeg xorg.libXinerama libGL ]; + + enableParallelBuilding = true; + + preBuild = '' + substituteInPlace src/main.cc \ + --replace /usr/local $out + substituteInPlace Makefile \ + --replace /usr/local $out \ + --replace "-o root " "" + ''; + + preInstall = '' + mkdir -p $out/bin $out/share/applications $out/share/icons $out/man/man6 + cp misc/eureka.desktop $out/share/applications + cp misc/eureka.ico $out/share/icons + cp misc/eureka.6 $out/man/man6 + ''; + + meta = with stdenv.lib; { + homepage = http://eureka-editor.sourceforge.net; + description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = with maintainers; [ neonfuz ]; + }; +} diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 1165ced11f9c..b72fcde4a9ee 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -31,5 +31,8 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.bodil ]; platforms = platforms.linux; + knownVulnerabilities = [ + "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854585" + ]; }; } diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 5cd8f572ad48..e9d194666094 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; - configureFlags = "--with-ssl=${openssl.dev}"; + configureFlags = [ "--with-ssl=${openssl.dev}" ]; meta = { homepage = http://www.fetchmail.info/; @@ -29,5 +29,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index be853e4213bc..1fad5333a144 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file" ''; - configureFlags = "--disable-pycompile"; + configureFlags = [ "--disable-pycompile" ]; meta = { homepage = https://fontmanager.github.io/; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 6adc805b7284..712c2081f102 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { sed -i -e 's|/usr/bin/x-terminal-emulator|-l gnome-terminal|g' gksu.desktop ''; - configureFlags = "--disable-nautilus-extension"; + configureFlags = [ "--disable-nautilus-extension" ]; meta = { description = "A graphical frontend for libgksu"; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index b4b98909447e..b12b84d106dc 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -7,7 +7,7 @@ let inherit (pythonPackages) python buildPythonApplication; in buildPythonApplication rec { - version = "4.2.8"; + version = "5.0.0"; name = "gramps-${version}"; nativeBuildInputs = [ wrapGAppsHook ]; @@ -20,7 +20,7 @@ in buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "v${version}"; - sha256 = "17y6rjvvcz7lwjck4f5nmhnn07i9k5vzk5dp1jk7j3ldxjagscsd"; + sha256 = "056l4ihmd3gdsiv6wwv4ckgh8bfzd5nii6z4afsdn2nmjbj4hw9m"; }; pythonPath = with pythonPackages; [ bsddb3 PyICU pygobject3 pycairo ]; diff --git a/pkgs/applications/misc/gutenberg/default.nix b/pkgs/applications/misc/gutenberg/default.nix index 8ab840221815..c5982f68201d 100644 --- a/pkgs/applications/misc/gutenberg/default.nix +++ b/pkgs/applications/misc/gutenberg/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, CoreServices, cf-private }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, pkgconfig, openssl, CoreServices, cf-private }: rustPlatform.buildRustPackage rec { name = "gutenberg-${version}"; - version = "0.3.4"; + version = "0.4.1"; src = fetchFromGitHub { owner = "Keats"; repo = "gutenberg"; rev = "v${version}"; - sha256 = "1v26q1m3bx7mdmmwgd6p601ncf13rr4rrx9s06fiy8vnd0ar1vlf"; + sha256 = "0is7156aim2ad8xg2f5068crc4gfvm89x8gxa25vc25p0yr1bpla"; }; - cargoSha256 = "0cdy0wvibkpnmlqwxvn02a2k2vqy6zdqzflj2dh6g1cjbz1j8qh5"; + cargoSha256 = "146vlr85n9d06am5ki76fh1vb5r8a4lzx5b7dmgi292kc3dsn41z"; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig openssl ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices cf-private ]; postInstall = '' diff --git a/pkgs/applications/misc/gxmessage/default.nix b/pkgs/applications/misc/gxmessage/default.nix index a61d532f1f8e..8401386ead49 100644 --- a/pkgs/applications/misc/gxmessage/default.nix +++ b/pkgs/applications/misc/gxmessage/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo}: +{ stdenv, fetchurl, gnome3, intltool, pkgconfig, texinfo, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "gxmessage-${version}"; @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gnome3.gtk texinfo ]; + buildInputs = [ intltool gnome3.gtk texinfo hicolor-icon-theme ]; + meta = { description = "A GTK enabled dropin replacement for xmessage"; homepage = "http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage"; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 110d17492f87..6ed956a1c1ba 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "0.42.1"; + version = "0.46"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,11 +10,13 @@ buildGoPackage rec { owner = "gohugoio"; repo = "hugo"; rev = "v${version}"; - sha256 = "17m8bkldvnd7yyzxi4rc8vv3qfypjzik38bjy4qavb7sjdjmfij9"; + sha256 = "0w5xkb6s03hprb4v151gdk8zzsgvy0i406363j1w03bic8ajwgmj"; }; goDeps = ./deps.nix; + buildFlags = "-tags extended"; + postInstall = '' rm $bin/bin/generate ''; diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix index 837919b1c326..64f252d27fd5 100644 --- a/pkgs/applications/misc/hugo/deps.nix +++ b/pkgs/applications/misc/hugo/deps.nix @@ -1,6 +1,15 @@ # This file was generated by https://github.com/kamilchm/go2nix v1.2.1 [ { + goPackagePath = "github.com/BurntSushi/locker"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/locker"; + rev = "a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a"; + sha256 = "1xak4aync4klswq5217qvw191asgla51jr42y94vp109lirm5dzg"; + }; + } + { goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; @@ -32,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/chroma"; - rev = "d7b2ed20a4989ab604703f61f86523560f8a6a87"; - sha256 = "0ni2ncck787sxk9gl14xnyjnw4y27ipypjf4kc00g635fvc64ik6"; + rev = "5d7fef2ae60b501bbf28d476c3f273b8017d8261"; + sha256 = "150jv4vhsdi1gj3liwkgicdrwnzgv5qkq2fwznlnzf64vmfb0b9f"; }; } { @@ -50,8 +59,17 @@ fetch = { type = "git"; url = "https://github.com/bep/gitmap"; - rev = "012701e8669671499fc43e9792335a1dcbfe2afb"; - sha256 = "10ixv4zwmrpxvpchws78yzsjvw1zplljw3iqvwpina2mkwwp71ql"; + rev = "ecb6fe06dbfd6bb4225e7fda7dc15612ecc8d960"; + sha256 = "0zqdl5h4ayi2gi5aqf35f1sjszhbcriksm2bf84fkrg7ngr48jn6"; + }; + } + { + goPackagePath = "github.com/bep/go-tocss"; + fetch = { + type = "git"; + url = "https://github.com/bep/go-tocss"; + rev = "2abb118dc8688b6c7df44e12f4152c2bded9b19c"; + sha256 = "12q7h6nydklq4kg65kcgd85209rx7zf64ba6nf3k7y16knj4233q"; }; } { @@ -68,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/cpuguy83/go-md2man"; - rev = "48d8747a2ca13185e7cc8efe6e9fc196a83f71a5"; - sha256 = "01hpll16rvxhnvv35vs3z8p51x54c5jyl1gjdm0g7kwfwp2chvjx"; + rev = "691ee98543af2f262f35fbb54bdd42f00b9b9cc5"; + sha256 = "1864g10y9n6ni0p1yqjhvwyjdh0lgxnf7dlb0c4njazdg5rppww9"; }; } { @@ -86,8 +104,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "5e63c9a565d0a3260d23d060a795783dab90fefe"; - sha256 = "1mmiz439lygi30dj1rbps57iqh762jkinnpb4wfl382v4h136qvp"; + rev = "8021a62ea0dfe0ed2e6107f5ccd37e0d4a92a996"; + sha256 = "1c32sqfz78g9wxvpng8n9r404lf2lgjn9b24mg8y3rxylx29gks7"; }; } { @@ -176,8 +194,8 @@ fetch = { type = "git"; url = "https://github.com/jdkato/prose"; - rev = "e27abfd3f31b84c37bbce37179b0428fcb1384be"; - sha256 = "04rjqh3jdxaqr9czp4vcj14hqfv7yppv4nb7ynb04c9jcq23ajw7"; + rev = "99216ea17cba4e2f2a4e8bca778643e5a529b7aa"; + sha256 = "1mdh276lmj21jbi22ky8ngdsl9hfcdv6czshycbaiwjr5y9cv7bn"; }; } { @@ -235,12 +253,21 @@ }; } { + goPackagePath = "github.com/mitchellh/hashstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/hashstructure"; + rev = "2bca23e0e452137f789efbc8610126fd8b94f73b"; + sha256 = "0vpacsls26474wya360fjhzi6l4y8s8s251c4szvqxh17n5f5gk1"; + }; + } + { goPackagePath = "github.com/mitchellh/mapstructure"; fetch = { type = "git"; url = "https://github.com/mitchellh/mapstructure"; - rev = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"; - sha256 = "1aqk9qr46bwgdc5j7n7als61xvssvyjf4qzfsvhacl4izpygqnw7"; + rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; + sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; }; } { @@ -257,8 +284,8 @@ fetch = { type = "git"; url = "https://github.com/nicksnyder/go-i18n"; - rev = "f6ac3d9cf0c4b6a32527779e992ebde26bd3d948"; - sha256 = "1vg25khaf7lr90xwf97bsyn873cdi1j7nxh68s80jrg2a86zw0ff"; + rev = "461e8b98df7454b4cb46a1611a6734f05ee331d0"; + sha256 = "0aq1q06y6azsi6mfmary5xs7gmmg8fh8lhx1wbpdlqk11asm9rq0"; }; } { @@ -275,8 +302,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "c01d1270ff3e442a8a57cddc1c92dc1138598194"; - sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + rev = "c2dbbc24a97911339e01bda0b8cabdbd8f13b602"; + sha256 = "0v1dsqnk5zmn6ir8jgxijx14s47jvijlqfz3aq435snfrgybd5rz"; }; } { @@ -320,8 +347,8 @@ fetch = { type = "git"; url = "https://github.com/spf13/cobra"; - rev = "1e58aa3361fd650121dceeedc399e7189c05674a"; - sha256 = "1d6dy60dw7i2mcab10yp99wi5w28jzhzzf16w4ys6bna7ymndiin"; + rev = "7c4570c3ebeb8129a1f7456d0908a8b676b6f9f1"; + sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; }; } { @@ -365,8 +392,35 @@ fetch = { type = "git"; url = "https://github.com/spf13/viper"; - rev = "15738813a09db5c8e5b60a19d67d3f9bd38da3a4"; - sha256 = "1mjfzg8zvnxckaq6l8gw99i2msrfqn9yr04dc3b7kd5bpxi6zr4v"; + rev = "d493c32b69b8c6f2377bf30bc4d70267ffbc0793"; + sha256 = "1jq46790rkjn6c1887wz98dqjk792ij6wnrifzk1maglmfb061hh"; + }; + } + { + goPackagePath = "github.com/tdewolff/minify"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/minify"; + rev = "cf3a1790b606e292e4a0ee82e949a4f0d1c7617d"; + sha256 = "1r496149l5iqzxkfcbll5dqcqxy4a7jjxvzm62c8hrybmwj574kn"; + }; + } + { + goPackagePath = "github.com/tdewolff/parse"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/parse"; + rev = "4ceb50b40fad068875f5b093c5df0619012dc544"; + sha256 = "1ap76hdiabn41r7zxc7nq3n3ld7zqf97jaf71zlzzjrphi3fwrg1"; + }; + } + { + goPackagePath = "github.com/wellington/go-libsass"; + fetch = { + type = "git"; + url = "https://github.com/wellington/go-libsass"; + rev = "615eaa47ef794d037c1906a0eb7bf85375a5decf"; + sha256 = "0imjiskn4vq7nml5jwb1scgl61jg53cfpkjnb9rsc6m8gsd8s16s"; }; } { @@ -374,8 +428,8 @@ fetch = { type = "git"; url = "https://github.com/yosssi/ace"; - rev = "ea038f4770b6746c3f8f84f14fa60d9fe1205b56"; - sha256 = "1kbvbc56grrpnl65grygd23gyn3nkkhxdg8awhzkjmd0cvki8w1f"; + rev = "2b21b56204aee785bf8d500c3f9dcbe3ed7d4515"; + sha256 = "0cgpq1zdnh8l8zsn9w63asc9k7cm6k4qvjgrb4hr1106h8fjwfma"; }; } { @@ -383,8 +437,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "af66defab954cb421ca110193eed9477c8541e2a"; - sha256 = "0dgi7svwzs37c7m5dz2jig3xr45fyjihhr8cg0x8nc8sc8fsyq4h"; + rev = "c73c2afc3b812cdd6385de5a50616511c4a3d458"; + sha256 = "1kkafy29vz5xf6r29ghbvvbwrgjxwxvzk6dsa2qhyp1ddk6l2vkz"; }; } { @@ -392,8 +446,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"; - sha256 = "1f6q8kbijnrfy6wjqxrzgjf38ippckc5w34lhqsjs7kq045aar9a"; + rev = "f4c29de78a2a91c00474a2e689954305c350adf9"; + sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x"; }; } { @@ -410,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "6c888cc515d3ed83fc103cf1d84468aad274b0a7"; - sha256 = "18anqrdajp4p015v3f5y641k3lmgp2jr0lfyx0pb3ia0qvn93mrp"; + rev = "3dc4335d56c789b04b0ba99b7a37249d9b614314"; + sha256 = "1105b7jqzz8g2bfkdbkj2pdzq4vhfmhm42khir88vjqfd1l7ha31"; }; } { @@ -419,8 +473,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "5c1cf69b5978e5a34c5f9ba09a83e56acc4b7877"; - sha256 = "03br8p1sb1ffr02l8hyrgcyib7ms0z06wy3v4r1dj2l6q4ghwzfs"; + rev = "96e34ec0e18a62a1e59880c7bf617b655efecb66"; + sha256 = "1n1p5zz0vyvlhac40hxml6c5xwpsw8rjx1pbls9381a0s19ncbdg"; }; } { diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix new file mode 100644 index 000000000000..9b6ac086efdf --- /dev/null +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -0,0 +1,27 @@ +{ stdenv, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "img2pdf"; + version = "0.3.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "071s3gf28nb8ifxkix7dzjny6vib7791mnp0v3f4zagcjcic22a4"; + }; + + doCheck = false; # needs pdfrw + + propagatedBuildInputs = [ + pillow + ]; + + meta = with stdenv.lib; { + description = "Convert images to PDF via direct JPEG inclusion"; + homepage = https://gitlab.mister-muffin.de/josch/img2pdf; + license = licenses.lgpl2; + platforms = platforms.unix; + maintainers = [ maintainers.veprbl ]; + }; +} diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index d8b1253ac276..3561fcde839d 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ db gtk2 bzip2 ]; - configureFlags = "--without-libdb"; + configureFlags = [ "--without-libdb" ]; meta = { description = "Download utility that can fetch files from several sources simultaneously"; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 9872ff23f347..e753c5ded95c 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "14026"; + version = "14066"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1ysi23j2yj5b6cn3xdsrl4xp56klpw4xa7c4gv90z2dllx06mqli"; + sha256 = "06mhaz5vr19ydqc5irhgcbl0s8fifwvaq60iz2nsnlxb1pw89xia"; }; buildInputs = [ jre10 makeWrapper ]; diff --git a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix index cd83d2a44e1d..80bf5deceb16 100644 --- a/pkgs/applications/misc/keepass-plugins/keeagent/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keeagent/default.nix @@ -1,19 +1,19 @@ { stdenv, buildEnv, fetchzip, mono }: let - version = "0.8.1"; + version = "0.10.1"; drv = stdenv.mkDerivation { name = "keeagent-${version}"; src = fetchzip { - url = http://lechnology.com/wp-content/uploads/2016/07/KeeAgent_v0.8.1.zip; - sha256 = "16x1qrnzg0xkvi7w29wj3z0ldmql2vcbwxksbsmnidzmygwg98hk"; + url = "https://lechnology.com/wp-content/uploads/2018/04/KeeAgent_v0.10.1.zip"; + sha256 = "0j7az6l9wcr8z66mfplkxwydd4bgz2p2vd69xncf0nxlfb0lshh7"; stripRoot = false; }; meta = { description = "KeePass plugin to allow other programs to access SSH keys stored in a KeePass database for authentication"; - homepage = http://lechnology.com/software/keeagent; + homepage = "http://lechnology.com/software/keeagent"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index eafe0b9b5c64..c22c014bf5f5 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -1,28 +1,31 @@ -{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub -, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash }: +{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchurl +, extra-cmake-modules, karchive, kwindowsystem, qtx11extras, kcrash, knewstuff }: -let version = "0.7.5"; in +mkDerivation rec { + pname = "latte-dock"; + version = "0.8.0"; + name = "${pname}-${version}"; -mkDerivation { - name = "latte-dock-${version}"; - - src = fetchFromGitHub { - owner = "psifidotos"; - repo = "Latte-Dock"; - rev = "v${version}"; - sha256 = "0fblbx6qk4miag1mhiyns7idsw03p9pj3xc3xxxnb5rpj1fy0ifv"; + src = fetchurl { + url = "https://download.kde.org/stable/${pname}/${name}.tar.xz"; + sha256 = "1zg9r162r66vcvj5rzgy61mda89sk5yfy96g5p1aahbim0rgbdbs"; + name = "${name}.tar.xz"; }; buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp xorg.libSM ]; nativeBuildInputs = [ extra-cmake-modules cmake karchive kwindowsystem - qtx11extras kcrash ]; + qtx11extras kcrash knewstuff ]; + + meta = with lib; { description = "Dock-style app launcher based on Plasma frameworks"; homepage = https://github.com/psifidotos/Latte-Dock; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.benley ]; + maintainers = [ maintainers.benley maintainers.ysndr ]; }; + + } diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index 662ca9761fb2..72cb1e85802a 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -40,10 +40,10 @@ stdenv.mkDerivation rec { preConfigure = "sh autogen.sh"; - configureFlags = '' - --enable-nls - --enable-safe-mode - ''; + configureFlags = [ + "--enable-nls" + "--enable-safe-mode" + ]; meta = with stdenv.lib; { description = "A fast, lightweight terminal emulator"; diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix index 23f14d7ac9af..3155ab678d86 100644 --- a/pkgs/applications/misc/masterpdfeditor/default.nix +++ b/pkgs/applications/misc/masterpdfeditor/default.nix @@ -1,35 +1,41 @@ -{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, autoPatchelfHook }: +{ stdenv, fetchurl, sane-backends, qtbase, qtsvg, nss, autoPatchelfHook }: + let - version = "4.3.89"; + version = "5.1.12"; + in stdenv.mkDerivation { name = "masterpdfeditor-${version}"; + src = fetchurl { - url = "https://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; - sha256 = "0k5bzlhqglskiiq86nmy18mnh5bf2w3mr9cq3pibrwn5pisxnxxc"; + url = "https://code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz"; + sha256 = "1i3pdrhnlj06phm36gs42s6b94pigcfb8wa5dhmplxn0dqp434hq"; }; nativeBuildInputs = [ autoPatchelfHook ]; - buildInputs = [ sane-backends qtbase qtsvg ]; + buildInputs = [ nss qtbase qtsvg sane-backends stdenv.cc.cc ]; dontStrip = true; installPhase = '' - p=$out/opt/masterpdfeditor - mkdir -p $out/bin $p $out/share/applications $out/share/pixmaps + runHook preInstall + + p=$out/opt/masterpdfeditor + mkdir -p $out/bin - substituteInPlace masterpdfeditor4.desktop \ - --replace 'Exec=/opt/master-pdf-editor-4' "Exec=$out/bin" \ - --replace 'Path=/opt/master-pdf-editor-4' "Path=$out/bin" \ - --replace 'Icon=/opt/master-pdf-editor-4' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4.png $out/share/pixmaps/ - cp -v masterpdfeditor4.desktop $out/share/applications + substituteInPlace masterpdfeditor5.desktop \ + --replace 'Exec=/opt/master-pdf-editor-5' "Exec=$out/bin" \ + --replace 'Path=/opt/master-pdf-editor-5' "Path=$out/bin" \ + --replace 'Icon=/opt/master-pdf-editor-5' "Icon=$out/share/pixmaps" - cp -v masterpdfeditor4 $p/ - ln -s $p/masterpdfeditor4 $out/bin/masterpdfeditor4 - cp -v -r stamps templates lang fonts $p + install -Dm644 -t $out/share/pixmaps masterpdfeditor5.png + install -Dm644 -t $out/share/applications masterpdfeditor5.desktop + install -Dm755 -t $p masterpdfeditor5 + install -Dm644 license.txt $out/share/$name/LICENSE + ln -s $p/masterpdfeditor5 $out/bin/masterpdfeditor5 + cp -v -r stamps templates lang fonts $p - install -D license.txt $out/share/$name/LICENSE + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index fd0a8ea1fe4e..5af524a456ba 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.12"; + version = "1.0.13"; name = "mdp-${version}"; src = fetchFromGitHub { owner = "visit1985"; repo = "mdp"; rev = version; - sha256 = "04izj9i9rxmgswjh2iawqs6qglfv44zfv042smmcvfh1pm43361i"; + sha256 = "0snmglsmgfavgv6cnlb0j54sr0paf570ajpwk1b3g81v078hz2aq"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 7d48b61793ca..c112cf0c928f 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub, silver-searcher, tree, man, stdenv, + git, pandocSupport ? true, pandoc ? null , ... }: @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { name = "memo-${version}"; - version = "0.4"; + version = "0.6"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; rev = "${version}"; - sha256 = "06999nps46dxrjakvpin1d2zvfpjil69hb3bxagq29icalag3y2z"; + sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr"; }; installPhase = let @@ -23,15 +24,17 @@ stdenv.mkDerivation rec { else "#pandoc_cmd=pandoc"; in '' - mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} + mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions} substituteInPlace memo \ --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ + --replace "git_cmd=git" "git_cmd=${git}/bin/git" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" mv memo $out/bin/ mv doc/memo.1 $out/share/man/man1/memo.1 - mv completion/memo.bash $out/share/bash-completion/completions/memo.sh + mv completion/bash/memo.sh $out/share/bash-completion/completions/memo.sh + mv completion/zsh/_memo $out/share/zsh/site-functions/_memo ''; meta = { diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 76517f874642..7068d8aedd37 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,118 +1,95 @@ -{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig -, glibc, gnome-keyring, gtk, gtkmm, pcre, swig, sudo -, mysql, libxml2, libctemplate, libmysqlconnectorcpp -, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs -, libXdmcp, libuuid, libzip, libgnome-keyring, file -, pythonPackages, jre, autoconf, automake, libtool -, boost, glibmm, libsigcxx, pangomm, libX11, openssl -, proj, cairo, libglade +{ stdenv, fetchurl, substituteAll, cmake, ninja, pkgconfig +, glibc, gtk3, gtkmm3, pcre, swig, antlr4_7, sudo +, mysql, libxml2, libmysqlconnectorcpp +, vsqlite, gdal, libiodbc, libpthreadstubs +, libXdmcp, libuuid, libzip, libsecret, libssh +, python2, jre +, boost, libsigcxx, libX11, openssl +, proj, cairo, libxkbcommon, epoxy, wrapGAppsHook +, at-spi2-core, dbus, bash, coreutils }: let - inherit (pythonPackages) pexpect pycrypto python paramiko; + inherit (python2.pkgs) paramiko pycairo pyodbc; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "6.3.8"; + version = "8.0.12"; name = "${pname}-${version}"; src = fetchurl { url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; - sha256 = "1bxd828nrawmym6d8awh1vrni8dsbwh1k5am1lrq5ihp5c3kw9ka"; + sha256 = "0d6k1kw0bi3q5dlilzlgds1gcrlf7pis4asm3d6pssh2jmn5hh82"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake gnome-keyring gtk gtk.dev gtkmm pcre swig python sudo - paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file - libpthreadstubs libXdmcp libuuid libzip libgnome-keyring libgnome-keyring.dev jre autoconf - automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl - proj cairo cairo.dev makeWrapper libglade ] ; - - prePatch = '' - for f in backend/wbpublic/{grt/spatial_handler.h,grtui/geom_draw_box.h,objimpl/db.query/db_query_Resultset.cpp} ; - do - sed -i 's@#include <gdal/@#include <@' $f ; - done + patches = [ + ./fix-gdal-includes.patch + (substituteAll { + src = ./hardcode-paths.patch; + catchsegv = "${glibc.bin}/bin/catchsegv"; + bash = "${bash}/bin/bash"; + cp = "${coreutils}/bin/cp"; + dd = "${coreutils}/bin/dd"; + ls = "${coreutils}/bin/ls"; + mkdir = "${coreutils}/bin/mkdir"; + nohup = "${coreutils}/bin/nohup"; + rm = "${coreutils}/bin/rm"; + rmdir = "${coreutils}/bin/rmdir"; + sudo = "${sudo}/bin/sudo"; + }) + ]; - sed -i '32s@mysqlparser@mysqlparser sqlparser@' library/mysql.parser/CMakeLists.txt + nativeBuildInputs = [ + cmake ninja pkgconfig jre swig wrapGAppsHook + ]; - cat <<EOF > ext/antlr-runtime/fix-configure - #!${stdenv.shell} - echo "fixing bundled antlr3c configure" ; - sed -i 's@/usr/bin/file@${file}/bin/file@' configure - sed -i '12121d' configure - EOF - chmod +x ext/antlr-runtime/fix-configure - sed -i '236s@&&@& ''${PROJECT_SOURCE_DIR}/ext/antlr-runtime/fix-configure &@' CMakeLists.txt + buildInputs = [ + gtk3 gtkmm3 libX11 antlr4_7.runtime.cpp python2 mysql libxml2 + libmysqlconnectorcpp vsqlite gdal boost libssh openssl + libiodbc pcre cairo libuuid libzip libsecret + libsigcxx proj + # python dependencies: + paramiko pycairo pyodbc # sqlanydb + # transitive dependencies: + libpthreadstubs libXdmcp libxkbcommon epoxy at-spi2-core dbus + ]; - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" - substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "/usr/lib/x86_64-linux-gnu" "${proj}/lib" - patchShebangs $(pwd)/library/mysql.parser/grammar/build-parser - patchShebangs $(pwd)/tools/get_wb_version.sh + postPatch = '' + patchShebangs tools/get_wb_version.sh ''; NIX_CFLAGS_COMPILE = [ - "-I${libsigcxx}/lib/sigc++-2.0/include" - "-I${pangomm}/lib/pangomm-1.4/include" - "-I${glibmm}/lib/giomm-2.4/include" + # error: 'OGRErr OGRSpatialReference::importFromWkt(char**)' is deprecated + "-Wno-error=deprecated-declarations" ]; cmakeFlags = [ - "-DCMAKE_CXX_FLAGS=-std=c++11" "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" - "-DCTemplate_INCLUDE_DIR=${libctemplate}/include" - "-DCAIRO_INCLUDE_DIRS=${cairo.dev}/include" - "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" - "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${gtk.dev}/include" - "-DGTK2_GTKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gtkmm-2.4/include" - "-DGTK2_GDKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gdkmm-2.4/include" - "-DGTK2_GLIBMMCONFIG_INCLUDE_DIR=${glibmm}/lib/glibmm-2.4/include" + "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" + "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" ]; - postInstall = '' - patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh - - for i in $out/lib/mysql-workbench/modules/wb_utils_grt.py \ - $out/lib/mysql-workbench/modules/wb_server_management.py \ - $out/lib/mysql-workbench/modules/wb_admin_grt.py; do - substituteInPlace $i \ - --replace "/bin/bash" ${stdenv.shell} \ - --replace "/usr/bin/sudo" ${sudo}/bin/sudo - done + # There is already an executable and a wrapper in bindir + # No need to wrap both + dontWrapGApps = true; - wrapProgram "$out/bin/mysql-workbench" \ - --prefix LD_LIBRARY_PATH : "${python}/lib" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64" \ - --prefix PATH : "${gnome-keyring}/bin" \ - --prefix PATH : "${python}/bin" \ - --set PYTHONPATH $PYTHONPATH \ - --run ' -# The gnome-keyring-daemon must be running. To allow for environments like -# kde, xfce where this is not so, we start it first. -# It is cleaned up using a supervisor subshell which detects that -# the parent has finished via the closed pipe as terminate signal idiom, -# used because we cannot clean up after ourselves due to the exec call. - -# Start gnome-keyring-daemon, export the environment variables it asks us to set. -for expr in $( gnome-keyring-daemon --start ) ; do eval "export "$expr ; done - -# Prepare fifo pipe. -FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo" -[ -p $FIFOCTL ] && rm $FIFOCTL -mkfifo $FIFOCTL - -# Supervisor subshell waits reading from pipe, will receive EOF when parent -# closes pipe on termination. Negate read with ! operator to avoid subshell -# quitting when read EOF returns 1 due to -e option being set. -( - exec 19< $FIFOCTL - ! read -u 19 - - kill $GNOME_KEYRING_PID - rm $FIFOCTL -) & + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${python2}/bin" + --prefix PROJSO : "${proj}/lib/libproj.so" + --set PYTHONPATH $PYTHONPATH + ) + ''; -exec 19> $FIFOCTL - ' + # Let’s wrap the programs not ending with bin + # until https://bugs.mysql.com/bug.php?id=91948 is fixed + postFixup = '' + find -L "$out/bin" -type f -executable -print0 \ + | while IFS= read -r -d ''' file; do + if [[ "''${file}" != *-bin ]]; then + echo "Wrapping program ''${file}" + wrapProgram "''${file}" "''${gappsWrapperArgs[@]}" + fi + done ''; meta = with stdenv.lib; { @@ -127,6 +104,6 @@ exec 19> $FIFOCTL homepage = http://wb.mysql.com/; license = licenses.gpl2; maintainers = [ maintainers.kkallio ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch new file mode 100644 index 000000000000..0a5c31fd40a2 --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch @@ -0,0 +1,47 @@ +--- a/backend/wbpublic/grt/spatial_handler.h ++++ b/backend/wbpublic/grt/spatial_handler.h +@@ -24,12 +24,12 @@ + #ifndef SPATIAL_HANDLER_H_ + #define SPATIAL_HANDLER_H_ + +-#include <gdal/ogrsf_frmts.h> +-#include <gdal/ogr_api.h> +-#include <gdal/gdal_pam.h> +-#include <gdal/memdataset.h> +-#include <gdal/gdal_alg.h> +-#include <gdal/gdal.h> ++#include <ogrsf_frmts.h> ++#include <ogr_api.h> ++#include <gdal_pam.h> ++#include <memdataset.h> ++#include <gdal_alg.h> ++#include <gdal.h> + #include <deque> + #include "base/geometry.h" + #include "wbpublic_public_interface.h" +--- a/backend/wbpublic/grtui/geom_draw_box.h ++++ b/backend/wbpublic/grtui/geom_draw_box.h +@@ -25,7 +25,7 @@ + #define _GEOM_DRAW_BOX_H_ + + #include <mforms/drawbox.h> +-#include <gdal/ogr_geometry.h> ++#include <ogr_geometry.h> + #include "wbpublic_public_interface.h" + + class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox { +--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp ++++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp +@@ -21,9 +21,9 @@ + * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +-#include <gdal/ogrsf_frmts.h> +-#include <gdal/ogr_api.h> +-#include <gdal/gdal.h> ++#include <ogrsf_frmts.h> ++#include <ogr_api.h> ++#include <gdal.h> + + #include <grts/structs.db.query.h> + #include <grtpp_util.h> diff --git a/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch new file mode 100644 index 000000000000..dddf992e4c12 --- /dev/null +++ b/pkgs/applications/misc/mysql-workbench/hardcode-paths.patch @@ -0,0 +1,187 @@ +--- a/frontend/linux/workbench/mysql-workbench.in ++++ b/frontend/linux/workbench/mysql-workbench.in +@@ -99,8 +99,8 @@ + if test "$WB_DEBUG" != ""; then + $WB_DEBUG $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else +- if type -p catchsegv > /dev/null; then +- catchsegv $MWB_BINARIES_DIR/mysql-workbench-bin "$@" ++ if type -p @catchsegv@ > /dev/null; then ++ @catchsegv@ $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + else + $MWB_BINARIES_DIR/mysql-workbench-bin "$@" + fi +--- a/plugins/migration/frontend/migration_bulk_copy_data.py ++++ b/plugins/migration/frontend/migration_bulk_copy_data.py +@@ -110,7 +110,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -164,7 +164,7 @@ + return 'sh' + + def generate_import_script(self, connection_args, path_to_file, schema_name): +- output = ['#!/bin/bash'] ++ output = ['#!/usr/bin/env bash'] + output.append('MYPATH=\`pwd\`') + + output.append('if [ -f \$MYPATH/%s ] ; then' % self.error_log_name) +@@ -417,7 +417,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"<put source password here>\"\n") +@@ -521,7 +521,7 @@ + + with open(script_path, 'w+') as f: + os.chmod(script_path, 0700) +- f.write('#!/bin/bash\n\n') ++ f.write('#!/usr/bin/env bash\n\n') + f.write('MYPATH=`pwd`\n') + + f.write("arg_source_password=\"<put source password here>\"\n") +--- a/plugins/wb.admin/backend/wb_server_control.py ++++ b/plugins/wb.admin/backend/wb_server_control.py +@@ -39,7 +39,7 @@ + + UnixVariant = { + "" : { +- 'sudo_command' : "/usr/bin/sudo -k -S -p EnterPasswordHere ", ++ 'sudo_command' : "@sudo@ -k -S -p EnterPasswordHere ", + } + } + +--- a/plugins/wb.admin/backend/wb_server_management.py ++++ b/plugins/wb.admin/backend/wb_server_management.py +@@ -40,7 +40,7 @@ + + def reset_sudo_prefix(): + global default_sudo_prefix +- default_sudo_prefix = '/usr/bin/sudo -k -S -p EnterPasswordHere' ++ default_sudo_prefix = '@sudo@ -k -S -p EnterPasswordHere' + + reset_sudo_prefix() + +@@ -100,7 +100,7 @@ + + if to_spawn: + command += ' &' +- sudo_prefix += ' /usr/bin/nohup' ++ sudo_prefix += ' @nohup@' + + # If as_user is the CURRENT then there's no need to sudo + if as_user != Users.CURRENT: +@@ -111,7 +111,7 @@ + if '/bin/sh' in sudo_prefix or '/bin/bash' in sudo_prefix: + command = "LANG=C " + sudo_prefix + " \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + else: +- command = "LANG=C " + sudo_prefix + " /bin/bash -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" ++ command = "LANG=C " + sudo_prefix + " @bash@ -c \"" + command.replace('\\', '\\\\').replace('"', r'\"').replace('$','\\$') + "\"" + + return command + +@@ -896,9 +896,9 @@ + if as_user == Users.CURRENT: + raise PermissionDeniedError("Cannot set owner of directory %s" % path) + else: +- command = "/bin/mkdir %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) ++ command = "@mkdir@ %s && chown %s %s" % (quote_path(path), with_owner, quote_path(path)) + else: +- command = "/bin/mkdir %s" % (quote_path(path)) ++ command = "@mkdir@ %s" % (quote_path(path)) + + res = self.process_ops.exec_cmd(command, + as_user = as_user, +@@ -927,7 +927,7 @@ + @useAbsPath("path") + def remove_directory(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rmdir ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rmdir@ ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -940,7 +940,7 @@ + @useAbsPath("path") + def remove_directory_recursive(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd('/bin/rm -R ' + quote_path(path), ++ res = self.process_ops.exec_cmd('@rm@ -R ' + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -953,7 +953,7 @@ + @useAbsPath("path") + def delete_file(self, path, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() +- res = self.process_ops.exec_cmd("/bin/rm " + quote_path(path), ++ res = self.process_ops.exec_cmd("@rm@ " + quote_path(path), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1001,7 +1001,7 @@ + def _copy_file(self, source, dest, as_user = Users.CURRENT, user_password = None): + output = StringIO.StringIO() + +- res = self.process_ops.exec_cmd("LC_ALL=C /bin/cp " + quote_path(source) + " " + quote_path(dest), ++ res = self.process_ops.exec_cmd("LC_ALL=C @cp@ " + quote_path(source) + " " + quote_path(dest), + as_user = as_user, + user_password = user_password, + output_handler = output.write, +@@ -1077,9 +1077,9 @@ + # for ls -l, the output format changes depending on stdout being a terminal or not + # since both cases are possible, we need to handle both at the same time (1st line being total <nnnn> or not) + # the good news is that if the line is there, then it will always start with total, regardless of the locale +- command = 'LC_ALL=C /bin/ls -l -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -l -p %s' % quote_path(path) + else: +- command = 'LC_ALL=C /bin/ls -1 -p %s' % quote_path(path) ++ command = 'LC_ALL=C @ls@ -1 -p %s' % quote_path(path) + + output = StringIO.StringIO() + res = self.process_ops.exec_cmd(command, +@@ -2160,9 +2160,9 @@ + def get_range(self, start, end): + f = StringIO.StringIO() + if not self._need_sudo: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- ret = self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) ++ ret = self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i count=%i 2> /dev/null" % (quote_path(self.path), start, end-start), as_user = Users.ADMIN, user_password=self.get_password, output_handler=f.write) + + if ret != 0: + raise RuntimeError("Could not get data from file %s" % self.path) +@@ -2170,9 +2170,9 @@ + + def read_task(self, offset, file): + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=file.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self.get_password, output_handler=file.write) + # this will signal the reader end that there's no more data + file.close() + +@@ -2198,9 +2198,9 @@ + self._pos = offset + f = StringIO.StringIO() + if not self._need_sudo: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.CURRENT, user_password=None, output_handler=f.write) + else: +- self.server_helper.execute_command("/bin/dd if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) ++ self.server_helper.execute_command("@dd@ if=%s ibs=1 skip=%i 2> /dev/null" % (quote_path(self.path), offset), as_user = Users.ADMIN, user_password=self._password, output_handler=f.write) + self.data = f + self.data.seek(0) + if self.skip_first_newline: diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index b4832a72c2b8..d97f2d2c0489 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "0sd8djig56163k0b0y4a7kg3malxlg08gayjw4zmvqaihvbbkc6v"; + sha256 = "0z7mr9lql5hz0518wzkj8fdsdp8yh17fr418arjxjn66md4kwgpg"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 8e8126192dda..f602ce9db66a 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { gnome3.gsettings-desktop-schemas ]; - configureFlags = "--libexecdir=$(out)/bin"; + configureFlags = [ "--libexecdir=$(out)/bin" ]; preFixup = '' wrapProgram "$out/bin/notify-osd" \ diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index e70be8201b34..bb53782fb7d2 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { https://wiki.openstreetmap.org/wiki/Osmfilter ]; platforms = platforms.unix; + license = licenses.agpl3; }; } diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 46e00a979900..ac985a5e4d2d 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, tmux, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, tmux, which, makeWrapper }: buildGoPackage rec { name = "overmind-${version}"; - version = "1.1.1"; + version = "2.0.0.beta1"; goPackagePath = "github.com/DarthSim/overmind"; nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux ]}" + wrapProgram "$bin/bin/overmind" --prefix PATH : "${stdenv.lib.makeBinPath [ tmux which ]}" ''; src = fetchFromGitHub { owner = "DarthSim"; repo = "overmind"; rev = "v${version}"; - sha256 = "0gdsbm54ln07jv1kgg53fiavx18xxw4f21lfcdl74ijk6bx4jbzv"; + sha256 = "15fch3qszdm8bj1m9hxky9zgk6f5gpbswwfslg84qdjf4iwr5drq"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 2c0d642863ed..45d83b5872fa 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { description = "A simple application for modifying PDF documents"; platforms = platforms.all; maintainers = with maintainers; [ obadz ]; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/pdfshuffler/default.nix b/pkgs/applications/misc/pdfshuffler/default.nix index e06f4407534b..025ad9cd30a1 100644 --- a/pkgs/applications/misc/pdfshuffler/default.nix +++ b/pkgs/applications/misc/pdfshuffler/default.nix @@ -36,5 +36,6 @@ python3Packages.buildPythonApplication rec { description = "Merge or split pdf documents and rotate, crop and rearrange their pages"; platforms = platforms.linux; maintainers = with maintainers; [ mic92 ]; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index a548c149665a..a17f34378a8b 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "pgmanage-${version}"; - version = "10.3.0"; + version = "10.3.1"; src = fetchFromGitHub { owner = "pgManage"; repo = "pgManage"; rev = "v${version}"; - sha256 = "105gmwkifq04qmp5kpgybwjyx01528r6m3x1pxbvnfyni8sf74qj"; + sha256 = "0ym1arla9wfkmr5n6h6dfyd680vlnng5s5j5nyxi2gl2wxqqhxzz"; }; patchPhase = '' diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 347b77c7ab4a..0c358e4221a1 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -1,33 +1,36 @@ { cairo, cmake, fetchgit, libXdmcp, libpthreadstubs, libxcb, pcre, pkgconfig -, python2 , stdenv, xcbproto, xcbutil, xcbutilimage, xcbutilrenderutil -, xcbutilwm, xcbutilxrm, makeWrapper +, python2, stdenv, xcbproto, xcbutil, xcbutilcursor, xcbutilimage +, xcbutilrenderutil, xcbutilwm, xcbutilxrm, makeWrapper # optional packages-- override the variables ending in 'Support' to enable or # disable modules , alsaSupport ? true, alsaLib ? null -, iwSupport ? true, wirelesstools ? null , githubSupport ? false, curl ? null , mpdSupport ? false, mpd_clientlib ? null , pulseSupport ? false, libpulseaudio ? null +, iwSupport ? false, wirelesstools ? null +, nlSupport ? true, libnl ? null , i3Support ? false, i3GapsSupport ? false, i3 ? null, i3-gaps ? null, jsoncpp ? null }: assert alsaSupport -> alsaLib != null; assert githubSupport -> curl != null; -assert iwSupport -> wirelesstools != null; assert mpdSupport -> mpd_clientlib != null; assert pulseSupport -> libpulseaudio != null; +assert iwSupport -> ! nlSupport && wirelesstools != null; +assert nlSupport -> ! iwSupport && libnl != null; + assert i3Support -> ! i3GapsSupport && jsoncpp != null && i3 != null; assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { name = "polybar-${version}"; - version = "3.2.0"; + version = "3.2.1"; src = fetchgit { url = "https://github.com/jaagr/polybar"; rev = version; - sha256 = "0p94brndysvmmbidhl4ds4w3qvddb752s4vryp0qckb0hz3knqk8"; + sha256 = "1z45swj2l0h8x8li7prl963cgl6zm3birsswpij8qwcmjaj5l8vz"; }; meta = with stdenv.lib; { @@ -44,14 +47,16 @@ stdenv.mkDerivation rec { buildInputs = [ cairo libXdmcp libpthreadstubs libxcb pcre python2 xcbproto xcbutil - xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm + xcbutilcursor xcbutilimage xcbutilrenderutil xcbutilwm xcbutilxrm (if alsaSupport then alsaLib else null) (if githubSupport then curl else null) - (if iwSupport then wirelesstools else null) (if mpdSupport then mpd_clientlib else null) (if pulseSupport then libpulseaudio else null) + (if iwSupport then wirelesstools else null) + (if nlSupport then libnl else null) + (if i3Support || i3GapsSupport then jsoncpp else null) (if i3Support then i3 else null) (if i3GapsSupport then i3-gaps else null) diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index e1a64c73a123..81e316eb0ee9 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; - patches = [ ./tw-version.patch ]; + patches = [ ./tw-version.patch ./json_c_is_error.patch ]; preFixup = '' wrapProgram "$out/bin/ptask" \ @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; maintainers = [ maintainers.spacefrogg ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/ptask/json_c_is_error.patch b/pkgs/applications/misc/ptask/json_c_is_error.patch new file mode 100644 index 000000000000..435c8b26e6f7 --- /dev/null +++ b/pkgs/applications/misc/ptask/json_c_is_error.patch @@ -0,0 +1,13 @@ +diff --git a/src/tw.c b/src/tw.c +index 602f7b3..ca601cd 100644 +--- a/src/tw.c ++++ b/src/tw.c +@@ -163,7 +163,7 @@ static struct json_object *task_exec_json(const char *opts) + + free(cmd); + +- if (o && is_error(o)) ++ if (!o) + return NULL; + + return o; diff --git a/pkgs/applications/misc/qradiolink/default.nix b/pkgs/applications/misc/qradiolink/default.nix new file mode 100644 index 000000000000..4029bd80b88b --- /dev/null +++ b/pkgs/applications/misc/qradiolink/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchFromGitHub, alsaLib, boost +, qt4, libpulseaudio, codec2, libconfig +, gnuradio, gnuradio-osmosdr, gsm +, libopus, libjpeg, protobuf, qwt, speex +} : + +let + version = "0.5.0"; + +in stdenv.mkDerivation { + name = "qradiolink-${version}"; + + src = fetchFromGitHub { + owner = "kantooon"; + repo = "qradiolink"; + rev = "${version}"; + sha256 = "0xhg5zhjznmls5m3rhpk1qx0dipxmca12s85w15d0i7qwva2f1gi"; + }; + + preBuild = '' + cd ext + protoc --cpp_out=. Mumble.proto + protoc --cpp_out=. QRadioLink.proto + cd .. + qmake + ''; + + installPhase = '' + mkdir -p $out/bin + cp qradiolink $out/bin + ''; + + buildInputs = [ + qt4 + alsaLib + boost + libpulseaudio + codec2 + libconfig + gsm + gnuradio + gnuradio-osmosdr + libopus + libjpeg + protobuf + speex + qwt + ]; + + meta = with stdenv.lib; { + description = "SDR transceiver application for analog and digital modes"; + homepage = http://qradiolink.org/; + license = licenses.agpl3; + maintainers = [ maintainers.markuskowa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index b13bc4cb7af2..e3a3a5e80d68 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pythonPackages, file, less +{ stdenv, fetchFromGitHub, python3Packages, file, less , imagePreviewSupport ? true, w3m ? null}: with stdenv.lib; assert imagePreviewSupport -> w3m != null; -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { name = "ranger-${version}"; version = "1.9.1"; @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { sha256= "1zhds37j1scxa9b183qbrjwxqldrdk581c5xiy81vg17sndb1kqj"; }; - checkInputs = with pythonPackages; [ pytest ]; + checkInputs = with python3Packages; [ pytest ]; propagatedBuildInputs = [ file ]; checkPhase = '' diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index c6d3d6e1a9d5..b8c49cb02a69 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -61,6 +61,15 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; + # the geoclue agent may inspect these paths and expect them to be + # valid without having the correct $PATH set + postInstall = '' + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift' "Exec=$out/bin/redshift" + substituteInPlace $out/share/applications/redshift.desktop \ + --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk" + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/rtl_433/default.nix b/pkgs/applications/misc/rtl_433/default.nix index 819c6c9391a9..7097dda35740 100644 --- a/pkgs/applications/misc/rtl_433/default.nix +++ b/pkgs/applications/misc/rtl_433/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1, rtl-sdr }: stdenv.mkDerivation rec { - version = "2018-02-23"; + version = "18.05"; name = "rtl_433-${version}"; src = fetchFromGitHub { owner = "merbanan"; repo = "rtl_433"; - rev = "51d275c"; - sha256 = "1j443wmws5xgc18s47bvw3pqljk747izypz52rmlrvs16v96cg2g"; + rev = "18.05"; + sha256 = "0vfhnjyrx6w1m8g1hww5vdz4zgdlhcaps9g0397mxlki4sm77wpc"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index be27e28c9938..05b19bbbff9c 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -2,14 +2,14 @@ with python3Packages; buildPythonApplication rec { - version = "1.23.0"; + version = "1.24.0"; pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; repo = "rtv"; rev = "v${version}"; - sha256 = "0i6iqj3ly1bgsfa9403m5190mfl9yk1x4ific3v31wqfja985nsr"; + sha256 = "0vzhnqys8nr6ymsi1mnv092z3i7nwyhgnj4jv6mjifak9j3164fw"; }; # Tests try to access network diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 4ee9f461760c..0e59ef5512d8 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation (rec { downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; maintainers = [ ]; platforms = platforms.unix; + license = licenses.gpl3; }; }) diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 55153d25cf98..afe944e868e7 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -1,11 +1,13 @@ -{fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}: +{fetchFromGitHub, stdenv, gtk3, python34Packages, gobjectIntrospection}: python34Packages.buildPythonApplication rec { - name = "solaar-${version}"; - version = "0.9.2"; + name = "solaar-unstable-${version}"; + version = "2018-02-02"; namePrefix = ""; - src = fetchurl { - sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j"; - url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz"; + src = fetchFromGitHub { + owner = "pwr"; + repo = "Solaar"; + rev = "59b7285fdfc875119f0c92cfd5f5909e8a8e578c"; + sha256 = "0zy5vmjzdybnjf0mpp8rny11sc43gmm8172svsm9s51h7x0v83y3"; }; propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3]; @@ -35,6 +37,6 @@ python34Packages.buildPythonApplication rec { license = licenses.gpl2; homepage = https://pwr.github.io/Solaar/; platforms = platforms.linux; - maintainers = [maintainers.spinus]; + maintainers = [maintainers.spinus maintainers.ysndr]; }; } diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index 2b0573f2d2d1..6b38c3d59c29 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -44,12 +44,12 @@ stdenv.mkDerivation rec { HOME=$TMPDIR ''; - configureFlags = " - --without-arts --disable-docs - --x-includes=${libX11.dev}/include - --x-libraries=${libX11.out}/lib - --with-qt-dir=${qt3} - "; + configureFlags = [ + "--without-arts" "--disable-docs" + "--x-includes=${libX11.dev}/include" + "--x-libraries=${libX11.out}/lib" + "--with-qt-dir=${qt3}" + ]; preInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index e44690a5bd79..bf0e964d591f 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -38,5 +38,6 @@ stdenv.mkDerivation rec { description = "A ncurses wrapper around taskwarrior"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; # Cannot test others + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 560dff594275..abcd5eb42888 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,55 +1,42 @@ -{ stdenv, fetchFromGitHub, lib, pkgconfig, vte, gtk3, ncurses, makeWrapper, wrapGAppsHook, symlinkJoin -, configFile ? null -}: +{ stdenv, fetchFromGitHub, pkgconfig, vte, gtk3, ncurses, wrapGAppsHook }: -let +stdenv.mkDerivation rec { + name = "termite-${version}"; version = "13"; - termite = stdenv.mkDerivation { - name = "termite-${version}"; - src = fetchFromGitHub { - owner = "thestinger"; - repo = "termite"; - rev = "v${version}"; - sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; - fetchSubmodules = true; - }; + src = fetchFromGitHub { + owner = "thestinger"; + repo = "termite"; + rev = "v${version}"; + sha256 = "02cn70ygl93ghhkhs3xdxn5b1yadc255v3yp8cmhhyzsv5027hvj"; + fetchSubmodules = true; + }; - # https://github.com/thestinger/termite/pull/516 - patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch - ] ++ lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + # https://github.com/thestinger/termite/pull/516 + patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch + ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; - makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; + makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; - buildInputs = [ vte gtk3 ncurses ]; + buildInputs = [ vte gtk3 ncurses ]; - nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; + nativeBuildInputs = [ wrapGAppsHook pkgconfig ]; - outputs = [ "out" "terminfo" ]; + outputs = [ "out" "terminfo" ]; - postInstall = '' - mkdir -p $terminfo/share - mv $out/share/terminfo $terminfo/share/terminfo + postInstall = '' + mkdir -p $terminfo/share + mv $out/share/terminfo $terminfo/share/terminfo - mkdir -p $out/nix-support - echo "$terminfo" >> $out/nix-support/propagated-user-env-packages - ''; + mkdir -p $out/nix-support + echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + ''; - meta = with stdenv.lib; { - description = "A simple VTE-based terminal"; - license = licenses.lgpl2Plus; - homepage = https://github.com/thestinger/termite/; - maintainers = with maintainers; [ koral garbas ]; - platforms = platforms.all; - }; + meta = with stdenv.lib; { + description = "A simple VTE-based terminal"; + license = licenses.lgpl2Plus; + homepage = https://github.com/thestinger/termite/; + maintainers = with maintainers; [ koral garbas ]; + platforms = platforms.all; }; -in if configFile == null then termite else symlinkJoin { - name = "termite-with-config-${version}"; - paths = [ termite ]; - nativeBuildInputs = [ makeWrapper ]; - postBuild = '' - wrapProgram $out/bin/termite \ - --add-flags "--config ${configFile}" - ''; - passthru.terminfo = termite.terminfo; } diff --git a/pkgs/applications/misc/termite/wrapper.nix b/pkgs/applications/misc/termite/wrapper.nix new file mode 100644 index 000000000000..0b12a905360c --- /dev/null +++ b/pkgs/applications/misc/termite/wrapper.nix @@ -0,0 +1,15 @@ +{ makeWrapper, wrapGAppsHook, symlinkJoin, configFile ? null, termite }: + +if configFile == null then termite else symlinkJoin { + name = "termite-with-config-${termite.version}"; + + paths = [ termite ]; + nativeBuildInputs = [ makeWrapper ]; + + postBuild = '' + wrapProgram $out/bin/termite \ + --add-flags "--config ${configFile}" + ''; + + passthru.terminfo = termite.terminfo; +} diff --git a/pkgs/applications/misc/toggldesktop/TogglDesktop.pro b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro new file mode 100644 index 000000000000..e86156313d1f --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/TogglDesktop.pro @@ -0,0 +1,19 @@ +QT += core network widgets + +DEFINES += APP_ENVIRONMENT=\\\"production\\\" +DEFINES += APP_VERSION=\\\"@version@\\\" + +TARGET = toggldesktop +TEMPLATE = app + +SOURCES += *.cpp +HEADERS += *.h +FORMS += *.ui +RESOURCES += *.qrc + +target.path = $$PREFIX + +INSTALLS += target + +CONFIG += link_pkgconfig +PKGCONFIG += bugsnag-qt qxtglobalshortcut qt-oauth-lib toggl x11 xscrnsaver diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix new file mode 100644 index 000000000000..bc36ffa5e101 --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -0,0 +1,148 @@ +{ stdenv, fetchzip, buildEnv, makeDesktopItem, runCommand, writeText, pkgconfig +, cmake, qmake, cacert, jsoncpp, libX11, libXScrnSaver, lua, openssl, poco +, qtbase, qtwebkit, qtx11extras, sqlite }: + +let + name = "toggldesktop-${version}"; + version = "7.4.231"; + + src = fetchzip { + url = "https://github.com/toggl/toggldesktop/archive/v${version}.tar.gz"; + sha256 = "01hqkx9dljnhwnyqi6mmzfp02hnbi2j50rsfiasniqrkbi99x9v1"; + }; + + bugsnag-qt = stdenv.mkDerivation rec { + name = "bugsnag-qt-${version}"; + version = "20180522.005732"; + + src = fetchzip { + url = "https://github.com/yegortimoshenko/bugsnag-qt/archive/${version}.tar.gz"; + sha256 = "02s6mlggh0i4a856md46dipy6mh47isap82jlwmjr7hfsk2ykgnq"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase ]; + }; + + qxtglobalshortcut = stdenv.mkDerivation rec { + name = "qxtglobalshortcut-${version}"; + version = "f584471dada2099ba06c574bdfdd8b078c2e3550"; + + src = fetchzip { + url = "https://github.com/hluk/qxtglobalshortcut/archive/${version}.tar.gz"; + sha256 = "1iy17gypav10z8aa62s5jb6mq9y4kb9ms4l61ydmk3xwlap7igw1"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase qtx11extras ]; + }; + + qt-oauth-lib = stdenv.mkDerivation rec { + name = "qt-oauth-lib-${version}"; + version = "20180521.233208"; + + src = fetchzip { + url = "https://github.com/yegortimoshenko/qt-oauth-lib/archive/${version}.tar.gz"; + sha256 = "0f46d44slzvzaqx0lksvv14lsc1jp8vd2mragxd61r820hybf5z3"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase qtwebkit ]; + }; + + poco-pc = writeText "poco.pc" '' + Name: Poco + Description: ${poco.meta.description} + Version: ${poco.version} + Libs: -L${poco}/lib -lPocoDataSQLite -lPocoData -lPocoNet -lPocoNetSSL -lPocoCrypto -lPocoUtil -lPocoXML -lPocoFoundation + Cflags: -I${poco}/include/Poco + ''; + + poco-pc-wrapped = runCommand "poco-pc-wrapped" {} '' + mkdir -p $out/lib/pkgconfig && ln -s ${poco-pc} $_/poco.pc + ''; + + libtoggl = stdenv.mkDerivation { + name = "libtoggl-${version}"; + inherit src version; + + sourceRoot = "source/src"; + + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ jsoncpp lua openssl poco poco-pc-wrapped sqlite libX11 ]; + + postPatch = '' + cat ${./libtoggl.pro} > libtoggl.pro + rm get_focused_window_{mac,windows}.cc + ''; + }; + + toggldesktop = stdenv.mkDerivation { + name = "${name}-unwrapped"; + inherit src version; + + sourceRoot = "source/src/ui/linux/TogglDesktop"; + + postPatch = '' + substituteAll ${./TogglDesktop.pro} TogglDesktop.pro + substituteInPlace toggl.cpp \ + --replace ./../../../toggl_api.h toggl_api.h + ''; + + postInstall = '' + ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/cacert.pem + ''; + + nativeBuildInputs = [ qmake pkgconfig ]; + + buildInputs = [ + bugsnag-qt + libtoggl + qxtglobalshortcut + qtbase + qtwebkit + qt-oauth-lib + qtx11extras + libX11 + libXScrnSaver + ]; + }; + + toggldesktop-icons = stdenv.mkDerivation { + name = "${name}-icons"; + inherit (toggldesktop) src sourceRoot; + + installPhase = '' + for f in icons/*; do + mkdir -p $out/share/icons/hicolor/$(basename $f)/apps + mv $f/toggldesktop.png $_ + done + ''; + }; + + toggldesktop-wrapped = runCommand "toggldesktop-wrapped" {} '' + mkdir -p $out/bin && ln -s ${toggldesktop}/toggldesktop $_ + ''; + + desktopItem = makeDesktopItem rec { + categories = "Utility;"; + desktopName = "Toggl"; + genericName = desktopName; + name = "toggldesktop"; + exec = "${toggldesktop-wrapped}/bin/toggldesktop"; + icon = "toggldesktop"; + }; +in + +buildEnv { + inherit name; + paths = [ desktopItem toggldesktop-icons toggldesktop-wrapped ]; + + meta = with stdenv.lib; { + description = "Client for Toggl time tracking service"; + homepage = https://github.com/toggl/toggldesktop; + license = licenses.bsd3; + maintainers = with maintainers; [ yegortimoshenko ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/toggldesktop/libtoggl.pro b/pkgs/applications/misc/toggldesktop/libtoggl.pro new file mode 100644 index 000000000000..c8303440fe67 --- /dev/null +++ b/pkgs/applications/misc/toggldesktop/libtoggl.pro @@ -0,0 +1,20 @@ +TARGET = toggl +TEMPLATE = lib + +SOURCES += *.cc +HEADERS += *.h + +headers.files = $$HEADERS +headers.path = $$PREFIX/include +target.path = $$PREFIX/lib + +INSTALLS += headers target + +CONFIG += create_prl create_pc link_pkgconfig +PKGCONFIG += jsoncpp openssl lua poco sqlite3 x11 + +QMAKE_PKGCONFIG_NAME = $$TARGET +QMAKE_PKGCONFIG_PREFIX = $$PREFIX +QMAKE_PKGCONFIG_LIBDIR = $$target.path +QMAKE_PKGCONFIG_INCDIR = $$headers.path +QMAKE_PKGCONFIG_DESTDIR = pkgconfig diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index 8e8a22ed4e41..15c4b8185a22 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "translate-shell"; - version = "0.9.6.7"; + version = "0.9.6.8"; src = fetchFromGitHub { owner = "soimort"; repo = "translate-shell"; rev = "v${version}"; - sha256 = "0krcidjh32xwybr1v4nykgf0jjnffjqx125bvn3jh2a44cikyq3n"; + sha256 = "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index 020aa963541e..0667ec49b328 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/sboli/twmn; platforms = with stdenv.lib.platforms; linux; maintainers = [ stdenv.lib.maintainers.matejc ]; + license = stdenv.lib.licenses.lgpl3; }; } diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix index 7bf9aca029b9..56da0cf22efe 100644 --- a/pkgs/applications/misc/urh/default.nix +++ b/pkgs/applications/misc/urh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urh-${version}"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "jopohl"; repo = "urh"; rev = "v${version}"; - sha256 = "0ncvfl5iyngw3lr2g7awpskrrld6y0x7w0xyp827lcr7x73fvqgp"; + sha256 = "1iq84590cjpf2rlxb60fy4hxi7vir27bbb10axbwrqwnp5cc4bql"; }; buildInputs = [ hackrf rtl-sdr ]; diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index c3071647c40a..5f5754a66053 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "urlscan"; - version = "0.8.7"; + version = "0.8.9"; src = fetchFromGitHub { owner = "firecat53"; repo = pname; rev = version; - sha256 = "1jxjcq869jimsq1ihk2fbjhp5lj7yga0hbp0msskxyz92afl1kz8"; + sha256 = "18wvfayib79lylv3g9ay3f85qanhrljvnfarwl9snfzklj4gkf2v"; }; propagatedBuildInputs = [ python3Packages.urwid ]; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index d090878f9768..b7d0b330e85b 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome-doc-utils, libexif, libxml2, libxslt, scrollkeeper -, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: +, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "viking-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ makeWrapper intltool gettext gtk2 expat curl gpsd bc file gnome-doc-utils - libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite + libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite hicolor-icon-theme ]; configureFlags = [ "--disable-scrollkeeper --disable-mapnik" ]; diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 71d95e138927..a2e3fa13fc6a 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -17,8 +17,10 @@ stdenv.mkDerivation rec { ''; # Needs the path to `tclConfig.sh' and `tkConfig.sh'. - configureFlags = "--with-tcl=" + tcl + "/lib " + - "--with-tk=" + tk + "/lib"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + ]; postInstall = '' wrapProgram $out/bin/wishwn --set TK_LIBRARY "${tk}/lib/${tk.libPrefix}" diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index ee07401d4846..ee4300cde0f5 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { name = "xca-${version}"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "chris2511"; repo = "xca"; rev = "RELEASE.${version}"; - sha256 = "0906xnmqzd9q5irxzm19361vhzig9yqsmf6wsc3rggniix5bk3a8"; + sha256 = "039qz6hh43hx8dcw2bq71mgy95zk09jyd3xxpldmxxd5d69zcr8m"; }; postPatch = '' @@ -23,8 +23,6 @@ mkDerivation rec { enableParallelBuilding = true; - configureFlags = [ "CXXFLAGS=-std=c++11" ]; - meta = with lib; { description = "Interface for managing asymetric keys like RSA or DSA"; homepage = http://xca.sourceforge.net/; diff --git a/pkgs/applications/misc/xmove/default.nix b/pkgs/applications/misc/xmove/default.nix index 32729d57475f..e461a2c8816a 100644 --- a/pkgs/applications/misc/xmove/default.nix +++ b/pkgs/applications/misc/xmove/default.nix @@ -14,5 +14,6 @@ stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index aa36ccd49e23..292e4e5ba38b 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - name = "xterm-333"; + name = "xterm-335"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${name}.tgz" "https://invisible-mirror.net/archives/xterm/${name}.tgz" ]; - sha256 = "0y7gl26mxw6kwqx9j9mi6lx1lp1v3nrlga19ddn07j2m9q0l479g"; + sha256 = "15nbgys4s2idhx6jzzc24g9bb1s6yps5fyg2bafvs0gkkcm1ggz0"; }; buildInputs = diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 775ae960eb7d..84c4e6202625 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -98,11 +98,11 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "30.0.0.134"; + version = "30.0.0.154"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "1g6695w1ijqs8jbkbrb403ca1vvrf298ayvxslrvk70x6l7lp2ys"; + sha256 = "0bi9b6syx7x2avixgjwanrvynzanf89xm2g3nxazw9qgxxc1cp48"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 7f2f4387da54..89b6a7ce3121 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 = "193sz96jrygixgzkaxx1vrpkhmnr6c7yzhsvv4p1qn0jymh2xd57"; - sha256bin64 = "0wwmfsxbphxqfw4g6jgxlr0p32vjf4h8yfd5zz36xpa79dryb8sv"; - version = "68.0.3440.68"; + sha256 = "0w5k1446j45796vj8p6kv5cdrkrxyr7rh8d8vavplfldbvg36bdw"; + sha256bin64 = "0a7gmbcps3b85rhwgrvg41m9db2n3igwr4hncm7kcqnq5hr60v8s"; + version = "69.0.3497.32"; }; dev = { - sha256 = "102lqnl2m9cbcql6sghib1504fyicx7cgv0jkfx863jpzhrfrkcv"; - sha256bin64 = "1y3iy25b3cck7kz5g913z64x1wdj1znqbn049g8h82x3krp76bgx"; - version = "69.0.3497.12"; + sha256 = "15gk2jbjv3iy4hg4xm1f66x5jqfqh9f98wfzrcsd5ix3ki3f9g3c"; + sha256bin64 = "1lir6q31dnjsbrz99bfx74r5j6f0c1a443ky1k0idbx6ysvr8nnm"; + version = "70.0.3521.2"; }; stable = { - sha256 = "0hcmnn72xj9p3y77cb6cnr1vz81hiqmksdi6nw7xqfw5cwr7h5yw"; - sha256bin64 = "0pa49yxj9s41mzhik7jixr4hwqanf31yzr1fsc6y5hkadbj7rwij"; - version = "68.0.3440.75"; + sha256 = "1676y2axl5ihvv8jid2i9wp4i4awxzij5nwvd5zx98506l3088bh"; + sha256bin64 = "0d352maw1630g0hns3c0g0n95bp5iqh7nzs8bnv48kxz87snmpdj"; + version = "68.0.3440.106"; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 73094767bf3d..671ab03a2e29 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; - configureFlags = "--enable-ssl"; + configureFlags = [ "--enable-ssl" ]; meta = with stdenv.lib; { homepage = https://www.dillo.org/; @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { ''; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; + license = licenses.gpl3; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index f217d853f0b9..47389e21328d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b10"; + version = "62.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "141e5f280b13c1440012f6b796cc361e3b5a29bd3301a18ee13ca4b860e21b8c5ff8e6640cd2c57c577d4f4ba3922bd89d96dcd9dcde8f7090238d663604461c"; + sha512 = "7e32f8fae2e8a863fabed1ca2da1d13d89873aa6450687021cf77fbdf8b8f7a589590ffe7dfb20fc6f4fda8bfd21cbb50e7d2ceb1fcebb32765926e85532a56c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "dec1fc688e936e24e390436d881eb2adebede9eede6ec5b15c7732413d7eaf545d5f93e5515f4e216aea8ee26d5ada2f02ab8f45fe045669659089839a3d2de4"; + sha512 = "b20b67c44eca5b615febb4983479f3ae4d8ebcc2b014b30445974d3a0f47672439f2121f4665cabc8ecefc955ee6f70651af24d46c7f324f898715565ba49864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3c25a7ca65184198ae3618047fc9f7592164367926492da6839e50ef2f72866bade1f44e9991fa817503b1a6b02a5d7400339ba330018e21f6fe863f6b7f389b"; + sha512 = "120ee79642bb4695b9b7ca7c1bf21e6774031be52a271da7042f6c45710d2bcf4405a4bb322245814c82c8f891067cc39309c69c5a61b40b908eedd804d9fdfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7d7edb00be607d01ed2e4dd50027b2839e4abeb26a89b4d85a2581545c8cd43002ec116e2073ffeaaf98b6c76fe185ed836e49aff2a2bab6f2e486dad55bf5da"; + sha512 = "85f16989d0f80aa21df59270d98306eaf260fd74c3e28c00a15f546c5fef9eabb39a079645cfb7c51b1edeec63433cd62d8871d75728489220a3def049b47b78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "0a8d24f7c1b67b97d511f545a108dcacad9a1c1ec5004a1f1f6571551c52c14e9f98b341a61d4a13e6e26490a3c74fcb1608ab9dbb260d5f1e4d421fc71bfab9"; + sha512 = "2a7d134b7f50d8ada8772daed52825f008a5efa7759de29393c6fe578c03e5952221fd9108e751671d3849492e2a567c1f1cd614d356fded4b3b11a7dd21a4e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "5123dcd2f0d4dafbedf3efdac669ed9f3837e092d53f23a6b4802b83e8f61b401f03e41911645125138bd09da1c3f575c053b86cc27bad78ad49dedebaa79ce6"; + sha512 = "522785be0747916af7d77cf93a5d9c8917f7b0b244497ee2dde9c2abdc49ab1bf916393865211db42b2118086b0e114d228ef8ecb95384bdc2818f08487c6a57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "aef97cda7e502651e88fa2099d39420da38ba06093516946223940fb18ea0fe52e0e5c83d1a7234003d70280320c40a83bd7e4a3329dd5c92e7b97144d884595"; + sha512 = "1bb6022ffeb6d0c6f263dc2bb2e111733baa00a7a06e0830a0e8103505a016a68c3b88244fe6f1764dab12c9b7682eebd547b62c38d3cd974fd4a0ede49a63b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "d6e04dce19047627906d38362012de87f6f64f919de2f1d23e60d4c686d1a7434290710def14a2cf3e932876949f64e74be3de1ab5318ef1a6118d32b916850a"; + sha512 = "8197ecf380fcadda666d71cdb45eef73dae713b73268fca1f1f3cab152c08cf4f8f923c5878d5f4e07c55ecc564080db31f64d8ad26ec2ad9bf1c0bde47b3b18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "8f2fcd0777da4d0bebee0151fcef871db78512cfebfb1ee3bcabf069e14134ff56734fa784fee12160f8a2ad3d12bb4f524b831169a916713b5ba5ea1324ce3a"; + sha512 = "e6039c1291ebd11c37ac233f105778e8bb19b3b7e3fe9622a01c6a9f3bdbeff74b24569284b7083da29febda260fa71429ac105f656e4c9f599deb132f497cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "63e81570ab71eaf477a661f7f6484de53ac7200395ce2ccaac7b73d6f28f73abda7f4c100b6c65da39e075c0d63f7e3a3636832d0469a252c9aee1cc5e36ba95"; + sha512 = "5d9a8af84b4944fb962da196ec065349b2109461506630625211d234ce7339e47bdcefdbf1c590a14c21cf740c10f31c1b5e6bf374dd696ecf2bbf5bbbeb232e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "011c335a62dd7cdcfe1000f616bdc7b826437e09134b1773c5380d05d68b6e32f33ea0ea7d75b132a6098d676c5326ec33f35f5ae6acdf125e5cf607f803718f"; + sha512 = "df7d1ccc455bbb55358da614f72ad878bb28f882ef82e2a007b743ce94f218cf3f469ac0b7ee968814e9fe87dac1c5c41b8b380f76f78f358e621077b2266a98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "a3f052252ab65fb284ade27c67ef55eeb7bc0f78a8a8dca539e356617fcd3144946c55c08eae2aa09a8337cf3ec2063f21e2d976248b647ae26cc159bdfc9e83"; + sha512 = "ee172b89d05b727d895998c42af19d7d5a1f9040bdaf323a780dbe9b39937ccd91a721409ef34276cbf81fe3bb0a43bc6534335fb68bb38de8f50194fccc887f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "30473eab751e7af94478b9a79af008a33a1a7438c85db0f46d96a5848a707cd511a82d67c91bd4bfdfb473c6bf8228ee0375ba58395c82b56b6b4fa5a714d3d0"; + sha512 = "2ea8db7e182744d607d683aa55a482ce0da78d3c035b841597c8d7382cdf843e3afe274cc82b97b3244e5306f03b7b34f1964e772bfbdaa42cf98bd960d45872"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "424486171233702a57601d16f1706175bbc4d32bafb7786a4d01226ff16c1da0a7f3df08343c317e9dd2da3f7aa4ef65e3545265271f7303b65e35deda0a8d20"; + sha512 = "aa0b2eabba996fd8073a09898a9e42f2d5c8fabd81ed02bd74a14bc5d9f9e00ea4f20dc647f461e5bd44b8783f12449de6407c440a6435796610ddd709fe4578"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "0ee06e265f188696f0f73047cc1b8b25df9e4d6940b6d907d9a8cbd241dfcdbb75013a7f9300d29b07144a92ad509d87637807f19d1235c4886d5ff4ccab5fc0"; + sha512 = "e93b043f81d8f3e559f732b2b667774fabbee643a5ebc8fd6fdbaf1ffbdf33b8bb0d85035f2233a40da2c611cfeb7740230bf53de57bc4db65bb96046d29eb1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "50678ddbcd6064dd2295496aac5ff3e8e563531163fea9dad4c25601c755680ddb50c06f5ca038167c0f8af0d6f003cd578eea90314d8f7628b5057f7a9631d5"; + sha512 = "6fa2edd2ed70b4ed8a37e3b5e61f1130bb2c69c5a34b03d2a28d7840834c0db51ba7239be548dc792df03f4832344376bfea9dc542fbd8771a10bb5ef05968eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6a3b71137b1a11824fbcf5e1585c12edf8f43fa25b725bdd0658336c9f89c7c8b73b0598165b22b28be77296d889fc006c4bc13a505fa9716296775a95cfc1fc"; + sha512 = "dc4f02881550ce4f77cbb66c7f3033c41d0697c5d86b8ee52396955b3d3f81fb870c60f82728cc4a8d7e647af7f08c1deda4d1f30b8c140c58786576c3460d56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b86d5c201bef12e50cad61046f15c06c0641e686134ab1d698147538a766bb01081f1430afe509a7fbdecc70daab983175151968639078df6af1cdae2f92a01e"; + sha512 = "df887b8627e3587fd1fa94055a9e39bd3b42ff5d0d9b2d3ad761a674700c0081f769fded2e9b5262316c81020d4ad58b421185851fbb1c770a023ff94b2b26c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "2d3abad249aa1e20f45a448f66a515debefcd410be48a952be46c8a75b8ec7afff528a9353fb3ed11497891d2646df3edc5be8bb231bd2e41c24da4598ccf377"; + sha512 = "6195000ee4013587a2f4cceb368b8283a99094f2617b0a350c62ec3e562a049b49c01691a876dbfce77c7d26c3354c00b9340bb0f8fe822000f012fecf19b842"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "1648fceab23c77fa0fc39b95e0cc52f501a82ea1bc5f3feaa431ae8ea934db155bbde0dba32802c2233422c230befb1062a959a37b73343cff73712faa047c7c"; + sha512 = "c44a694a85b2f443faa78fbd2ca9cbbd94a91fe1f33c2438a0d027767896f842edbbe668bfeaa9f79a00e98d7ad89b45173273a13b9b0825952f39ffac256397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e6158fa1919f6929a3ca870ffa85c372f78e9d0f949d61852d7c12a5876c257b853dfb709983297a139d61a47a6de8ccbcdd770898a5db924b83ceb102295fd4"; + sha512 = "f20f82982b59b223e8bd2f62c6c0fd38517799cb425619104e38e28526aec8b21eefb9b76fe9f6c7be6282a902144ccbf1033cfdc2202d927336cbac9d9c8c58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "2212ea13768d65fbc05341e0e1763874aad3731b35f342289e82bb9de1f539044049a0c66b5b94be6daec35993671ee8c1e06e4097c0f22ae9e6561b0baeba29"; + sha512 = "163c3cb96fd01bfe1cf06f3f725f612f966903ed64f8f924008288e040402e252a490b7153b9a916040c25c074856b179eae4a89d511f4d7bc73dcd985367406"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "09405b6e4cefae4cd61a9cdc05f5b69584771c4eeb5a211ae278ad7b9eaf67ff493c62065e5ef4544abc3ed509c53c665163bc5fbb3cc95eecf09df1f6a222e6"; + sha512 = "147b7d01424a53245d0f73440961280bdcbca765b2580594db60fb0a398daa483f913d799543e97903393dec2e09d66ae437f1ce2d64a70c6ec74fe0017511d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "69208896166416d4e9dcb528053d7bcad796912d564c3b6a265dee4425eaea910a14fde18dcac8dc615f5f4477c1c62bc500bd50caafe53022238097bbf2312f"; + sha512 = "e822437b28e12d38bd701afab12c77d3667bb30e40420db8bee9e7ab85a77b8e3fbf00300ec2711753b25503aa7d2fb870c646ce652335cdde9fca436e04324d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "00c6f274b35b38e68bd8745437e73458851145fd5a5797e8e90d11a9f8d373e0832e337ec4e77cd76ec5713a97b3d7e8a400d65c91f60b704881ce410d4305ab"; + sha512 = "f0a5a20d9f99ab7815834ef58ded2900f32bfc84f998894b0098e22e33eb192f906c6d8eb95aa6f16e23df6413a841c681284796a85af85d9d8787c9dcd20b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "0d5ad1a42c1a95bb7c7025bd41ef1c8edcbb30f8ac97894e6881db4249fcaff4c1fb4b669d5c201e871af15087fe1155bb769af5c99851127f240d694e8f8f6a"; + sha512 = "722e579e85603f959488b98c45904e65f87d424d914b90df79e1e763cc84602d03dc25891c46c7ff2abb37f296c97193f08e6f90de01b64cc15b6da48678da6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "290d020b458546f2c70098555d0a76eb49acf8c8f57e2ee64d3eb640a503af2488cfd7d6a99d033993d742c030c15385d6cd111267bb4cd8d40d277e6f34fd43"; + sha512 = "f0533cc71133daaf7de1fb200b7f6394e8cf7aa0113f4816096674b588c1d393381cea1607e94311a85621bc58197a923af2772a32b424966b1e5187c9a3aec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "a258208143404590fbf367f554169f441a3e626dd100e9145de0d3777f7598fe2f404a945bcbeede4743535763d19c619a221b3774004327e315a61e565f7a28"; + sha512 = "a12837c9698e04b697fee3b7fbbfba1d69ec795b80bd05e64e0db90e53faded0201fdf9808c8302b7b5cd15c1dc8f092a9a3ad2084da7de58dc1248e03c2f5bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "daa7a7f23935aba9b156dea9597d65386b95146a47872ad74213c188360eddb03b630b143866b37e6ffae7f271dc72a27f0d84c71c6cf73c48aaa686696416f6"; + sha512 = "8ed88af39e201686a3c2f6bb42690726b1fb727d1978568f9968d588272f0c90565f69c2ba39ff0d24ea7855206d1ed6b8cb924e5079007ac205ca9962222af0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "208d9d9a53ffb8daf32a35e3500765a2c700847afa70dd355fff2c6242165ddd35b0044bc8512bd5fc4ddf8a8422a109833f8bcc15f0b6349464984126094749"; + sha512 = "aa40c774af32560d751b938bd002a42dc144de9ab1f2f250e8c19fd564a5087d635662a50c052b14cdcb845a682b25c805b0ea54b7957dc0f36ca9b26803a081"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "6e68b76b140b2823d5bbca1c6705b2f71b01cc66c6296e28674e85f8294d6a663e27d2e2f92a150be5f79457e7b542963fce45b0146323f736c221eebf199dd1"; + sha512 = "43599868abe6827f8f17cc01157c5ab0a942654be65ad9285282da314dad3e22210a98b3039e8f35e9e3db49af0a18551c4f98f0b2bb1829a3987f0e00d525f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f916ae9cb531aa5bd217ede28bf09495c989f8e833d66562fa2cfb9e26edc600fbbefefd59aed117dbc0e292ebab5bcf62b39aee6daff37050353945a7602309"; + sha512 = "a9f7cbc0253b10430c0c24648fb2ed5a0a20504ba306e1247a432f7d77d8b2ec9ad9ec2cd3c28079733e4b9ebddfe7488b1db8e3a835f1404e6b579066384d2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "0e9b6e7c98a91d90b885378ca7281124f9b53b2e139d6238d75da1e118358703dcf882261cf2c85350c372f5439e629dfd75fb1759138fd69fe63ddc0b09e4eb"; + sha512 = "51135e2c5303d0d237a7b1016cec133bc2c490ace618eee703a49c0c9dd9f08a8af563a6a864ebc985b8962645f05750690e3a554da2194de42dae397ab97d1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "02c6cd4956391a935d663393ea1af8f97721e5417d0747b3b0ede403e7376503a4628bf600ad7849b289fb6e6940e5f0ab048862b1f20d4d8f7a593d6abf9d18"; + sha512 = "64b32c975093e936e938daca63944ab118df082d04f84567beb081b413844181d574dac1d858084f33abc4bb79d3c154f661775ec0918a052ca59ab2679ecd0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a0baa3de6c78bf8acb655c0b30585abdf4a886945b7e97389e80eb3372fdeee4e01c0c376508bafbe7727bc6df8058472616afa395f79535b67763d8f2559ad2"; + sha512 = "a4510c29801a4ca7609ab61dc1429a1f3034a61544a9a59ef4d8b64db7269f8d6f9c25f500a13da4af7741d035a7b29e064da457aa8c3beaea57e8b134ce66ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0c9e076c1e7c563cdca8aa80cd097cd2b232276fb14ed56b28ae56ebb26f8d5ca1c720784b44dad860f0b86f17fc2c53888d59b0aa6495c2d8cbd82703c0db9a"; + sha512 = "09547877fdb386abd306081d764df6aa4ccc0218aff9f84453f97e79609004bfee2f3d702fcbaef5eaad1194acac7788514da21903dbfa59d5bb54d70bf705aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3c262e88505932ef95d45530d822e1331ba63a8a7f54f04bf17f3a53bf28bb91ee42ff76318a582f58227b61ca1ca9c1780da9a257c5a51a0494ba59467a33b2"; + sha512 = "a9d150098a3adeb0a88587e66594c297ea3b16d17a4c7331707ed94ab6c0565c9a9045d5cd863a97ff2d98464bc728701501fe57a50fd7ce6e3d36697be1fc58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9baeabfd553b98b4c53ba02a58524b2c1ec07cce92b9e51edabc2583d3ad8bc525376b2604330bcb6764bc62830dacf641e3de82916a6df0003ee0b52072f46c"; + sha512 = "babe69b1a9b9a469db354546822c9fddb52e17fb6aa196eaf05de24e51cb8a1337994f4d92e412fe4c92de5a79f4561c799cc44cae039e0de6c8ea25a91516c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "16b07a0f348b58448c9646d0de7f8d686838dc74caf87184dfe395fc1ce5b1a887c57caa3da2e3bae21a52d283f3929362b826925b62ca757ca4acb80ddd9ad6"; + sha512 = "68a5ddfb2c450e034a8491ccfb5de00a807f89ee9d65f4fe42bc9bb7dfb7c2b26c3a0eb79039992c7989105549f177f087599ca84a50257417a1aee0920d2f2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "230b7144c19a1536efd264952797be74e6f615aa5a25a648e03dd8f47dcd50f1bc9b22708d7ed3a4cc10d3364cd043c57860b9c1a152b83d67439fb238b81e5b"; + sha512 = "22aa041a0f076ba986f13e835909bbdc0958a61d6ea92933a392b17335e9698b398fb4534f9c830dac3fdf94e8633cbdf1fb9348199b6e60de1a0a97047a8144"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b917ea11cf2bbe49367259eec378a4674eab86c926b89d090137056dd459d8d2c7670a9733eb4b0d4e0fd6166ba58854c4eba190a1d99a5376b390a945195cd7"; + sha512 = "a8bed372475435fa95e387ca23189f3d3130055a1ca211e7a51fa74b47835bcf04503bfd65f31747fa30e370ffac644cdadd0df3a25e097d56b909bf8c2651ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "339c69eee74cc48d3aa0c04625cad84ef564c56f4471230a737d126fb77e15a08e7b98dde625cea4225b7e95f75b2fb1aa7ba4f8a005ed3518a2949638c739b0"; + sha512 = "067d16fa5afd8fd83f5e27d26b282c80b4793e85f53c12436730b6577b5ff5de009e2da8305a65883b04149f9120dc365de9b2681e3fa4479f1e201cc7ce2385"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "f04d05f5808f194a8a2d675e88d255aed01f6e6b91f90e6459b896cfc6a9c9af3cbc669274a07bb8ece0d401786090f05e0a762812ceb0005a4f28345d4bd32e"; + sha512 = "d7ae260f75f7d7931849fc55811e26ed51169870d4e3f574a692b92d5454de69428b803c5c9f9d3e090c79857577b02a82820ac75c52306a12eabd2ef72ab38d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "d8204c6e70710e5ec4944d59609314ee8bf8e0a54ac637aa63ffe15e5b5fad215f6af8f3fdc7ef3765e72a70559dc8c5b5b7cd7d31c0445c64e5c9b401fa29f2"; + sha512 = "f508a9889691484120c457b3838b1a6de00af0f7ddd23a736cfb8efa9db1886b8cdb9cdd2e9e134aa44af86e8ff8efa4b4f967ce31abf8d283488e379d01665e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0628e53b0b88bb8cd959391c1d071772b0bd07f7585466fa8a8b0a5f6be63b880a904c9c8a8f059a0a287546594a532365756fc5d6ddf302aba8c70e3d9f26cd"; + sha512 = "ed40057ccbd2da2a675b83f28ee69759921dbefe2490573269fce6b2b671ee1e1b480dd75a773e22ab594381996f1e1f5aab6b0145a8a4612cfcae601439dc9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "853e05c9ef13ee2d8c8739cd0d5173ea45747d9e85820343f292fdedd7ec3aa0894cf33d3d3787109fe30fc3bbb25d5ec0149a5905c7ae9ef81a35ecc69b5a8a"; + sha512 = "ef4c1b377ccd898585b7aefa02bceac1d9d8ecbcd02f0679ad029743222c479f3dc57c211ec9872d5bf2f58e50336d5f248c46ce4d46536da7b0aff03cbaf135"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "cf3d52618cf17aef06158d7843253b3933a727ef40ee2cf0d68635247aea8bac30b0d3a13b962382155857026bc1ee41bf08edfc5d359241d9292bfb60917142"; + sha512 = "fadf57fe984884b4caa678cff5ccaefcdfc9f560ccb33c8f449ad87df19d3177ab0205bf5ceaa60e5e874d05c1262f3cf465a0723c24453655e60280b7f06b19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "9d17bec7877c2f9d9d3760549398d98547ff8b9401ad562a38d904b87bf9fa19c42099f15c12376e87ef0c6d0e11bf4549fcd1d404e45c898278aa5a115ef691"; + sha512 = "53f7db4751de67b40d31de66228ad0deeafe8216a217661069a1931de3dc7d050f4e8d9a4721df5680a5d784203709fea5851f887b9c22f2b232150b2b969cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "5fe3b888a35a2efc32ebd706254537cbed9e6d97856f1010728aa1ca4bedcbcfe05ad4c6bd6a69d7bad4a88013f0aa5c722be3cc32f0d623f9e6275368d80e5b"; + sha512 = "58ad97f682f24ebfafdef3641c59410b6e252bb4e30fcee3c7b51bad7081fd76eaa15e116759e2a6844cf50ce0b597ac8fb7be8eb48618d1615d3654af2a8bdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a24db960cf6146b98af16953103c88296affb340368cf11f2c16f2d9c3ab65a93d7b288e1d643070e6b68ccf80be7386748b9ff5696f5e4ecefd3f66b9f538a8"; + sha512 = "e5e8a41fddfff24b958310dc89945d2a89455f00dc04906c0604e153350c99a49b1c051da60ca139928a380db6d51408d8de9299248caa7319e9e2bfab6d4e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9c89abaf1db0aacf4199638cf5b5a4c07b955b5350e4f084496f9cecbd5d0060b4e2d1d4dbcfea7bcdc02d1ad356bb4aa49ad167861911f7611e72fc51c520d5"; + sha512 = "cb2a6793fc7c08d8e6727a12b5449e4afef224b4f764b14cbaece7d9c78abaedb0eadde140becf9a8e5eecf0359e4d365f502545838683a5bdb49a844a1e60f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "5e04b44e4c479bd9cce19de826c92a0824ed48517dc18c5061bfc9e04192705de281adaab0207261835be423eec28659fa87a0fb1b5da2eec379d5b75215d0e0"; + sha512 = "607fb8a8267d125a639e0ae6c906df579874df537fcaa54aaf7d5dd42d17fe1e7b3aac680fd25a18fa4c2dd8cd68bd7dc168bf59df28d7aac80082982cabe8ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "150f257a0ce943546589cf97c9acc3536e3eb34d7cbdd47924e3d3889cd7ad88ce6ca175851eb3d9201ef3aff7795f8027ee31dcb163f06e186bd36ea9d6ce6d"; + sha512 = "2e803d9c3a633f2daba2768299dc3c8f52b67f4a511c20bbcb608962e28189768d242af3797fa06cdabf8a89c3179ce229e690b19eb2f3baab754f30595761bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9b7ed329a473077fdae2faef685b0e45123cff6629a1f205645150eb6a1fd00d2559b82835b04f061340489ea46ad2e8056da49870db3e561efd4efff002499c"; + sha512 = "c6d559bbc1eeec0e26e7b374e867bb9bce9663310578ebe518150e977a46fb9fdf5f23446d37e64141c6fd4da89c6f79edd08bba7c450c78cb07c3e66e5c0771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "df5f981d1d689e62bdf1eedfefe5b83750fb289e4fcfcff83b7656a4ff422a03125021efa713385a03547e27caa16e07af731ce118d7145a7a622a29dbef4158"; + sha512 = "8e7e979c3abfc711f3cb48c5baa61839f1e3973fd35a74964400d402cfdea31a69310a94e49dffff63411a94b169e19a9d508c83553541fd42f307652a72d5bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3ca6c1b04223dc2faa6e978897f398cdb87c9621c1f9a35b7d160d6071c1fa776434feceafc743d6efd280c966d5ac462f6d51284c81a15acf4111dd6c49b326"; + sha512 = "e13112297a1d154866d9933d1bf6daaeeb4de05f149ad0737268ad7f4fd42c8be1af9c111a2604368c1c633a2e50f009153845b688fd8c7f42e6d94a429c6607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "e23f125394069cb6a02f9c24324bbbfba9bca8e04a29840704c9fd100745a84151db0b09d6792560a29680d6c5543fd446affbe34ba1cd73f06225a1a799cf5c"; + sha512 = "fa9bc4df90efe92d0b803ae0d88cbab6008d8312bc3d3bdb79913eca7fd6864c9141520772f0ca17f85d7763186630410238dd1a3fe8f62915d0beebd8d3027b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "15550f601fdda8166140ab74955ef870e597b7e6fec72571c1e3b190f7a19856fce6bf90c9f233d9a90bef709d3eb54632e788a86f3b14186353bbfefe183ca5"; + sha512 = "10fedd6b5e5f2fc7a3160c7ae8e7d48e336534a2a9c5133621166ffe9bb8ea81cb08dd44df8e92a2db9638df0b6aa7861dafafa436b63c9b509cfcf4e4c26ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "3ce50f80908e80decdb6e71bb89b7d9a4ce3dfedbe5785efd4f7870d1b2c46da7c660ecee2b6532741222da3502043b8a23e96ca31fc9f9a3098182173571325"; + sha512 = "88a76d6c3dff55eef87b380594ee64367e60b3a42ca8b8a7d76f7d4dce8d7b1e51bf7a06dfd6d2f43e804ac5840f1748a275210abef98dab5f6ba3819a674b10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "55405f1cccbb3bf8b9f554a45a7d9270e1e7766ad82b202cbf733b95ae88fd77452a3bac476122dd4c149fc76c5e59d9a14a53fab7b9669adc10f1fead679388"; + sha512 = "9e4bf43b24577d60113455d52eb6363a3372d5fdcc22e63dc173dd1455a6385391f5a676a499f22809b883d18b78c1abe186d328fb2357a464e891d7d27434db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "d7ea10bca7bfc0d4de8e4c21d8e1c409b03921cf553bfb5ec6bdc51f9a8864d271f58d96af33bb657663e9aaf6f00882ffc225da555eab52605f625b18db01e1"; + sha512 = "9a56ccd577e112b072a42a65e99a35a5404d7127b438b6522e9787f5b75dcdd20e4d42f8f370d218e48554514059bc3d625f1b13395cc1b3e79fd7069c276057"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9e54689a8302723ad301687dcca888317892f0f03a9e2b6640e9ded1cbef4618d263119a956836ed387c926e3bde6463266f47f9c656df86941728b12c0ae546"; + sha512 = "67d2ad4f29ca504ad1b515af5de47eefa48678d70b67b7853273bd98944a4a6398822c2cc0e2135e0fc1a8c45152c939a4bbb06dea36d6917a854431bae62f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "8411e135b81863bd49d76e68565ccb1240ff383b0fe0bed835af204c95374f6c5bbe14716f1e5dbdb9dc5bd3e2d5e003c98005f2e7c93cd85c38b85dc4b93895"; + sha512 = "d969b4adfc93dc808c41ebeeb0b44668d09fc4ae47b6f324a3bac7c4c304ba914785fa1bfe38bcd0467935665e7853e1fc38621b70c2e6dbb3004c9e67c78ec4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c426bef4210a9dcf67644e67f4e316a6547a5f02716030c8688564de2993524564178a36e964f159022ba007c95d85ab697a7f718b932b1c2d88a699cad14a77"; + sha512 = "289a00ebb4070dfd94230b6bbc1fa3db40b96f9f10d2062d81fcd8b34b6f950ef87a68a50270220052246adefa046b00e38f63b79200143fbb0c8be7f65872b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "47b2afd069a86270a7a227286997d75a50ab83e56e36e310252dd8a7b20b3a6cb34aeea379550d695c01b627e5265579a4b75f267cafba20badb1332fbc258fb"; + sha512 = "6c85958a7f09075f3c271b62c20a6d02bf18ec36da494f884b3a18b7ec5fc0df91c5ec5a3b14d1ca7501f6a804acd8b56888c331b55c565511a41caba8a8bd8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "72d65a3ba9e39a30d15b79b241b76a9ffcc2c03ef1942067c4a5947250610ab289926e9a0e3b8ee4903164bc07e31c8d548abefdaeed696ca0c5fbac401f341f"; + sha512 = "8b63d0b332ea5c7328df9dee470010ebc9dd17ae342ef43961e5f87f685646a7cec18a114a028bf0bba0df15e5eb2a04794ee28aacaacf50f75294a9268e9b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "7bfc29f2f04395a8bbac0bb0df647769ca8fdb5d24411b66204a2fc3b03df380977b2bdc07e62cc9cee9bc15cfdc637166706505712fdcab644d08b19324b62e"; + sha512 = "8639a93a8fa49c7ab3d0ee9c9e966bd7a5b6e99d93ee4c675e307c9720f09a485add3f81e936ee4aa1928fadc427e157e86d9497d67d3a06e15a9b7012087073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b7b0ac4fd8c577d3208dfd99e68f491c7292e320da4be5e69d87c35a7289ef85937743ddf94b94ea29956859caa61b2926221a523c28a6502b170f9a53756598"; + sha512 = "3220272d6a6c8d853d5caa4e18351cb9565f0fe806cd67f7206251f0d3d0118b0a8e5469d8b170aad07d0f6ccb805068a5dae79f6c9f18958b68839470adcff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "ebc6b1f6559f8f2af68116b1439d5cee695991d458234b36afd0621e9ee98d4361ef5e9dff4d8b5c3721756a16857de7bb1928e99767fcf374ebb5478e69b9f0"; + sha512 = "c6c166d486eef5540e4b6f0ceed6a1ff638f4aa5e87efa680e03b0108b23679e91dac02eb06ee933981411770967a1dcdbb35afadb1269f8b46faabad92faf9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "148c56f85858815f8f3206f2cea2915c46bf2cec601fe7355517474d10bf6f087504d43f80aac83171c867ac4ee7b2a83e19cfa515dacbde56a1c36ca45c7a59"; + sha512 = "b59dd15e2f89ebe15a361c3a175ee763773d9ef7d85f58aabf775bd16f016f857ab01c094e271e5b8e56ce77114de57e31cc617b1c58a38a521b9c8a21ca000a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "59e18eae1b625b74d1f6c51bd2e3d5c790521f4fe64d81448b7a2260b02b8e40c69f1a681002a1307adf0e725f30ca027e761ab055f0463465a264bccfdc5b97"; + sha512 = "d363573109c810116b4f9efd2b3f87b456ff3d825808be21754ea34659b5ed8ea5fe87018149178e7f91433b2a7b8c61f7c4a59264fdccaae5acec2344597f1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "59bc40dd5c0c597ed2b5c65b6a911800f90faf6e1576ee3d62ff26caa6aa91673e7f8e002fe65cac1030ba4b5f3b00d22e362d06556b7124cde5a41213d4dd1a"; + sha512 = "457a86dbd230cb5f87955ac01af4fa58c2b4b625d67bb8657dc3fe01ac625935469b3d72f6065fdbb18a18af1db9b402b4d2540457e8c54bf2816a0a7b667db9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "487132fa97faa3fd152261e94c0d5d2c7ddd05051b437fdb1ad586e75fac5072369f4f6fbc3109f00cac5cc9aa99b96300fce3536d364b916f080f98da27139e"; + sha512 = "662e3e3fcf70c90d95fed5864a5807ca1ff64058d3d0ea31542a66985f19c9783ecbe0b4becd018ce2760318477a01ce1c6c5a1ef0077293f3fbdb5244b2db45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "83f19eb17c6bd977b244be27ea374335be1ddabba084ca4a44a6a89bf1beb0b6bc52c196d66e39c947e8ba756ee52c1b0f157afa1dbe907b9009c4d404399c18"; + sha512 = "81d954f0b5e1b8fa820cb9b860a7a09ea5ef4702febbee123c0cedea11360b84fd06d3f9ca79c008e734fa5a7021c6c276b31a864e30a3b91f8a239854feefb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "d9a61327cbb8a7a497421a2a00174d1e8d1989dec9c10e50f4b1c17e935b82d6871949dd6fd35506c5dedd6d729c968650a3d25a160da32b9d20111b5b63893e"; + sha512 = "8bc73c2fa797acb388950921eecae58d4f499f78d6f51afd62218f974e6763b2ee3ee366fcd5acfbce759bafcc03798726d38ad0dbc9c33c2026d6bb6c0fcd4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "848187b6f530ddf5f78de17974fedf3662e2f03dbcf7f5f47a0d0ca6507ecc6764242c5a727bb39a728e4ca54b7aaea27492fbb5a0670c2186f5ad581ee9f1a6"; + sha512 = "30391e5e9c34347997ba8824a77c60a3ca6fcef1039275c8147eabe8ca7f79849ce4320deb7b2e8610e83942b968e90b484483c9ceb2b9d0dba012aab26668a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "bab7b0b13a4b2e0be7ccf4fdfd35edc5829af8ab661a52549a511644da78ad220d2bc57be0d2193f3d9365476bbdc38cf55a42e774bc113fec26f6ca60dd31b4"; + sha512 = "69d450c2370320e6ed9541185fdb53ac8ebfbfd3a2806525950c5e97d1cdc4c1c587b5bda9f290673e83529aa0cacc5f282650b7d38a43cdc9d179239e39ed93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "848e886a84a3df7e1ea0a5c4e5fa9910112524d4f30034feb5587467cd4ec9dca2d89e680a95564534dbd3716c8105b772c9b463e735ccdd365cdec80649f525"; + sha512 = "e731b618af837016e58034014ca6c183215b3ad3aed2cdf21b41b14d4a807f690ef7f642c73906ac72a76cef0f89484261b46b25f6761d6367bc39a4f0ff4d9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "dfc0c340c66c66f3b20e44f3cd58cd2c829f8c99fb08658c02c13e21092734803256e39e4dea41f26d681bec91448338fea39b1fe44e5c459626ae3f2b330cc1"; + sha512 = "95e5d85c77e752ca569ea48b79c0e1dd99e77532a8176ba61e3737a770a717863485230bc50ee3e2c09a6c441c6d98b7e8ecd432ce281247202631e16c7397dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "b245f08c080d108b15ecbbbc50726099987971a5514e9973835c43a84acc718e014e46eb6c384eed19193b253b69c3bf053ae6452c5c6c036162c9989ce62e40"; + sha512 = "a61cadb8a75051f93c4f644f6c5a0a03fdf7f8ec376a712a9999755bceb343140ea670df6df643e77900b2b8e164e9a4214a12bf15f5e805d0f30bb03f68c30c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "72f329ccffdde5e17d47d44d49342b7bb6e0d635672b61af01d4e06d7e3a6dea7a84775caf6443f48bcd706815cce4c98844cf15a9a376798a99bd1061b01560"; + sha512 = "47a4a306eac7388e71a1ce7ebc4714e0934d676315d97f0ba94675fe746eedbf0e3daee7b5605a9fd7109eb6aa8ac3fa4331f5064043ac1b9e859a26989270ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f9441776e6a09f7637c5f482c80ba95fee10812214cbabd737cf2a791434b1bdbc5effcb3d1e0a91f7f6b4accaeec097ce80652c4ca0237bcbec2632c425f8de"; + sha512 = "36c021da18c2d95d24144b18ba878e6b068abc465c056a913d1693bf2973be628a68f7f4bbd3e8cd822c97e674d61b3ce8251e1e98c1f7e97b98ea93cd89450e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "06b07da3df2ab84f1ecb1364c847e883d36f2269d09d8265d80c24036ef8fe141b7456e649924505f8114b26143490cf956807800f03850a538fba1c43885add"; + sha512 = "c2dfecdd93932eac75af5dcee4e75b7ff0dc5d09cb391f113205b05b4e0bb345606f1e1be1a1dacb46eca9f39d5fd0987d2d4d53ad5f71e771f9ba3703dc2f45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d74d17ec500e8c65509b97ec30ec3e14f31accd4cd50804de0774389c84a859a8c15cddd53ecf2ea89b864951ddea43f54020f40f2bd33fc77911afa878869ca"; + sha512 = "3247716a11ee8b140219a8825298eba191a7c07bbb18decf8284d7a14a7583e80766d2580133d506a3235fec4494e3322635654ed4d1e624990e0a45649d780b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "c5f347218ae3f5f41e7323099a5b9aa9535df6a88e9d5b5cb1d9c1c64fd2370575c47ccd1d67d599003002e9fddea1a640e04d19d1bca05669baa83739ad1843"; + sha512 = "d2354d10182ab21d951dde2c2d714f30f855a199a198be64ec81d00f6089cd32000efe0ae074f24d46daf7c99eac7ba88538838eb3df30ca4a59968cacac43d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "273f8f45ca61978de31451f53ac2759a1174cc4fefa8c5e10f1307f8a91a6939ce339b1ea56dc4b7f394789f46418a6a0dfcd174b7020c66308ae32ad4d74971"; + sha512 = "667a8eefa2188422848a8f6af0ed424adb6b8e815c11e3660cea18ea1568d4097342f0d094d8e39e3ab264b87ae451b7873f1a53ae129582b6ed00a45eaad417"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "33c79d802d4d9537743ecfc54c477261dcfe69952b418070bc7c0e40bb8f253127a6bc8a1b001c99d406f18261ac4f65454d373962203352e6828764b5017b5d"; + sha512 = "aaa74d3a4bb948e63e5c0f7ce049822a9add2c30bc69d6c9d96b54fd35212b999affb0c76b6ce52c5142cda992bf7a2a8b33e47e81540a481ef91896c1b86ded"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7cb1ace78d0f8a4dbc6425fa3cbcf141e63b595dede03f81eb2f4408c7aaba20ebf869790918ea7849c8edb415ddcc6d12a02c41e6f31c40d4bc37867c982c00"; + sha512 = "f20617ddad0974675faf5872ed5959d9d903d80926a39a8065739a997164e3eecc51c3c5eebb4564916993e1915b88544dc4a2c3fda9c73cba956d65fa8431d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "4011c45ff581eec5c4db22a487f1de1b027b7d40dd133cffef892e3f1dfc817d1b9d06c46c1ada6a3f0b9a45bfa628621eff562d05265bb6adf4a3a8cc4627f9"; + sha512 = "07758ae74963a24c2315e72333a98abc212e1e6d0cb58a8fb7385c224dfdeb76f6af06159a74a0dd3669ac75de5396952dc87220cf0840c2570937331fc031c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "a060d98fb193fff7f44eb5f21077baecaf0f0658d49474cac2a8e57809403cf7b288e8b590af5f23b160e2097fc8b09a92fe9aba0edf5b5482e6056577c8a1f0"; + sha512 = "152dfd4cd0ea7b39bf1eb79ee61ffb77289274049e9b760a5e05001265d3a2029b13db764fbabef6c8b6736f592f55b047cf01330e7e1cd3f058689942095ec0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "c059806bc61111639ff803f342e9e3863561c8e89a9a075e107f5672d46bfe73f98355c0c5c4376550addbd89e9958375413e4e8cd4dd244845f08f936121de9"; + sha512 = "88ee9a99415036a4a1623575d574bc3fbe23c69acceed6fb174a73ffb9e728aeb85cc80f9ddd3b1a8da302e1fdcef5c1d5501a21e816eed5b19e76bc3b868fce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1630209404ac8eddfcc831eb485f63454ca6336a87268d7cef8923e54d2922be004e7ebfd1251a42b98be170d1831edf5360d7918629668b3eacd955ede8c8de"; + sha512 = "361201558aab5800fdc3686522fa02222e41271357cddc21c8d89e1ac78b21222cf06ac41189c2eb870fd89e6066f6324b6450a274a25fab273a6d6964d96aac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cce5824503a866959ea24160179b24eb56511eee9a2905c08f1fb48379cdbc450554d4f432d37e649248cf75bb411d8e37de0dbaffeb172b417195b037584253"; + sha512 = "1314249f6c869c75888dfdc24a7decb66923760ed10b1db63a245a0843864a928b66b3a831e2e5d137a09f63dc099f8f19c16da5a6e622a50a3907155ed2550c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "ed0f789dca473901e00aba562c633eb1bd53d83e91a17a4943079832b22e77825ce50fe4c347ea1534c3a017837ea3f4c4d4bcb028af11db3149a886db435104"; + sha512 = "9f7d9c144bec3644d469672840f8854210832a5a47fd8d6454f35257f52de21b760a9e1f70c5ff4042c145c14fa10bce23a080b577060b868f779d85b01b8c0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4ac79e3f3f5fe2a5bc86577847e7e227baec60d69e34eb0b42c4cc0561b9d3cb020ac64c865fb282fd3b308a0713e8d63342c19fb46c4b477709850062b7cebe"; + sha512 = "be28cb4dba902e706f10ca3db8eddcd18a95ae6ad742686591997cfa7909de2c2d37f4b3a9154708a8ef1cca062b6f5275fe566fe1a33f2e6d56e4ad1b62a56f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "af9b5197c345481597b7af1c7600ea07d2604d0dac93b2cd87db1e70fbf5833ce579cf8e89e13f28ebfc3106f993964e2a8314934121038de5444736c68cd08d"; + sha512 = "b576d962621a5c8ff5ce61d67b7a3d08f22cf7cc1a48edaee1fafbadaac4d2633d89385d3d9f57d00a12ad38eda41c6c1428ebf2b9884dc9cb9437c1a84456d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "38218acbf09ca1aa67d0bd9897e1dcaa27e13ce6eaa0b40bf94df25e17e7259bbadf6fa58a86977f6e05d7dd344ee38be4d14ca2a10653188c9de8e3b950f472"; + sha512 = "eb8dd68eb51c7f19f52f23819e934891b06565376b13accd0da0074619cd35ae74ec2f1476a7319f4746a136fb734bd94e8c8faa8db40eaa03ec001db79f7373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "a69df7a6883535f84e67240b07530f4fde5f40a3ff526914f0e13d02ddc31297708aaf3f75f4283570fa31136fa8bfb179ec2b5110c2588c7f662ebae27845f6"; + sha512 = "3982dfaa8067642470e47ac27ab47cd8a2e21b76e972786c333ff7035879ad186e4b8bb95acf70dd7a77d5a65059c0e9f00c47da0a81b0c720f16dfa900d1062"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-x86_64/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "63440f9ead6d1dea97761a8ee3820da2b9bb99a91ea862124a81a7f5a9115f865b449729d748aa3f078ca85057382602216c3935ff63d93013d383699c8e820f"; + sha512 = "ee934bff4c51fe60838457054449d4ca438d4ef163535e583c8692e8e3f3dbfe1d7affe0ecb89e544c22bd7afc775966bd0438094d538451a919ce3da48b7e96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "bfe0baeabd282fd3cd6a1b4dc69c888c58ac0c4f2caf7842af844b9e13c2b5467ff0748c836b00d6eee338a74891e1bdab7909e6142d0598417889104bee0b78"; + sha512 = "7036e33fde1fb0b9bf5b39874604fbac9c17d4cd635b2ce473088def9007256d0096cdadc3182a9707ae547777af5638186962170e5e11cfa484df194923c9a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ac652cbbfc3a6b7173af0bb3abc142024c3d62f12cb2877d24897231b3576fb4a27ee25f78b4ede5a960c2b870a801990910650bbd725c5fce68ac6239e575ce"; + sha512 = "1ff3092cafcd0a6d0774d6f8cba93c47db3a0ee7001af8c3f06286059cd5ab34ff8715440a7b8a57eda6bbdbab8ed2230c02117e250ae6cc28297d97680ce61b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b45b34e7ff3bf73258c2b26bc613d9748d179df9366ca0f74702ff7fc5d5e7eff6df4f00ac0d7e0e37f68fa15cd6c4b61dadc16e86f7d563ef890ef502193d8d"; + sha512 = "1b1a33f4c826d6e9238db6a7e24e028a2ce06092bc7efad9ce708a06ef8f4e33fb2520e35c899dc703ae81ab12fe9e89813d3603bffb1ee3acd52bf44fbfc526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "8c0a69b3d5edb1a5829c6a3968497efda942f9e5c0fb314af85f192b32f671eca6283c590daff428029fef5de8be0febb262036bbad0df64df5f07a268e7beb9"; + sha512 = "ff57419c24d73a6c4dedcfd02be88bbca1c78f3f43fb0d1a8ab8eb464eb38a15889d126fa553301ee3a66d50d77f2b8ef88e1809ff7cfce8dd4132c00ef1128c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d2cb19ac615c36a74177fd565afbe2c451727b66ef09c5c9fe9ac4a45b249b009e33c0684bf0c497b2474899b59899c11bea275b0f03d57d12b14d0dc685c10d"; + sha512 = "1c5b21bd57a3d064eafade32ff89070a46f6c13797f504e0aca3990f298062a5ebe074e1bb821253e81a06d9492d902cbd5b9e0ed981aa66bc18d85bbf82d30e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "90b0c69503bcc24cf082a8c6aece55dfc4ef0567c4f4fdda084376f5216d2165b441a6160208c307383211ae191a5d4b1dab4129d5176338a0101790976d9b35"; + sha512 = "5869edce6bbb1984e15c84cde58c77c88732c7b04aa2ce52195857b2a549c04d4ef9af1a90c80845d2beff8f6a6ec1331ec789d7ffd6f7848d2e9a67e76fc43c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4cb4bdd55cdb65a3b989a01cceee343f7962889802801d6a5c42b8125b1db5e5127da33d73b9013d97a5dba4cf495528c857b5bd2439da0e0b636d0b3ab81fd4"; + sha512 = "6b035d2d0ec5b9d2bdba120cc76823970edbe2193a95a5b55d869418213e03d6dca58dbf555400592ab3626c06700f5910869b1a459ecc0bfc69c8f49bdfdd81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "1d134ac3f604bdf5a70888d40192633701294fee6d1441469cb51315d6a06308f9c35848d7629c5703e6533f0c3b6d2665a15a2f97eef55cc713c171cf8596f9"; + sha512 = "02e0903e940890924f6f5622fceff812c73576c3c7efb965c9ae32dbca50f7b9ec44dce69d127ab9a6ac5b0a4d3bad8fb7b5b5f7a4f7840859b221f5132243f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "805779852caec7b5700568fb422162b3adb4c68dc8f3e1457766877355c34f4c0bb6f5032b5e20adda8a99db8bf0385bfc1442feaf624fca24f5b6741bd0fbff"; + sha512 = "2acbe46e29bd576c287add7bbec292a2c306f40402d525611c9572b7751f2122753acaecc441b1f121d24dea922e493a8e0c86180c6eea98beced8c0df986ccf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "2bb5382a81c1f26bbdf9ac224fb132cf0384231f0bdd3e4f428deda1f61acc2dbdff79125adbb7b13f1f13d2b0ee6c0ded37b1303aa58a87d98e1cbb7e80fe02"; + sha512 = "baf4938003380adf8136aa00c0f8d0bb08d84714b12bcef2f3403f73d1540e9a289c65991b39be53ca6a329d72f5ea93960e3801ddadcf0f3aabecd64f4a1495"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "5f3fa574a1f81cd3567db4da19bc1925abb137febb65da56dc18535c22b270f193877c8c486df02c547454b72b0b72c5b0cb42c26ffa7c3f072bd5b6eea542af"; + sha512 = "e9ef2861c948286acca6fe8600eddc9adf95af26f9b12349f60896b4aea62c838be784ae44da5a175b2458ce4b1b29894ce45c4b927bc777844aa76d745473bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "53b3cfb12ff230336f96af103b2b18b676b2283d57601a97883de941f1bdcd0b05451cff96c345d5bd2491fd3be98478ee0b797bcffa50ebff54706f84de761f"; + sha512 = "0f90520613ac75a78720786a6b1bed17a3765081ef5c7f398286270c92b92940b98b566b40233192f968375c61e285257776ccbee22280a9c807eb7f7e198d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "aa61f35cf869d383a0752c7502e94a03f24b1f9460fc0af950bc30d02c7a48e0bec4f21e6336e4ab897fcb566faaa79c56dce2f29b4c66a280bb61ac4a16c97e"; + sha512 = "de03884b41c072bea3950d8d920fb6eeec6bdefba4f28295639567050d4ca89efa29f9ab169ee6c7dc2cee2b8127a83853124c25e282bfe7ede5bab9cacdea1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "a3b69bce98be7ffe94f7850bbd10ea8bdd7480579f2382616f3d4b491cbc88d0b74f0ba84ee36f407bf6ea1de9849ecd182d5486470be2cb23723e26da11c2fe"; + sha512 = "157d6179152e33d85eced2dbda53294d94ef1b217f469bc63483de254d66cddae0d4a378c3d13bffc6f7ca07e669fa2755b82cfc66e5ac09bdcc2f075c3713fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "1e2c63f40827a00416e663ff601a4414f0c2f0123dfd53af4f74b0d9ae82b1805ce124511107296abedc95d921e306f8a5fd516f669fb4fa3a41bf0619654ecf"; + sha512 = "37bb3290f6a5f54ecf505faac44651f8c0566ef2a5e47f0aee4084931afd1226651eb35b66bb9cb2a8e41afd06b2163433fc3435a415fbfda7e81e0f7f3a779f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "cab4ad092fdea3ff0e109493a21723e36bdc33e508195a53ea1a1f047dcf6dc3428b94f58fe5f00c87baed398fe02545b13c6852f8b15cdb777443793d7d0f38"; + sha512 = "e5098770cc159925e4d89bf27d5d72dcedbac6fbee42ffcdf26694f9d3a0710e5be4dc198241a3236fe06109e4b6e4d86b1dfa3d669effe42adb574141e16fdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "c70d0ef9d6ec38cd2dc5029436b9125e8ccb44a8da340bb24094b5d39b56a70c9583fe13379ed82c95ebf3a547886a22e89cbe9ab125ed0765d7998519b95695"; + sha512 = "ddfbe195d60b949637f33c627aa9a4c9e2ad1f04788ee5f35040e251aac303f8876bba7d350aeebef11ae5bada037e31f96b8f46771ade8fa425b70d2a4a759b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "a0f75c5b3615fa714360f436771f0a05a6afda2d9375a8392fbc87b5f2db25dea1f70e3dbcc4ad7a4298ff63c7a86bd1ec7c9fe37289b4135126859b74ee887b"; + sha512 = "40df7ffa3472e2bcdd35a2549e6ba52a7846417c92eb058a84e32dd355e7c6724b6b75fe617956b970ee0c3565450f9a84458d86eb282b1f1de8b789c6eca2fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "14b60dd4e8e0e53d250ab42fda33ab7c5c46699538015d055956db97ec6c3424b92518f44fc7b620293425811326b4cf22d1f8108bd60137ed31268a913a3f9d"; + sha512 = "3702da040d3478a4562a30f8758eaf5e574ff664c1b2a4a7b676a436e4172b294fdcc120b1cc043c3d060315c10c40a2f0f9506eed6cbb9dbfc80279d65f76cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9ab7752b05496b35efed2e32630c883d5c760f579c8733b80c3e5d3c6dda958856ff33997f5dcdf1e34276fea1784762aecddb64cfffcb2dea8b0c09e4ef5ca4"; + sha512 = "54a5c5d242579314997c41b0e26fb7751f19c97ea9b43c8ba1f3a7dcb5b6681123aef82159c4be9600564062b20667dfd1197be0d44e6b9ac3064d682c7eb2c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "26eb2c42b5b70309e0c039e67005fd45af08eac5f47d016179571f30288e5083c0aa5b099a9c6bde611fa3b064d9bd4b81af16618d516cab45d09f914661332d"; + sha512 = "cd76f6f7d54818e8ade65147921a0160948500d7bc9cebfaefd1c8a2dada91a2c5bf277222fbef1421ea9748ff799cc2213e300dd1c767c56b4b0ef977dac556"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "dcd8853c17ccec0b6db65d1fd950ae669a260a3860fdf128853af2358d1e59e968c470a0e1da087730d6a5808648ca0e9a7d922cd8478cc10dd5e4a1fc15c268"; + sha512 = "046c5fabaac28242019b208ed66a71d1824f6e055042576cfb8ef026906dcd7b25ad75aa962ec609884967288bb58b78e915865d858b8620123c0168637c3364"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "58bc4d24bf787617c9adee99046e1991572a71ad742ab0912b49c8b9c393472b17f959d0fd155c51e26510020a1ba71f1126200802a8eb29930741a067d5cf35"; + sha512 = "852c4763231c2fa64330b417a1eb710e8fb04fc11821e2881697e8c3a42d375478a37156efb0e23839f147074b8116e29ecd6dff04e77a4a9b9fad57d73fe5c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "0dee04349296fcc57e3c8438d61e38eb9909833e2a5125e3ce9b13210d8158a732b24c9149ba20132bd4b07f9b75986c58a379b22497d1148cfa051ddcef6f44"; + sha512 = "68dd635f30b450c6501617fabdfd0104ac9ecd89a9c400acb1ea7481782c4fd4da601531cb13d0ca3a79be34adbb62d35b70ea9d275339319da39915e51be6e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "d75b85d0b16786658c7c81386ada836abd5956850d878369c08a9aa1075a7d73167ee1be3d740dd5730f72bd6859982be56acef898d67ef3431fbbe7b2180b2a"; + sha512 = "1e287c91c6451284a62c27d91916aaa2adae0d66bd7b2fa77003b8a5ff5030fd7219a42b9cfe6b1d100303a7758f591e88489f09ce9c4c6240b8f3dab7ce3044"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "24505cc22b65f389071ccf9deaf5694a931f9fdef9e3e0a139fdf1b7343b16873b6f9941a3194ee113e2f0aad2efeaae425da62e0e0e9f02a31771d3090c20f8"; + sha512 = "71466b5a790cb8eded34971266c2d8d21204b4caeee5b6497d0bbaba176417f1b89a2644902942b47e10a4656bc522339db2a0852470cfeba5e9d6daca731dc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "84597be9df488f0f269b93f54412880662b507bd9eb42fc71ef8d2029e69f25da5592e39b529ac8c94496a37aceffd292a05e38ac51ebbd242d6afadb9d7ef3b"; + sha512 = "90c6a17bedee44faca5e01f6982a67afd65bc05ca604c056c427ec4c52b7d96e19de8d98751e73dca840e33902080b36bbadcbba7cd1e89c8147f89d324d3893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e67eeeaefa96bd59159cdc95ba7eab27144c38434530cb4b25949016b9a39aa09e451c4199450fe1976981f354bcf7724865e28938964904d652e76fda4f35e4"; + sha512 = "da66ec9771e13333a5def77cfe3a744d05ba9153ee21f604005340aa2b880273bc1c38066107733d4e0abc0ed828afd1bc77f6ee2be5e790f15a6e369fdc8b89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "535a9138633d8cc5362e7f42394252e95b332d6ee35515a0434aadb58b0b7ff359e1e2b7ba7c5b682a4f11f3361534e83b3f10fc7bcfe766b8ebc54b61b08ba4"; + sha512 = "4daa9db65e3c4ef3479ba4e0ac8819e8df0b711d87e9457ed3a2025fc9a0ca7de06f2b5f7224364798eaf3b0d56ab81b44ba5e2245cc8f52dd465312818f4c6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "f7d0bdd4afe35f01ab01c1b846ca66814e83a11155c110f08fd03418649bf478996f15b8d7990aa3d77f2fd4e2f3b2b516b8e1c34f304e105c05a35989b9880b"; + sha512 = "1da64fe7c723606ff7b2d3502b7d4cfc2f0866a78649bef876ed8e357612a2bb2eb37f85f0e909f5809937584259c5aa92db2976a5e358d70ed3a05f294f41ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8ebf14e8e31f602889a6022989934e1842d7f3c8b2682ecbd86890fc9c3f2acfd8992a7b2a3dd2ed5a4e0854622c0041e0c4630f08afe800b67254dcda2a1db2"; + sha512 = "fda5d73cb75dcde2f131eb0036f3275761709dbbf5839cbe282566d5370c4daf81966250b59bd3b5db6bd768d939062f35e88c3cd454cbc10f2b575878324f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "e247421a99dce2fb9a1b6ce1ac11a3e9427dcf56b83719e73a894036319af7404b856e70b5170c0a9cce1bbceb99e9aa3d47310a5f0bdd48afcba0023d77d4a6"; + sha512 = "21f80e21f4f2fb496298883df334768c096f834c5dd82a71720e63a11d94d64515ae692f192bf540c13bf245497cf8c37776bd1c53fa57158e751865a0947dad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c9e134eb933bb3b176e229748233cb840c690720e932fd00877e0c1cc374316c02837acdcf132e687e00da50c922545bf643e37fbecd37a2493738987e36d98c"; + sha512 = "f254bf9b8715217a62fc9b604db47aaa2985864a7cbe925591cdf4233b81bd73acf5e7eb34daa7506400d5efc86c9eecb8ee9ba6dfaef4e43c03142ca595ab3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3f574d2aef865fd60b0a8e2c51144c27eeac6ee9258a6e97587ba3f38c8fc0759e636d6ce023a48ed6136f6b06a913633278534c3b8bf2b9c82ba86c696a2b61"; + sha512 = "0c0b97a0297e886feb7b18e3081e460fc3f237365ed04280a1587814631261dd1c8c35a0610659d43e70a36927413ef20e46067c13d0daa6e47b9c3f058bfef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "12cd6a2918e9f27867fc49d763a24560ec80b57093669ae5604118ff940fa772a63dad46b9fe4c88486b4e465a4d63a312a9734137095f232980a29debcc08ec"; + sha512 = "318e324647c847d6a12ef0bb74dcf2d75367b423a9c2d89222ae4a193f9f775ce85617e9cc72d3b960ed216a9f48fb67fd0f51dd36e2ab8330208866a852b04d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "273a2724765f6484d9712e58e24640f4c286f209f1869f696f43eb219a2b474cadcf151b5af72acdbef0446cf345fd8633bcaf0d20d8ce43a7e3e27b735ff371"; + sha512 = "c9f7033354260a72a24f94f481f5cc67bf91fbcc9170a63eddc48307972de57b937d4fa31e1eab4db1ecb9dc1f05dc56b2e38c35a946445a1d77535a1d41b433"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "dd9e0544a454208c49260f03b1016642d05efdd89aa8e58e5cfd2d2ba2ecebdfa4faca8ac225a0072ab0995673dcbd736ba178a04da11bb790f2a82bb2bd5c42"; + sha512 = "08a6c18f6b4beaef405e9e9292a197c42510ef50a3071fd3c20687a94ecb2bcd52076a234fbafc4b9be82c8111498d1fd35468bc604def726e3187e9119f496b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "88abfe08ac9d415f21ec61d54242fc8b19c45ce549f1a09ee76c8bc3fcc3f69b29fb03f1892b52e924c5087e5f835e5f0b7e10cbd829b484d98fb1cf2e4a16a8"; + sha512 = "f23c2be81ad724862b4408560c8b28b28a9133290a1f2af37db4afbdeedb713cba0bfb23cb436c671ef1d4b42fb10c2398416e347d75afe3e77d215a9f0349d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "3a56f21e53bad283b76f7ad6ded6aeea44f06e2694f078a39d8bd898f3965eebf0330f7a0a09adc37a0fa39e2a123108c8b7e3942c6fc1c402eb29ed8acf021f"; + sha512 = "46f1069551fb83ba5502438f27082d591f1ec4d24e689c825115553baa6d39eb026203de30bd6a50ff082a65b73514e7007f0419375a05bc2acebd38d323fd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d393d86f05975163609c1b878d0d9a88398147788c5e4c943502ae0b892bb6a7677a32d66275dd116ae9fe6a2c8e205530b255c004b63d24ce985700b328bd6b"; + sha512 = "6864803363c3f61cbb8bf903da7275c90f8fcd0d8997a9828392e4fa2199d75e46d5690c55fa8980437a999af3322cc5927cd576d675602c049fa15b605ede1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "39b50c156f561436af31f728770ba114c02c4006a078453b9e5716d4973d1bd8a470e6184344715d77b3b9c978d23ce41d86cfb958d26efdf505cdafdfd42359"; + sha512 = "9932f1f2ca3b0646bd63aaae3bf118e91f39957581ec03fcd6ee4138abe00b9142acde3afef6ef31f802f9a5ce5e64755af912fb6e70d49f9baf4abf497fb82f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "886a9c9ed15c04766e14250a244f10abc6ec35d65d81a7b89226425df7abcdf0654b23d1fb03fc94a4d38c7370ae16617142995510ab9cc91142e1646f9f4458"; + sha512 = "b0a216cc4194990b993ad31156325ea5296d16901a0b6cbb3e792142ddd7e38b728331b68d73d2878b24042d0015ba7a0550d3ddb1c5898119a9cc4a5e91bb7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f09f8b374e34cc117978f1293e1216774ee6981f00b0e1754cacf9de52c693bc0196be1a5cf3e8063d69bd9784892edbc3a38b6ced06633c9cfa99eb12be76ff"; + sha512 = "123a4d8b8be454276ed6003051adbe2c87f0222d96c20902fce3820efb5149c4a1d8af13763974339936d5d1b25695ccab68f7d13d773899f19c2346735ebf2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "c60c4bed569222f1fefe97f519edcfb3098ee2769addc6233da16c9ea49b5192e5672adb72a12de0deb00dcfb033f4e48435f9048e27477caef749cdb14bbc06"; + sha512 = "030dd5862dd46ea72079f0dcccd4439bd766b98072d7e0d92d1260a1c2e2f2f2e48cd7a8ffe0be25449c5598a308a18093e273338eda2bb49502a3e8afe6f670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "826c3a6727894b521ef6a5960e4fadb230b51c1518872b1d9bfd99e6b975431bac992d183060d031c378644112110809faeb92d2d26aa9326a2ea327d7513d08"; + sha512 = "c7ce79360d517ce4012ffc0c472e04139e2e65a068a97e38677e327cbeca054f54973dbc1344e1cfd36155e17d5a3e9a13b118fae0a3251d1f6de36bf45359af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "df9b791279f5d0ffafc48489095c7847f003f007a19e77af996fbd6ddb19fa79ecb8a9d07bd98821516dc85c78ba7c628511253311176e8a85581d28c7fe52db"; + sha512 = "397902ace1c3e21d564e55dbf86a218408df70fcf185a4b30406abfaed6bf8e1184fb8077d9b606a350100ae471484bb4a48c433bd889cc38f9655e7475a2949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "f8751b0908d220ed6444c2ad6fa5a2070ae843190bdeff9db1f032a260a1b5e752703fc4543e91a67df0b12cf62a7af22804b74f1004cfc4bbbe6be4f28c446a"; + sha512 = "982a9b5aeb1ef8762828d0cc974d8a7b77d457591f662a35f3d0f56c158aafe6b026bbb75b8f58746f4389afe08a90240238fac7994ddcf7ad1edc8567f3e547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0eee3e6e29c408a1e14da2c89c5f14f19b0d2edf8ef914d132b94ed9685a09c3de2908c8ee0264eb2564b466cd8779a58a0fd4eff38a2a8ae73191469ce327d1"; + sha512 = "32d842954afccfd9433621e9d9a7fc7c4ac3915b07b0e85e7caa10dad55e338768bef50077d129368059621d3af3354b5033077517089c1aa70c8d21043735bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3ec0feb25c12cba1c1641b5e91d79318f81c1fc635e32fd3ffeaef6acf0fb55d2c5c8fb6917175ca0ea6534a74469cfed283565c94a1d5a87f69ba70f9d25a98"; + sha512 = "d165c88b6288f10eb7b5f11402528a077b22cde681738d9371c4ecc5fa01c691593b7599cd605224631aaa3d93eb05d89923a939aa025a929fbc35bb9f09ae1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4cf4521fa259ffda0b71bff3c01a1296a22da00844e3b357a2df2442b9129ab19027df8eb766ae2197d8cfb7193fb8cf49cb6baf4f32ee9b0264c85763a1cb0a"; + sha512 = "1324b6c140db320d6ac43521091b9b77d52800e76f3f9741c83a7382bdad8522b8467c75d82c48b61d0018c40671e0bb23870b112a8957cf8256a72c009886c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "921260f5dac381ac51ea859515e7016f3528c9e985c09566c06342d225614878cf25eed6dd74ffba9d108d9cbcaea7c44852d3010493d7586ce34ed1e0312315"; + sha512 = "6b10cda6efae14942aadf96b3d1a2b7ae58790be601ea46e04225d356c5ad1109eb9ac7a6983dfa21d8c2e6710219f8d3a05605b2a80a498fc6bddbf2abbee09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "31edbc72aa5088466f49dbf28efe97484000cc7cac1d84c14fb22af3aa551f378df04c8f08683b5a1a690e6fc7d6c061db3ceb639fc94ca6d91245de252bbb79"; + sha512 = "f43b85b59581eec108f882f8bdf2886b658a00b46c9f651a28d9cfd09af02f4c49b70ca72dae5cedb26c5ba246e8b01dd483dba6de42da170f12a73a6f02e87d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "db1ffa1be437f472100f748bf09f2c7d8fd82554cc04c7b95bfdae5903c69b1421eb4b35d67e7fdab9dcac6780322c1cfc55fd70fa12dfa55980c2344e49218a"; + sha512 = "3f2e08852c9400ec7e7402b5d9dc97e0002ca4d3099e0b101697f8581e8ef318ecc77f286aff1d33d945cabac20e7af4296327a25bfdac44293362ec416d59e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c0bf7cf8fd9a89871ee57b3b56a1c648f89cf59425bbf8d95e9b41a13040b06f714a8fe2cfc99379473ff925ab4eeaaaa618685843e7669c9a92c66adf9957fe"; + sha512 = "a9d68aee2257e50220d739053c6ff18d8fc18b8ed56e49e5b3bc49694805575ca427c7f00f4267f52700d0880f1bbd39c9e9b18a6b0706454024e46f4de34de4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "69853a72eae2a40490f5005cb7666586025eb481f0be8a5b2aaa66f10b1bd60d66185b34a24b76932b0f2b551a79a832aa3cf7997ea08f038e9471bf9310f838"; + sha512 = "01b17ffa5140f86e5d51bf8093e99fbd50cae29e7ffe6813b61c6788a0363b7edb2680cb922e9172c7f9e2f1a8fd934938a3883184f9a9cff99c597b65663919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f5605483a35424d0658d3fe662c1c50371924a3e51dc3761c2a0cd5a91266d95421d2ede9f5cc0d6af93fb6ef2abd8a15aafb0bbba724c37241c4b3b16eedade"; + sha512 = "8403cb0799b57a5dcb703f5aeb2c75acdf1e141785bcc91097eee8daacd51cda79c31755fc71c608794440146a8762ea53f20ab39a62870cdefbe5f59448b930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "c1c48e1982a1961755a336e804bd1b40ced909808557d4afb3cd53761fcba2183afef6c91c408ab53adbbf39861438a7f3ce728323c410889d2568f90f4d1ec3"; + sha512 = "75fa171c93bcbffaefa44b5c8e66ea049e6234f4a97d51260cdd14a2beb9c9a62a1bf05453253afe6de5f7cee5677ad3ea96cf151d7632809f2e50fbf21d7fa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "947d68caabde62361d7b4e5efb1550d963c3d6795d45301aadd36d31952bc5445e6179b5db6a26ede685216ede369b2f486e8945fb573d71962569554d1b19d3"; + sha512 = "0a6ad18cbe339f925d6254a314ef0cdf3c3b007765eabb96c3decf3b17b359c7122bd4346c5e3b0539236defbb7f31cf23dc0b7971af2d008618bfc60d932047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "86e0e12d63d3acfdcff623492da49ebf7a405556fe57289622910097847f8d64adffbe27bdd2de9954431af7a4516feb692a4f9c0e79c46ae1eff8b301e36870"; + sha512 = "2daee318ce7984a519abdbdd7cb86fe87689c21af736b25c6e942518a50ed8e83178d2a16a81c61d829cfd5c87a657f357b6d23d6301368ed4bf886f07f75b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "2b726e938679f36f4d6fceae5f12ba746468b6f4cff03e29c1f7d52ddcac75d380fdc8d780b46be2d2a2581ba83278fdb233e9b91e42a0f68e3d0ed784e59b67"; + sha512 = "aa64a352d7179b95f95a3a5dc39bedbcfa96a7c77686065b0ee5bde8eacbe684cad1231cbaa9755c4476a3a9a4187ef97fbeb6741f18afd2430ef43a6f9a8cc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "49c991aad99f32c3f1901af207ce62d8a2a4445fdc5d6b06ba47e2da64bac7e99af80a330f03ad65210a636230b1099fcdbc0b526665f4a8657e529b1c3be102"; + sha512 = "4505b712e03bae127f5168c221360543f29681aeeffa088ad66631dfb6c268c3ca24bad11c84439f690ed4a4d67138812ee74117644a803b1345d548638eaf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "01344f2ac444d9d7d87da48335d3ec7e4456e61062c3b9ce9f398be2fbe16aa9ddb01709358642b7f69ba0a6d987093e07022d25f66319d2b1e2b56a2ba3865f"; + sha512 = "bfc47b18ad8ee9c65c8520c8b57214d3493c897d0d1bfbec32ad961aa740217247755610b029039c0282932b8c1de19e9b34d801ceb96b3d4969829944de1858"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "95693deb31f66f6d8303c0f34bc003903322adf8563d19ee0918eac00c83cfac7911d9b11c28bf7eaa5b8b1b08f8a90cc248a8639f655978cd9589b313aaca83"; + sha512 = "1d96dcbf58668827b055be628160c90f4e2d1a3e8178cf953e89e30e9bb041ecd5c1d409be905f6bd6d1780dd278ae105d1a82ec7226196614faee83f333f7a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "26cf1ce58796e570317e693b30658e3b423f2ba2a1e3614c3ecfce0b0de8aa224cc1b6c6cbac161763bf0ae8d3594b856ed15a6a40bf1f159f7d5869178eb4aa"; + sha512 = "71a561df96f60272e7dded20f30ec8632d8df0a675ffa0730b1e2c61e131d30f70f710958fa38d5bf647cb372b763975cabbf11b81f187b154af3416aab8d2c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c835c1f3776cf34d0fd5f626f61b57b70a200215800634010fcb758c9ae11df9f989c618682e85bc04936f83b105b30cea39a9cd350c6f9d6364f2a268a56b4d"; + sha512 = "563beafe7aacaeeac411aae9b2fe2706d9ecc497984322caa6ba4e44957c24f16e06e1db90605b4085c708f563a416eaee15d2b7daf9ac481c947957ec25b5fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d63731ce8920ffab15c23b477e9bbfe9d4fd8b6202f329f333c557111a21458aca6fb2d6573bdb5c83c258092603ab105e43a5c8f890586fca7346ec5d468ef7"; + sha512 = "bc728d67aee3f0e831316dda5415efdcd5835d3c4f29a575cc0c2772703551b4752ace541d9535f9da56132f94fe8ce116ca19c5ae07b70958fdd934f74c151a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "0a592487eb0aaafb37b8d2a27cd9f7a1fffe215b5a04595dae25f2cb8f309fa17ab1f642be2bc640eeac55a301ee75c5e7a25b10b3b193ebee361ec9e4829b39"; + sha512 = "b368091fb415d2397e95029728a5e97e07b78c2d2119b5e3d2b0d00fb0fbd3484b397e7efa1976adf61cb8de3cacd63f7984b0b9341979a9e3b2e1b61a4563c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0c4b2c54893d3398bffdae9a3c0cd6c61bb23b11b9984849facd9b17221b065e4527289ece0e1ffa731dd9d6cd0f8c75ec884c47bf41c072e72251b33eb4fa17"; + sha512 = "ad489157ff5ee3932162741e4c1746112c161cea1780e8c7764798b765aa1a821cf794f259d9ce5c3c852f575af6bf0112ce2ef90259b9432cb9c57a76508cfe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b1bef0780fd17e0e6ae543c23c6c9fb89c500b0668b30c4596cf340d2fa5bd2663bdd683b18aa02de8f7945b84a23d9b43e71b60a5b6b6142996062e72e20df5"; + sha512 = "ade119bcef7a54c05fb81ecaa30b4543225d78490f93611988d9df10992aedecae962d9d50cf6ecb09e9e83466423da8714c5dd9ec2d5588f0ca2d3fabe38fa5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "e80503ec40fe25c43b622e4542f6a011d2101a8cbe9452b2ff17ec584422e3f3e0ce962b441efd929c764d69c0ee2a8f8bd56d62bfd3ec89c6bdcb1cbe66d12a"; + sha512 = "a375b759aedbb9aeaee233b2bcc0d9c7958d2aa989ccc6cb7e6100de6c10b1957fd0a73ad24620db1c0380f455e06559bf6b991f6616591bb547ad247d15703c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "a3aba8b75413ef60a379f58a4456ac5ec9e67c3b5a591b05f86252bc12901140a5e84975cff07475b3fa03fc65f1141e13c9538d1071a9c39d919c484d36d636"; + sha512 = "06dc4e376936fa64ea081d047c224baf43dfe14eef8a6f27ef9ae0d475f5dda5bdf171432061e31bdf368da0eb2ab6b694d31df868a86c9ac0636ee701da9fcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "79e5bfb8a3db4c22097e3c7edc71578da7db59a64f66f9598f3c49bc619c83aa94652d9fdecd2021696c22e2301235cd9d83ed0000f48d30ae2a1be7d0fa5aa3"; + sha512 = "6bb9bf90a1e0e747568f97b82f3b35eb6f552025a6d2e052b359e667451e336583c6bdfc6a3746d24a3bc5ccacf72301cf079811046a4adbb221003a70e89da5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5405154cff12e11f5cca920e5120661884185f1972c2bcb79a61be5ff49dc2359876e9b18ffaf6ec4429bd13f787b047ff83f1b0061d6bcbe94f9add319a7f71"; + sha512 = "9991b32bdea0e392a955178f9b64dd243e74da3ec95c52a9dd5b42e399534893503840cecec8329cbf2478b58b08b94b15c53288a02a12b2a41e0af12bc0ff08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "c3ae13e279b9443418307e34f25a0bac54844d70edaae6d7e77a370197f2fa82608a0f666ad7d6f59830ac7f0425c7818992ab4dc62ed44979b7c774e82b115e"; + sha512 = "e61e0d63ae95aefaa17ec5ba1b128bf0bdd3de1a81037ccd61d746021a32d7274530acfc332c1b25b08708f03e0d15fbacea1c9d9c196f19c77fee2305e255f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "aa91fa31a4415d50c8f3b73520e4bfbbc4e520c632af1b7b8b7b45e9bbcba1f29d2a18df87c2296cb0c6471741e75bc2b4044c0e1c361400b51c20c6a0baae66"; + sha512 = "49149c7636028e69c61dd8129fa149037c5cd13aedf1e83f137ff5cbb4a368b0a222c225dacc213f31ccaee323f31831b5271cd8adc04ffcdadbe6d71943963c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f655ed4d8bb895b9e966aaa4f95eb6cb9a450daac31a164ff0a8107f87a460a40fd9fde913613f7099b601a003862c33e2af0eca0eb75936bc767f0afd826b7f"; + sha512 = "a1827c77ba0d48903f9e4ac2ffbaff2bd404db41335313f27dc1e024cb2b5d724f67456f01d01c0eb0406141259e351e1d19184ee6bf61660b8204d518c7fb4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "1f2102b4b6e57d75b9cebf0669ded9f3e88de67b545cc95a7a38408330006dcdfaf206b792f16e94c6374e722baa77733e64255eaa6d94662df0352852978d50"; + sha512 = "c8dc8882a7f465a51813c09e46a07cf0ba42b4be3e40c7adfeda22238e8f492c74c224fc54965cc9a1145fe82a0eaab61ecd64503c1870f341825c3054cbf01c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9971127f170ebe9549680fbb22ae1ebdccfa52ced00b5afd20d14c552f3c5b12754b00552986eb1a658515960bf71cdbaf5f85fbf9dfcc059ab713814460630c"; + sha512 = "b0376a03c13d892b4484ea207eb31cc2e7db1333d7fec82654a96cca1ca2a724f74f552f1baea2aa9c2580055a9aa934d1a2ad3d4ca41b50ac554a9f65b7146a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3c7f660809598f80116f8081d7a7f3e1455739e65b99a28a707c3c93a7dc2d0023327c5fbf9bb0a8f484ad640b53fd9356a8e0fdfc5d3c9ce4f3c54ad47983a8"; + sha512 = "f356ecf9f19a8fb314340851f101375e7667d8c99792398ad5e5c17745db181c1a1e3513ac56597f2d75bd915a4c6a6c12f3ac71682aeaa13aaa952eaad9477c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4752405e671d48899d9cc306555d40eb2eb5eadad2228777232c7c12d26dac1dd60eb66758df012fa5fa58366df65bd33513eff02ab7592b35ce605dc2201ab7"; + sha512 = "549a9b2e1e6e7935434186ca3d3c4b97520b0261fd9c3f95253ace286021e43785237ff7d3afda5d497dce366eaea09e11e172cb1271031f3c1cab0c55a07772"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "2dd94e26837bf9f52d80480069674d54e7851999f89d36940249475e7262eb66c2f88b6776b0e798a45236930ec4eabcd818b9ff5186ab4688959bd4c120e8fb"; + sha512 = "79256f61f98035dcb063e45ee27c06eeb1e088e2dbe4429b1a5feb2664b8b37b2851f23c836d57e0272b9fed73be22ee029373107b2fd19813f7d9466ebc5900"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "788f0eeec94ce2506522eddc9ecbb4d1873003fa6813dfc419819d3b957844b81af98f01d686d94bc2d5ff28d075a999a54caa27b07ba05b3707edd9b4b967f9"; + sha512 = "907241d6ba61f53ead341cba2de045a8e6c31805954469a84792035472b9dfa6f8175716f765d332590259651fb5e17a96d1fa3d4fb0f12279b6cda9d1f0c5a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "84aa33cd0306c6a8353b71dae4528752639f408866c446b03ff8afb58842d39cd3fe268d9c3209d1a5ce73a2168eebe307e4b82b11043066f39c67f526afa53e"; + sha512 = "a8932f837cbe336fe74a223196f2f3d4383be4b1c8f53d793fdf9a9fb66a65527fb65321160df2eaf1328c8b1cafc7558c3e14a06d7d49bd93f24657e24deb76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "39ded81264e7a0b5f52953130deabfac540778cdcc08cc9d0f24429d69ff6805a9ee0a853f49f235c8df84093936df8907daf77ca5c2cea62b20bc210e9d8756"; + sha512 = "f1a76d7a77f1ff67a0defdd51fc2ed246e06ee00e11a80e58e35f4d35e081e1a0520f3f11fbdf3314a722c0f4c033cf6915ee792b8d98bc75b5552f92527dd4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a3fb3ec97d4367e27cffb76c457440a5727b67829afb1a419e02c18b039921c66ad8db96b56ca37488b02c67b8cdbf5db211d03bfeaf65401a84cced13ff36b8"; + sha512 = "f31660a7c3e85f759611d695fd44db021fe004f990e5c2680906f60b8650eedbc6d624cd54f5a6f17ab0c46d27bfc260789b2f294908a9c77d1cbcbfbf90baea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "8723521c46a18d0c1649d2a0af7702a854e12249323390d65638424fca7dbe72bcee4e9c8150bdace09ed2f587db2e02024f5fea645c933a945590ecd20e8c48"; + sha512 = "823d671493e005bf7311dc563916d28e9fb6c04378366a5be8a9ea39a0b5e6606a299682b0e58599a02853c6be592f1778dcbecf42650d200b5e8d4a9883ea50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c70b6a7cc124a930bbb2bf74652232b64d05bc87c625e49b94d1d9b52be85aa56c8a0ac8a2bdf50b90ea41a74728c19ce5ed3d9fb11b96be29bff437883401f6"; + sha512 = "c397bf56d12ff28b36ffbfd132c3d304017069cb12415a085bcb7f27898136bd8363c8366ee75324aa136442d93733223e1493204163aefc792eaa531a50c3b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "df9e5518ba53314f8bf3e99914c2d36e1e3b495e0333ddaed3bfb5c16a75ce2a83369a1247c2c7f14a774ab0ba0bdb92ae1ee4f25314c68f7f6e3dada4a10b8b"; + sha512 = "7fff653a86fa12dff883366b0d76898ee3fc0b6c93ec91617e0b27254df873f7c5b8b3b5217f0082e474808a465fbc254ab682c521b36f031eda75c5558128b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "d9ef63ac6c8159cad45147ab8bafcc73577a111715741968050c71ff33d12c98d94189a93b461b75e63c0679fc9374c9f997aac5fe3398c49d3e5318f3fce0d1"; + sha512 = "9b7d327e5e72135bcc4591d7ed2aa606dabb2e292b6ccc480c8665b247a24fa0721ed23ecfe242cb50604f7f211435be63915c1bbdc828e4590a91802d277155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "5edd9666d324f3cbb915761aed91e3be5d297ce5ca1e77c793f1bf8d8535083eaa36537fe9ace89ab1084879cbf351f77780d998349092a4333a34a0231938fa"; + sha512 = "0067469eadde18e120645a55701454381010530fe7cea3370efdee5e728b2b0258771ab3c39ada75727c796d44be5bc1487479103649964aa4926f8e23ba9c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "96d6be5f3dc67e0839e1afff60e3bc756fbbaa04adf2e3dbc743f94dd039dd3d6fbb0a14dbfbd012138580fb32de7f485ce0b1782d43e24551bf4620c246d18f"; + sha512 = "3157d512fac92eb23db2774128d509277ac8047e525b14c98f9b7b291c2697fb4917144605451b1acbc76cf9f104e0c39d8a4b9c0e90d8bb206613802c2edd91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "7e57727f21316822b4f181cf722cca3e7df7499a4b4cda2fb0e0df2eb7f00a236ff9e2120f64a244ef9c329ec2bbf739a067f0828f4a3f2086497ab9a72918da"; + sha512 = "38e928345d279831f5c7ed1c6c4e618377d5a92e69b65f7b3d9bcfd16f24c32018bcdd8fe384350a6e846996de783897619ce8d6b734dd92cdf3f1308b9cb582"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "aafdc6666a206f6945e73221efc0273f95495f447c1f7375ddba78a04656ef9e84f683fc8ac392f6de711628f34712e0e0d31032792dd8a45f71f8188d5e65c8"; + sha512 = "14745f76dcaf57d2a365a0eafa253e7849ab1eb168877de7a9d20a142228581190766eb7c0064edd966301d63c728aea63190d2a2fa6d2e803a96f28f15bf9ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a47e557b6846abf57bcad9dc67ddadc91f2a37043a8727dee96e8425de8f76625749522b7764144028bf080508a6821b1a6ae0b9691fe92855cd7d34c2fa5165"; + sha512 = "7fc7d0ab990b64dbd611ea3e76939ed438a1a63360e746beab30a057fa053717e92c35706ab8f2ac81c52a9bd92d62cffbbf99d3ac85cfb092bbb2868f47a092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "a44789be262632f69d12c4f18680c2a4601cb3cc5ee1cce704906860a3fb1f2306b40d59ed551a90d81ff094665f525e37c557b70b61e4a49c32a23a4ba99fd7"; + sha512 = "256b8c553e61796b439ae3d4f90248ae07bd7c13b9a32ce3baeb24901941ff8d6ec6ab810122b6a6da713c0a1b3737ad66e6d798d6cf62fea87885541920f6ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "5be10d54271606b06174bd2035f4be33282c1ab69eceea095c49d537cf67e3e6e918ed604132a131dd783e5787efcac9a0dc3eb5f301c1d2dd1cd0bf52d63a48"; + sha512 = "152a826f7ca28351a6395728ca6ae1fea3623bf154e00e2bd0e56ef14ef819225a65d12dd7cb6a483b2a2e1e08a3da39082d9997a7116b2a05c66b45f8cd77bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "4e9753d9d416ceaa9b7fb6d3d191739f1e9e095dcb4c20227a851aa0b6a7ac21297d3ccac1a52abf0c5226b9b20702b9ba2d363137fd6c9f44ffbdc497f9d441"; + sha512 = "b5aa2d4450c34eedaadd120da155622590e053e2b5bce0328e1e314be339a7e9def21417d18c094602cadf5fcb674fef0ec6691fecc00e2f92336c393cbc0f66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "b87f0e013ea58a15b001fcfe5b41b7adf33d51490fe96fdb85570dc3be6dc66f514def826cb8469a7517b532bd241e79276774f7e47676cc632f36150259da79"; + sha512 = "9c4d18c8cd48e63a0142ac2af142e75581cb57d242e779b4fb6d18fb3e90fa748952275409fa174261ca8fbebdf4d69251b0681a4b4a0aa03cf03240bd97e855"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b10/linux-i686/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "4a7a366523294ecddacdab2aa863f06eda275fa31cf5ddfbbebd5cb740399507185134c3950a24183da89f87a6cfffe54e2c934625b384084a424ce150e864a5"; + sha512 = "13238f853646c2249e3eb13e140507ed2e3551151ebf0c5db3c8146239bf1a943c794d77beda40e97d93ce0eca955ba3a1b618431fd34180d2adebd8c405a137"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a581f3f48fb6..fc24898b964a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,995 +1,995 @@ { - version = "62.0b10"; + version = "62.0b17"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "d28ef8bf25a809eac59456ae1952cf2f0b3f2e9d3b610b91d7bb263e206e24bb5c553be46c450d7c71ce16f0b65d559796e430b9f0700cee953c891088ea13b2"; + sha512 = "e039e831474ad897e02025413a582b55b27c67fa7e4745042f4f8be5f6c9fa7f40e4d82d05597629ffc11e8f02568ac5ba80dab6028f58ab56663d54c2e15a73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3967402c97db66c917ba06f6d2514ed6cdf072a34eef3b6a47c3751f8ebd04c80dfe6586abc7c5430a573fe0375761b448f5d60a062dbf6a3d2f84700924f2ea"; + sha512 = "51d6b84e6ace621c670e443a75565e18a6aaab48e3f19598d3710bb4545cd317a753cf07090fe9dcbb8f11ad905900b3fc6d6b020218717ccd4666f4b791743b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "1aa485381ada3fab9df3a925bd143742976303576df3d30a7ef095b12628f9d0eb8bd21152dbfbb6d73d2f4e4c1364c3481e9b96a3a003b802c618aecd1237b5"; + sha512 = "9bd7222734ab1ebbbe196baf7c21ff0a6d4e2a60f31f870d02310a9d79f63ad5cc423da0b96f2f5026f59d8dc2a1ca10612faf680e2b39c75da8305b3de733ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "0c7ae9d3de5710ea08ee80610a3e7b0ed5cd89d1bddf3c64b478a10f2250286b20ea062c663ec5ef92a5e8c3af9432929f47f1b2c760d1222aa3eacfee3f3979"; + sha512 = "b8ce2b0cbb18c9bbd9efe40859b65b9f0bc3c98b3085f90619ed84aa13a949adf46862d6cfc5d2e519e198a5b4659ee7c6658cc07904ab71990e20d1147c3b4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "662f4a0a78329e80c9eb466308839036091f31b1f258b5eb5df31f3dcc7b6d0d6986d506392dec30f822c69fc207e5669e77ffdf26c7b7156b42a73e155b65ee"; + sha512 = "3f1db020f7dc88dadf13b12b3c5c74ef5ee4cf61f1a0e1faa49e403ef7c5307420118c049288cdc0151b47f075781a5164a9b4539f2b0e3072cedfbcadfcf076"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ca0b3d4722075dc6ebef171bc36e1b4e9206bce04c8fdb1d038b0abbc120671a2ef4d6023bea627f0c99fbffcd999b70634de90e1b51c518d8642892545c29cc"; + sha512 = "6a91664c66d275c5adc08c22f611905b2e15d5739ef0af9514e923c8ad4baae479cf5bb2240861ff9075ce99180f6a9cb136968e65367dbf53a0ad9621720ea9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "b981b720cb776a8e83953f8e4dac7794c981681d8e6da010f0afcb7e90df5884058349cc6a12d4f5a360cf7f9067b87afbe862842f0ad016697999bc3d94ad82"; + sha512 = "83db2d53eb86da5e409645812b1bd48c0f315e0afd6047567c62685b62efa7362cb46374defdfd935ecaef8e83b469ad5f27b99d12eee286f7cb12efbee4ae9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "a7bd1f001152e4ea8a887e685b126bfb4dedc7a30270128d535eedc04dbd489a3d6117ccdd8893f5753b7d5227d4731cbdfa1f7bc292712ea2634006aa55d6ab"; + sha512 = "13bd2cc3266c63ec87bd7cf1d843b4d93c6178a2501d5b19e797493da20b7b4963d224553aa9b246d49cd444c394127c91e2fb772f9fb60135b798d9ff856e52"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "a6b5f4d3aa3db7be416f4bb604a749c8118fcdf5d3bf01cc57dab87c874f0f52412658c9f509c2d09100f4cdf7f5b446d11fb45bfea2d25d4e65276f3257ddfd"; + sha512 = "2ba3401663f896b58aee0f19ffb088429765627852f0406d6c60c2285d441f17639d4cf102101f2be7a29ea0d15f615db4fa3b3584466b06d8ed52096ee98178"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "3cf7f43ca3fcb538cc28c9ab7d3d6441f15123a1f3275cc81b1dec1007012a970d18ee52e8b8781568247c5a854aa78bc316656dcaef48edb11c7b6c99874bc9"; + sha512 = "e39d0760ad12719b0919659bd0976a362a6df65bb2c035a7e0f6e3e58f771e821b8ce02fcbf32b7cdd5d2ffc0de6b4b40ed7301f1be0293596b509a09a2c4c4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "0ebaa8740a3c215ee275c7ea7669ec4bebbfa4a20f46ef4bbb81b51362fecd72fa1d16bf7e58822024b59934f478699114ca744657aa523d90bff6655b776e5e"; + sha512 = "7929ca419228b0c3aeca4131b1952fa1b754278d77134abc4c1b4ee2e91f8b6349f5e6a4f1a721506262ab321196cd977cd446787c9ee2a3b2d84dc2610bed0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "288ca47c3f89b6fec2312bd254e2d9aa4469a79a767b2fdd9787a7dcf9af589d17a8353a1260a773df63069628b69e916c2bf76c85076f123667f932b16d04c3"; + sha512 = "750ca92294db2f3180e0bbe2c449b42b5ebb28ed71a5b5f0fde1a0f033867cc642d244bacc3578eae5dffb787b9732510f7790c4ffaf2c742916550e5193c30c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "1099fa298f51a7f65dc585f0c777c37f49df0b6c1a18265d0f7460fcbe52e791a9ee8af2af37901f3d73c6acfe919a37966deb4ef5399f59f2ae66563a02ca44"; + sha512 = "585b4cd4d7ef1d9cc2930f9b3fe12509468b52ba0f99efce40e56e28e3fb53c60248bf6362edcdca518a49e9667b07a1ddcd6bbb33487673137246b404a0fd02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "775203aed14e61aed84e15ace9336799873804eee4907ff924a994fe8ba99d4e49960dc1543c4cd70c4fb805ec1474a657c14791ac8322a7d59c824887aa2f7e"; + sha512 = "65c5de7ede82ee5c92903e37935a08be96b164c20031d389205171de6d4afbd37b87acde1717c0c26fc4bfa942fffca97a03023de5c4a6b8b4e9ead07c8b3528"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "addc8fc89acffe5ed37f011b2ef9b3f1fcb815e2e0f2b3f944ab460688c99e54c92ddc35719e56770be3426d9380e33c2bff834fd3b327427efd20d8fa3f83ab"; + sha512 = "f4aeb3ed7fde6c2efc50c4170fd52af33d223352df99fe80ae7f9ffc79281bd6cca55540060724ed237f81f083a1052e389003cc66fc910f1d70beacd59b2b65"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "33c038620535a829a445de6f1b9f9d09e4d6078df3c9172c9ce59a27ad99f7416976fead6ad5071f11fd4fb626b36dd269f072c293dac7fae59fa65c1514e95e"; + sha512 = "2bc2db8f32b38c4fd6176f674bc2b6fd01a0b743c7a9b1a882f37357a22eceff62f55207aff17f8fe61808ecc2ca5b813471c3bb3e0accd840bb45e34f05edc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5355af8ce344786f3a81a7cb53a316cca445eda21b7d905cd4602436ce3d3635a0e99f1311c47014e95875deb50c7bfefbfe3efeceb3faf57e7276f95aeab723"; + sha512 = "42a7ca67d0f882adf403384634e84c8606b6b155af5afe463829a791f5605969ebb2569c74d84bdf4b45f7bf1b0297b1b3b68c2a404bf8c4487dae06b43564a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "11a3139618cd5e822b467df2c1e4bb79caed748bdeb724dc29e6a4d94f6fa75d8434b219a3ce5128f70ba841cd30a8c21516840d7743be9f9015dc919251184d"; + sha512 = "942836a33ed6044ea8de524ff235614f7b05cb4efc09b04782154497b19d8dd548dc46f630fa49a4da619c09e88a337359c9102f605139369d1682c9b408cbf1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "d4a45db4c07f5fc353056c18493ea5a09957899bdd98a3f00878e82b981385a460aff29b2c66b4b807228a729bd4d810a7fd38cfb6866ac2e19f8187f0763588"; + sha512 = "c11ff6ce36a730b00a42eb134209ecf18759894074c8956062d82135540bc3e6667df228ef680b8b7a04be8d3c55b808fa65c8b4f55f41874319d93da1db0012"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "80e5f2192f0b4c7449bec3bacb15cea21f4afc2360c5860c76be29e65ad7894915f03b1bcd719d228ed7f66cdbeb3d20867dc9cbd4acdbb16b7afaddd56c3887"; + sha512 = "568f5b808c9038668e1c1c42b6fb5097d016dfd62192219fa8cb42613206e6814cd58308cf9967c634a332b135a9303e5e27e85768ac0f2cae482ac0566e440b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3dc1eee7205d63c7788b1152f0632621e8f85c1f23e154119ac7106ebcb75c807f6f9c534519e1822f7c5c3fa58067f9c5814d60fd1c045169248e189cfca323"; + sha512 = "9ecf0d27ce9f4f5f7ddf5d9ccaff82cccb47f4083ac0113175a909657362bab7ce80812752ae425de9adb7e87daadd6d3f512543b636bdf9d7bbfa8a908e248d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "fe145a9519f1eae0099903e609bce27d59461e3760a9fa11ad9cb5b8b32e2377d014d7f56d275305669313cab3c9085901068ed30355dbaa5a988c9af1e28ee8"; + sha512 = "1a9e0bc564d36ecdc8e906eb079bf6d3368007cc5e8fbeee7520eeb75d9299e111a556745d594274bb7882e8a513ca0894d3018ddd6ac9177dc2c1d336804dce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "7afe1eab3f574a7c25230bfb09ea1d341b6cccfaebb36a659a5f7a1b3c5d6fe2ebf4bb6220cd8aa12159a67ec2cd42d0425c1aae4c5b672b542cd08a473efb79"; + sha512 = "b3cb6de9a31029cf019db888eb5c4680fa20f4d21f0dd9afca02b35ad039c4c0d844bd0ec8d9790aee0b583951874846d30b6f506f21db2617af4ccf5ab98304"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e0840f4e92de51086ec442a048adc62d5222a83e9ac6e5b3833b76c71a8559c764c7d44aa7e1aed24a1f58a3f2e71cdfe866b329b855d3c9f51d69537ab6e9f5"; + sha512 = "6a4cccd98f9bbd25ffe07087c847e22d62e467baeadc467b33c057b96a94b93e2821b13f8d6d9773ac7c182e06ec2b42b9c6abfe9b20fa869b72d2d7873ab213"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "7784aa459edc544cfbdc61f8e66832e29aba98883b818e5c304210618a5047dd775109a95d902a9c336c6a1011e0d414f02c43dd7e250d83b096758f2fe42a4b"; + sha512 = "b7246ad58dda67f3b8958a54817bc80610427f2978d0a8398fcf38164f8f9c96137fdaa2305be3830a42143b5549b1a3a017adaec9c5c9a2d07060daa85c5e92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "cac7d6e5ff4c5a8c82220c59c835b2852bcc7d6ca257f1c0956fd89c5cfe57da36bdeec124beb413102490c1c1ee135e5d218c14d4b3b5465bfaf75dbb112a78"; + sha512 = "fcf8915c6cbbc578c81888459db625236a3f3ceee7eb0076c43427731aa9ccd4476b4d1a5dc5656ccbc5d5a75cec550d4e4c39c894529651a499db4fd8137c81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "84393d5cf5cfe1c0acb7a37048b169b526a5147adfb66f48a288689af06e33f1b8fdee9c01358b1b71105ef5a10f953b5a364b8b4b576969a068a2badb13c6c8"; + sha512 = "9cb80b1d9182e7f9e24d1ab71c6dad4d283b11f0c8fc1074c5e20a7b847d008575edae6ac1d48eaf64c9acb239198348a08b930231dad156b3209149571f6a0e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "eec6a5281fa9ab6fe4066fc7a33ed8a0358dddd627a4e93da4341fc00a56c3a059137d51e56393f3414d9f882dd0a6e6806e43d6bafadcf9e6c19ee11b7153c2"; + sha512 = "633e9ca0911086309b6fdb15389fbacc88f32a3db0fa8d7420d7eec3cf11fbbf1f548f050e3e88ad0cd397f055a94aa9516a2e2c4fc2eb793f0e8e38a096ef3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "6b3cd6cc4fee12f2b57853a8f7bcc76f8efd38a78ca93aea98b8e455517aae0ff5223edb54c4170cd80264d3c64d4ea5c9d3a06fd4636a9471123587884ccc34"; + sha512 = "ffbb61dc9fb1902c334d7d4cd023fbe09d3cf1e2b44bd1a1d5f286ecae5b8612b40b498ccfd01c86ce6d3e5b986adb9a6a889909095d182e003f06bc0df3bbe6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "762f2c4418e00e53aaa91cc1a58d2dbd457c98a2f0b04f460907fa568adf2872ae894127544fa52c16d532e4ae0ab07b8074f42943fe0c1b95f2e7fef9548404"; + sha512 = "489e1b834bc02fb54500e9521ef18971e5a17f03be582447bb68330e6cd679a3f8fa59655e46f7f9f8c8d6093d8b9a17a5500b53a75e8e2f48670b9f0560ba56"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "1ab50a62a06f3a27f22d38d846dd1f7ce4c606a0be5ec0f842ba5567c550ff4154e7aecc7e308118acea9fe8dfbe3b26b99286ade100247647b67e13595f1dde"; + sha512 = "7e6c9888adb48210b40b7652e5d02d4bceab9f11e4b83df43d334cf0dee6eb4da408d1a9e63c6fab0ceef5995476c0534555096e91c59456104634eca3851bb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "834179706c0d4db08810e5d2a5d5b5353c61b359e10e472d488e099417714486ce9388ca2bf15ba20690ded330a876802ca9b7b702e1976ea872ee9b96b9d21b"; + sha512 = "d17b5e9810428a4268497fbe94b529b8151dd38e44a15e99b9e2bdfb756da2f9a9d02d3905a4b6314076281a87a2a687827cc81cb98dd9eebf7a6bd73f9406ba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "a8376236472b3296f858f28c3120d68fdc9505c594bcc11e6514d9255c965777228406f4a0d40314b32bf826416bc6bc86ca72034b10c4bd28599b09abe72c3e"; + sha512 = "2a4eda4aff30d19d855015451cf1ac20540d6b462d6435d9d36a7aef6c5cc986991f84e8e24ab0c2dd19cb2556a15d96e8e28cc05c72ea028f91f98749945e79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "fef251c6e44bab8d943b532a2e1e45a8e72df7c4bd260adbd2551748f10c1b7fc008695469e43c4c97ff8ba887cc9f65a5ad87f0f538a980988d6f6c3bbb4ed1"; + sha512 = "dfca1b04004b51a8ddd77c68be9e85e0ece4147d074c53f912029934163e56e3e09cac1281f8bb4514393c3f5aaa9acea27d45a59707a80b75fab933e25f51c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "7a2bf7d18eeac44cd2660eeba46e0d5b5c85ed6fd150504e6bbc2e072ffcc7272672854bd37992c9ba33c91dac6cf0b7a2bb32065066c7c4e1c4373c91de624e"; + sha512 = "bf28291a72fde1f62799b5b4794774ae3df1596d1a07678696781949e6f1c05f9751f5c43b1cb21191e7c16d4c8c67f295c53358d9995da41d086b4ce907607c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "987bc98b79d3259b1c36b8231d47c07e7c5619d5d9a3a794f28c213fd9a8540b9642f7745496dc4a4ffbb31c7e6615cd6f721c571a874eb3204840e2530aea17"; + sha512 = "7ab5d5b2ac6dffc0cbffa22971eaa72999475bdaa5baf3dbffd5ce4c2b01027a4c6ef517d4369f86f692395721d9032dff667c0b07ca402ca8d1ffc3e96febd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "99b909e532de6761f94adf995e9de48026af4300fb79f34d2744c677d8df6d363b2627ea64db6fb00765fb283157a0ee7cc2ed6939e35a0db0d72ef98b5beba2"; + sha512 = "7fd419e89cefa2b387b0fb23cfc252ce3a1a628c0313eea8153a8e82da2f74abe069c8c88a3ff80e0bd3c38ec91ca7b6ea7a41251aed3077cbb69d10ca398ae4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "61e6601a3bc092af06e4ca128f1fa0083cb0a7d62f1bced70a44bb3d526ee2cf440ea6663e072801c2358904e3232e310c9ae1d6610aa1021597ed26e9412a0f"; + sha512 = "73676ef0c8568d1d97a7725bb4e4334581bd0e09c3d4d93b276ef9345626841c83659791046872dc04631ada4facec7386e07969b9d6a5b8fd37aeaedbf82a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "a57ff205a6050fa7dcfa3784a84e7c09f2b5e790d24dbf84001b5ed9b122a8904c02268a88389f7a8adc611c8b6ffb86fe07db99ff2993336668fcbb9fa366e4"; + sha512 = "fa8bec8df767f62bd361e346deba0de6d994f7d84334a2adc18cac6c8b4454ef2be6e772e34fad41b5c608b9b2e82802acf171c50acc3dd75a5b16bc66768105"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "664687f45af86c5c50990775c0c98299eae4a2388e2034390af32419effaf21437f36e1b776795e3747f582d4f9f2979c1901c189ff1500123626cedac2ca5fd"; + sha512 = "f58e80c8cda4777bf49ec736dd1cb17e25b7efeaa791d385ad8af63ddf0f6ff01fb4935f8e006b73555c2c351d32566a13164ecc00ca611bd2a6e5403a2a5fdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c7bf83d4167fda83cd6c8e3e8ee67d2ac83bac1cd66176f8fb4e5d6ca089fe74a01163cbd32907d54ffd31e9871392dfa864b49608a81753eebecc24dd15ee53"; + sha512 = "9665884890f6512e5f460ae7ffad24340a545df9f14fe20a39ff6e8363dbabf095bada881239b57203a0b4da1bba9b16551c60d09510a9fd2cd7fc6d5c1d74cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "635ff733faaf7f73e2cae9c82ca6c8a3544ee50963ea8a6d66a27c362ef0f9f33a7898b1aa71f4cc35dbea36c4822deaaddc62bf4dbfb3a196c82810cfc1971e"; + sha512 = "92bf250acc6e0fac999ed4adde4d5412ec87bfd4b70478dc0313a322be55ced401aeffbe3fa1fc77b8fcf8c8da5e47490147e49565eca9c0a0ac37e50b31cdbc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "365f23c6bd1d925b86a7defcb1f79582cdb55b45cba3e57854bb20d0f9d81e64d80a8ba59f17c133b2786a8e6db64ea5ed66a7827ee5d7af2831274649108617"; + sha512 = "be1157e943bfca4e516dd442ac697cb7182590ce15bb7cad3ea11ae438c5fbdd8b86b3102bcbde78f7a2dcdee54ef0886b130276c5897e3eb55f364ad0c0bf34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "5b461a1914318e4c677ffb90ce1f1e7ebec0ee71844d752b79bdb9c96112566f434593d6109ad5ac718563993a3858e0f23ae8261aadc46914cc00d2021cdc60"; + sha512 = "30616cd4e6ba7fd9d98bb7b4b95a86bbb956e58d6403aa9646009d26dff2a2f9e743d4807cc178babd083b5725454384fc646a266b0b036a1ee03d9f6380ba53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "163112f8f46bf50824cea46f9321c01f9f56e961cca8c75d9be1bf62cb1d02f70fc8ac0099b1c5ba4c78c921b99014f56a863ae86628bc45d550820b5cd610a6"; + sha512 = "5736c7ad3467dd7cb01128184ee4de44fde57add1df07d0538387f527b1ba7e0c02a1d50a3e90610d368ec6bcc86b12a63a2aaa6fa37b842ca258b604e0648d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "69824e25b1fc093107440b9bc01afb3f6e2928743c13c600175a899476594ee07b086b1a2d0c18cd045229494b191b77777291bf05d8718c6e555cb7c3c68e88"; + sha512 = "74cde3231acba2627134639efece862877eb66b6852b64d3477069258bc9f6cd333d602f5e6f4216515268acc8e264a54e24b6139aee0564275b74c424847e4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7998a6468aa4d2a023cf824b10ea49340a4bdaacc103cb028b5f86e2e0ee7c75caabd3e219ea31396f4618bd7e053b5138315e5813da88d7730cf50b95f22d25"; + sha512 = "2ac18b1795fb09d39a6dfd4a60d1e99f0107309868a90c8aeb29e721408b886dfc8a53f8fce0572ae91b004586e4752cbf2fcb5a5f907557599cb588fbe8ea19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "4598605812207c90494836756ec3f40658518b4f137ea1f3428f77cd8b108bbf5b3c9a904268613cd4b5deb5d1841989b02fcfd4046b592b8b686e9b7853a6fa"; + sha512 = "a58c8aba9a0ba03adc349bb75a236c06a31d9e627b85ad46b112e1a34b77b9d14d4ee6636fab0b3b1eeedfb494db7129371928e638540393bb9dc468f13bb7e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "be2c99b0b6300137a207be27e4874fb2996b76872fc2a7e0825925629c132a6e2941994279bf5d5e6f9ffabf9121385675cf2d1fb1e4e080e60774f020098e02"; + sha512 = "02b3134b0e46c3029732876017b87464d9c5e69fb298381cedd70dae789c4a79c6948f0b0650cb567eec989fbdc1c0cac077a084627e858a5449dd5196ce39de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "8fbc33a87be306df37db45604e0c5bb4c489436b38d61a33d75cfa1d69779c3edcfb32809daa4515a0631b795d9fe6896aaa31bbd32b9c406a556487f27e8051"; + sha512 = "4ab61d1f55f29c7657183e514c90b58f7be50e6e421a579bf95efe03257d58d9c751e8bcfcf35dd5116a7c898b61fa56c3ddd39150d38fa99b7f0608f2d42c3e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "3b574f1c3667da198e9de638fbf07f595c1dd8eab7deced07f0163d18468c443e4e630e9bb3f53c906ec50805363ef8bd2c349fc58cf1e7b9a498341b7ab66ea"; + sha512 = "c226d9cc2481c199973efb047f98a92b47d325cef30513756bf62d2df10cef578b21a182d36c8bc8f3510c48f143229139f3e2758e916944bc1f0c8fdf56230a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3dce20ed69a821bc734ee0c187ce76fce142caccc08f66f6031f99c8dac2da8b0f8f23a65eba3110fd3b596ac78adf2dd47974838757db7c73b27efd728ec556"; + sha512 = "99bb797482557cdbcca6a1ac50c4214d807ca6db2248e39e6c98b6d2d627763652f21654b937a380f521530186de602e0dc8ecd0eb1a2f11dd99904aa2f9719a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0174ea6eca444ccd1c2de27585aae9e4ae7edeb569bcc3d3ce6b54c49b7a8b58eb235403f197c99855561b070b2b6afc4a66665bef36fc69537fe903a4a5940a"; + sha512 = "8d15ca85b7754529bfb275acc46f61129031a7a9cba7c7caad31e9608c677e2049f4a09bbdcf1f6d3c1b550dd4a8196349bff8937eafbbfdb190e8606ac0aeb2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "170155e9c64f6261ba6f6d292ef1f503c8966b49630215e14c6c61a9033bdcfd6b595ecf638212811628631e36e3cc4664867a817c78aa2e0f38e63077be831c"; + sha512 = "df10d32090a66973e4dda4d94d9c736e0a18f00c701235a20e58164914e3de59653903aba094558f7d7b3ba05b8d5abaa06ca0469437fef8d9d97f868b0ae776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "9f69e7e09848e423cd4103e40e5aad4458d33e6d978c4b00fc867544908c436a6aeeb9d41948262dbd97ce3cf018a71cb6d5a3d32742e2c3bafcb52107784de0"; + sha512 = "29199f1589d24d982561fc41087b94999d4c0baa352188501b7cdfe50b110892b33cd2ab9f6fa3bf8420b58b2d7a9416a74e9cb553888dc16c1365ac0ae8eb5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3f22f9712e42fa10da04baab8960a03fd7f479ec6acae0cd37bad04b52fb919aeaca30e8a5a074c9763e1b48d69310f27ad8bb7d8168a836919b0313f9b864d4"; + sha512 = "92d552f5757576f2c9c3be7c7fd283a179c47f1b8c51675a4f8269235a29a3d887bd2ea6a8a30633c132223223d50e0e2ce65a50003df2638f537d18d09c9705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "f6d1b176db8d1022f2189b24cbca3c47a70dbf44542db310549364da9f442513d77530842118e187b664ab3335bee20171d66551d30927c8ac02d45d4d361601"; + sha512 = "5dcf9ad9af1685968c011fd22436ce226884967a51c9ff2b05f54d90f853d95b3e586137f5c2e24922f685d7c709cb8077a23365b5c226639ee4c89a21f61767"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "bf648187df56f207b720ae53c484e81046b8899e6047ac482ff5a8b937096a0991834a2416a1fd0560236079c25393f9d2171da15bdb7e6cc6bc320ea44e5b85"; + sha512 = "8f7730140f816d6ed4abf7a61a89c8e6ce8fb1242b3bdfa9d8209c87c3e2c7f592f946789aee57eef33176671748b04615d3d8f433c39a3c5e92501bb663e00f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9de51912d21abdb2e857a545d647c4f83da421796bccd6a8ac6095ca33a9dde1b0cff62f548f734fc7510590f8a29c0e2146ca2ab0745f8095a2f787cf1f6072"; + sha512 = "267f33b76df130d1dd06750d547db570a68539a05c9e6a1795ec02898d78fd54cf72a1dbfa8b74c71882472b11929b7eb35cc5c792e374d803236db7be64d5d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "40c47f9bfd0a005f740d425e0a31e7676b2a6001bd0e27948e237bb1f0b087d808c1db836fa06ccf002b4c24e21ca7aa30dfa6dd07cf9a9995c746f73ace7a2d"; + sha512 = "3f55b56575eefc2b515d540f6be6f907b215c244381cdc858231b85e8687f8bffb6dfb25cbdaee38ab536055a134a206816afb71307c61e343e5ee473189df48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "9f5c7410480474c3053aec0c88fb0afe5528382b0e6d8a1a53d9e7a6ff3a0dadfbc3a52212f86686910da7d8c000254dbb30f320a93096bf973ca974e44d7882"; + sha512 = "4af80a0b429fd1800fc6979384ebbaa3e9b13c136f48d12b2cb25a13f10886d85f864aa8a635b59e827ad8d203a91b7c2200278bb04ced4db20e5c68984a150d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "daef12bdd690a9dba14f71c5dfbb074eea26e842b526c2d48638872522a1da06d3c486aafd0713caadf1a41be6bca2609bb38282010b1de8db65002e5a427cdd"; + sha512 = "2ecf95f3334eb40af526e40018021cae7a4ceec929e02f97dad31d468231691b7e4bb29f4bc0a6699a90b45c8ac7df59699ab3c75c7e4dd1c76746b4dc62c542"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d0be68142b8b640b829899da1103a82c7d05dd310f8aef55f38dfb83b8c080b366c4431a16fb912c2a890ac2b76f1c3812ab91444d8f00ca70b0a07b3bfff778"; + sha512 = "833466d1d6eaf4352a1488e104cdeaac1fe7d05e96836a2187f71c9fe81653a7e26d0a488605d79918c8004a9776c86d1f29ef22df14f505dc58415f89f7dd6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "2c813aa382885e2d06aea8e4bf10f0d2582c733285a82216a490ab8ec26fba17a15b9b0280ad33f7cc18e33226b77b6c7d255a3dc00a2fc4cb0764fb7075f6e6"; + sha512 = "76813a7bb7e01d8d0c9d4ac1c3069af5cead2447480490605797459944e8280c9350fe9df7f12a8dae491710d0d374021b99c0d4b902cb734619b9863b4d3ab2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "1a325a8034278cae28602a77b64b2ca33d4dffeeb7408fff2e9097cbf04e11ee98c07ebb71bb963e039d4cd7436ee6dd2bc2134505cef573231509371ad5ff39"; + sha512 = "9e30775adf279cbde154f0fd392acb4592b9c75dce0532435753bda755120c2d2eb61f6b968dc5de7e70856339a6238f36cdf413029d92e8fe2b537f00866154"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "a8eca8c9b7dc76f055d701bd564d17efcdcc82c1b2274231e7d0652ddcd97655dd2c8cca1fc49cc280a7e537d7e463e33483c093ddbbfeed2adf250f77d60d05"; + sha512 = "65ef02670895f237303184e90d06bdb6373af3f0282209588937be77c859db483843638080c35c112c2206f927b2f4221d3cd1adcc3f16d0c2d5b0a1aff7f225"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "071c9078dd840aa6baa97f6ce0e9f6706998d03ce544d7813755ce217d31a3aa436361156e19cf343824b6ab56275b0d0c15f49390af7f061238102dedc2b782"; + sha512 = "8419e15179296fc16a5d5f5d09cfe65aa0b678756c7e27faaae14b7f2bcbc724e43d5f7b710d3e79ca67beee60e5c5f452e9596779e208f58c77883e1693ed66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c27c3f020b510cb05b9dcbd94209a759fa15107d6c81d0cd7f9b1935f01c61a760a1f6f0b29b133268598c20e85fbe27baf3e74f137619671300036500fc6da9"; + sha512 = "50f99e38d85d59addabe4f2437e09c82f5e6e8a8fcaf3d42fbc234cca0c541c735d930d3cfaf7b5b6e3d7c51f1ce82cc06450fae52cfd6ac5e0ccce9e518f166"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "a136c0ae01187558c46848ea5b6d30442493189d8b380bcd60a12f17134d9259424cd5479e164efaaa840b43b355f4da2912d65c15500dbaa70195c5ee25674e"; + sha512 = "c9b27b683ad5b3a015843aab9b1cc73bf1bb216d5a762c273631c04306b8710cd9570109eb9d81366adec16b1138c3a4d860f2dc2497d537185fd60409676322"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "7e22f58ebe1b99c50fb84f216f1506dcd20d4a8d094b8b6787f26f9b44f86496eb68f8463694890a3cad3f491468bf1f2db6aa347446999ec67e598c4d608677"; + sha512 = "e4c6ea3b5e8e895ba9311ff16413323ff982b93583be3751a2a004a855d3174f85fd3898c9f95aa88e00d307e59c474b995f3be99ba52d73759fd4b13ca6cc99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "18e138ffdea50531c30ca75377c3e241954e7ab7be5b4d81c4042a0c523215b570391c3ac75e7e860ee0b26016bdc201a76bc198526d7bd2c96637d633aa48dd"; + sha512 = "cb79da779d9a27177923b211b99f06eba1b769b9419beefd9140ccd538628dc8ded5f40d87c1393093f6a7873f24d6e8b8e18b23e691e583859ba79b8fb5caa4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "7da8c3c9c1f13cf635b1d70836b507983fcde4a50a54fb6781e3f50f4cfda2d38b10bfacf27e74ff501643c9eb93722ba88ef08c938bddb85848b2821727c378"; + sha512 = "6a7bf35979b1fc27816551429cd90cbd24c391d26aa322ab0e7267bf5202181c0a07092878be6a558f767e9c51e91ee9ee2d53a89d4a005b0f0a3ceac1859f41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "47e0b6176db5b5c97051316ddb1d67694534aa3d4d2a84ae68581e23667ac1fd4774c7010fe63961ca8780c7f799ddfd2bd959a83ef57894737336cf6f7bde98"; + sha512 = "299a816776656628638a5c59dc165e8edbd3e84213059ad829615fb246a6de78a6a0db53585d0f27b23e1f4aea83eed4b216f7851fb918c46484550f203accd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "501990e922eebcd108ceddd5779d55852e5d6dae0fa4525a86066096d44ac84e6e09886a8a099968c541a5916a14e59a4c683b9faddf28606606c10af38120ab"; + sha512 = "9a915f6f438937142ed1664b142e2d45663f56384c2be35cc1597762d6b0d681bad5456c9fad947c7b552855086a7055691e8a33e74faa486879e4fda0d594a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "7b22e657f393d34e9612c680b7ae3aadb85e03575e2839fbd75c06aa4577fc57ad4891ff080205ec2da4d303fedac7fdb67774f06c91442a629e5ef863edc58b"; + sha512 = "251657a065f5de9ac28e4425310048cf7960835704586530b201bb69f790c7513ec5b9590fd00b2e1b92992b3574892e311b5955bb3e725908dbd2d76ee5851b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e77995d8427a651f405389662503a6bdb6ee93247f96ee925e214d35859da88f5fa355a9a247d5d8a2536f3b0d962a2ef103f03e8b97423548136c4de2095136"; + sha512 = "129b1b986d3bbd8f3c0895ac1705cc488f5de652cde35be767996825523a65533fd7f75564897722976e6b8be67a0711e3819056f36917048ef97306440e6c66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "bf562ee1a588b6bb97282aaab54d6f60d130e1012db226a805f4cf54a8b2bc6d0dbf37610faadacfffbdff0d50714e83413a5433336e0425fc70c39802b92535"; + sha512 = "f15f4bb22322a95aa2cd10b33cf3e7c74a6cca22a229260118993c08fa7e3f1643a54efe9fa4d6c2241d5c1fcb60b430bf88ef963cca8a2f98c3ec9172866eed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "8beb3d7c5e5466da9a182e75bacf0ff0d512cb7b6d2b109721e595e289b292e11a71471abe8591f5f5167bd8113e7e64d5f4ff1c0827f56de82f01d67e9068f6"; + sha512 = "b46124a50862d268c25cba907f1788bc0b22ce926e3ea76c17bcc32b00b07cce53c3502b927d208a664c04c93405a2d199c26f56075c0c0e0e0c639ac86b249b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "197fdf8238d86fb62c9f5f70a2683c978c3eabb4aeb0a2f06db6c62f2e062158b28062bcca8d5ec871e3bda6a8ea05039a2281734108a898358bb9239a69b34e"; + sha512 = "b28faa2983476e110cec7fa1bbee4ee65b064d84a18908f7698c40f2d551b3e1796358b14fac9a1de32336566e15d7684572435015c4e5ee874a8e96210e483b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "bbc0b871e9ad5a9af2474062bda1eea5b45a5cd715167eb33cca748c27d9c5ad2c3a56df2e4091f691a24b6863447dd0c8e8d2dc808dd7f90a811edc164cf7e6"; + sha512 = "676a127961cfc1a68d65c05266da3debab12441a642f6f98f3b52db5cb830efb25d7ca2bcd4ff88efd606437f5aa729c152a5a616ccca65aa51060197691a4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "fe7c5fcc41d40a0c890dc6b59411a757c3bb849c81c1c4113c053028c42612a5575277400f1e1d93dbf2be748b1ebd0c5063deae8edc76bb5f7234e3d46fe949"; + sha512 = "68351211b3ef98f1930f90b807c114065b675d81f84d07cec5ffdcca5e3a9b41eb0390b7e88c0a2942056bd08e4cd5ab340abe11563886c85118c799e0acf1cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "7d34ae2573d004f8f140607e9991c55fff98babaf6aec74fac6f3bd3f34aa2ca41c82354c5a935429dc3b7e95f2c1472b3715b2d5931b30ebc4fb01e37f18f27"; + sha512 = "34a4af9561360c154e2e9ffd0556f3e87cff6cf2cab90459916c88967678c6b410690607b9a131c0b0aecafe418a6e368666defb5d3b16df7c0d2641e95c42a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "8e281cee72a2066af4c1237f919fa523893957180f0bf21ffb5e0fc10531487a08e179181e62fae7d273269c0ed936a6e2f206bbf4e06cda80507de76d4282fc"; + sha512 = "450bb4c94f380ea801679c8d4e44cbd520a3137486572ab7bb3e521ae9dfed55568c460f83f1383fcf30c581a526c9d03801cb3175e2fe70796ba88428aa729b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "dbb1bdf377df73f72b5e329fab94f3c10a8108e5f60b74c025c6373c593a37b7946e20b035111fa25b69e424d8a9adb6ceaf07d0d5a0163c89a5c3016ba09ac0"; + sha512 = "dc7aab2a519419a4d0b14a4ac5e137440569e35af383fc88638d6aa1c91a5c722b62bdaded5cb18f2cc66f88115a7ec74590f9c98edf18736c6d2833e435ff8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "de0a93df81ef58eb79dc61f2ac641f7ef06c0dbb1ab273b0b244312731bb4ce80907bbcfb10f59fa1cdb94f712499ac708baa224beab7a11ad8313bee8291e44"; + sha512 = "d1d676333f6ebd8ba564e1aa49a003b0ae901646c86d4d58649fa92db92bf67d0d93d6a2f4878361a704553a2fe922bcb0c657872f5e759f0358d0e44a6d2539"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "274ad7363cc5c03672c3a0e4f50382ff1229018f316143e50871bd0a0ffee5d02996981dc376520f558f42cd0696ac334654f10e579cd1139cfdde12014bf3c5"; + sha512 = "736f0f8b577bdd2934d306a1674b1342590b62fb472d79d1eae65741dd0c670a400edf7e7d5caacdb2bace402b37fd3f86076a03088ef1343ee1fac02343f4e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b6febe826fabd153bdb5d66c0cc6f65eadd69d5b0137467861c24f5d9b87a1abe24f1a1d58ad2480d4cb151cf61731faff5d8cf47ef69c02ffd8b8d57b3bfdc0"; + sha512 = "74fd745b38a39d562f5c8a2a410dc67b3fa2bd82f30e9155b00eff81b1f85d18fb2604a1730cab6a440390fcea9cb66c018d0a2b008870b443c3bc08f776ea5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "69fb65b14ce8a63452172e970aaceb41a7559061efdd7379154962198541366dc55190dbae81080d74eb5b2236cc74c77c15bae3cedb12a0437558e10b730ca1"; + sha512 = "a411a89b0289ab47674efbf7bd43a9f80ab79c25b826ceb21ea7968067a78c9e10dcd8fbb101dca57492d5167fd8b604d15aa1fdee7a458b34843815b2880dae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "25d5725cab0dad6d67f08fc9ab694045672d5ac497823fec237dd68d1e626639558222e6293177df503c19e9c297ed22273dda60283e80985c2ef9ccffd16360"; + sha512 = "88efc962145833472bcfedb760f85dd9099b596d574509df7eb982a41ee4eead4b336eee60ea79ea0a376f7fa625db1236b730b690ddb13259c8a06fd03c17d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ba95efcda55fd6c6cf5358bbb24bd61d4f57f2103a38eae3289be00bcd36ba0d451cd9e4bdf00dfadb86abf9376ec202d53be017ae47c97e29ae05b11e4b9c22"; + sha512 = "6be44084b417b0dc52917524317081c7bf1f75398518b7a9be939b2f539c28bad563b7adfa9b42e875daeef80075c5d5aa728dc8dabded1ef7457cba7a601e5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "ef08a290c0b6555c5f80ac162f1233588e579cb32cc09c9a6f86c90c62814a67db37bc496a52f6490ea6de2addf6601fb225ad98ffc99180d16f1587735e1e0d"; + sha512 = "7216aa7d6cc26fe7c98539d0dac48c68530971d8bc99385379d250b5cef3838215f9eefb10b5b05a4d18ce949beed47b75c755880a1a1601faf3feee17967894"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "337f8a7fa73712c03e4bd78a86f0acd5e8fe50c31cfab0549db1037606a538ee0881c8036d1709e554dab14643f89ecf83fcf86fbac5ba2bbb60c73c06a66508"; + sha512 = "9b8078a149e85a8c13af01280f248e2713c4e83e9d0999a5fb0f0eed539355ce6bac3a9a2d4122db06d96206b02a34f6b51a8e5198d3046c3547ff1be85069c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d45c5eb136282a0be9a96081804d25f717dfd210c57f64aa84ce5a445fbac3b75e271ff41d865f7e3ca3356e6586062259e097b1e4dcfe7e6e7566ec592b905f"; + sha512 = "f018e84596c981b135638dcbdcb8d4424bc1626ba48eeb26b83713c45afca5f0a90b38841ab0c08196acd91981090d20e63ec0810a8f6f9b51cd2e5302ae9062"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "092def4266f697f4bd01765aa14d2a260fefa8cb7083771133d48238bd4e5ab13a901fe2d175f6c38814d74ee5236452fa7e49fb7d203501bddc210c3af7ba0c"; + sha512 = "96fc4019d827bfce46684b2e447197e6a22b09843967c25e2dbc7c38341117c4f55bc2d16d4b5a63445b29ae08efde697c93bc4f677d3498bbc2bfc8f346a8f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "9b459458fb94ca2946fa5e461c3d2770b00a45cc11a17cbc7d01799871e4478e94fb55605eea23d42cfd0494defb929f0ef6faf043f53e227cf140fd1ba0e0b8"; + sha512 = "ed6c25d7f4205999816c2cc7f2cfb7ce682087656f1721af8a8f4530217dd79f23032830252be629bbea0d6a19422ca7b307dcda341dbf287a7dd9b901ccb197"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "75a257e23b377f096d4d2f6900e1a0ee3aeb3952b513fbc39d5ef771337c8639f4f076c98af6b7719b396684a876f5407c13a6b9c17af4ede7c7919dcc3541db"; + sha512 = "6e5a6a59694fe9a2b386e79b874cfe92282d177959c447c7f500f9ea805d9e07cb7c1d57eb10f1c8e3426f142f28c1db03cd7935321fe81f6548d4331197b259"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "a3898ff8293e78ae37eb017c16d7b2b01a2b5108ed674303505cdcd088d13ccd5891435bc128624317a7cf4b917072cef9b56cdec75111f2d7027bf42fdcff26"; + sha512 = "628ee5f3b03527e222a55f434b6c266d98b10d7fd41249641e478233fc877f28c84825366d5151e43f3c604a0c3df6e7a0753b3a04213e88b169daee7da71c26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "28afc83cc294430582ba0e7400c72f0596c15a9a8691a8c068dc2473fc86528beabbdef64ed56098e510474675e61d7b6d4616422a9f67f6e7e930c11e550247"; + sha512 = "e47cd677d2278c5a6bea963c2d38c8f3505ea295481cd934a5534e4b6f1cd2b5ad81fb7f8dfab1f2a1dcb4face3ad514f56e1c7824f559946a5fbe5cb4022ce1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-x86_64/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-x86_64/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "3e25f27060906e4ca1c06627019a45ffa09384fcc3b3f20450138e9984cf9d29d410e67083566b58b3e99a15b8b7a05bd0716cb797bd3958f1b0105066030590"; + sha512 = "cdcac4355ded1ae2fe0900a44e077e2f9a768cb0207dcff57f9559721338e1e9f62d4688dd2397f84cba6c7e010c1431302f91e42c9d2c7bb24a732674d73957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ach/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ach/firefox-62.0b17.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "45db81de89d4b8f6eed856b6ea00531de1879a1c61425482e7eef65fb5eeb5614e894078d8216d98f097e1c3356c6ae62d12e4c9c4a17d2ae0cd026c0a13898f"; + sha512 = "a0f0c7bbc8ce8861cd3ace0acaf3c92a9da788d0583ab7c83557d6431623f80e729faeae14ac3807853d95883466a5cdb2ff25a72b255b84a3cae00dd5536904"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/af/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/af/firefox-62.0b17.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4aa9ecbc712372716a98460523e463e6144f88cc5ebca2d2e102ba1c78107dc9b287471a383ea7c55b4b0d1930501ec69202656346c7279e5c15ea32e3ebb5a3"; + sha512 = "04d5e91ca8d227fd3790d36e7eb846cea50b0328bda59f0751b57fd8befc6dc9c74937b4a77ab0acf9c57b62283e4df22cc457c21283f37eb857deb77c428b63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/an/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/an/firefox-62.0b17.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e7c69de522160378f75ae339b62dfee2c8391247cd83b5b2b43974e7659dba131c954812e4ea55608f01f4f024ea8f8bb37d2bce95ddefb8e50ed73b006acc0f"; + sha512 = "d4531e9ece8dc30b47aab6053ece67241ff052ed3b4f31d8cf4ffb9a3ace48abbfd2dee6d6632e3f963955d6b352f09bde2a2012d8c48ff0bc12c961763fd70a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ar/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ar/firefox-62.0b17.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "184c608d477ec5f2fbfc547aac6e5863208d92b1de0cc362efd68b5ae0d414141a904c9ed7efa53f0946d934a737d3ad897b6b92fe469c2aaa58aa7252ad2c5f"; + sha512 = "4b5d1c3b2f9b8c8bfe8a8ffad3a62cbeda296ccd521c8e937967031434cc74ca3f7e431d4a1b852907d07ab35e5fe11f9fb74eb592bb317cf67bb93ece5b8787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/as/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/as/firefox-62.0b17.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "d11215275176c80bc479bad71e88a42d2fab7af2b92803a1c34fb80216e0d07fbb0af8350918d6192640a42186725d42b64f95e85c8822e5e0f9b208653c3647"; + sha512 = "7b6b5795882034bc8e790ec42930cbe8f52f2f0daf63ab8a7b9eac27ca7cc4e0ea604ca08faa8dc8e560d550bf6400b27b2e70f9b8597c011e0c59b56101ae25"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ast/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ast/firefox-62.0b17.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "bc3b79d190a239827f52ee2bc2d5baa58da3e6827878529571e1758bace4bb2d87b59319b1760c3df2921ae620dd9566e47429f63a9c213dfe0bb2f277703335"; + sha512 = "e4995dadc334deb20c0892f2f980cba5ecc9c06191580308a462c23cb972486891a981e81db7ae54f230aaafafb0608bb231d8a4c272bfb570674d8babebd57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/az/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/az/firefox-62.0b17.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d009b86e540746257d691125407bdc2a16e9770da25079376591e113a7be128411ccb309ce5dd3dfc11a4e5136fba9c98452b2fe1c7642a76c17145b0b65f0a2"; + sha512 = "59b0cb8fc86339608550188866198ede84cacec5f82593fde8368c379feb68152611e6129fd2dad8e00f07bb183455f9201849b22c38599078873cc3ea352e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/be/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/be/firefox-62.0b17.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "490362f86b3ef01b9cb28aad1ef57f32e4f843a7d5d9c5cc57d803c3571abdfb348082cbc9b5615a1b47f2192ee2041ba62ec28babf96c1541ef633fe1bb794d"; + sha512 = "bfb82a8b580eb42939b00ff2d92cc83d0d2471d195a8f7aac5e808496a9e8a078f974093301dfcbcd16759b1f8b69134e911de35043062fec9f7ce2612315bb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bg/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bg/firefox-62.0b17.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8b8d36783808a0a1edb8fd27d163eea9605a88f1949dbae9ca9161b172ca5fcb11a4d127a8e1e321bd4c5879aee5576ed1b2ace46ee47d528eadda56022a1fba"; + sha512 = "d878c71266f98a4778840f1f1766180edc7c40ff7ba976d984ec0307fd3c69ac945c343f7a440c592b04c11be68acaaff2d99fef39adacb66fa82cd2213ec858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bn-BD/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-BD/firefox-62.0b17.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "0e57b4f8760e1747e71c550df26da448ea2db0ded608ef1ef1ae80ed9d5d03b26bf4c221f078aa04481445841bb90032ddad48d03f36910653c1b3c64978c18e"; + sha512 = "856e9755cab299753252a67c8d0eeba489a2ce7a87af032c5b55105f90ea1de28db3e99cd4aa09ac251ca3e5babcb53934a26ae57f1231656611773b3c988da5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bn-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bn-IN/firefox-62.0b17.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "3300e0a5f742001006d7e30ee6ac50a9a2fa4554248ff2b29349ddd993d1c7a85852b6dc311b0869edfdff564f5442ee1ceed033452933c36fadb155407e981b"; + sha512 = "c121a4b4f468ab4a015c2fe4d2470a2c61f4c7d001df6501dac8ae9dfa3f939c36e7764e822aef94f172725b03df7c48e9d5ed46b658c7bbe69d5b1de534c10f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/br/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/br/firefox-62.0b17.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "da396f23f2ab91c05d85fa0099133a95edb4e05700b0e08d5ba240a38d4efc20ef6769fa3a0ff5de2622d1dcdb381a264db6cdc90dc3434672223220f6e45ce8"; + sha512 = "b2904226d994c9c699f24c39fb8b0f50f8cf192efda15a3ddc3915a60728fcb50b4942df514214a46ce29695f3c3c044bd33d55bf74ba965af729c85124caddf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/bs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/bs/firefox-62.0b17.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "2e68d37451290d73e04d6a5bfd192b399cad78844ae667228aa18b77c08da3ec7cf785fbafd5ea490a3bacefdd97df81a55c9e944d8cba6d5f3a67a257d319cd"; + sha512 = "6f0f553c749072dbcfcd5da45da7bd1fb2276a10770938a0c14070b2093be2eceb0684b6c53b67e07ccf1d8b7e61b60021abeeba57d4a13e2b9d62deef012051"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ca/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ca/firefox-62.0b17.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "ded10aaa1d983d636f7182622a29c1837f51ab27146660139858608ffc9caf0c6f5b836434b1cb1d6d837188cb717d75b1bc69d73c77859fac9c705193939e06"; + sha512 = "707bb26b6cc24ce9267a813f266cdfb5ea788dfbea502fadac5cf49a54440c8d9831e87d5e5bd49e8002a4622d2545becc2452e2536387c70e25c1d7147a0848"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cak/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cak/firefox-62.0b17.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "e4e5ef06ce826d5318aa4ff3b7c89ad88b68785e14eefd4bdbea01c38c5fc1eb43286cf33225b344a6c665ac8ae264b4155fae8d3e14123704575da4b7382219"; + sha512 = "717c98a64fbec95ef1763a86a35466cedcba7b657309b3bce7a833ccdfb3f278922909fe74e8a875ee0387db76a8f9f4182de8dc1e7eb17ee59b2e424ef6a871"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cs/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cs/firefox-62.0b17.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "f142fbdeca019d1d5d012d9046514cadee3e81eb444c5d44d8ec83a9909ffb4837b0f219ea1190d06d5794e38e15121b33e7ce832a58b564d2703b7776cddd9f"; + sha512 = "54a1163d642b77210d3127b56dbbf0cac60b3afee6f8b5884f85be8c81570445e74e3e7709aa8bfa1d5e132e05d2c6899ad854a38d42389d553206b7284e3c64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/cy/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/cy/firefox-62.0b17.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b0e41b3b2282b60821db2015979ba228dc32118c001473f6758633ec27acb817f097a985fcf782c81c7035a8d29c77eeaff2b217183979163fbb1bd83b6fedfe"; + sha512 = "f160ce85f5430bafe9f43275a7bd0c1f420c767983b5f25580e63de7d962a61259067628dd73381f18ffd7b9bb70f297a744d2af5fad96ada80e03619fd23984"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/da/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/da/firefox-62.0b17.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "176b7033a988ffdeff54fc738b60505af089a6e43a38434b66e0405894b7b6cfd019cb98807aa24e168273978142a31bb5b744ee6e88cbbdbeefa715baa28f36"; + sha512 = "18f2f42819bb23f5690ba64153c4c4acab1519138fb2ca9150ac923d69a4495f171abf3a5cddb429ad09a090221df6461628ad8184c5bd05182108a7a2120cd0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/de/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/de/firefox-62.0b17.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "d1d01695f820f9779c9741cf7fc5d8685bffb6e0d0439d37408f946229d78aa3852adcb5f24f8382300f232c157ab2bd44dcf99affed9295aa7e271aa135ed09"; + sha512 = "ef480f7d900f45800060984543b4eb3bd7308cd8b8f032eff06bba5506654fc96921752da72b73986ca55125ab16a2aefac97d5996f705be9ce9b47d6faab726"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/dsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/dsb/firefox-62.0b17.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "640efe3fe993feeb58be649bda72186279108c08a68ea1c0258186ae48cd8397a8edb5cc3678360168e17f2c78c8c3e7f45edca0a28f43ae572bca817efb3ec4"; + sha512 = "8c05ebe73ed32e25b11d36800b9e1103605f4963e02b1b72a1ac35a8ae10aef2f516431cdf4aa32ab376c15b4bf07bb927daad020a7693949687ec46904e2aee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/el/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/el/firefox-62.0b17.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "993563f872020e49c5c12ecd03322d54f449f5161506d0669d80338133b1a2f5a12ebf6938dc9aeb89dae3dc589cfc3a80a9da90f40932b9fb02698827e4c426"; + sha512 = "80da58193df534fdd8bc2886dca3f21986a32b8b940bdc1077f259edcdaed353a8f1437f968cb9dad5b46e06f94356354fea17c66781834be4b22d4775bb72ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-CA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-CA/firefox-62.0b17.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "02c617c9603a19d27acab55a5e9bb742d30bfca3db737897d50e9d8a8685487b0600db1dce1769a680fe3dce64dca107a31b904222a534e02df8cf51df92b31b"; + sha512 = "6cf787b5b646ffbb43442a2066985dbbd2a99aa0959dea691bccf4d0a727213f4eef3bdc232ddb1e4c58411c3412ea06d11f3f3f985ffcf646b44f2015bab4b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-GB/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-GB/firefox-62.0b17.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e096f0b92e79caa3f38bc805e838f18ae43880235bd409bdc53e545bf73ba27731fe1bb1e0baf1ad98c6f726f29e253368c47e69925145db388170bba6deab26"; + sha512 = "bccbc642ac8f4dea2365c9d2d4efea2987d06c1708dbc51ce6293c5c2ae02568dbcad6b101ca1c8c4cf1e0e43d8fa8e6ef60a2a9e811e13544ae1579658530a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-US/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-US/firefox-62.0b17.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "f29ad64c1eac9314c06a8873fac9425eb0a038e5dd2570f4d1a24d8ef071201f5cdd0ef6280eb3ac790f8c5c55bac3fc177ef8004b979909f4c7949e42d82846"; + sha512 = "5e7c6a524ffab57954ca30ce717aeb0aec555d933d5584f530c8dc3194b6ed8fc8a57e2d4d1c48539aab2b6bf7bbea51617a0faa0c4a9441ea42bc19902cc874"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/en-ZA/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/en-ZA/firefox-62.0b17.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6dea9ee48c0d4ece3d9e1054f873acb78cd87150a3e21eed3cab89d2ee8cee58fe752167a2fc4ebedd630a345fc59a2d735d1c451c7b0537f5a8d5a7cf4faf30"; + sha512 = "e214e1f6d179ea4ff2b6bcb79c58625d269e1e41c17f506fb3e80f5cf33f7e24851baf9c28c7f1792555b576913009ef3b7c648e91725e75cd47711ef280b471"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/eo/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eo/firefox-62.0b17.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "699106f53dafd9d8b9c8c72e7c2c58418e83333b40a884d12506db2703b159fcecfa3adbd65ae27d4f71ba0ad608ab1da134ae59f2ed6d3091e01ef01a64f7b1"; + sha512 = "ca05ac344bb68941ef82926cd9548036a3ecdb0fafbd71aff1d75b6c90b82e55ed8f3a9f00800656c146356a4a59624835e23ef572e5a04872c7966d9019e661"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-AR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-AR/firefox-62.0b17.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "34b9a99f25124039e2702efdb22e067e9484c1c9a01256a78293d11147796a4caabaa0f14b8002d1fc5169bf08fbd02a0c0ccd8ab42c9dcd30247e1e016d3be9"; + sha512 = "7ad38902eea68a200b4da512580840d54f6457515d7c3d763619cbc021315dd0b153e224c448ae99e7122e9dfcf53cb6f059aeaaa6319d8911e092e6bcc5d6d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-CL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-CL/firefox-62.0b17.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "eca27fe26595efa9610eb7ece6665c610f720177fdac8b4fe5ff55805995b9d0b48f0b43c71ea9a546da88959020e4e3dfc035515b0c63a19cfe1ed980406fa4"; + sha512 = "19dfac04335e93ca66cb3767e7547224df13c278043bcece2a437ca1b63ca30e9930232f6aa8314d063557d4ed6889780ce5d0807b056e97d49a767aff495ce7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-ES/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-ES/firefox-62.0b17.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "da1471d3f979ece98eaf437bdb1bf153c1d05266b41b8a54aed3a78a30647eb476b154a87d0f0969231ca11747a00468c3d5759de24442eb1c2e3d49a85916ec"; + sha512 = "f7d72327058245c76b8e577bbe62cee4b1c6333836386ae5a473e56ed825cdad023c3af9038ba23b1527c1f0beb4815765b8309321984bc9f13d67987ab0d03f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/es-MX/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/es-MX/firefox-62.0b17.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e16025fa517bd2a670c8a7f3bf2d5f05e8efece75ea8ffedf88f5e0e728d18b6c4041c399da501d2cb0824a64e30503ab71a3fea068d30037fba47d494ed0ad5"; + sha512 = "c9c637305140f02d26a1d0bcb99d3419e7f30f12d46c39e611ad8893d918b770633d08b4a82c6f5d11b06621e32a530ff7a065deaa958eca6787fc4f0024192b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/et/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/et/firefox-62.0b17.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "b7029f56f0f7d6d70ebbefbc1f406c75fb1f0617eaeba8864012738921b18675c752ad2863f177d26a5949a718ebf82699ff4bfbeac8fbc267578cdabb8369b9"; + sha512 = "585df3ec775bccb61a602a3e62cf7faadf0091d2fc328c74b0aa8810cbf3d614edb418f95873c56eedb5cd2ad3efb211cc972f6425404f10b0f43b5bb1480152"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/eu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/eu/firefox-62.0b17.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "4f2972f199cde9802742cc7275c7e9df1848f04de4e5500db5c09522948b4a3ad027614783939d71d7b6d5c003af2ddf4411d391e8d391282a2cfde48790db82"; + sha512 = "071688f8e892d8deb70f65f0176a4909b337e1350fe0d0fb9cf1a66ff69bd6979083ed99543f14212f0936ccac084afc98979655645fdd9cb37250f2639e86ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fa/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fa/firefox-62.0b17.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "10d54de8b66459b1085d0cb04c4448086dce730b8af1c8a31d340c15662f206d1fcdb1ad09bf6744515cab6fb8db69185a2cca9f3fdd438fd57b249b76e9a7fd"; + sha512 = "efaa758e950f1ca0f4c011ff1da8ffa5d6d3c9c23784ab3a2cf253bae95d6d25ad8fbdb05167118099ef6ea0037ae341c4c4356cb5af849db2f63b923e616e6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ff/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ff/firefox-62.0b17.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "ec98734be92fcba4764d61a0674577ac388f8252ec62a8631cf66ab4eb88e8a1af2ee3157e0cafbf97c59a48d90443f0a8781183999da713dea2a7d67f816ee4"; + sha512 = "1b30f20f6959803c6f105588d612d2d0d88209f2103d829d56f4788b43c4faedc827fcd150a0af0c4987532bd4bc7ccd7591afc34e6e22d18ec304841d9c450c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fi/firefox-62.0b17.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0a9c899263a068262d8f4d0f666c43f8b06bc6dd9377be27b88ed1920af42eba98df4b491de5d980f54f43193ec6ab13b8cc91df95d6eecbf755930f49b1f4b4"; + sha512 = "97157deb509825073d484222b5402d8c8aa239285b9af7f12e92649672c1fe1d9454ad5a88d38424272956fbcddf069ffff2b8d80da809ad65f65ac185d50e8c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fr/firefox-62.0b17.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "bc23a2b13d8cef1b92c73e2fd647a670db5933a4e93a53d2bb7a5814d6fd420a5cc41984b6adcb9863e1f9dbc451c9442e0663f096a707f947f0420bdd6924fd"; + sha512 = "49e01d81c93f464e1b028af91113123513af7d0f4cff5f76f7ea1b32201a962c49f0744545ec82e0314aa2c74004199d2734a8aa236d057c6673cb2f8df37b32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/fy-NL/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/fy-NL/firefox-62.0b17.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "e154036b3b4f42de8d880be470caee5fca4a393c469189fa59c9bfece9b9a2b1fe9f32a65c77c47f8260d5ce0ccb81e1bd0f43ddf98bbc608e76db446fd1be40"; + sha512 = "e121aa2fcb0c023ce339d2764f58ae489b1fddaecdd4751d76c6ddfaa2297e071a5cc0901e36fd089dbf3db2eba74ecee57e379d7b2bf0e71a887b87a4fb9425"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ga-IE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ga-IE/firefox-62.0b17.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "3483257b21b58172c086c291d77a3c651e07d62b0823832d5d8e1f48fcb9d0d3a7c35df29e11e346380e78d6463802765ab1009ed4e64d7e0f4db1e4beaa6419"; + sha512 = "719d35a8d603dee4be8806dedb253979d89cb8eb912fb389b6b7889c5bada5cfd5c797eddb3612b9ff57147df1ee2e55df9272619e7f88ee63944bdf9697c050"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gd/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gd/firefox-62.0b17.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "de877d65e07d38d7b30bdbd3be409797b22cd29b3ed49138257ae008ee022655a3082a82f469ae99a2e8bbb3d4787c35377aa383f43da9d3cbc978a6d73c9bf4"; + sha512 = "63a247caa38e0a9fb34c99f6949272fb1139db5944a4fb2f13b3ad1ea19fffedacbe70c3a409c1189de5d89790cfb03ac69c22bb224f6318010b752f520ac4fb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gl/firefox-62.0b17.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "37c29b7e014b20c93733adf75bdd4a427d89d8d0589e26bff48a94c4bbfdf3867dad8e6df0803afc08206c62f6a6952d46332e62258cfd2956416b4be29a3a5c"; + sha512 = "93a3feda1be1d74eab798e60532b99196ed343999d7b7b49ddb5de98663657cdc894e310e705cdd8e0f1a1e0333292014fa47e787f15908d691ccd3e51fe27e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gn/firefox-62.0b17.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "5931414b6ee32a5b8e2d3730067b16b924ef93a40e93170592ec66452311dd9d50a79a73f26c143e3ab9ed06ecf8b341fd035445ec95199340dc64a10d9df3d8"; + sha512 = "d8b94e55d6770646ea47ace57364c0eafe47d62a2dc57a40a2c7db7e74109b04478e7e8cad08d29a553eeb2c23bac896476b049f9ba99f62f1b0e585f7f6f403"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/gu-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/gu-IN/firefox-62.0b17.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "80bcf83c93319688123fc4256eb1346bca6d307ae9c87d0427eabecb006897d73c1fea677e33d1b9b4e888427116c2f1a8df60c47465becfe4a947e081b8d5ac"; + sha512 = "1361f71c0a98fdfe727e8cdcde445c01244d63520a37036c95abaa2175b450fa029a634e6b0b044771ddaca310a92db2d5526eb8111bbf3dda7e605d95e6cfc8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/he/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/he/firefox-62.0b17.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "05c03cec4ecbf529244f19823cd00e0829e830e4c23faccd750fb1f239ea155b74670d315b8f1d94ed692c62f0c41fc30a6c051ab0410f84f408cf399dbc2225"; + sha512 = "0468b5ccca77ce311059cb204caa3f9fabba2218a33c6d1accb3adeafbc9523bd21611a2c0d2ba926c3bd9c1026323a054de2bb6017344013535665da9ae2d4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hi-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hi-IN/firefox-62.0b17.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "92655f6a715fdc11cfb65f78bdf330e7f1bedb445db81069ba14a6baa1bd8494042ea837fa3e4f8f738d9758e3e7b9fa54122e7aa063ddb629020646fe4a8dbc"; + sha512 = "76900afd9f8bbf8d8aded010695fefb9b45a7fe06908e55b39f7447c850716f5c4139cff722aec342ec88fd3b84f81bdde607d30e7d6dcfcc4e6a37b5a7ea973"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hr/firefox-62.0b17.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "b87544de15a28f2fe7ad4c9b9f41b4bc1ecb679ede72b28d6dee37717f7c72343949691bad30ef3259680d21c8bc302e5a63f346e1714a8b3f7dac07051a3afc"; + sha512 = "59f5dcad6e28a127dc702458d15f094ec106013f996a136e07b6a7214751cfdb9e50dbb46bd3eb202156612a8e67e4ee6bc82843dc0868a7595e9cc9afd48b9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hsb/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hsb/firefox-62.0b17.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "003c07ea6f748a2c98a8f4846484be4f49bd4e0541467c766eb00728c79a9e72441b8b426b20f1a6c84fa66c5c7d5b6d4903b92b5cf15236567610f6d9249816"; + sha512 = "62496712ebfd4813c428639f05d936c9444e59725a4f1b43ea2eb164468d90f8a3f8c4b20280f61a4049bda348f4fb973647f921c3da384e05313bf748230917"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hu/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hu/firefox-62.0b17.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "177bc5d4653f8c2f555a7d8f8998a7433b607ff6e90d65f107ab2b40ee5349f96302ce63dd352c14e23f399d6a815fc0da6e52260d8d196daf4752ad8ad0e183"; + sha512 = "51d0c976525fb2beeb53b83254d8b1a3211618e65f44a2e9dfc02eba6bdea229aec340242615481e4170a182316242986f09efcb7db14f83c86710ab13688981"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/hy-AM/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/hy-AM/firefox-62.0b17.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ed449aeeb3708c335b62aaf5ce19c6f0e510505dec97c10642d5a1eb9b9befa6afe8fe14ea8e8027d0588643ff37b8a08694748fa7486b47a8aa20d841f41996"; + sha512 = "d131287920a31ab5daca21708204e405681c7e1e6c860cb10b16b475e42ce1160cb7084e31833bffe317e47710729027fe2f77bcffd35e715b661ac81bb1748e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ia/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ia/firefox-62.0b17.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "caef9f0f146be66981c92dbfcee6c3198c361183940fcf8a82dbf69572e0b53209ae9823bae5d4727ca63f5f28dea0fef15c810d1b5a054b12f912f83d23aad0"; + sha512 = "50434e6bfcea74603cd9a5d8f660295e8c433423abaa5e27b192522936fb88d93a27ad6ee64fa136d120af6ab1183a7d21bd85bb3577291863f0b4509d8ec8b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/id/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/id/firefox-62.0b17.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "2baea66a7b8a9f43b3160130c59ec8e0b5d80832b4a79147185b6f632dafa53b9206c1824fcd2fa167efd4d9e24929ed56bcdaf75e453ccf5e2e24d638e37253"; + sha512 = "e3d73385e4120d91dd08fb3abc4f6268f6d10cce23ebd34553e3037c176f27f39c90f8fce59a0416cee210e73b1cf57b2c92596b3b4634700d8287a89dc3e014"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/is/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/is/firefox-62.0b17.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "a2ab5f55bc7494b546f28e6d322d180b30ee0ac4af6151b9b1ec6bf228be0ce569177bd503e0893bf065b120d697e1682de5d36e3f47967abf03e2d6d1f80899"; + sha512 = "775d84a419e24914f31cc4d34dbfde547e42c35e41397f4ff462a80ed7f91cb87ebdda4a248735d402ad57bb00cd8d7084618a381c89f53d6ed17bdeccd93762"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/it/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/it/firefox-62.0b17.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "a4d4fd7470dc71f17fa4c7e4b9f4342bf44ca318ece327ad4e8e45bbb4a972d5401da5313e1b60b7f7c847a1115239f62f962afcc1f509faa1df90f44f2118da"; + sha512 = "27e315aeea864d91b422c4e6c698e9de06fe14867c12fe8b455ef284ebfa80c3a00774df7003150ec24abb05f8717577092feb4a41931071836a09fceeb3893c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ja/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ja/firefox-62.0b17.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "db130fa050eed1c2e413c93ee928f5f3d9acf0f749cc29eb54b3dc2c676bc1a138fc14da9ffd7d261fadbfe3f9611229c3f7a7421c69feda7811258c93ae96b9"; + sha512 = "966d8519de5579a30a1cf8cbd275602cf39d3390ae9f70bc56709ffe71b0937c7ac4ec6788c3b972739376f76114037da6b54d94c091e035a8fdb5c3832cd4a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ka/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ka/firefox-62.0b17.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b20d5c5cbab48dfc924c1415ee25c3b4c5be6070797352bd205529786ae0b2b08b68aaa1d8314f7cc93ff29e865407e48f078f9a5010405b52c2280681d06fe1"; + sha512 = "029b687417bd612ef8d26e209795c8691ba310d95c2d6ef4603a71a0c334a96c12e54b79ef1b02f35385f28f2d7d399b7c8bda494d3c8e8aa7041f6a9e9771a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kab/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kab/firefox-62.0b17.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7b48ac5dd887a7dc0c69025853e9af79776a92fdbbe8e357b996e2869827f78af1bd4a5ff6c380cc9b1f82192421e8f09da8fa9c2641a44e8c5c16f7a55f699f"; + sha512 = "bf07ffe28d321b12435f441674d28d26cc076f0f3bf5a4c74b481581bb2bd1204c66a7ff76698759c22436cbe9c101b337a007c7d44530f6d2d87e89dbd5d95e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kk/firefox-62.0b17.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "4e82ce00c4627ed3af79c1f83e02e25012603e17d8f45ad7a9bc6c89483017c9e4f6b97a4b7cf3cf46f3611d6ee66eb9757b9b40ccbe9d3eed0fb0119e630dee"; + sha512 = "2fe956a4f39c6e42beabe512ce45406ba586b462a604bafe3ed325e7625ff1558bcd0e200c147438741a6dc010d9fdbdd1728391ec660600e60883f91fe0f203"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/km/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/km/firefox-62.0b17.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "8a99eca4f7dd7c82e83e01d36160737d325d949fc423aa64abc1dffb82a404047c97512a046190c601b27236f48ab878df3858bd8d57bb0fbdaf9927abd269d9"; + sha512 = "abc5c7b2bea6d67f7ad229a00859740c37675a584f3835608bbc6e9b0e1a267f81cb4e29436dbaa67035fc1824f2a8c8d25de59b328fed512a4c6741fe737448"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/kn/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/kn/firefox-62.0b17.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "798a246bd5ea6d8478b72d5105b43150e3754ad97d886bf1facf6469c44e1045d86fef9d7fc6ed66598cf9f8cc77e278d8cb04ead39afda5e280abdc5174907b"; + sha512 = "a26e3c8ebb41f40bf8211da74f8057bf058dcff95606a9614ad75340b9a1f1bb2c21f368beadcdf953a43a837d7ffa899a3869fbaac0464136216c9351a8173f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ko/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ko/firefox-62.0b17.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2245df3c930f4d5754c83a6d50ac2af03c3a7a312907f00d12a2a555a4b3ca7678a2ae39b8166bfd2bd547aba4aa3d20bd4c6b4e3624d2cf73b59ffcebc24e8f"; + sha512 = "1b6d2dec4f3cfdd1e6f80c7bd35007d17394e7cfc16f8e5c469f3c8dfffddd9917dc775f0adf3e86d2956caedacae98d78b25961061dc7e214394fdff3737d33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lij/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lij/firefox-62.0b17.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "0c4e948e1cd3aa773fcb38ff0399280a4dbc5c3f27751d1eb056e5d7157a4aaa00b7f437c45a9ad1ce566aad6831fdde7974d788dc336c8b79da095d44a52caf"; + sha512 = "6749c691ce78968dff64f124b992c9e45882cfb245f6e406c8ec2a74278828d419beed30ecb8762f2330590474db5a209f0720c574f1eb4f1fb0739c80f040ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lt/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lt/firefox-62.0b17.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4115192841dd74ee49e5e8b28dc877e144b7b517141ad0919146d196abd822a4ea379544fcfb5ba457facb799913c381c7314e8a4f8acb1b2cc46fd0f787e604"; + sha512 = "cceb2c1dcd6146194fc6f542b901723d9101ae03157567b4b6f0a9ce680a7c3d18e7ea959a4b772a75e138ef19e0c6ae7aa70e2c51304ef8568264c1e1e5a5d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/lv/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/lv/firefox-62.0b17.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b85f86fd806789849bd4bcea933578f70b38c8cafb9c52f6112cce1b3f4196291adfe03052cfd51e76ed8705df07a6d16776cb9de6d29bf8dec4eb77c24a1003"; + sha512 = "1f9a6f75d4f4cf44f6bf3244e9b0fde13358914602579a25b8e8146010321b0fd31de81aa55aecf759163ab54d4c48b580272d3261b1d534da26c1ab8664beaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mai/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mai/firefox-62.0b17.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "069c073c8a2fd77c7a6de72b7b689e5e1d1596284bee7a18c33c55080b2d1382edde21c704fe45048f879ba8ba71b662470463b28ed67f1334f54f246399cee1"; + sha512 = "de067af17fc6460fbe046fa661eb85e609061e68975ef8f3ba22492a6ada228a09ad92933a385ce184688a4d40477995d54cd548ae03ef37c73d53039599e97c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mk/firefox-62.0b17.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d231cfe0e07ec369d7c69f3b2e25dc68798a614fb316b3accdf9ed3dc34b5482f504a550efba19f131ed6710363fda72751adf837a36324a13fb55662cb941e2"; + sha512 = "9c2033a0403b76301559a306c76cb29ed0a5267db915bb0771c0c808b16bf95e822e2c5e7dbade943eef1b3789ad5ac1bdbdfd01fdc0c18b49f08b35e6bca983"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ml/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ml/firefox-62.0b17.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "3516dcdc5a7d7f5426c4326bdcc0c33f7c4f7fec85dbf8e161640322c6463c64248ea97f8314a1b9e1ca482cabf669bcb0b576892ca6bca941e829759ccfd068"; + sha512 = "a0f606071b04b1822b7a8d51f46b989dd7520b7cf1330fcefed1c8e6d09b095e11c176f9f94f123acbf9eb61293e8b765f3ab4f303442b4a10993418e25cdcc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/mr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/mr/firefox-62.0b17.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "17dfdec17f967569109d94062935bcf0481011b42642a009d76888d7318a297adc8359408db1e1be815eb4421f4a64a30a3c9c5b9cbcdcda4be24c5a2e052655"; + sha512 = "67b307e0a45dd6f2bea45377a22ba6dfd5437dac5ad3ac0995ee14091608bae6b86a3489b8dab9cfd87879d763271d70d7e7683b4cbbef5c1bc488ef94ef553a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ms/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ms/firefox-62.0b17.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "cdb4c9a805421d996d66e42cbf5c4189f3a1806fe27cd6cbe7d677dcc0f18841630bd73083de17273e20f130a3a381a65a4c1e267b6e204c0115dec8c6e50646"; + sha512 = "099133a0a252f2b123328c66c6530fbe98280ac1fc5cbe8b2da4537fad4b5bd265e972843d9dc4bc937ec03329ac258e9dd7c931843d8d8859a75ccccc2802a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/my/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/my/firefox-62.0b17.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "81ba5089c9eebfcd1a16dfca14aae2d1f2cad3e2937808938d818e995b2d6ef62063d08372b31cf980464c0d7b80fe87e7115d8e9cba0ead5a4981404ae72266"; + sha512 = "857b59f4c1613e4243345ef9819f88932918b4cb708f94bcfdb2537145e19c2825cc6fe2166073606ac282c10250c552f1d4c482d991a33f1224cecb5186811e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nb-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nb-NO/firefox-62.0b17.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5234f60af1fca63d501df28f570089b133e6659bacf875b2f977ff555971d836493392fdba1d187edb796616bec9538a158d01b72f06d8846a6b1f53ace61afb"; + sha512 = "edd41419b95e5ca51eed3562207240db6cdf85965bd77e85e8a6cb7395e292cdd6c5af444934d922cd5495000f8c46d22774fc7fa7d371236b22147fecbc4560"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ne-NP/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ne-NP/firefox-62.0b17.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "5bfa1ee81c81c392f2c221ca691de094eca2abbfa1970b972a7db89f9cb9a95187f95aa96ab6a0ab7f9cf0c9d9cf52bd476e8b54199190371f45405dbfaad198"; + sha512 = "6eae78f9e49cc61a6cd217b4059b0aa91942b3122207c716fd35a726ef9402a11bf35e2ec84fe51e0548e286bd0f447019b3f1190411662252fd7d96e0de6ada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nl/firefox-62.0b17.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b1f0fb4a09a6895ebca561d587afef654f371f706678204cda0b67b3764d8e41629205999cdcef36fdcb786d6128a3df5947c265b461bc9427e6416b2dfdf5e7"; + sha512 = "c5005b61225e26940a30b6f49f6d92dccb976c324a4422812e9414170961e60933754da76f50ae4b0f6cfddc3ca300ed4439376545d1770331da619af89c3673"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/nn-NO/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/nn-NO/firefox-62.0b17.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "679f9a69b1ac386e92b1b1324fb12e4766f7876321d2eceb33d5d7e6244c70b7780491748699599da944223e17c5a1542986779acef26da5215d4b2e2408d2c1"; + sha512 = "03ebe1aca85db5d5c0886f08adf3c5d0b8e6a9576eb1941f28123a87440297cbb0fc0957cf847d59d85dbd1aee4ffae8a9ee11b3d9005258a1ecc89c6c2692dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/oc/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/oc/firefox-62.0b17.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9a446b70e7676c2d9ccf8d3dbcc203570a9421a771cc274cb271ed35a769c854a3c61caffbc5437d9e26e562d80784f01384215d2dda37de6da1b5fc617bb198"; + sha512 = "8629f8ce3d89472be12f321658e7de12c652c540b116ce6e8e192f4f697d08159298e977eb09fc5e24243d73e679f54d586a444d99542f6b35e1018d9a9c74f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/or/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/or/firefox-62.0b17.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "ddb1141d2312d663c3c4470bb1dfa2ac4171ec18aaf7fb8a3722ea627d571814b0f81495c28d95643547eebc012be816497bc632d650811c32a1f046aee6d7a9"; + sha512 = "f9af314dd17d16f981124117bd3705c9d20b0ee75552356d1b6423a07b6620dffc05e516490f435407647d7ff800411f2118a5d190090fba5da33d59cc3dae92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pa-IN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pa-IN/firefox-62.0b17.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "4a8d82235af85a526e6f1035016fbea9e4cd89d82d9734d092fcf8a19e0aaed591f5a493f0616f0c892b02db7738193bb5aca2c4112d59062286bbdfd3d5e22b"; + sha512 = "14e472a2db37fdd16d092741df7300aac32670bfcced278a1f2d4c19750ecc9b7342b5f8f100d7a4c92a8bd2788da90ce9f7c3c9de65963daba0398f292a2d4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pl/firefox-62.0b17.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a7fc6a43a7995dd08bc84d67c776fc45616d469d2af4a62948a910c4728af0242ff9fc70cde7bc0b1c64b71f97c4239ca45e3a1069eede8de92098bc97f93cf9"; + sha512 = "6d303012540dff3d0d62037893559099cb015d4a4ae491f9a30ae5586b5ce747233fb9ce85aff018b3f675782ba20cc50de5ed8137dc0fee43fd50a4d0db208d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pt-BR/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-BR/firefox-62.0b17.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d3d4c9ebb1172fcd3c20cbed28dbb14b115fcb68bc817c396f8a26b143550fc1562aaa65442e609b091b94b26225f9021b6981b4863d23be97076a98fe092db8"; + sha512 = "172b1ed2481a2c42f22fae52333e254c9240062d2b197682f056a9782ae8405b8d33aaecc580b4a2418449d7af99d2f95da0b6929195e2f81e0d5af84bceedf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/pt-PT/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/pt-PT/firefox-62.0b17.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "89620e4ddbc92a4a35ccb408574abbc7dcf02717f0c22e2febf71a1b498fe93377fe959203acb0d46cbced9a2a8d63ca4d72adaf151665e58c29c38f157ea21a"; + sha512 = "646f0c2d24028bf02af352b0cee3118c37890a013cd17a37d8c260c8b8d2ecdbe1a258177b2e82057ee1b0ee18748b3c22e5d10b454626f560e63b0d95b28fc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/rm/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/rm/firefox-62.0b17.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "85960d1395a5c3d12dda25260c6a4719eb7705ce5b7e66f384424272478d3fbe129984addf005a35c08a0735759b07f8984fe13d378f11a8c3d8fac5714ce049"; + sha512 = "25a2049dbc5d0bb7223989bd8cd3cbda0bb31a1a41a72fdb2d094f8f31977929e22dabcb792e72152c40fd45ad4b82efa1f4023a4e1ee2ab26c3dd6b0c06047a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ro/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ro/firefox-62.0b17.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "f443b0442b5a9e512cc08e51eefec6a49cec0ca1e154de4e1c4d973498da28d8435ceeb1e89634cae5e373f6af2f4f8e4df2f4683bfc53318d47ff254b084b5a"; + sha512 = "1e718ddd6e94769e7de9a458b9b4c914061a6902100f9a941b49d8f6a2f128d5460a9b932b4efaa7a8036ff64792e05713d11bc9c90022ea06639ca704a392cd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ru/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ru/firefox-62.0b17.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "d24a276fce83acf32eb3c067a102f51e75fb351eeeeb7e1bbfa4e533c33f8ac8ebe128e2baefbed9162d3bcf64852b88acb0775414c129ff7e66d64901fef215"; + sha512 = "575675c09aa212a8952808238b783b7728ba973981c1d91af7178a8f80be26a64edfa0ac2ea8ef8ed99d3d7b0fbdc88113f6b8e56dc4ba77e75e40cd7fe30013"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/si/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/si/firefox-62.0b17.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2f025bb5c5e550ba9f10200bf1a56d5a33f6c80aeab5b9937596a3b19ea0b094affe8734ae4252e5f2a3ffa50ff437dcdaec44754312e1cf34f4b317f86ec72c"; + sha512 = "a8457d36199a6bc80b40747e553d97921fe670b5bd5b23b74163788ccce8c2b5c978da0d20e8ccb4546f76ed6697b7833b30132008d85a6d26e1056ab17e4f23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sk/firefox-62.0b17.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "9127e226fdaba68cac0fd0e8a977f3ef85e8cacd31d7021ea1a9e30b39acc11b0e4c3d78db2fc09b596e5de7806ef74fb48c3de0ea6e6c5c7c3915133e583ef8"; + sha512 = "4db245112df4feff3a9683e5cd451935dc43044e07c5e44d60dd8e425dc3fee3fabfee0b2478045cdef3bb69a7a948f0bf5bdb894c3104c41a1ad2a2c3d5b2fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sl/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sl/firefox-62.0b17.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "112f6ddef9565c7065c9c47c9b412940fdbd5bb4606ff2ead622eb536943ef42d9c2a1791357f02da797ac7ad73decad3e6aecad43366cb6e69fadb7706d931c"; + sha512 = "08c3774a94dfeb9d9f984aafc298336e8785f06d4fde3ef9b260e53a8c6f21c9531d5d52a9e09a81b68a17275d6b1d725f3fb894df0366a7b4e2de1669fe94a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/son/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/son/firefox-62.0b17.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "de9531b0f128a8d9c33e3c25f67ef78977053b84abeb482a39008c06f96b08c2f3fa699313ad68c1d8e1f29147bc00cabdc30efa7d15dff47a7db9252c9fb568"; + sha512 = "f30bab848220c3969c572783f7fad6395a2c6933b57383146bc1799dd5e5dcbeaf679af9ccac90a72cb607360f2adf8b20c75503c314cdc9cf99a0d18eca2c93"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sq/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sq/firefox-62.0b17.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5bfb920fad1399e7e1c3287ef38175b901ea230261863b45e79850a2d1e2b779dce89dde073e76f7da474f1a1cd1f09aa9ead8fbbe5caeb763a9d0b683c4fbf6"; + sha512 = "cd07a455109ac035f3adcb81bce85dc7ca9fd871498e808dc91c4eed3775fb1b4b752b769769ac79a2e8bdb781c1425c3990bf3a6df40cdfc2b6dce6e99b7c70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sr/firefox-62.0b17.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5ee7e8cc7752c48a1de329c65753bafb6df0b7cf8a56534521a85b132f41ce0836ef0163b17104a7132eee38a5facc2a5f9de7aab31677b33726def9be4662ae"; + sha512 = "e5e2c694f464d781ce67e6e5738784538e22f8fbbf02853a6dad9d6d31ee4914b2ab9e2fc2a609eb353c4a040d58ade875f9b64f061cef97e2c5de1e386ec469"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/sv-SE/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/sv-SE/firefox-62.0b17.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3fbaf21aa3d1e4e8feade93d015eecc97a50d6dec6e3aa487d450f53348297d1c48e38cd221282fc6ab4fb00fec099962225406ac89329519ccaed588a75ef88"; + sha512 = "b714ca1dfe8aa648fa9fce2a5b1c35d01d7f5bd8088afb91b18ee02a60bc9063183c5e93044bbfb88bbe5a7274cdb0a9c20aa9a044195febaeb2156ccf10a650"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ta/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ta/firefox-62.0b17.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "0dd9331f4ab4c35559551d433ecd1a2ea2ef917d1b04dc8b727a77540318100337b73a4500b0ccbfb24fa853b2749df5c74820af794a9579423e9aaa4b62a71f"; + sha512 = "18d93447e531436500f6ac56a60f7e550e2677c8a0fef730c44ffb62a6c36c3a9de81b37dd6636c687a2ebaae3a1594e8ad522b9fad4c7233c6f51c2fe1c3a04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/te/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/te/firefox-62.0b17.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "ddf351df58fdfcca150012fb033055ef0b3e5175b587dbe9a1ad92144c5170f765c90cd8b8405aac85b7f16da1f4bfbf6316eaa8f45144397a06a11aa944cc75"; + sha512 = "a4f06d18f8bd33707f0ab7fe68ed169ca14be68800c69a7264b9b30e4f563a349f9e5af357f20af5ad1382323699b74219f95c00187558d0b923a28583204b18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/th/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/th/firefox-62.0b17.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "d838e1ba30654631926a16ac3b8fec40989da3a0ffb95ae59990f9a22cf560e30222941777241c94b5cce9336f073df1d5a6472003481b36ac514c6ae12376be"; + sha512 = "8d7a09e43f4f184f07b5d67a49fd2d48691166cdd4bbfb4338d5f9f721cafa0a0d9a4cad3b886bf883764edbef592a11acef1028b06e1d023d7a86827c861cc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/tr/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/tr/firefox-62.0b17.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3925df8ea333c2a9bf1c3e5fc09c5d6d662aa2644fd34f81f94221d895514989fe1e35ef3b688cafc13229744e3c8f6e2af08c5d08c10ee2544418195cbe3221"; + sha512 = "aa390ed3142e80a089b6363a41e674f62f7b423cf01d8a49f89f9646d5e3e3b79a7d14b044386b9a2bc11ae7648668b502d31f27561937e94c4cba057f5e8499"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/uk/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uk/firefox-62.0b17.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "ee80ae9b0332432a9afeac420484cb0649a0ea947fd869835c41973ef82c10ec1c469105efad08f6a6bba56f0fe7fa27ecdb8fa939fe210902f3dfe18fa6ae4f"; + sha512 = "b878a398a0cb21b53176da0ab40f9bcc29fc31dfe82639ab266c6d6aafae4ead7d7914d17d916eb0e3a733d9eb45fae1c1534ed473cb64b145325253afe7d999"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/ur/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/ur/firefox-62.0b17.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "fc7f6bc1d948a3572ff3aa169858b0bb1b63c9dce3128cb4f55177e45f17554813e2a65daa4f7ff1a2c870022535ac556f98ac28f58490d5914abcaf8bb9c7ec"; + sha512 = "c828613d82a1df96fc5045539e173633761b24339a1386dc2528d275519b2b511dfaf83baa560ce0e34a05e5db192f2cbfd8595eecaf3ce922de1d8bf1555216"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/uz/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/uz/firefox-62.0b17.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ee9f587298401f6895503c109e735cb73bf60ef85891a189dc27dcb752b9c40d9b91e9bc943aa6d393be80575a90ed6f1dd1b181590133173735f71ffb517546"; + sha512 = "9bd604b913c7ade0a61e5244ccd8d0fddc209d8bd7dcf232ccaef3019a31d416f2ff0da0a267349a5f1458e2d80f1af1eb98969904708a486b9ac06b917e60ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/vi/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/vi/firefox-62.0b17.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "8a871f77be68b897cc5ac78a8f83984954f16b55459ab46ede1f970cb912ba7c0326de9c39ce1847bcb41c1eaf032707ad7dc8754f7c6c7520551ab8ab7c98d0"; + sha512 = "93ed4c1d8e394d549bca34177ae5180390ce8a9d469ef0fc5fd858a0e61bc8f9f7184917826b72269f28f79793040286bb94760c5a06609325f41e2baf22d7cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/xh/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/xh/firefox-62.0b17.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6f592662d17b121d0b8d7dd25441b9c948432ab55ffc2f8e34415e9eaf75e97ba707bcff00afbba84d1b664e69598897c3a4595332b14e533378eaf52dc830c1"; + sha512 = "fa28b9e1f6f3598e0936c916a7d9b93866caecaecb9c07f497d63b57dbd2ca37f6110ca2e2b63361e30c2ff2961d97dc2eb9b88b9deeee6ea3a6969a46cdada8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/zh-CN/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-CN/firefox-62.0b17.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "f69ed795a4262c4288a2942845caaab66375d9db4d955fb22535862a29b18217e8f8bedb2ffffeade15f5276e8a76bbac2f0c0ae31b7851b20c696ed1b8605bc"; + sha512 = "7f5d84e863a76c2ecc53b0b7ce1cae5f48818586ce8f7ce14c42a423f0d3336ece9a84c35d89613df286f7f0165b63de0a38079a007fb40f7b3bd12f16ec5afd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b10/linux-i686/zh-TW/firefox-62.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/62.0b17/linux-i686/zh-TW/firefox-62.0b17.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "9834484be2696bc4caba686dd4a87bc2a15a1c6125468d570cc1ac837ec111e2fac22b04f6d2226ba705c04e69195e95258848ba9ef0711fc2cbdbb1521302b1"; + sha512 = "0f904bb2d25dd1f481dc7a5579a64c6bc3e14d4f6038a9ffda0ac8b24549cd1cf2f3bf337f4221c15532e25372c1eaf76a243485434551ae12ad569e26cb4fb1"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 2665a20d3add..13808fca99fe 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,985 +1,985 @@ { - version = "61.0.1"; + version = "61.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ach/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e872332980e0af6f087aeecf87fbd824604e0f30f45f60d8ee6b325db0536cd2f79fb0550236baa7b6d2087fc85f3561ab793de273c66ddc44896eaf185104b5"; + sha512 = "572696944414358a50dcf8e647f22f4d3172bf5ac846cd29bcb4baeb0ac5a351f361632ee87dacc1214633848f9970f93cbb25a6e9cfbd9ee796e30e06f34715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/af/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "882595f99b6481a42d9d2e6e11ff9e71b562442cb267d02b3f23797cd96dbd588610eeadddceaf378f22e84df01d63d3e3941d5630a9e1e117043ff2c4cc9919"; + sha512 = "dc4b22a8df99c3519f3a8001d0bdbcfdf4fc5d4dd13d18bd15892fb29e928126d46e2ccb9b512dca0c5395852a3c918a5aacd2b9a7b7f2cdb982052e915d5413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/an/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ab697e5e4b1286b19fc8554c248d95afcb5c605d4e83f6d5d060280e3b0dda6b3214fee6b05aa50bc34713791fd4236f7c6e46b42de5131b6f4a66d306657eea"; + sha512 = "2d57784a18278bac69c08e81fafbdc3530d17a112d3f1e7d407e2590935c87058641498c74300950d3f151bf5fd67065133d91c83e1e500c72b60ebc91a4572d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ar/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "2b149c4a4fb2f9cc40bbae2827f17497510f9eb979db3ccf55b84f9563dfe0c08fcbcd36e74b4e685f940f4309827091270750f66d1f96e9b6d01ce591c400f4"; + sha512 = "e397f8d276c115105afcbab6fb71afd7bcc93778e79ec86a4274e10a6a039ad3107cbaabc9dd4bd197ce6be7add3cc0af954f029c179a6972ad2ba15ff2e3eb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/as/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "d40d924dce02fa4f269088163901c643b902bf13d45f15a902da0c97b734ec2924b0346161ce86cf7336018c46b775c7202dc516b4796a3661be56f5bfe66b60"; + sha512 = "9869e76e004c1e77d976f01f9a4cafe29c253ad3c85b1119d67a65c784b5f65dd7a4927ccd535ee80fd63a6a47127e614478effbd0455a227e200ca31c846acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ast/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "a705578265e08e3ae8595074943378ae7ec76d614bfa2b0d3affede6842172b605f96db4aaa28165d45ac9bbaeb3ca4d3681cac698a4a77b14e723ff2368575c"; + sha512 = "5b298cce253df9c8a072fdc93df894fdb4218c720ded3260f282c711270086104eca08e2d5afe1be4960beb274017eb4e0ae7313ceb5d6e596d0591f026f78fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/az/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "4189f7d1ecd2738876a72e65641484320ff0c4e50faf94d782b0ed3b3b0d1877a4767b45034ff8296fb54faf7f3d6a388579cad5eb9f35a60def134a5f02392e"; + sha512 = "cd8df2a19e10d5445ac0970814ad245e25f6ea695ec9590344c1a4e261b6fd7d15534028f6a8abf1943fb97f0e127ed55774e2cc2bf7cf85be525503bbb69f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/be/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "103d650c8e4c81339399a1afd8cd92a2df39cd4474280307f4902e5510b679b3985a1291310033db28995f483121ab55ad0c890b88b71502769da84e4dfe9558"; + sha512 = "94947ee7b7477b467016cd21daa8134bf28ab289ea29c0905e04291b7560da895124be2ab7403d2b9874291b7e33f5a92d36f9c0ed9d58ccc3306ecd7723305c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bg/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "187ec7aabb8931f5b99a7ba400947370df299a001c06d923b7d95c4de5d2f044f92cdb13400ae751175d9d50ede3be7b7cb2a22d67d07480bc6d30cb0cdc8e2e"; + sha512 = "9b0bce62c85282c79708245fa792207dccd7bf939ebc23ddb2e6bb7bc3f6fdbfdeecf69d1ba599b2ec8d10fe2d79bab5dd229cf9fa7b79e076797267df39c54b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-BD/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "12db6da4e99ee661595773c813bda46ac3418a7d6c79b2532d6c26bc726dead4d9e3f4c913218f858e0e5709da6384befbe976b6958601ba1453ae93b7595b17"; + sha512 = "4de95899462eafed03464fd054b7ee12cf53d004fbcb58ad18bd462e57f5c50c31d3b50f689a7d54f973228a2877e6c77c47740280daf7d6db4f7ba5988b9484"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bn-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "678587691077d68613a4d3adce48c8b73660001c7359240b60325e315f792c1febd01a05492d494df13b19e6d8ed6b3f3d00202acd4ec9468bf744fe627ce08c"; + sha512 = "2ecbf2ae7d1296dcfd6e2268dbc27060ce07bb4b3d9d62f6bf27fc8874f114dfcca73672adb4d411d2c1eca7ffac22f7832bc5cdad12a492c3bc4406e3a6746a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/br/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "1936b78bba3d802b6a4ca598cbbabf840f8febc19b27e4bc8994158874de076d68b44972e1f1ffd5f1c5ef29f6d08605b1a6c087c69a4bcb4ea0363569d79221"; + sha512 = "a92abcb1aaec11ae3b0eee75b5b5610157f8ca64627a20018925431ac09cc4295d14357e63ea0fa2b66bb415039c659f53292b8133558d591a16cbb5772f875f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/bs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "03ff822e4f6dec24385491d711d9b4115bcc2452d79ea46542e303ec17da8e5034206f4117d9d5218257dbf33928230a17e51b73e4aa71760167b11ef36fd92c"; + sha512 = "15dda8914e02198a9b6efdf0ba9dd4f37e41ec7c6674b8b32189ccc368ab6ee671e401cd668c5ed57157634220c176be543c277342e708baf7b0110cbbb4fe64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ca/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "91edb8c454d77b829a4b639f3eb820c4f8cc62e83ed759e817ee433eb5063d0565b2f959be21a090ea9a9b2d36c2345e1b8024c46fdf60679eec91f6a2aaec31"; + sha512 = "230591cd45dd9d3644313b96ea304d33e9c87d6968c37b73ac3c701132bf13a3869672317b135f31d8082f39298c978c07d614f5055555ba9079afc6e17a489e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cak/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "654cf46693e478a242f900569e64d18c0f61e2d6d45e8b5af0e46577118083c0fcb1a11f127453d70c028bbb1011477f9420b3a2456afbf5f328803552879e72"; + sha512 = "c622e622cc199b8a9946276afdf03f006403bd302d2c62a5076403e6764dfdcd121c1e15fc56d45bdb1751131326babdc9be96e6425fcab9e55d6c689e5959ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "81b762008dfcaaa2b7d2921d84267f6a494e3cebe7e899cd6d0c70777c28d17a97647eceace8dd26e3dbc03c86d21c3471aa4f5cb2a95548b790a3805dc4f535"; + sha512 = "8e4d452a75befcb6c2a6e7ed0b4b1aaa8f18d4d61302ddf6b8143e024352a060621c375742748db5981efecb8075268f56811702586189a116698a669408dee2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/cy/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "398718832a292c556f1fd0aa735db9a90776d1fcc88955d2acc2f712e24106ce89d532456f9922d3a3a96136b508a236bb2bf0edef8f2f6a1670d02f12102200"; + sha512 = "349f73f43be8dad527549ff158b267c62be7c0d828c2adcfc635e419ac9840076549a7a51396b306bc042d1d7697c8d6caea3bf0b4e3f42e7c0efbd5b8d92e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/da/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b77a4e71d3a48e7d2de30f7f45274afc6e81f3f12fa6391b62973489153709a4f4d13d8d880ee5546254ca2c0e48e8fa24e5b2f70364313f6fcdda29c627f26e"; + sha512 = "187bec61e1218fa6c2fe79b3e80066a617ee3c26f83aa16b61a21e3fc76a64c2c821120f9206240642dd10175b6976c352b13a5b2e5514126a3840524fdd1de6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/de/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "ce223acc8cfa532933fb29896e5169ce3a4c9b187ec5424022e24d77ea5f8c47bca8b389258f13a2280d32aa0ef1490e71e95c6324e8815e91f0503d66ff7345"; + sha512 = "8aaa8aeecf1a2dff922b785ed3a4cbf248454cf010ea9c188a4ac70f0550813944a8e9265c2edb13bdbdfbe20ec5a0dda3168d2dcd529d082bafcfaef6271913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/dsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e79b5ad7f5aa1e8f27ae3ae7bca8a0ac24eb73a1a9feb6fde51584b46cebfea2dcf3cad67a61b0e612e6dea900f866ac8fcaf8bda69a11d545cf883c6fd4b7db"; + sha512 = "c821eae950e48de43580c9dd4af7fc609927e3fd27ea876fca909bb3319574663120688e442ba83acf1d273e1fd22a87d0cd934e68151edd9a8561015e58a47c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/el/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4bf55b08dafe5e9700a56b11fbcb4945914e7805279f40f805815bfe57bb6520667807b6b6ed3fc9843d3cdd1019faeb17428eb5c0fae8b3152b5d7b2528e5a4"; + sha512 = "afa286bd1ac48a6007b6e5072bce0a26482a0eefdb00aee824de8c4dd06688d16731252933cb71b9f3bf6d30f951c6df68c2ede85733edc81facbb628118c72c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-GB/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c7cc66b75a630fda0f6e10cd9496975fb63dbcefaf1f6988f66f1f5e86925d569ba770df6de86dc3b479f43ade9e43d515777475dc34ba8ca9d1f2f86623a1a9"; + sha512 = "c2ca0c9a72503ac5817ed9ff3736b812005037c51534ef9a159b7914b974a356f3f1bc89d0669d05bde8dde124f2fcc3ff3a91cb412ec0329c2e6def875219fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-US/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "9eab9c7b56ae920337b21953516271fd9ae1b3f3ebbd549e3e1145f96e0adb98dea082167923badf97a109a168496290c2be49965f3034667de49c1d76a48a14"; + sha512 = "9f32b33727e5877bfdeb186420a02f185896a2a5803565a811203d86e84d51ede06f27d63a88a482028c36b65ed92ac4c17196aa2069370d6cae09b74bf482a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/en-ZA/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "003a2a93ee8138fc1c696e3aca12c10eae3e4a94a854305d96f25d3b0340068414e87cafa196a471a7bac06eef148dce8eee22d74a8a18ce3eae22b8c6b8237c"; + sha512 = "e41b7ea34f193bbcd892030b5feb2f117bb5f3f9dfbe69560ea64b7936bcdc47a55e878c645786999a2e52c4333c033320eb1ed9aace3481a9f37d87c9ae9ccb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eo/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "a2c71fa1e6ed3b38d65fe1f9f81e34f53dac6dd0d1411d8b4eb08beba1882e2fd3dd286d7c827ec8731aeba10243fac15feb5d42ceaee45231e875bc69734d4a"; + sha512 = "e0850feb028cf0644340d2842b054e49608cdc1afbb9487ee744f6fe1ce0662874f0f96de2da52de2e0abbe39d7ea430efc70392d555e7cbff7a46f9029ba9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-AR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "b6c4bc1568a760ce22613153c289d8eaa3ddabedc181ab891957e86b2aad8ef4022d6b4622a2ed897fba5b1ccd7732fa5c74480c7414d18c2777593b17931bd2"; + sha512 = "72bde05493e4c140f6022e24cccf0ca580ed3c423840d2631cb28ce8a20be92837f78cfaa3b09a324bbc0fcb064ced351fc66a0edf2c56d972f629aed6662dcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-CL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "27216ca2542f8bbd821f94525837e1b21fd46bd5d79c06476ad3b1e443429678d625ae4e23f220dd383e3b32b3f5e208bbb1f95bfae4afd7f2bfe830ff007109"; + sha512 = "4bb298e184263edff9100e1e7f58cbbd405dbc73a265a5dc1d78e8cd25e538d34ef0994b6b5e79082fc12f1c0b2035c944e17eccaa7e1bd92eee8d27d8f50400"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-ES/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "77698e03f595a02535f058c7649b2fe7515073b64baec470b21f2baad5629873d74ab62bb8db7b695863c8ca1c0d5e54a164439c3491576e40aac885cc9eaa6b"; + sha512 = "13d7f54f7899eda53add9dc4a1bc27fd30e0caaa9c5a95d716c1ef8382c2317733cc7a71aba9aa4f2a024717eeb09be7fdd55dbf6183d1679e61e3b57964e61e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/es-MX/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "837cc72cf2bdf5524f5912da8c72b17882d43c089b63958ebf45184bc375eb77294a7196c7007fb4016afe83be5ef46492beef07a0965cd09493cfe1e79a7039"; + sha512 = "66c24cd9a80da6137a94bf9cf2bad4ad3ef0141bc10c8d92435f9d89e11712afc08018d7e1b4f17fe03e4ac62b2f6ed1cec638dc7d0726bf27453e1741a1ba06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/et/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "446c4ee9b2b78966181bdb4a9bf7ac84cb350bd8ef0ed609479c54f314ba2e17ba1b23da244fd1cc58b1ea388cddb3897b48b754afd36ab7c1f5fb42d8e51b10"; + sha512 = "a7a686b1e16b616a3aff8901148a2818cbbe2459851660a23610ddfb4b8109aac159fe80986744bdc4124a10ab160d2703b2e8f65def0c86977bfa3fcb3ab020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/eu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "f1fc634a87af4d75c0bc71af2a657dc26fbf31b8fdfe78c292f97a3595684252a3dc40e55d1632f387164907dff57625af5b8ea81d75fd1930f5adc744e6298a"; + sha512 = "0760621f5d053fb802a46151f6283fb7a0b7de5c22ba0a55ae0f3056b0d43cf16c6da79af8a2217a665825a840b9c83134128f455dfe6e83f473290e425ad396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fa/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "0867ec71cbfe6e56d244acf9ff28408a2ea3d55634c6ebf68fc68b89e5f6fb95cbf45efcf9f76c4106ac44d333c191293b93d82b0414d2a882186a5d5475436f"; + sha512 = "29e8466e754900b63704206b5b650ea60aea841aebfa58187013a495a95dd32d939308253b0f856ef5e04d3ddf320c289e74cb03830a16374e9fe2c03214a1b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ff/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "5d31ad4bd4260634917fe9f131294e612f211164551fd232a86ba5a408c52056f20f82d5a6c8cd62182533bb4a09d29766a908dbbc604abd5804ee53ffac040e"; + sha512 = "240232a8dd4556c5c4df872b60b3352176490b7afd4388c26322008c7dca489f48f679c21d148016965ea81d850eaffe9fb7887b97cbbbac955f9cc29f28b4f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "fb7f452ffed85ca74c2d214654decb4f61ecd397b923428b9c3214b88890c322f4cfccb3479965b201a619c535d6bcaf0d6dee0fa631c1b858dc7ecb902e6040"; + sha512 = "63c7d4ede5e02c9d4b2e59234b57d4f539c0cd3666a053b127cc18d080900bcf488f8d3d7f2dfb98399a1cec5ec6780d86d93ad9dd2ce7612e84604481562a64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "efb1a2ce95d407cfe519d6bf1677918c3edcb837fef9506c45084ba873669be0de976c9b5253acd0af0cec2a4007a61f3c810cc243661251f7aa8821e2dc9e41"; + sha512 = "3a4263e78c62faaab850c743660e633269dd9e625f03f94459b34ede41989cbaf498755fb8c2f507e4f4b88b633c29a3eae837ffce0572ee03afdf67c53d4ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/fy-NL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "82445a34694cdd79a2f9619c9269615d70e2c8806fcd7be9d201b42e0e462a56372a55d2138c7ee795d5df36da9da224668db33fb0414600aba9f517f569e558"; + sha512 = "e8c7760f3f64b4c525bd0521cb66ed11bdd9142deee986fd6a5f6a322685633aa3539f819e3ec886884906998d37dd6401b77e4790a246cd098c47cd49f929d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ga-IE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4fe90d326992d7289e9a8650f27abdba2a71e7a4fea86f5a0c1a66217172deb2649fc69e8d43f7b650f16a465ab113f079267097e64a50c2de9218970e43bf32"; + sha512 = "8f59620f30767cd58babc163b803b2c8b174562e5a6a686c5a586d24db0da4c4ecf180c13673a6a434faee02c2b7ef746c1f10e45055d42327044a945925e514"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gd/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "80a193ffd23e52d0d31428849d7bfcad1d92987edc4e6d6de48aa8f8d573451578ed99a6faadff24872d1e77633531fcf96ff08742ebfb311b010b8ea91b5ee7"; + sha512 = "ba496ad0daec76e2c6e4f3c2dbb8219d1f3234893acb09602e51b7bfab4ef84d9f49104a021b206ff528bb323e2255c97e92a6949b3949098e5863f48e9fefa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "8edd57a08730b18e343d7d550e888341ec17cf703d3f5a63a52ffdef89c6cb2aa403486a5b417f8798137db69d3ccabb874caed0ee412f17515a2587a0f446c4"; + sha512 = "3ef33eda5d7a88fb6f67f91983ab2db11404f58686ecbe30dcbc27dd1358660b4c88ab8e678184cdd3fd4102f93120e0d0a4d75435812b047ec2bcb74cb52a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b7cf94842186bc094a82a27a1e5cc53746158bfcc4c74f66760318b59ef2c573421b08b56331afbb00979be38d682700dcd2020e0c315b25c8f98651e337cb1d"; + sha512 = "5e86c34b627b66872a7f07e30ee6285e61d041e69b0e2355eec142b23ceac8ea5ef7e257adfd1ae877b442f7171381cb013fddd7593d1b6e42f3a22e2267a5df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/gu-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "ffbe4bbdf378799f5026affe421244cbab92c3c9c9697b56d28928a959c6916ae8807e190e659cfc0ec119eb6d98701bba8bc67d6eb62d6d9a0e530159c8ffaf"; + sha512 = "72e43c4dbc3db08473d96d0686fa2df56f82ebdbee064a152ebb2a49cb4fa7a9a80135fa9b7106ffdb64d3342b38400de5351a3b225360d5a730f0f4991418f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/he/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "26428931a19d881ef5d4c9fce86327a9575899160a376ea5e486d3f0e413a25f44f28dd13f44fe7499bf72e198ae80c0271674e0882847fe487ea65b7e2530c0"; + sha512 = "d3b5a43aff6e76264eec6d211a5a9dd0b7fb89e41bbb265f31091ce3261f4a160e1ddaf59432bc3771bc5afacf1a3e12e42e0d08107727b0e8b5941ff29174c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hi-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "9eebf3a40c32f8ee17c14233e80c694922429dcf783fde48281e8ea79bf046f2daa2f244392db8c9d33beb6cc95d55700489dec1f95e5709f120e540dae3e7bc"; + sha512 = "7b568bad470b3fa069b44bc0d69fbae51408ab44751a99fc36a7c220548d0200ec57d8362dbe1dca7370e587d5aadb45b5c9dc91e6d267f2421fe5a2260d29fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f51f38c60d4fffd70b9be574643147a1c12fe70f0a617e996fccdb408aa40665fa3a30cfaa5f843d98ba1a91b17df71aea211677068057d8c2358b5853a8139d"; + sha512 = "c69df1a2226a967dbc0cbd3813ced6ae36b696389187489ec62b78b3180800175d3c33b07bc84c45112947348e160cbcd6db2e68d5e4b6f07e0a2f6adfc8fd2a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "abd9500491a639a27f1edf9c8d9f32b5d3097f673fc724fb9f4eb5b89ea848c5ddac54be5927fd581254e0c343595ea131f58a6a2e68e03e3176c896450c5740"; + sha512 = "080ad8f1bf263f96294e3e6178dd64d30a7fda50d229081b14e54bfaa183c6efeb0ba3aa66cd23c8541a622382e415a12e3e063cb3aace5619d3c8c212ea3078"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "11bdc7443008f76e6adc2eb54bd5875df846f6dc050fff6f9dace91e981d210867a248bd3fb98c20bc2bb4012374d383c1cbda58ee21d0fa57ab7545f25efb8d"; + sha512 = "44f07968bb89c3c0e2d365f9cfd45d89b138a269cdff48542124a34f9d9ba9df5103e4613934c504f90b494fe20bbc6f71a12c210799e689e8f69405ea22e4a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/hy-AM/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "5fa03106c35a4781f27d27a9f6e4466bf93e56b7d094b851cb057833a6cb2376a231066bb04fd05e0ae0f32b42ab7a859447f8401bf0e3abd44fb9bfb9ec4e17"; + sha512 = "8d3ee8a030ad60ae2de062b21437e8d512ff3feaf614b91da71ff6af9d3994be79aab1753e3d46a94237d7e0a49eb670781c2567f96662b6057ee7172a0363c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ia/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e0d442b1cb6c770ce00b1a87669e61d6e60d6803a4623cd67025bbbae1345839329f6d924960c355c788dbf4ce4caa1f1b946d72ae7df824105cb1be547bade5"; + sha512 = "448e543b5f7075e2e1b984c808dded1ee67dcefb600058635c87d0c226eb02aa8dd7f59c624ebec60c9c0b334f98607eba88e111f2b03a1aa579b74b1398511e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/id/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "18c827e2f584e649a4a4a8653dfa5a3524ce5dffd7bda78bae3e1e6cd183e7f68605abf0f108552aecf20ad75e5837800f6cc98c8eb6efe479e143e03a629b6d"; + sha512 = "a1f8eceb53485ac41a685f98b1e9dcf57ac094c0911ed8f9a862d4b3a5fa8072c16fa6a4cef3e06d15b07b3866397fcf9ead7b4b43143e0f5dccf93acb2f7676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/is/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "d2230cd1cd82ab815d66c673a5add1cbbaaa82a239f6d8ab19b09a4307e3eb4cfa1355fd599e60adfeb12735a846a71917ae25f4896608fef4ed42438743c1b3"; + sha512 = "43d6ff785394bdfb6c376588531a9fe043b18fe44ae83f481b11d71a2422b5d5022356cf960d92f55fb3d0ee103e6534bc0299a3d84e9ca7e6b3a5544e11ad45"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/it/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "44c6d3d5ddccc04f6a7ed73346051fcaa6131edb716466956d063d432f22c8a2baa70d5bc6dc02fe7f5046a12e166ced2a5e203bc71da140b68e7a1ac55f5612"; + sha512 = "460385b5854565f4ca33431c573ac355baddd7a35a2fbf631b3748b02102a749e56fb1128ec3e9f6b721b1123578060641bc3b783ece271a1708656626b10a13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ja/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d8374b8f783e7c24943cde05949939260934b0d006a5379fa7de9b0814668dcea935bad2d69036fe03e0253c99f792c690966ed8ba3db94bebb9f58d5cd628f3"; + sha512 = "682430030d87391692170bc81d759d806f4667b66b4e3df84e836e65678f274720038d0556f5338d8eb18e281b64249e758b5265b3ce30e6f272ca9d84ac1496"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ka/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a73aa4e06b9a198c931119f16e8e8e1bb244c231aa080f499c442a5b2fe3095640584ba5637665492aba8ca04ddb2cdc45648e1fcdce8d74c28d71af46f008e3"; + sha512 = "e8c9e6a61867efdb9d021aaa8f059e3ac9896444448b08b7d90f70fb2847d46d1950a24e6fa2db0b947cf3ec628bba1c230ee7d8d53a959928122018a9e5c7da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kab/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "207a97bf5d9fc1a4d624657bc68067bee325fa5b05ba34347cf6a6998168792974bb486245fa716a013e96112f9899998b7d2518da55fcbc551bf0634ce50902"; + sha512 = "17636e7157d6cf3ab73b7e36eeb7ad5bcc35e756fe6d369b98305c58b88208b5b11f673f52425363425d18c2a7fe79274a6e5babeb926adc9cea22afe3e55e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "c81fd754bf280972ae7c6f59c3892dd7ace4a399a2dceaa5163fd078ab3379904f7a8e4f831373f871f0031f8557e098646ca04ed7085e8a9d40914d407b8c02"; + sha512 = "4eeb48f250c617ea8eefd99fb44159170311becc229f77ca014e801594260ea23ce46ae11e0526ad620dd830b857b73de8a3a90c18764ab2a8f71cebfecfa143"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/km/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "eda95e84eb9e2d3e073668bef38e68473b0e628f8ecc5a2e84d124f7ca3d060949ff1e0909c08002ff51707b66d08a3ee955417146a8e6a6ec03bbfb5ad39290"; + sha512 = "57a0bb58ced30d8743c30d288250328568758674e55127d51e99485f5c85e8b0b300aeeec4d34526f53d1d538189b75925eb907e3b5fb2d455e0546e179dfe04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/kn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "8254394f428957da380a576af4ceb49e6a2a0a82c35d7b0aa2eae5993c12118114fc77875f7ee1a80085497bda1182ec7ebefa42d66a268640c87564e6e2c7f0"; + sha512 = "c40e9f5906cf3968bc92932f45d4d0b712322e6efd9a5d1f3b48a7b94a162c6390142081a8a4fd2f0fb8737869723432eeb5a4b44c3161aa38a4d506bff8a3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ko/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "d59939490741318d2fe11900df7dde9adee99d8dbd04a365b4a13e0426898109bef586bb097884ae280a8261aaa21d38673c352bea06b035731b72510d4ce35f"; + sha512 = "3f6104ed9b2fb9f1b0e3f49b06aaaf513ecf7e31b417af90c11403bca7a3ad51a87b448fa0a2ae6a01462b57dfd21f90376421ca8cd9ea62b0e3a1c7462aa9db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lij/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "cc95e24bf4edeefc3cdd8e4d7be72b88f51efff45a61beb35d4d4f0e42727fd97e762bf2f04d9e96b2fb4052c8e34796723f49b2b80117819ecd0594e8d6d901"; + sha512 = "46c8eb64b30455ed97618d67215510b22acb6cf5946ba492c5938d879e656d983accfcd7ff2e93cebe7ea5a52e9fca348ebb9ba02e70ffb4196a9d9edf5abc51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lt/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4d6b6dba9d9f75a315549969a68d73639ae61a79025e9dbffe0fb171360c8b0e04c3cb13653e4f294375f248a7f2126394b67e7c21d20170dfb5ffcdab5c9df1"; + sha512 = "54470adc31bdab9745f72598d402fc961d6b407b6f8fabc8e0c6b785a5a5f3e9922e06a922688c6bd1ba43be81ed37bbab216fe2182bdd0b32befabc55fa1a48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/lv/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "f47220148f2190b71f89708348a57d830d74168240e4badc3018f2ae1c477ac0ed0f4273ede81fd50773c947f478cb812da98b2510063b74f15a6d6b01f83923"; + sha512 = "376ded474c9c8a898bab54b66a4a9e9cb598dee114d9a156b9e7fb925250511e610d2e17a5decf4c2db44f227065cb2840265d6955364a1405060ff022b04d07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mai/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "b77dc269a68f39e36becc013128895267fe176cb6f97e5a2ab07e4191869647208068bcf3579d01085edf7490d061851f5392f984be2687b5f067cde98bf3d47"; + sha512 = "21643b1b723a42d81bb4476b16282d2550100278a221b5538d5666c8fd7f3e96f242393c4b175cf6431e82458e199fa80a51ef0f5bd6a9b691d0150bf1d4c8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "444d572534c326688f267d624f1ee661f2a1b236ee7b4f62009d6a6685636b07dd63faf2066a12f9dcc9434fbb1ea9be663456e06ce9afa66516ae3911b4fb60"; + sha512 = "452571329b805586a1218dd5fcd5b48f7f20fc914ba006441ec3642ef8653537b764a98b7916c0e440888d60d41b290826114c3a37083ec098fcd6c86a6adc15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ml/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "74d42e5341168db08fb4c012e88f53b9388f67efa9a0d5907817b3bc04540c721c533e077d1c05ac1b067a2dbcfb643ddfa08966cbd56ab0e0f46f2c822504eb"; + sha512 = "8d2c850525f9ffab96c4d02908440a9a5f4b6fffc49e5505d5eb33d35d3690fd7a81ef73aac810d0c52e0deca5b69dff9eb3f0eaf508b7c866442943f7cf9547"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/mr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "3796574509f0ea2971f02356a5bad744a6b0621054b55e391e22cca934b74cc7e3370e550a3f933db7e92cf9e070cdf6d3a576036a72c2ae228165e2a06ca6d0"; + sha512 = "1eedeaa3a2b6362c460e468b28bf7efc9bb5c960c766ec9f0e423834aaa67248c5bea0fe9b4fc0a8e62b0a40d8dfd1e7ff31adfebf6d1d6405daa02879977015"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ms/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "920c6f3071d24379a9460f74d8335b35d0114da5eab39efd2979f150ad9795e8ddc16044173ff69190a024f824502b96e047bd79fb1ecba554f0a6b8da0c311d"; + sha512 = "fe2d5ae09b8921d366616eaee49c240ff529050e1b3f97c915d91c23dd67b22d78a75e14e2f192963f0fcb05eb812da2c5f68313599111d85c1abc0ac9dbb676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/my/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "bfd10c2dc7377a2a55c437520f21401d750831d088995d98bf4e1eb2524f1d69b49d3ca64ec76e8c875757075a270f1714a8ab739a5881b8897b8c9320d09281"; + sha512 = "631a6059d38a64c24e1f7d2b9a27aa2e405fe413471ac1e1d7ab337f614df9a1470a091de35904c39664d679c06eaddcd239c4a392c1e2ee548ce0be7fd5e416"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nb-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "1955303700b9f3b7ceae901076e51400c977b35864ab96d71f1d3d246bc4348464e7cfa2e9a1840b6b06f3c419028a0226955eb8b5e72667f4b433d20570da26"; + sha512 = "90d0c3c696ada86b47e9a6ce8aa9a8d0939eedf5746ccef79ae170a935e6b97906b187d7839af158a6008a9022cc50467febaf0617f3a3b1e8e21fd648805d13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ne-NP/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "4398dcf4bc81d8ebdb72e0b6ea488ae707c04d175c8c18248fcc69899929e2d5615eaadc04804d602dce0aaf97ad19358b178a43604434d774fbf82dccc7546a"; + sha512 = "b5e13e214cbea0d541aa8c29d53afa4ae952970a64bb5695be62ce19c829df901dba4c66cfd03d5d3a31f69041c9c700553b2689dcc4ac4ef254d155700bf5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "c8a8e55cdcb4eb6b2b19d600c5cafabd8f8dcab146a4c78e0d4bf66daac8798b63e2b30f5591f58c50117632d9b736351c2860ef28267e2a5f6bc3375cf3ae03"; + sha512 = "44470b1cc4e95a05b4198ac3458125651de9bf9548dcfbcab5850c519fea01a3e8c6161e4a66271af68d7f1a1b37456d2ae1e51ca890307e6185a531c8cbfe74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/nn-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "6e0c8d61c4b6a93ec3d8935cf92254957a66305ef743007946b959ba1a6584c9e585e6f4e971f16f826d8f1e09f3aca50a68aee3de1a92c3afe4a3b5fe712c30"; + sha512 = "5e49d30ed8fb64e367ea3f5b472baf0caff6c4b880d811cba5db969d21f8e5dd0d8ae4c01a151fd495eab1eef817b35b6a6e14441a860059b8f20453dbe86116"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/oc/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/oc/firefox-61.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "dc8cf40472f9503949a776c9ca9a5e29d72a7d218d1ec10ea7abeb960d0abf5d879b6952bd3af4864abe4f1f065b37317d1276358c3ae4c1e062dd4943dd38e7"; + sha512 = "bd75cdbb1bcbe24347f35b748ec5d62da6bb20fb0f58f17a348f8bbe19e92ec3d08da3148d41f56e0b42a8e49e1c1b70b40770c737e626239b5b538bac6d42e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/or/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "bbae097901a488360c98bee5bd19c43eb36318f0fa04b3bdd37c24fd69468d7d2a0d48ee20472f6811052410368e8b80bc49d00c16112e00608a11729b27ad93"; + sha512 = "e88f706c60e93b205484411bde177fd9b1ea921372669b5665ecebd795d7abcef5d2caee16a8605bf7f3f23e8d0ebf8036c156097318e7f8d3a22517e1fdf017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pa-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "1e78585fa23960ab22aee044231de1d7bb99087f27ab717dc3d3d783593bef23f5af3a47dd06647344eaa1e896a72df217a90fe96afebe32bd5158e45d03f0dc"; + sha512 = "81af24b8ab70e373339ed4fd7116e1c4f2bc7a2ee14b46e2af29860add01ab492ec692ee2653de81856d04a465860e4cfda0af4928a237bc0c8469c4899136d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e60a0662710985a7879f004e2ecf0d3a776ca346685cb314f964563917ab3ec081f73e411014163b4fececc5eb97a45a4496574c01bcc964b718306cf382b189"; + sha512 = "f7b6b21ab27b58ab1bdaaac012dc035e7cb1226f46da43fa3de37c7e4fac73f5303dac02332510eae7a8bcec0172769b620acfbaab8b383a64404bb294d6df66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-BR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "83de7c2b7f3d6939bf888fe9c5a19a08af78427f3b466a910e385ab0f8d1a1282dcd21d8c7160c1c45ed1a4aadc44934e3fd8708d8ac09da9bbe5f7bd5ea18eb"; + sha512 = "c17c0e7990b4192f10f7269a5c5c6c74cd6e6353b8649a0417c537197c5f853085948e9d0c50f08afbb16e242f3d8e9eaa1e9657bfb6c40075e5f4e640771d2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/pt-PT/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "700379d0a99abacb29ffebf57a9b50ca0a8bf1facb868cf6f3cc2ab41575fcc9c0e4d1b6e580a535e1c06754a4fd05ce5e7263791edde822e3e8d5eb9b5f87ae"; + sha512 = "2a5db6053556c75d399bbad5ffbfe51505f6b25bcd73008d85f7dba66d89fdf56ee0ba2cfce6e2617b463cb8db087a1700507051322fdd2ea8f732be5bfadb9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/rm/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "6595217951fd22ec31abbdb90364e4ffe6bd9656f9d34e10ff6bc1182cd8872409467dac1e0f86c7f7eda8ebee1cb4af5ed0971fdc0c55387831ff12e012311a"; + sha512 = "94e95e037ea9f924363aa5b80298f67ecc678bb2e22d552c2207af1cdfdcd9ef5b85fa4a6b42ed08167a4b482859658ef6a946adb7462c2e2519c4685428bb90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ro/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "05e68cd9143f9cd0504ca906843d1d6e08a5e9152e11c237b461a1b63f00efb82ab7fd329a42aed7fff255d7b3bd2a6b5287ce0b2d3ace12c30710cb309e95dd"; + sha512 = "dc901a8b6ea913f976c915807bc4ab5fd4a756c98a78498ef52fa8577cb9e3a047e2a38240bf675d72644d975ac70d720f693db056e764218151431de572a37b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ru/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "5bf13f5994d8672cde5b7daf942abc2157c9c988fea459c5fd4bd006f68b013b3056440f73794a06bdd0947a4d2a5a7764d497dadde3b602d4d945ca49b6e855"; + sha512 = "dcaddf1072b19f714e9f50eb1d5e8e15bce98bf96bbbc13e7a4a82581e76339818766e389279fb33d212afa6cea947185de130a3eb72c0f6079e159ff2f18e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/si/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "43b0859b38ea7ca87304f0f0d7b95bf161eb1ca1fa4f28c99267b8c746dd690ada601a2becabd70a3fb09294d29c82e69fba8bbbed8ba27938f43921569e6a3d"; + sha512 = "5544833432d6b41efdff96fcc8d2d322f5c158764320ae6345e9183b2d48817afd796685bb87998e5e6fd227b1753f503bedda5f6fdfa9dcad2083cc9b7df9fd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6507d61d87d4723fbe97a4f51c088dc2d3717925a5aef47e1cc21d75f191e64726b86a48f4c1bfa0cd3f5e59b4282626a711b335bca44c27fe06388f73eb4108"; + sha512 = "d4702ea94482a276ecafaeb7e991ab850a432158009c95489b2b87a82402c92a84c33ce43b27ebf58367e20d63bc444e656f32cb957ad0ad03b1d9f793157052"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "752a398b84af789bcc5a0138ec5774ad49fd0e116338a8da0d07133952379af429efa89721a72ffc092230545f870afd02668a5b9b76660c43d29ddacde92902"; + sha512 = "6103a4d340e45af988d17b93c4e8951a656ace095c9e13f5b0d6bcfd55d51e27f9f26614223d40dc19733aee34606a80a221838be86a1f91417a1c6f00a7771f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/son/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1cf5e57b99b57e243d7edfac411bfa8c894b439c0a88f169ae2566c986969af7fa13209fd3693243839ce59fb386456872420e57d06ae156923018f709c9b96c"; + sha512 = "ea04aee1c01d4d545ab4a370e4be4bd23b9f1a698bc660877a754f42995334446bbc08412bc9f8ec92a2a69a6fb8bd0caee40f622813d9ac18b43773c3111029"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sq/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9ccc8a1870e4882c7862aac6a76677223b73b2087dafe64e26484a9c549479d825b7f566ab99fa8fb85094585e8c457265e7296da3da1c2b1b5980138182c6a4"; + sha512 = "6789f071e366dfb3300cf5057d690c89daafe969a8b8b4e5a3ddee6683caa1426e62901d2288da61b8e8c59ac19d9764521b82f2d0d4fbe375d4e4eecd5751fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "8faf82d7555ae44d65d4d30d4ed4c97a30cb9ac8ab970f654f0ee0dd5ab1bac8823233a638ccbb591a65a603aff17354eee86775636fd4f458127a59a9cbd460"; + sha512 = "2d079c315d0c66d2e1530cf2d30a357d62f9bb6517abe7313911bcfb5c42ac95c47b3f12f654ea61d2fdb74d44ed0b090443f6ec66ec22cbd51c674084a8c4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/sv-SE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "881de9734d9d21d7c94257a4539b4c60a3732abb77dd1020c7101e61c88beae474f7aca3f5c8317614308af7c27d402379ecc3bfcbdf5644b04492cd8b57abb5"; + sha512 = "c78e06de0834a84bf0cdd22a46e80901db3dec7d5d9e0dcb6ad850a040e8df6d3ba2c6e68f8a3da118dd9306c7af7f352d9b56e839cf74afd3730b2d8ddbd38b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ta/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "b3726893b48cb95ff2c4f3fe8769efe82bf36fecffd1860b66f55018ef5cf9e0f6345c1443b88aabb822945bdb6ecef570d7590eb346a0f6f463ae72cf3849f1"; + sha512 = "d996633ce2cfc9d5766840d5198900a341c8158f4bc00c32ef168ac57a1c1d89dc10e9ebfcb2a504273d1722ed319acb9d9aca8d30257a7a6a01361ae7acbc4a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/te/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "c4cb2a1529a4fdeef248ef530b9fcac8730b6caaead597eda24d165648982bc2231eda8650404cba5465ad7281d25910e64dc7ded802a0c042537ee1c14b9888"; + sha512 = "81b745184db9c550a135efd9b085e074a0dbbce24d81a16a39fb51166233d84da6c61b556e39b2ec68365ded627b31065d367c224721bf9e99338456aec07698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/th/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "5275e34f34bded8945cea10496d41834c7a1ea2380ed29bd338cea64b0cb10cb4e0985ea2c4ffaeec94167d224e25ecba68e2195a40915d8ec448c1db049d300"; + sha512 = "a6ba250aa390005ce6830f14a4f7518062b3a98444da87e36f515fe29d3408b7efe9947a9d865a220b9f60ce57dadc12099c5742012981ca9c4d3fcc0ff4c877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/tr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "4769514468e6653a9b1fca2556faa9c25d8d9fba7b2301e9c9a2da0dc0141eb9cfc3801fae1808868db14aa0ab8b5cc0832919cda86f7306c4c0b922fdcb3956"; + sha512 = "55eef864538b70b8d6e7fc2e6af2c73853a48860dfdb1ac5e4471675ebd2d9f089793c1c6cee713654caaa253b059e9e01acb12aa0f6f4efedd09632d10315d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "3313520a53dc840cebab96d2901f83f34168370e5c08df92edc996ac220ccf3aa2eaa62e765df0d86f4072acee2eb2a3d513c2aef26d9470b9eccd1baa447120"; + sha512 = "2bf67d7523c9b07acbef099dee48902d19a5b542ffe9eb65283524ce2cbcf853b1e3e862fa2a7640160cf5dec8ad884a237f4bddf215304a458a4d9575af8137"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/ur/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "4bef3bf1d3dcfde97d79518e1d12305949306e1f71e02e26116bca434c6ac4ec3fc7ec7d219ef1360e999c4a3963ab3b1f1034eefd4be04fcf47c4667b426aab"; + sha512 = "4127578edad2690915aae81fac45cbc90694b68d593562f4c55a1545cd1b8cdcf3eda18fbfb2dc9fb3e0dd3119fad09db68d65e6fdc09d96aa65440750fcf380"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/uz/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "7dd28ba9c29e891498f6caa7d38dd4cbbccf807a96b0e77f83499159d574b37409304f6d16544ea592c2b0ce64c66e4f4dbf127a9a9aeb17e8738cf99cb7083a"; + sha512 = "7b0257e2bf2edf26afaf6bff2a06f9fc81bbf5397c8823a65ee63e54cd32bd2329ddd858a5e1374df64bd188d3d3392434d83e05d0fcb4a71d0a73bb6da224dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/vi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "a19176978e40e7446da4edbf2cbf8945e5b5acd49acf22ba14ec7649f375f7dd6498a8662e285518361b6080cb549f038e91c02b5f5d5bd88874516b6eab2ef0"; + sha512 = "071e162e6919168fa4858aa98d68a2c6ff8ceeb10e5968a2dff55040613ecd7e7290f3acc929f8f2faf3fa4b97cdfbe4fd8b464f7df0c3d1d530af5a9ca8fd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/xh/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "51149fe6381d6dc077730afc623624a0c4bf4da7f0a28d9dd601c3e2ce80e2ff79c8aabb7fe308bfb1faf402d59c4feda46b56fd8cb183201cc25131df448cbf"; + sha512 = "7e12d3e453216ce6ef2dd56980a130c52e273b23543a3df0b5fb11c69d1366533eb4875814e5084682c54f86d2cb8a304b95b08a66c8595c8dada69d4e97af71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-CN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e244d0a4ef5beb49f05fc5602866f3e075f0269aa8a606d2f9ebed615de00088108677b3489c0d62c221fd931d22b8e25ab915a5aa51d650aadfffbf59b8ad10"; + sha512 = "1b98d214d15d0163aa91316fc6f507bda61169701a8accac3aa79dc8b6d7260d58813d87ce25d7083f6fc2d2a16519464267feaa3981e2e556298d3cc3f1abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-x86_64/zh-TW/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8f7b559e0ba2235a5459b45a099c8c892a3a3cc1b43d9d7bca4ea0fadcaab757cb7ad8b50f4d5e363214896c2d6b1ad0141b1cf978115bd8ca756f1332d3b214"; + sha512 = "f466df89dcc7a4b72ef7b41800961828012fe913b2eecdf68f442b492109467ee69a95738db2afc1ff39fac0b6376598e8ae5b050aeddd6fe3d40d0dc8d424b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ach/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ach/firefox-61.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f071c04decd07e0a5a9113d33e149c46666916c493ff5a425daf2bbef67b7f073f529f34244a260545a28b887d42928cb0f9bb3ac59cde2907f79d8e1faac8c3"; + sha512 = "6aafc9db497700c6c91087e2477b707a162447199f26c87a4921b278d81828e868214501e8b89deb387c097d5768faa18eab83076ed84aa59799b24f62a3663a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/af/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/af/firefox-61.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "372f02ad225840314ffc709ed5053efdde3d1917d165b898980c877fd5eecb49918ad8616d326eefd3e6e85a6c816cf82f77db4bea1fd6f92018f73698db8de6"; + sha512 = "5cfe6413a70265360661dce8555941703feaf9045604313361553769b4738e3febf21a79c8be66e24272fef72b41dbf0c3a2e8e76e5b992789250d4b04fda45e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/an/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/an/firefox-61.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "a75046b320adc861eab167829e7d7a8fd460ec89e995f4f1add970dd608d16c0ba4ff7875d0162dbf404c7e0301ae5898f88911e9e4ac4405cb97ce3dd62d1ca"; + sha512 = "cdd9509e49d563ed3d26f58fe957375357fcee36fca7526a20dbd09e9f4f2867c81508cb637cb8d35572bd730b13ed34fceb0af4aefcff631e632bb78a6713f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ar/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ar/firefox-61.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "546e1138d18802cda7375a1e36c5d1751a5621b644b9147035814eeb2408ee9e070183319debcc0a5b9707ec978fec7f9ea787b0c6ca6d4e2a4f05ab7f2f8ca5"; + sha512 = "906d0020510eb911d7b2709c55cca0e4a69638c685bda7e7b406fb41f385b97ed95ee97515693d72f722a619d13583d227264d0819ef973f01e67427a269225f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/as/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/as/firefox-61.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "003602b08fb96218a0e86a577c466bf4c6d1860165bfdc2eca566ecaa4185c6f73a0763b8dd3b8c3d50b11e7345b42afb20b5cb30aa075d1cd8a05d06f97d34f"; + sha512 = "2fce0d7c990c7e2039a601ec5b5feafa7da368e24f363489c1cdae831bf36a11e2bf967ec4f74512f6ca06095ee3a59982b0a5ea3bd003bba9c3f4c763b9771e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ast/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ast/firefox-61.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "76b37c34a3c1b5f8b55d8fb326709f0aa7141b869890f35d9452b2beda692302024e07dfb7870f5689a47f9fb5f5e4f9ab097b552f25e60dade571d0010e9326"; + sha512 = "872e0b0962b7d6f86663c0cdf5fed6f4927f4a24bfe1848debb605e7c19bc574d98bdcfb74a2e5a4362c27ed1b9372881fc1418c742e4cfa75d15d838cad6f87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/az/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/az/firefox-61.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "4ade37b7cb1814ee254f902705aeb74ade1172267a080fb3dd029bae059819d4cddf34d23872d49c5696aa55d6a49f64a0a00a5ed5186c58f687a614db3b7822"; + sha512 = "dd92dcd6f0c32d5487525cd88832fb567ef0e8fda5cf7f401399992243146bc2690881839d5752ebafb4e7e099c6594c71ef99d5509d94753256507216a2532a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/be/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/be/firefox-61.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "6352d3e4495c184048157713b4a3716cc65d8d69478a22b93937c545663746c9bf3303935d97e4f1c0574f3e22c4b06076405b31fdfd5a3df3f40b3b0b1650c5"; + sha512 = "1eda2b0945a4d8e70c0e61b187abce6873b9a8a578c089cb66b2728bfc71b90aab71b57599417ce775b4d5fa1c0fd908fa4b9b3183a3aa570da95d4fd726ba84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bg/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bg/firefox-61.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "642fd894a03672a0b91606bb7f8a6039566d007c3f90bc680db208bf3ea75327186e6540599db6c18bd76359622184e9642e6f53a9baead022fb0cf6e8ff5315"; + sha512 = "597dc8972c670f67f34ac23ffb57506b896efc9436d36270dbcdab484dcacab174aba53671f5462ffc7b54b9718c0280a66734e789edeb7710cd7c2b9fd602a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-BD/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-BD/firefox-61.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "bd9a7d34937da1630e4b621f70942c43c6242bbb7ae6108df460316fde6686436b22ffb5416082d483a81296b1afa179391fce40ee21800e5b984827a5dd20c2"; + sha512 = "79989196e4647c035d4af9f24dc9edfceebf9d90afb1efe894e0a54e940ffcf32e3746b9e07b486bd89a11ef8f35cfaf2e61992071352a561a535bb058c0396b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bn-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bn-IN/firefox-61.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "a186b8d943d7cba1ceb768aaa8607bf97228ac54236ef5f3b71b88eb2d1d487f69250fe73620dd9b4928b5d12b66dbe3531c4643f4e6eda6e1851289e5b5cde4"; + sha512 = "25b3d138308e0667d62e41a8384619fea548dfe441cec761c82e238c1f0467300d6abc89d265f22f1d9699ffa2165bbb7dceab76169a78acaa4bb1c46396182e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/br/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/br/firefox-61.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "dfff029c7b96118394dfcdd4feb19c0756bc3fe8e8b8761f16767280d2bb97b1643f14ee182ac30f52d0da1f4b0c984a09e43c7ffd14d7e1b7aecb560597d1dc"; + sha512 = "8f18a08ed64cf071462b2eb65e0965f4b3825857e867da2898f959fbe84ea55cf19fbed289a4c4e739e5c4fc5392f1f496feb6b4f383e86a753f5041dfa333ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/bs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/bs/firefox-61.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "83802af9571a658287bc8753c3dec0cf077d1a0e09196e965f14f172c7b76172d2833a2096f71299718e225dfe3c7ffea7c38c4db1436018fbf2228b0c981499"; + sha512 = "2cd2a33ff71b4a471d694912f8c102b53327f1bdf005316e16d32ef17a510784cfeac972f9a854304b07d6c9d19459b19bf3f7e47caae2e58a635fa555115039"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ca/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ca/firefox-61.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "e850371abda2bc4241fff1c6e9b79618d378a0efb266f4c39239aecb3d44ba42b0cecf71183ab0ad6de812e779376c2a40e77852a436102de2c038dc7e7e6ca9"; + sha512 = "78649a90b8e890adb271fc57328669afb49f70e9f323a2849a2071b83125f3f1f40e13beb353336a9c5aebd930979889c719075b49ce4099715951164d979926"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cak/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cak/firefox-61.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ce33c245d288e3ed52958acb89be5152fd78b29aba3d83e78543cb48c8424ed647c2ed03af0a03dfbeb3a3f1f89137492f1694633edd68c5d22ed66f0a74aaec"; + sha512 = "8e66b6ed5b20efda281350535f2b08892763c2dcb62ba4fc764b598606a36b4a6f3d5960919a8f2967f736add11132252449efc4bef827653534b45566ff69ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cs/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cs/firefox-61.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "3d012a8edb3691d05426a236dfddef9841f56f1afb59a4fe00a710fbb3060650890fa2e766e6a42112a4b5c07b19b2de10f6737e630a05f89b9ce62a336dc2c3"; + sha512 = "5e81414b8411fda775b35704de90d006be40cffbb51b495171b9f69896b9d486e4438bcc2bd2f3775ab5f998b7b41599f44f92ee150ddbbb2a84f64058657938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/cy/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/cy/firefox-61.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "86e7849fe9edaea1332c98ddd4286b75bf5814e6b74f17fa8b47015a9534a548390ade8278fb600248dadc2dccc43e7c4f1f5aea4a6d6e299bef34e8911e1be7"; + sha512 = "8f4c5db5c760e16ef258bf2da401e51c2cf3d75808d83eb4b7adfaea4c2b69bfca0cd92c9cf69d7e4de188a2c43574d37c49b3c641dd9c8edb7bb6aefd2e4755"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/da/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/da/firefox-61.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "5dcff5b9527b76a39a3e932be37af0a4faf32a60b32f4827136892e51c051c20606a91eea7767c5d80b0a2c97a7be44e7199d0ba8b20417b297cb0637c8cf725"; + sha512 = "4aceadbf8cd2ced63f15aed369d98f4234faef18560e767aab1026c876fd3d6a069cbba49139eea60a78e0e42c063451918ce4090e850fc5528a93f527067335"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/de/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/de/firefox-61.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "34eb449d0aa62bc473413b0e8e21409ef9a4d2d08c7bd5164a780512662b2ca8d9436eb059c47824b4cd50c6502aea9e0aa1d198561882da1018aa18b72a8821"; + sha512 = "327c8b22f3ff3c11061b5ee58d1ea2311743e53d804bcff6e66615eeae3aada694c8adbba58f3521b6bcd8f54513bcff1d50ac952ffe5f1ff3f22b52264bdb68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/dsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/dsb/firefox-61.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "5d9dda0e61b5a29d62516996ff0e2cca1f535c5b0d343a5382a6b07641f2122da9aad42682e70d8b5f20b562120190f9a1eeefd5a2efc1f119bdf78e86f395d1"; + sha512 = "5a964d9c25326d2a97730723be2a999bcd8a1bc91b2d0d7ebb4aee9bd773fe93cdfdd94c70cb2f9c0ef10f84474c28726c21c23e19a1fb9b55e6db5c2a74b6b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/el/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/el/firefox-61.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "b62151ec4a320d6e1a92d47082b0bbfc141958424674162056ad302226717ef1841a54da07824457d0ac6e953524ea2d617695b0a369c88ffc75c2acaaf3f702"; + sha512 = "ed1eceba7d5bae11af3a916902a55c66ed97ca6da9f1a6421e4be76c65b25111e2ca7c979c55f920d5fa30146016980fde273c643a5ff4996ed32b82f0b9087e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-GB/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-GB/firefox-61.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "b031bde943a2b3d8863dd4b578c2d7213c385066985c1aecacfc06f5dc45b00893382c1e6c157bdf6b889a86fb580b575e81156f29a475ea47e90e2e6113c3e2"; + sha512 = "019be53a2e1bafbc4ea77730545c40be314d7e4a370e5cadaffd735a2dcb3dbca14e4d23b88dd2e34aa4518a57aae1b37ca561e8e62d7acd3417227f0d18d344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-US/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-US/firefox-61.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "38f959e86d5caf4c30bbc8fe4b2c9e2451c31a1b30ffc0fdc38e92d8152580c8c2fecf7c5e4ebe86fc41e6b2f7f8691b428a691d89744308e9e800633df1b022"; + sha512 = "ee88e6d55855a9e2fccf2a362f26177393447dd1210eb8f78992a7760bd0e8245267c4143eb5309a7ac5826b345b8c9637bcc504bb7214d1f7897db70e9c7697"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/en-ZA/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/en-ZA/firefox-61.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6a3b9855ce3fc053ec5cbe65b177290444097317f40da1a19cebeeac83f78e5fc3c74086b15c5a4af80341bd16319d09b0def2d3e2b65b67adf57065021c5479"; + sha512 = "877cb9d50e95a8b0789660d871f263497279ea229b11218bc9398facb23d78200db4ad19e0030ca44cf36ae3913f8a119abddc3278e85a4c89d298c59a3443fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eo/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eo/firefox-61.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "cec51b0e9a5a0017171e724337e8b5edba7bcf4a2950061b4203738adea2fa65991bb9012ad84446fbb4e837e2feb01e1128ba424e6b0936dcc1cc6dddcbdfaa"; + sha512 = "5c78af15b977019cf7402e88b823ab2488b08ba9e8dd27a55caac7570392e78afd8aa972f0f95f21dfb1239936ba23272ed5b84cf24578cda5e7bb1048ce7d67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-AR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-AR/firefox-61.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a659ec66e3bfb25c51765490632906e320e1ce16f81e16a528c8b48a383f264fa01694e7906fd27948d4ca97289e240f2a45f4a8afee3340c0152e053108f621"; + sha512 = "8328fef71e94c07c37491a331ac362d142d44e93404c0a3ea883426c8f11ebf6f5bf6584237b7fa75439c7312bd1f33a2ddcfcb8882c3cf3c526abfae48a620e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-CL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-CL/firefox-61.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "2d1dcf65d150bfe52743b251127743aa5fee665a4d8a69d8250d629fb48d99f4d6af06162dd19011aac8d1d6dce22df5b1d5516084ea238342e14bc008db520a"; + sha512 = "ef4e96123acde3a3ed75d8d93868894f859349613b556d44056009d55a3794e78824928eb04afe8746e291fb3d443b7a1b6f63376ebeb65102f7e03067480b86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-ES/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-ES/firefox-61.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "c843d1f6ed5175e8aff02e0501e377ebfa4095f423f6c8a069166c38fc417fd2ce670d1d23f2d00ab927bf2065103cfebf4e7be0acb803e6e448f523bcae0177"; + sha512 = "934e92d37b920ccb715a411509905c150501eb14d11aefd084f2639afb8ee1a4ce3e869d682ec9f9db4b70a795875f09ca3d7d997f0e621ef99cffeeb1675f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/es-MX/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/es-MX/firefox-61.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "274d9c8343ceb3f9f9bca4d1664104b1ce40e5dc47bd029764421fe88e0700f5458d9a82848b5c35acc0f4a2b9e02b5d651638e71dee877ca7a1faa5955d0ea3"; + sha512 = "57e7bacb006bd079554670fc216ab2c1912a252b7966b32cc25a7d6735f7b0928ae0911b666c2810c63031d57513a4ff800cf92906a95868aa32608eb927e2f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/et/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/et/firefox-61.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "30b7976181ade5c66d0f6e0239919e490b9082fa36deb1d483242d83b5cf150632862237d30481f8c8135fc00ff977a9b7cf1c9abccb8c2ff7eabfe5052d0c6b"; + sha512 = "b357f29c0f77e7ed4ac764f7feab6588cf322a1807210052359402e5d1092d3d8cf515e04beac86d32a6ddac43b4be8b92d88a1437f6899b4007d2c9faeb7fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/eu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/eu/firefox-61.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "92136a5d5dc0771be51a18e17c613fd921a99e40bf0069f2ce638c5c1e3489b8a1be119586cb4d8d7e57dc7132641158c3e5046e64c4047c5be137007302afa2"; + sha512 = "61b4a7b767e62b1a1b4eee4cb024e869969b5623de658ca2a3762c271a6519fb4869c9398e7a3cbb987f01799961021fff6f8634b78dc62770ca1f345e56d061"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fa/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fa/firefox-61.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4911024cd6035415f4efa7fa1ed4e69d4af83455119477dd920f34626c941ee96177969c843744b1336f8ed557a2acf8137d5965d001725d59dbd0fe75ac68d7"; + sha512 = "4eec6e7231fa548c0a24b8904b55311058dfc89b2ffb87142859b994aa0a31a07c48107495cfa66bb4a65094328f6bbd7f33e0ca33632457f620ecd90678552d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ff/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ff/firefox-61.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "244f8cffb392dba35e18faa76f1fac9425a8389046953c6a74bc4776f71863b2de2bc97e0bbcef2b02929982541877245d2a1d5e749079b64fac3e461c4b87a3"; + sha512 = "0a17ac2aa0a855c97b613741d7933dffc4569da9fef9f753a4e404847e683cf10a4444ff4cee5b5d1f86ef069525d0f2635433e8249ef029bfa2c247ed605386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fi/firefox-61.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b3cbf12bae53f19d8ee270458ad57d563dc09a4362c889b03c2135fda52964822c77acf444cdcef2f0a5f01e4c6609ae65769ffa0533f0aa22a73fabd51d8de0"; + sha512 = "32526703d86dcd74739f419518974ba7f43083a8b3f971d0dd7446caf787c5ed4be82710e3bd53f2d1e9e5dcb67f46735bb55f60ec7d9c49c62cfc2857866fc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fr/firefox-61.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a1f09c3e1bde95708a97e7ce579af3e2c23fafe3715ba34e98f2f7409540b9a59ab4bd932c89d30c88d0689cf4d1e58fbf5f69e3682da39db5a7e460d3cea015"; + sha512 = "b7e00691c8a1a5f0c1a6312a79eb40ae17e455e156f66da2f4e43beaad5ec35d770b783aba83c500db1fa885b1038095effe69f936e17d69bd320f41b71d4b2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/fy-NL/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/fy-NL/firefox-61.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "050fd5cc1460eefb184d15497f3eb0af89a4796a80e556638f03263dc80da24f67a098e527a7d9d105ffc8381693aa8cc92140d0c51fdfe091697021eb526669"; + sha512 = "d8d70ed1d04686cabc9862c5cad06dffa6fa8b975a2a61f0154a6c1c6b182a173abe4563b727de30f414a4d04311744917a82158665883697d26589b29a25263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ga-IE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ga-IE/firefox-61.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "95aa5c888b0c8d249db2faa39cb42b4c004c4200da6b3854709cc25d12654d70b9fadcd732141c8ccd81bb1352c7c627b6665a9ae409ab87f1acfd4e27900cc0"; + sha512 = "352620fb58ed1fc024e8633e70ce3a705fa518cb8f600b3bbcf1c50c440812ab8f04608bb5a3582f96dfb2a19b0d52debe6c4947dff2f06f426710d8f927977c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gd/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gd/firefox-61.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "2ff55c69c3d7e87937b9a08863bb69824e07c84d9b433933fcb48058ac7973d1f8da67058220a805e1deb0c7f1ea25551f8f5e790a54cf0c18c2b38c83680cb1"; + sha512 = "90923e5ecaa85d21d7d6de57c79a3f35b329faa14a74e8b210cc2024f1d48f3aa5c4930c63e8e1688778bdbe998f06c72b5bdce8287ffd7ae05fe62845ba2bfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gl/firefox-61.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "d956ac5b55a3437b00502823ab79b879f4d3448eab489e62a73520e56c67c5abf039badbfd1271b589baeac83025d6396712bce3d3ae1b4bff4767cc3ef08cdb"; + sha512 = "339f8ebd6d714945e50be0d18be3af010e2f00924a84df2fe5641b06842278550bc76b01474ad2b2a0feda734f6f2ac9254c008c3a6f942714c684504bdd47b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gn/firefox-61.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "176a71c3c938e602cdf4c693a6f5f4a424e1984fa949265911ddad5f9babad588318849f5050051233fcd077584ef9c10a76c240193edfea0aac6a960d739d83"; + sha512 = "35de07bd227904bf0372555d81ead164d993410d963e0e733f536ec445112652c04d3bce8f910d0b3daa3d9ef2ff956d24ed680916a5e86c3e9a6f9366d0dda9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/gu-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/gu-IN/firefox-61.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "fc054c9c78d3705407bb388c0244cab2ffc941f7f4fadcc8c27181e720f40c1b6fade221b0ee9d2d833bffa1f09cce4714248a8f94a1d199580e99b63c10cf02"; + sha512 = "20b1b40d84264f0e98ab91a4e5943da078b7c37816b24443f8936933d779453d640b26ae04eca1b24b3a68134a29e7853bbd544c4cd725b934660574c6381284"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/he/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/he/firefox-61.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "1474c09dcb6f0aa2f2637c7ebd69eea0ef0374218138a1a3d51c06034a3803d47a82641fa3d95a1e0c960d72413ff68e8937fe3602abd335c8faf818184da3f1"; + sha512 = "f8652f2cdc19827a7f2a92e6ec251c5f0bd8448d3dfaa3bd930a4ba116dbdcdd7f2a9c083c5fa93ba2a24395147782146c5443221c6183622248e54d0687f287"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hi-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hi-IN/firefox-61.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "f0ce4bde052f506464c7a67b289f1202a8ffac52b21f7a0deb1a4a93067f9a9537d925390548924effb15724dca8a03bb5fa10eb991ce90ef201ce7a6608f3fb"; + sha512 = "7051302d9315dc30fc8f6ebebaa587b49d17823aae7a542133d2f82a1d5a18e3062ff02880f347518e5f88a0de913568d9f6b4ab72bf7dd20cff5812cea65ebe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hr/firefox-61.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "46a12ba74472f1d1698d62b32a3f421c80a4408ab98e5f72c1e221af89e9a428055a73ed11a9e5e909c27d89a4b03f230a2f55205b425e877f81bbee3a503f37"; + sha512 = "acc1297166057cdac0015758d6556bc870481d96951e7a14704792e39010938a6c0bafab2cb28e9a23bf24695813e8dc1a80512c1c5fc75bfb8a0d29f7091c93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hsb/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hsb/firefox-61.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "d6e456e80f4a0282091cd6e35aa75d61da9a8e5a02cff88f2c102404888b86b80ec3b0f5e3bf1f90f7ba207c9ee2ef5e83f64ace8d3f3d2f4875ee97d08d4243"; + sha512 = "2ec761ce5eaa14cf5fa114524f70b93998d76971de7b8d001e656cd6331c32252ef3ae78f54906f5dd416896b2cf8b6f5afcb5e3a02d017d9c8a33835655718e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hu/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hu/firefox-61.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "1f1b201d42db1e6122aa7575e1a39ca3f2dfe0a896066080ddd917b5f37d6da824b483ab640a38431e2164a918d804a6f6647b1c3456f9f09e5e89dbb4b0de68"; + sha512 = "160d7307aeb834f9ac15ad77c0cced4cf7abb855264e10d8a62eea1b1ef85aa3b0a00fa9221052bf4a3df010e54fa198d7033d8450d59212ff36c936d99a1469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/hy-AM/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/hy-AM/firefox-61.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "0f99f6dabb425c27f3f6045413948e8e10c4b765c4104a1bc4c2a0e39a78495565a7104c1cbf8b47dfe5c3e9866855f633bc1b0f649d22864d4688941edc4832"; + sha512 = "09950c9536fa0bdbad207b84ccc83088b23a7f2f960d094ea0615de566ac1bd9cf55acbe01c0f574114dd9246bc74e582e67706ec0c34a2c9ed6dea3d30bae17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ia/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ia/firefox-61.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "3d192886bf01989adebce0582c9fef6ae89b06043dbd5ec5b0d3ce8157e08b288007483617f55f18ffb7a98647f31a856325b3974d446f7d4d0b0b27c619195f"; + sha512 = "e6c1b00971dce7387e183a8328234ba65722c69c7d48e328223eb7e490af3706298d43c11844505ba2ea5aaf21a1fcf7b3cc8ec8946862fe7aed8128e6c6d5cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/id/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/id/firefox-61.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a82f87671af899d82cebb1745f8b373390982f7b0a7aa08e2f3b4fbe1d3ad4cc5356277767dd3200b794702af2895e43e2443d7a9fe308d7671786cdcfbea8f5"; + sha512 = "85506ef07ecdd1d466fbb261d46bca8cc4ac8b3a707f27db9083dfe1996e5214cc0e78080f33c2b3198e27e044c6a6d13717d69b43c3ad98a1c43f50b12bb69b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/is/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/is/firefox-61.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e89106d20bdf294de5fdff8bcd76425377d6154677f114547ca239a388ea78d4a447e8e6d7e0412ac438e126c4b6b10a869873e2da59c1df35c45e62dbbf59eb"; + sha512 = "973b863ef94121836f472f5450f8a1a2d3329306f289b8ba09ff811b336196a157cfc966fdffecd54e78f4f48508ca1f8284f0c2d3804579ef82be4e1adda48d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/it/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/it/firefox-61.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "2113ee46a7f2122300ed8bb84f3a5bba79e895e1d8c0b2632f64c7227ae815a4945a6c9c41bd504c8800deb2ad48956295fcd4c283227a433d7e670f5a5815e7"; + sha512 = "fbb8e899b2aac3f4c64ccde0fffa11f8609ca3b7ea8bc05e062d207b46234b2414746822e0fad8d24fe8ae43e3bd8ebf2fc5d26a02365012a95a4070de002274"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ja/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ja/firefox-61.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f06a1380b6a3e00afb1a07edcc3580c24c70401ab265fe4f9033fd0ade365b522eda4a81531bd5d42ebd4ae4b8661a0cb1bf37cf6db710376946eb7d9bdeda47"; + sha512 = "c6585b28baaeffcdedeb1167aae4d20874755e970f53aafb351a31acd3933e6b805cde1e22ce0c2ade58984ad940a5d8b6857116f11ea6070bfa88c8232bbae8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ka/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ka/firefox-61.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "834fd967a81070bcc1802001726a9e061182cf30a03227d4713b9d59df6e3559acccfd665b89b8b63e43764d14e37f0e5859075e276c67bd6e0972f608e5df8e"; + sha512 = "136f49750c33d72e7aee3fd5733730f1b78d6656fd45b2aa2299d8e9d01adf13f9debe1d08d8fb9149107e96ce5f5fefce81b5d9a2d9a1e1896cb8df3c588829"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kab/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kab/firefox-61.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "15be0475321c0a7542361afcb28c5ded73b71bbbb504b4fa4a4a03e37178a5ed341634278e039ecd6f19c6ff25930a70f93abf2b7fccbe9faa9748134ed84ab6"; + sha512 = "2a0fd4952c493a4c22e76135efbf155962fb51444328726f29660cb97586ba76c1903d28c7baed9bb4815e57747b5a009649e179971b3c7aafd19fb96be23c75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kk/firefox-61.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "74e0438fb6c73fe86246e90ac4902a0d07d3af65b11e76260aae00df7c4e0f6999ee63d3c88dfb33390ec480925d79e017d6aecf916a18cd7dca7856823a621e"; + sha512 = "0cad124b5e3d995124057fe0d818121be4f7f186c7cd4ada4d13b89ca5d505a8830525ffcda9a27a0f5f2241fb65b44b8433d95221220740ab8643f374c938ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/km/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/km/firefox-61.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "2090a149d0a7062c62e0a2207c9c9d4de1ba9121898cdc0f820e4aa893e9af2937769b71aadc150c9c543db9fccfdfc5a027ab25e5b51465cadc591ca50df0c0"; + sha512 = "06a58d8d54bf641e3ddc7fdb3417f8a5a2aaa16e8c11f961321c939e803249edb7dd3e08027a4b20ea840298b4a12da20c2771364d2b9caaba496d1eba863e15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/kn/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/kn/firefox-61.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "0ddcf94f52a3cc68a0f92aedfe4b84cb739967566ddb8f9fd67c151efbb3c5abf10a841a799a13280c21c1a4a9e2869028cb450cbad49fdab96b4ad797bba327"; + sha512 = "92a9d9e4fc65472200f408238ade4ed23321d4e25b0c7eff9096f23f76e480cea0031159b53e509cc6d3d6b2c0c0c8396742c81f2fc3e9825c1d5e45a35a12f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ko/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ko/firefox-61.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "c53b45bcb74ddbb385360607662b4ca845099ab3f276cf8dce4158963e90d3d17c2aecb4a5b0d4ea496328e72f6a1268d11a08bb2f5459d77033dd10fe6330c0"; + sha512 = "dd9d7674f6261a94cb00fb823a02cec12758476c1ca1cf6a973eae78dbc1c94ebfcc14155c035966781398e1d3262e000da4291e90ec434756c8c3ba0de7b7b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lij/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lij/firefox-61.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d7480cc04cb4c13ddf7707be2b0c70694863aab289a73f28fbdea83363446f635ec52c8bbded3ac9c72360721a7adde9407da82816318bfc6dabe1e208582a23"; + sha512 = "1d01c34ab89ff1122147685b0551aa650f5b751deec35a5e7d64d6ba46272e929d7f1c49601fb2b1f5514b840ba6554af892c79c1a3f71af392216271d206cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lt/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lt/firefox-61.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "315c23da9ec3b270ba8840c8fcb5c34fba57b87319f499a64f140fb0e9803b229831b4366ed68287809a8a0277d3db955ffddd4042a4bd3f0f453e22ee97ed0b"; + sha512 = "93d3dfaca37a668eb7c43bdc74ba521bee0344fff43ff9cefad5e4746b7c3ccdba445f97577338606951a15fc5e629bcd4b8cb979842fbe550d3e7e88169b3a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/lv/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/lv/firefox-61.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b7af965deeecee3f907a0b119c886fe5c70ca48ee3ecb094ce052653e9241f6754f804e7b8513c57f060dcfe382949dbc69a4baf34875d5f2bc3fe452b3e4e28"; + sha512 = "0037d16778bccde9146965d7553513a21a443960cabca4a65b6f58ca2ea9f243b3405d3993e8ed078c1a2b7bd636deb86ed829f8f699400fd755f35cf048c463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mai/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mai/firefox-61.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "def09aab80c64677ebd5088da465d7f76e56c3594c88343ffa39ce67f125086324a3e75161e3bc08e004a48555d15faf6b568357fb7909cdeb53934af6879696"; + sha512 = "d8025e4c4ab5b7e9b2d8dd8afbc221e1765eddf878943c4daece0e27b7443e7e17de3e400d99a5ef5b62a5ba9e3f2a4c27112551c8c0ea1f81136d6d74b7e91e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mk/firefox-61.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "51fb92f31ba8d0c7b5c27f54ef4db116be1266e3a23514b39b8af9988c8a72302b9157640773fbd4f0aab2f76d586ea2ee0b78fb4aeb5304635e7dc13cb5e0cb"; + sha512 = "6ed44201501bd8336615b29078de4e52374712f857e2816732277cc37b6f8b305af0861894f3f70fa62fe2de6476d689bc5b79bd245b4dd750dcbab0b448c69e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ml/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ml/firefox-61.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "389b1ebad514f54484b2af8991d358dac58213a259ecfcb979561bd09954afba0594d9f0397c8948ce74165191046612b5da3c09d9c317118468e6c751177730"; + sha512 = "5b7272acc37c4dffc2421824b86c5f0192b7a92535f193a0b567fff8e79129f41bdb336bfc1c742ea0f106739eca47339d9f550b785951364233e612b035f94b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/mr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/mr/firefox-61.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "73ef9e2b717992bcd196c60f58ac6b4867e094b16ce0f6a919c32e159eca98993415f90e9edda96c64eb6cd1c0769e4b1fbc2365be41f0452ac93e657ecaa3d7"; + sha512 = "fff73ffc6f080aa064df90a2f19c85364a09c831a095bf3722a5bc0760e04e305be8683804883968a492589a652d705f1cfbbed617de2f00348a723babf60a86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ms/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ms/firefox-61.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "bb19da37decb720804821cf5a4ce295bc385b5402412ee001e43a15f0943d56aaecfb94ac3a761170f2b479a50fe58bf2fb0ec6f318fe68bfcd3da2f05ef1919"; + sha512 = "a7574ce597a12b92aec0e88ca72d544cca1ec1a5def40b034a8cb25a24a3672c42e2fbe7ebcf0b5293f55fa12216856503af5514c3ab2b3cea551a8a43900b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/my/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/my/firefox-61.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "17b96fc20d62a938e92bf8f6659b451752700292cf209da477571945a8d126784bd3e5ed75e27feb5c4b75addb64b45da2a2dfdbba98f62b3508a74c0a681a08"; + sha512 = "0bb892e7ab8126f2f946b1d3c9b8b00119dde0a165832ed211265be4f698087ab83970b1c1d47171913db7e01f43036e90b4aea135accb91c33beea1031d545c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nb-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nb-NO/firefox-61.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "a99b83bf5b85b44c46166448fb56490c020a7dc9e7357c9b4d5abd2552f91d7ca6f9cc445b8b2255481aa212b7ac1c9662e5406b760922d3d64c7ae611823bea"; + sha512 = "184130d826eda76da820974a4f729de6eb569bbc7f36ffe2d4599b7c142d75c5537546511770db38abaf28b9d3866937fc6d51c7fbcffb074432da3d98310b06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ne-NP/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ne-NP/firefox-61.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6d8ad313b854fbb564f06d3ffae52f90ac7bc57620d0a642874a1eafd950966471cc201828045e5fd005a7cb848f37f77cee2efcc0f19dffb7f02b391fe02acc"; + sha512 = "2428dc2175f0da8e4fa66ac11810467306a59b181c34165e4a54dfe5f3bebc182f0fbcb117f15707e72baf97f4d75131a3ec97d03d0fc1109229caf83519dd51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nl/firefox-61.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d8fa336c7084823bc3430d0c11e2bc8e38874e3ca33886e48a1318ca2d5deb7d0a523f9b7f8e86596e456c1d4f899edf22af2058a162ea5ea1266596a812aeef"; + sha512 = "96bd92c9979e02a13db550f7f3a795585baa1017691371c5e5bc99825d730d535c63ddbf805ebf8a0e6406ae80ec644d0f715d04f913935f845ad89467c01832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/nn-NO/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/nn-NO/firefox-61.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "69028673fb57cb9fb7d87d6e3bdfabd5e530f51680af61052791a9a160c6a8a2545c9a4e5bbc3cf37d6595120641f20c4514dad59ad1ca4745c8fd5b72fe539d"; + sha512 = "26f35cd02873ba061cd0f38cca18947e2c05589d3b399c55fb4d0f356c26d399848467a20fc542c7f51c67c912ab7c8fe5fae25c97d942260276faba40d24c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/oc/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/oc/firefox-61.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5d1d399dc74ff5cff63e460ca223c11e130ec2fe96a974262ea47a055899a6ef875aa4e554c1edbbedd0b5fba66270c5664a7e66040e5d59bed6cbe3793b9a84"; + sha512 = "711b260ac771280d795d6e3746df07bed4b9357b7261e83e8b17934ab027d77bfa1781d3d9d1923724f49f16136468c1fef40d1809d6a020d5b49b7767030f85"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/or/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/or/firefox-61.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "31b555805922b46594ec82918c70a1862ab032e6a593b1b72a85ac7852a4d49dceac2ea76f2ca22d0b648a5e3c7636611bf247c4ad4133ddb5be309b99768da7"; + sha512 = "dcd1d7068c75428533d268b50d3d1e7324dba2709abe4049c9cfea4fd4413b09c3c7dd9f944f5f54f57454d8d2aa8471b8ba5871e73cbeae6fa357c8c68e90fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pa-IN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pa-IN/firefox-61.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "62d1d01fcd5001e108c17b6b6a5828f387b89f1c1a77f954dd31a88d226c355086e5246e4c9dbcb805a4faa12ebc9662270aa07d34c397ca43cf0daa1333a106"; + sha512 = "f34c32479a92cce9fc6564899b5477fdbdbdc868b17904f8d7ae338c2924fb7cb8335b038378a805a2119ff5ad13e349c7b80efe7a29add706bbaf1466d623a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pl/firefox-61.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "e2f51335bb4ab71698643599689865d56c3832ffc4e946ddbec63109c53f6dbfd337473ef7f3052fc63570c8b3e029cf68bcb0754916bfe3cfb2e1c774eb4435"; + sha512 = "d62822aa991cd30cb6c5e47dc211bd4018de427b243543bd83bd166601e40e3bed35dfc073660573dc500ae19ead2dca858041a3b80bd616def3c2b3f72aee11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-BR/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-BR/firefox-61.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "55fc461bd3016d633471a999d6b9cf58b64f7ed243ffe7eb00e95b08b94e3f774ce300b6745cf2eaacec9399df8c905a0c2c621659db15e1bda0faa3cd747006"; + sha512 = "5a2ea1494423a5ce1afc60c2d1a4e53ef084a02050ca61a688ecf18ff9d99e43d6bd334683937c12965767e7e5b0bd1a32708f1f2c2a241db1f68271633ace66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/pt-PT/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/pt-PT/firefox-61.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d29373018e02b47999c31f80bb5be4b04825cce738451e81b1c3a9454f6ce278f027a7ea6dce97d49ca795495920179b1163a33bf2a04dcc64e1c4e86ed7346c"; + sha512 = "83cff834812ad238b103fcee8b801e46ae542eba3475709e04848f18df0bee68075b2834ee871bfa5eb58ad1ec7fb34239d661a27d0dcba17e6c39de8428cef6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/rm/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/rm/firefox-61.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "02853099aa53ac35de59ceeea533de72eca31897b0e46e503870379ea57829d8e298bd39cac55cd6b42ae757617a2ab7e0d65566422c2eb23b8518bb38f6acd2"; + sha512 = "c4190e7e2007805b2c7507dd26b0695bc5d3c007eabd6a592c283a99cf0495ce1dfcd6dbb1e753a990f64466f24618d3b84df617f99fb266ceadf32fcd990af8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ro/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ro/firefox-61.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "404a9b30e228eb990df49126a1066b727669e4f76fbcc0ac90934539393a56342a01cadc46293b636edcd9fa11ec629496a822c693da74f900f322ee19bcdf76"; + sha512 = "292112e0af6bad96b97bb0a1d58d0b7c9d4cb476cf531b1caaffcfd54c2f0ecd72a4311f98b614d7f834ffe2779261f77eb43d4d7ab724378dc6b7ad83bb1840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ru/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ru/firefox-61.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "62d8315cada27354c4d59c94d04522954e82277b245055262e856e6c98e967e5c1fd84aef1d5893f51d92d567e6a0992c7e8ff1661620af6b1980b32d0982fd6"; + sha512 = "3d6fa0994fba5ff988e281ac4feff8655a5353ebf0d99df5ac7412cff2d19d478a912851d27f2af5bd78fdbc68030878682bb7ffa912180d2c4aa9bafcd77cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/si/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/si/firefox-61.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "b7bce8630eacd3b7e07cc355068a0e9d432223cec4f5cbefc4f912dd1a9aad37dd66751c3ad4192592b52391437f2fb0bcba96f6683e83e63501bcab52f632ca"; + sha512 = "e6d3c4049f267e68216e9824743b123539e5445a5d53297eb8af33af95a418e492a655a456970d02049f8969c81c0ab8c5be1471a5ab8e01b4744995b799158a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sk/firefox-61.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1b5fcdd53fa59a14645494a6a2bb2e2050c9c6062fc446496888dd64e555c2326065658e622160fa02831ca073b5c3e226de5cbee8b42678a5bbdcdc0ba52d09"; + sha512 = "66fc1f3f4fb7dec1c261db144243dc0647b4dbc4257de93c5fb017ae616d31d6825fdfafc30d3fc299a278d5fd51731f24e6033cb3807c69ccd1512527029063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sl/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sl/firefox-61.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b539609ccc63eae0ab092b5c7d326f414c058c58fc5188e1a55d81478e1305b612b5e7bf32f071bf71d15ddbe36fd2d09647beaa913c624e30b68bfecb52b09c"; + sha512 = "e089b96b77a60c2c8e96f107cd26f37e681f8a8c702cf32ee3592344900c81daba274516c32ac856609917a30f8d60d853fd649fe575c3a2915072e45908126b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/son/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/son/firefox-61.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "9bd817b0ae3a80472a3cf1ba8f8c6c564bd09fc92b09c95d97008cf940a663f61aab6e52ee99991be148a54296c5af38c7105ab655a60fb6f7e171b0b2b94880"; + sha512 = "00eecadab36816ae5e977dd50f335222e1fd8253b98daa1f14920e48678afb22b0e619ae4a86e6a45c8d2973f83f614f16a1f860e6ed1ed488851032075d6c72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sq/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sq/firefox-61.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "c066ae8b06bab9c27dbb21f016d860c67fb63402b899d06030b821f61b4bdb1ed0cd946792e36203a2ca32d86a49a67538da24745133a36fdecc654726f13235"; + sha512 = "ebd8ed00c12288a3ae4f6a113bbac8595ea9c0fbc35575115fd019c6158857ad083588100d4cae440822780bf25789501d0dd800bbe2baef5f037fb43aeabb74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sr/firefox-61.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "8853eceb13dba82f95382592009198eedf465618be213659ecb962fb3590451aed7a45fab05749c77f50ef6b5f188f60d15c92af37e6f3325661de35dfcb2d71"; + sha512 = "bfce8265755adbc3c30d56a1e4bbbbb14385ddd3d2434b6404b04e3fa3120d58b32cb9e598aeb1540f23d2757c23fe903fd5c9d5167db305a88077e98d9a39b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/sv-SE/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/sv-SE/firefox-61.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "7898426b4152fd469fed37b8e84daf73ac93203ee3d625a3efafbec1e2f910e321300d94329115736e1f800d5c538c7a43046e184b932e05b580238faeb63109"; + sha512 = "518b28e8f88a763aa09c5aed12eb0f2b582f84770401f3e11e5083fe69d176ce1483a81c2345a7fae2473551bf41db6a35f341495eb59c559a99398b93a7195a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ta/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ta/firefox-61.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "cd6248f8946bec179a192411a0f81b48ead19354cde614f1260420b6134b69eadc23f278489756ce55d3a45b94f0f7b89e4fd5a08708899485170540833634b8"; + sha512 = "a4d5960e0b60cf03c0ecf7f0d2b697dbb68dbfb4e0f3c77548c020d574f60c0fe7cc032a81215f34108a11651800deb1b1533efad3e238fd32780f22bd5524fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/te/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/te/firefox-61.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "6d6ee190eef46bcf6894a429a589fdf0c336eba5e3b96f28f46d6359562e4c88cbdcb18cfa0053fc5f10e4e7e310e9d7aa3a7ea32d3d6772670221d5e9b28272"; + sha512 = "8bf1510077ce86f50c668cb8d931d6d0899d1b7559736312c86acfdc3149da75f8c8f750393e02023a9b063c27c03adcc6bd5c29c950fc0a6055392a2e0eb2d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/th/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/th/firefox-61.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "44fcee59ff292ae1015cf305440ec2f7d8fcf7888705732927311bea40d4bd140a6e74f0e0bba3788b3f9ea62f18d3fe2c23e12ddf78eda7df57da914d53dc29"; + sha512 = "af32b002380fee3b147b2cc44831c3d2ee29d784b8c935fe1be464b302992aebba73a39929ca23b35b9b6a8475e909a73622f70810e0a4a21bc7db74a8b4da46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/tr/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/tr/firefox-61.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a398769dd7950dabb84638e216b1cce7be94693c29bf2989ed313ca7470f7c5bfd471a3663b08dd0c16b3ac28d5e0b1b42b30b05ab812d16914939bb1ece0b2f"; + sha512 = "4216a4e126a41f26b344804e4222535aee43c9f52fafbb6e1d019cc743fe18c0cdeed7fc04dd06fb921efc0431256ed2f09ed21fafff8a1132d097082b849388"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uk/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uk/firefox-61.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "fa3301461971158c7dc6ea683b3ba130be99674762dff62cedc5120d8473cf66ddb08579b3a911946a62ff9d575e6baabb5beae7c458af8a5b5a1028c4abeee3"; + sha512 = "dfe75bb618097d0a96066dd65ba0da7e9d3ce91c14075023c48aedfb88c6d30b83c8ab503666c7581783baf347beac58e81d49e7f9b671bedcdb6827f0843b35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/ur/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/ur/firefox-61.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a8d587b5808ca09907e2d788bf5d85df12663d30dc6d28b0c589c98b4e973eafb5a34e0fa69c5cefec992a50249e1c846f1d858e089f5264e6db14c261b6dcf0"; + sha512 = "0a1a8cae5f364b5e0e2570ef6e06870efd136322082e2fb7690b381f05195eee48787ac679916cd7508f9f51458c038798c9e73f982992dd5b0de8d596e83ca4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/uz/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/uz/firefox-61.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "b502728c13ac63f4017f2ddf655bb894f9486c8538c75cb4e68de06ff2fa93a2ce0a9f3e36180a28aaa0fe4c23d35a5d734ab26110a1631d8bc5aea00f7eaa14"; + sha512 = "153e781c6e4a530fad7631168afaaed74b0c8323317b1b4104cfffd8ee9250ae9af0ed9a0a0f157fc6745dfef7889402426c3d5e13d0c1b234fdaf952c9cb3aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/vi/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/vi/firefox-61.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "22e87ab09fd252886bf0040b43cd18e8d17666efe86da5fa3d6c981f3d85c1eaecf323a27157599d335ab8d09fdd8afd0a34ba7d2daa6069ef54b778074a98e4"; + sha512 = "1cc2e611316137b1d569d3c2617d41bddc48a8618a8937eab643ebdf94727139743b8bc6e1d18a7487e9d30f867ae1b7f77bfd528e0b535d122a4e8f9fcd311c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/xh/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/xh/firefox-61.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "eb941a2457336c1057103736501d6a0eef688750e7a3ecf672bdc7957fc10ac0e681cbb43d6d88e9025182df1c18bdc2e6ed42332359ad464756f46e69240d75"; + sha512 = "b0c4a093950fe90ad2249a5259843e7b3b4bdf2179b0c7ee61e1f965a4104636a53d7db0b91aaff3047cc7252855970f12e1b3bc4aa9e4f85d301652cb53c6c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-CN/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-CN/firefox-61.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ef196dc65cf7d93986d332795f5bee25b8bfb7322d8def53921bc3456c28ddfe555ad9a15fc7805662564d43f17391482442344502ee71cb30a77add41ef5a11"; + sha512 = "b3d1ea1e74ce5c7779bd1c7299197d0143688cc6bd9c4ae0b391e3849fec40c3142a9b7db19d3805616fa885deb16a6fdbe2fd23ddf0eac0fb0094498917d356"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.1/linux-i686/zh-TW/firefox-61.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/61.0.2/linux-i686/zh-TW/firefox-61.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "7bdebc9f67bf6ed0f5b19d95abb2b3550ff5d8da4d9da3f7764340ded15fb16bccf910bdc56c250db789bed735bada5ac8f4a5f5353174d94dabf984e03f7c23"; + sha512 = "cda9d835f282746cb711054f1ed2f137e0f7e89c27429af12f470ed8984ea0c9a4f28e5cd403aa2f37fe0c06271c7651f794009ec11ddc64a96c4c661ca9ecb6"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f1d7b216120d..3c4208c05c2c 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -20,10 +20,10 @@ rec { firefox = common rec { pname = "firefox"; - version = "61.0.1"; + version = "61.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "0alkiz89c42y6677n7csk694g9qsfzm8x928i6007mcdyh8ifkg1604pxwp6irid0w3v8cz7b2153jkk4f0qdx85a2r9csh8hbar583"; + sha512 = "3zzcxqjpsn2m5z4l66rxrq7yf58aii370jj8pcl50smcd55sfsyknnc20agbppsw4k4pnwycfn57im33swwkjzg0hk0h2ng4rvi42x2"; }; patches = nixpkgsPatches ++ [ @@ -37,6 +37,7 @@ rec { homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco ]; platforms = lib.platforms.linux; + license = lib.licenses.mpl20; }; updateScript = callPackage ./update.nix { attrPath = "firefox-unwrapped"; @@ -138,6 +139,7 @@ rec { ''; homepage = https://www.torproject.org/projects/torbrowser.html; platforms = lib.platforms.linux; + license = lib.licenses.bsd3; }; }; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index d2e7c59faff8..38d596480328 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -43,6 +43,9 @@ let plugins = assert !(jre && icedtea); + if builtins.hasAttr "enableVLC" cfg + then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins" + else ([ ] ++ lib.optional enableAdobeFlash flashplayer ++ lib.optional (cfg.enableDjvu or false) (djview4) diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix deleted file mode 100644 index 26a7e883c60c..000000000000 --- a/pkgs/applications/networking/browsers/jumanji/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchgit, pkgconfig, girara, gtk, webkitgtk, glib-networking, makeWrapper -, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - name = "jumanji-${version}"; - version = "20150107"; - - src = fetchgit { - url = https://git.pwmt.org/pwmt/jumanji.git; - rev = "f8e04e5b5a9fec47d49ca63a096e5d35be281151"; - sha256 = "1dsbyz489fx7dp07i29q1rjkl7nhrfscc8ks8an2rdyhx3457asg"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ girara gtk webkitgtk makeWrapper gsettings-desktop-schemas ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - preFixup='' - wrapProgram "$out/bin/jumanji" \ - --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - meta = with stdenv.lib; { - description = "Minimal web browser"; - homepage = https://pwmt.org/projects/jumanji/; - platforms = platforms.all; - maintainers = [ maintainers.koral ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 2384a9da19cb..94d0e9e5badd 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "30.0.0.134"; + version = "30.0.0.154"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1xa2mcbcxpfrqdf37a98nvvsvyp0bm3lsv21ky3ps9cba8a13z80" + "04hfh0vn1n70gdpfydq0sj94d6rkbk80h4pmy3rsfvhg0x540wx8" else - "1jgl57ggcszdim51dcr0gsjmrdb2kdvxl0lv5zl83cvxcyz0z4p6" + "073327sszbvkglh5b18axmwv40sy2vyacdhcd1fx82qskv44sfda" else if arch == "x86_64" then - "0331r5af4zrvwc4h7dp5qyy91dfam5z03yjggls3x04i10nz5myw" + "03ypgzy88ck5rn1q971v0km9yw3p10ly1zkxh239v6nx0hs35w84" else - "011cf0kycs4ih45l23bp6rr2vm7w7jaj4pjvmqwjax4xrb5pzkic"; + "0rld7i659ccp4gvcvdkqkc1lajvlss5d4qndzf9aqiksvdknv62x"; }; 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 8420dbdaaa8e..ba8a8de93209 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "30.0.0.134"; + version = "30.0.0.154"; src = fetchurl { url = @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/30/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1plmhv1799j0habmyxy7zhvilh823djmg4i387s6qifr5iv66pax" + "133zhgc5fh6s0xr93lv70xcrgvaj7lhjxk5w7xz79h3mp185p3g4" else - "13cb7sca5mw5b1iiimyxbfxwpmdh7aya8rnlhkv3fgk5a1jwrxqr"; + "1xz1l5q0zahalh0l4mkrwhmfrmcli3sckg3rcfnllizq9rbfzcmr"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index e6b5ee641ee4..fcc653e08f41 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { name = "palemoon-${version}"; - version = "27.9.2"; + version = "27.9.4"; src = fetchFromGitHub { name = "palemoon-src"; owner = "MoonchildProductions"; repo = "Pale-Moon"; rev = version + "_Release"; - sha256 = "0v6vgkxac2s1hw1namvrjysj2k1kbkabwdxrpq6kyd8svr7n974r"; + sha256 = "0ir5gzhw98gfn15x58g1fwi11jd7gysvacqxg1v0jdjhgdl4m5sx"; }; desktopItem = makeDesktopItem { @@ -79,6 +79,8 @@ stdenv.mkDerivation rec { chmod u+w . ''; + hardeningDisable = [ "format" ]; + buildPhase = '' cd $builddir $src/mach build diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index c71ccdf8a0d2..d1561a065269 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -76,5 +76,6 @@ stdenv.mkDerivation rec { description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index 6f4bc17f8b50..dfe6513bf0c1 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -11,10 +11,15 @@ let inherit sha256; }; + postUnpack = stdenv.lib.optionalString (tomcat != null) '' + install -D ${tomcat.src} $sourceRoot/hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz + install -D ${tomcat.src} $sourceRoot/hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz + ''; + # perform fake build to make a fixed-output derivation of dependencies downloaded from maven central (~100Mb in ~3000 files) fetched-maven-deps = stdenv.mkDerivation { name = "hadoop-${version}-maven-deps"; - inherit src nativeBuildInputs buildInputs configurePhase; + inherit src postUnpack nativeBuildInputs buildInputs configurePhase; buildPhase = '' while mvn package -Dmaven.repo.local=$out/.m2 ${mavenFlags} -Dmaven.wagon.rto=5000; [ $? = 1 ]; do echo "timeout, restart maven to continue downloading" @@ -48,11 +53,6 @@ let ''; configurePhase = "true"; # do not trigger cmake hook mavenFlags = "-Drequire.snappy -Drequire.bzip2 -DskipTests -Pdist,native -e"; - # prevent downloading tomcat during the build - preBuild = stdenv.lib.optionalString (tomcat != null) '' - install -D ${tomcat.src} hadoop-hdfs-project/hadoop-hdfs-httpfs/downloads/apache-tomcat-${tomcat.version}.tar.gz - install -D ${tomcat.src} hadoop-common-project/hadoop-kms/downloads/apache-tomcat-${tomcat.version}.tar.gz - ''; buildPhase = '' # 'maven.repo.local' must be writable mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetched-maven-deps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ${mavenFlags} @@ -123,8 +123,8 @@ let in { hadoop_2_7 = common { - version = "2.7.6"; - sha256 = "0wmg0iy0qxrf43fzajzmx03gxp4yx197vxacqwkxaj45clqwl010"; + version = "2.7.7"; + sha256 = "1ahv67f3lwak3kbjvnk1gncq56z6dksbajj872iqd0awdsj3p5rf"; dependencies-sha256 = "1lsr9nvrynzspxqcamb10d596zlnmnfpxhkd884gdiva0frm0b1r"; tomcat = tomcat_6_0_48; }; @@ -147,9 +147,9 @@ in { tomcat = null; }; hadoop_3_1 = common { - version = "3.1.0"; - sha256 = "0lig25jkffkzc2bfgyrnm3wymapgyw9fkai8sk9fnmp7cljia314"; - dependencies-sha256 = "1ri6a7lrijh538vy7v0fzgvkw603pf8jkh3ldl1kl7l0dvszd70d"; + version = "3.1.1"; + sha256 = "04hhdbyd4x1hy0fpy537f8mi0864hww97zap29x7dk1smrffwabd"; + dependencies-sha256 = "1q63jsxg3d31x0p8hvhpvbly2b07almyzsbhwphbczl3fhlqgiwn"; tomcat = null; }; } diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index e5d649c68b79..1e03efddc062 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kontemplate-${version}"; - version = "1.6.0"; + version = "1.7.0"; goPackagePath = "github.com/tazjin/kontemplate"; goDeps = ./deps.nix; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "tazjin"; repo = "kontemplate"; rev = "v${version}"; - sha256 = "06qcf2cxs686kd7iqccmqd5chdzxgbkav95byjim7sgvq9qjajfi"; + sha256 = "0vzircajhrfq1nykwpl52cqgzyhy51w4ff7ldpgi95w3a4fz1hzz"; }; meta = with lib; { diff --git a/pkgs/applications/networking/cluster/kontemplate/deps.nix b/pkgs/applications/networking/cluster/kontemplate/deps.nix index db2692a79e72..f0a52f5266ef 100644 --- a/pkgs/applications/networking/cluster/kontemplate/deps.nix +++ b/pkgs/applications/networking/cluster/kontemplate/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/semver"; - rev = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd"; - sha256 = "1625b5sxpmlz60jw67j1ljfcc09d4lhxg3z6gc4am8s2rrdgwij6"; + rev = "c84ddcca87bf5a941b138dde832a7e20b0159ad8"; + sha256 = "1dcfdr018a0yszjpvr3wshvq9cc3kvy95l55si556p617wsn1wan"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/Masterminds/sprig"; - rev = "e039e20e500c2c025d9145be375e27cf42a94174"; - sha256 = "1yhpyzq6ghwl0242phjpbc9358fcw63pxrcxsyv9n4dm0w15va3m"; + rev = "77bb58b7f5e10889a1195c21b9e7a96ee166f199"; + sha256 = "0q4g12f3nvda1skz33qzbbdd2vj3gjfwf361hyzlx20s71brk3bk"; }; } { @@ -50,35 +50,35 @@ fetch = { type = "git"; url = "https://github.com/ghodss/yaml"; - rev = "0ca9ea5df5451ffdf184b4428c902747c2c11cd7"; - sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + rev = "e9ed3c6dfb39bb1a32197cb10d527906fe4da4b6"; + sha256 = "07cf0j3wbsl1gmn175mdgljcarfz4xbqd6pgc7b08a5lcn7zwhjz"; }; } { - goPackagePath = "github.com/huandu/xstrings"; + goPackagePath = "github.com/google/uuid"; fetch = { type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "3959339b333561bf62a38b424fd41517c2c90f40"; - sha256 = "0f1jyd80grpr88gwhljx2x0xgsyzw07807n4z4axxxlybh5f0nh1"; + url = "https://github.com/google/uuid"; + rev = "dec09d789f3dba190787f8b4454c7d3c936fed9e"; + sha256 = "1hc4w67p6zkh2qk7wm1yrl69jjrjjk615mly5ll4iidn1m4mzi4i"; }; } { - goPackagePath = "github.com/imdario/mergo"; + goPackagePath = "github.com/huandu/xstrings"; fetch = { type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "d806ba8c21777d504a2090a2ca4913c750dd3a33"; - sha256 = "12n3lfbfxvnag916c6dpxl48j29s482zwsqjc6wk4vb68qbz2nl3"; + url = "https://github.com/huandu/xstrings"; + rev = "7bb0250b58e5c15670406e6f93ffda43281305b1"; + sha256 = "1fc8q65xvsxpa12p8hcjqap2pf72zqlwpm165js9kwbgm2sf977c"; }; } { - goPackagePath = "github.com/satori/go.uuid"; + goPackagePath = "github.com/imdario/mergo"; fetch = { type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "5bf94b69c6b68ee1b541973bb8e1144db23a194b"; - sha256 = "0l782l4srv36pj8pfgn61996d0vjifld4a569rbjwq5h14pd0c07"; + url = "https://github.com/imdario/mergo"; + rev = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "ab89591268e0c8b748cbe4047b00197516011af5"; - sha256 = "1cbg8wlv1hmdps9ksa4kym5zy0mb2yjykw4ns7yqv7nmz4s5xajr"; + rev = "de0752318171da717af4ce24d0a2e8626afaeb11"; + sha256 = "1ps1dl2a5lwr3vbwcy8n4i1v73m567y024sk961fk281phrzp13i"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "1087e65c9441605df944fb12c33f0fe7072d18ca"; - sha256 = "18llqzkdqf62qbqcv2fd3j0igl6cwwn4dissf5skkvxrcxjcmmj0"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; }; } { @@ -104,8 +104,8 @@ fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"; - sha256 = "1srhvcaa9db3a6xj29mkjr5kg33y71pclrlx4vcwz5m1lgb5c7q6"; + rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; }; } ] diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index 6f836d27357a..0f137a872da6 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -9,15 +9,17 @@ with lib; let - version = "3.9.0"; + version = "3.10.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitString "." version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "191fece"; + gitCommit = "dd10d17"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go - k8sversion = "v1.9.1"; - k8sgitcommit = "a0ce1bc657"; + k8sversion = "v1.10.0"; + k8sgitcommit = "b81c8f8"; + k8sgitMajor = "0"; + k8sgitMinor = "1"; in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; inherit version; @@ -26,7 +28,7 @@ in stdenv.mkDerivation rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06k0zilfyvll7z34yirraslgpwgah9k6y5i6wgi7f00a79k76k78"; + sha256 = "13aglz005jl48z17vnggkvr39l5h6jcqgkfyvkaz4c3jakms1hi9"; }; # go > 1.10 @@ -38,15 +40,15 @@ in stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./hack - substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - substituteInPlace pkg/oc/bootstrap/docker/host/host.go \ + substituteInPlace pkg/oc/clusterup/docker/host/host.go \ --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; @@ -61,6 +63,8 @@ in stdenv.mkDerivation rec { echo "OS_GIT_COMMIT=${gitCommit}" >> os-version-defs echo "KUBE_GIT_VERSION=${k8sversion}" >> os-version-defs echo "KUBE_GIT_COMMIT=${k8sgitcommit}" >> os-version-defs + echo "KUBE_GIT_MAJOR=${k8sgitMajor}" >> os-version-defs + echo "KUBE_GIT_MINOR=${k8sgitMinor}" >> os-version-defs export OS_VERSION_FILE="os-version-defs" export CC=clang make all WHAT='${concatStringsSep " " components}' diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix index 34a3be55f305..2beceddc7fba 100644 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-provider-libvirt/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { name = "terraform-provider-libvirt-${version}"; - version = "0.3"; + version = "0.4"; goPackagePath = "github.com/dmacvicar/terraform-provider-libvirt"; @@ -27,13 +27,13 @@ buildGoPackage rec { owner = "dmacvicar"; repo = "terraform-provider-libvirt"; rev = "v${version}"; - sha256 = "004gxy55p5cf39f2zpah0i2zhvs4x6ixnxy8z9v7314604ggpkna"; + sha256 = "05jkjp1kis4ncryv34pkb9cz2yhzbwg62x9qmlqsqlxwz9hqny3r"; }; buildInputs = [ libvirt pkgconfig makeWrapper ]; - goDeps = ./deps.nix; - + # mkisofs needed to create ISOs holding cloud-init data, + # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 propagatedBuildInputs = [ cdrtools ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix b/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix deleted file mode 100644 index fdf394073ab8..000000000000 --- a/pkgs/applications/networking/cluster/terraform-provider-libvirt/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "c861d27d0304a79f727e9a8a4e2ac1e74602fdc0"; - sha256 = "023cyg551dvm2l50dx1qsikkj77lk2dhiya7by8in7h65av6hjgl"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 358a1f23147a..edeac9671c16 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -104,8 +104,8 @@ in rec { terraform_0_10-full = terraform_0_10.withPlugins lib.attrValues; terraform_0_11 = pluggable (generic { - version = "0.11.7"; - sha256 = "0q5gl8yn1f8fas1v68lz081k88gbmlk7f2xqlwqmh01qpqjxd42q"; + version = "0.11.8"; + sha256 = "1kdmx21l32vj5kvkimkx0s5mxgmgkdwlgbin4f3iqjflzip0cddh"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terraform/providers/data.nix b/pkgs/applications/networking/cluster/terraform/providers/data.nix index 554c56fdae66..4ae44cafbf44 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/data.nix @@ -4,15 +4,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - version = "1.9.5"; - sha256 = "12yhy0p4xciw70i0gvwzbg39f6mfin2cfdblxyqjlv9bwg26k7jz"; + version = "1.10.0"; + sha256 = "19lplakpl8dz4a8xw9va86gd774yq4gayq4kzv3pvr62b03a999x"; }; archive = { owner = "terraform-providers"; repo = "terraform-provider-archive"; - version = "1.0.3"; - sha256 = "1il8v9zi838naprr8dqzipk6ns71l8vdqidarxklnn8wdwxmacg4"; + version = "1.1.0"; + sha256 = "1fsynv725cmqz819v9p4i4h4w4y77mbya5y9v81sqvacqvr3i05h"; }; arukas = { @@ -32,29 +32,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-aws"; - version = "1.25.0"; - sha256 = "1cg2pch6nip96qdzca7q0ak6308fkjxz9zjdcv74cwg0f65frh7d"; - }; - azure-classic = - { - owner = "terraform-providers"; - repo = "terraform-provider-azure-classic"; - version = "0.1.1"; - sha256 = "11myqq3wnxvpysjycvwg7b14ll8d9vkn06xb3r26kmc42fkl5xv1"; + version = "1.30.0"; + sha256 = "1si2fm5nm7gad90lf410zwjf2q5kd8mv6nkkbfnfdzkpkchavr95"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - version = "1.7.0"; - sha256 = "0lf83pc5gdmd61i93221zdg9pdzfpfnvhis8kf1s2jlc6zshbabv"; + version = "1.12.0"; + sha256 = "1avp2vhlj60iw17pw39003p30byms7xvq5lkippm60ak4ky9p51b"; }; azurestack = { owner = "terraform-providers"; repo = "terraform-provider-azurestack"; - version = "0.1.0"; - sha256 = "144dfaq16g41i9y2pcq2ilgygndad3vivr6fbygg8yl10m5l4qp0"; + version = "0.2.0"; + sha256 = "0s1ga0ga0rbpp552hbq1dfnkpdjvk1c40i7qqnqmm20xlz6k55mb"; }; bitbucket = { @@ -63,6 +56,13 @@ version = "1.0.0"; sha256 = "0gi8p1q0y8x5y8lqihijkpqs3v152h0q7icv7ixk33xsdcvb418y"; }; + brightbox = + { + owner = "terraform-providers"; + repo = "terraform-provider-brightbox"; + version = "1.0.5"; + sha256 = "0sn7k5bqgms5sxjhjikmby0jf2n6y14z6s4wsifxaw7b0082fy28"; + }; chef = { owner = "terraform-providers"; @@ -88,8 +88,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - version = "1.0.0"; - sha256 = "1ar9wcgr45f2v6bqjn24zii0qwfppla8ya3gjc546sh1a7m0h9p3"; + version = "1.1.0"; + sha256 = "1rmg7gndhmb1wp0zszhwx9vrax8411iy24yrpkmayjify3vsvdpx"; }; cloudscale = { @@ -123,8 +123,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - version = "1.0.3"; - sha256 = "0nh2dww3hx6jrkcd9lq5hpnqr3grp9cmqi4nwmxlrc5azf8x0mii"; + version = "1.1.0"; + sha256 = "0ckmjpw9dkj5490kwxamdvnnidnjdgxnb1biqpvwj4139hlcl628"; }; digitalocean = { @@ -158,8 +158,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-docker"; - version = "0.1.1"; - sha256 = "02lhbl34dq7lsby3g32969i4g9l3z6xw1v00shljd3amgyz2l2r2"; + version = "1.0.0"; + sha256 = "09ribvyv02r907pdvyrwaklr14xyvyn14rijslnm16xp8d4waz9h"; }; dyn = { @@ -179,15 +179,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - version = "0.2.0"; - sha256 = "0vrvyqhzbrvhyhdkg2y2dgadf5j7bj0cbzd13f9m86d146zlf8lb"; + version = "0.3.0"; + sha256 = "1hh4s81g256iy1rvp9snqbyhidz8n6p7pzanlxp89ffrq9p32sp0"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - version = "1.0.1"; - sha256 = "1xf5cmn434a0zr9qxc7f0jma9gf111cp7fm2vgyhkd62hipafcas"; + version = "1.1.0"; + sha256 = "07g6kc211crxf9nvgvghg05jdahd1fb09lpwfcps9ph259pwwam3"; }; github = { @@ -207,15 +207,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-google"; - version = "1.15.0"; - sha256 = "0xwijnv7mzlyzplkylfphph568b9bxavrclnlwvp9ylvklq70nzl"; + version = "1.16.2"; + sha256 = "1d8by6rb4s2dggapcbb4b2g5hf280bjayz9p5q9njgsn83579pnm"; }; grafana = { owner = "terraform-providers"; repo = "terraform-provider-grafana"; - version = "1.0.2"; - sha256 = "17pj4mm7ik9llhgckza822866x6986cdcr821f16dchvn3bfbf2i"; + version = "1.2.0"; + sha256 = "1kn2bbdgci6nfl2gyk4w8w203fscqws2748idv9m53ikczg8n573"; }; hcloud = { @@ -228,8 +228,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - version = "1.0.1"; - sha256 = "1kx74d0ywzim5zj3y5ac80r18igsqax39yv9qaam546a88ya31yy"; + version = "1.2.0"; + sha256 = "1w2r0wnfcr9aqij5ckq0apd8az8yzdg704hi1zjb1ggb54v97n31"; }; http = { @@ -238,6 +238,13 @@ version = "1.0.1"; sha256 = "1bnqrx4xya3lm5wp4byy6npazll6w1g6bv4rawgncswsgx08zqng"; }; + huaweicloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-huaweicloud"; + version = "1.1.0"; + sha256 = "1jsvv5yfxgz998p4wbldbq82hl4ykn1yp21igphl94n3b0jj33dj"; + }; icinga2 = { owner = "terraform-providers"; @@ -256,8 +263,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-influxdb"; - version = "1.0.0"; - sha256 = "1w1izzs22b2w2qmpdxbhaj9kvnfyw0wlq3nigrigwwvqav43knh9"; + version = "1.0.1"; + sha256 = "0713h50675njnpdy4w1azfq8h6yai40gx6w2fbvw4n59h6jlfny4"; }; kubernetes = { @@ -347,22 +354,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-oneandone"; - version = "1.1.0"; - sha256 = "1yps2mcdy61afxva7vg0i82s24zkdrn5abwblm0gcgc0cz588r9d"; + version = "1.2.0"; + sha256 = "1lrcy05zklv7vc8653f8cn3jjc9zjjwi488dpaphsmsl1md3m88b"; }; opc = { owner = "terraform-providers"; repo = "terraform-provider-opc"; - version = "1.1.2"; - sha256 = "0v413wgnr8h682han88s0n15cdwd9a0dxr9s2mknpi4664c41qlk"; + version = "1.2.0"; + sha256 = "19rfm12w97ccyrzpdw0qlwfn7gh64lqh17kj3cv11y1f731z8rlw"; }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - version = "1.6.0"; - sha256 = "14chn2vb8y9rz5irh8m2ky9yxmw2za45gikncjm4gfc3xl6803iq"; + version = "1.7.0"; + sha256 = "0sw2kmcsi9sjzi549fj6knida01q0lnpqvc3cpyjyv92f6w4bznn"; }; opentelekomcloud = { @@ -382,15 +389,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-oraclepaas"; - version = "1.2.1"; - sha256 = "0r404rysjhbsxh45ad23k12rs8js2pdczakzavnjx508kr29gcqc"; + version = "1.3.0"; + sha256 = "09vsb52cbf2h1rdwfg4xb54gklwgmaxdgjcdq1yx5gxj7lfbdl9v"; }; ovh = { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - version = "0.2.0"; - sha256 = "12dpgx0fpmqw64v5a70fihbgixyw71bdjbdi17gal7s2pj1xw159"; + version = "0.3.0"; + sha256 = "05bzkwa50alh8mpslh64dddp815m8df240w1mmphdmp9rsi6hqp8"; }; packet = { @@ -417,8 +424,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - version = "0.1.1"; - sha256 = "0ls5z02vaalcrbaq375qnk0267pb17rpsx4s3plfnr7qclv21pwn"; + version = "0.1.2"; + sha256 = "08wv03j70mych4nnamivjihwvca3aksjxgjlj8yasz5292qgl05w"; }; powerdns = { @@ -431,8 +438,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - version = "1.3.1"; - sha256 = "1g4filwv38rq9wcdbpnpgfnv8qj1kzdnjc8awvbsdlxlj4fa06bi"; + version = "1.3.2"; + sha256 = "0mk77n833np6ahm6bzvpg31a0m1qazaipd0vqzccqfkbz78sm3jb"; }; rabbitmq = { @@ -466,15 +473,15 @@ { owner = "terraform-providers"; repo = "terraform-provider-runscope"; - version = "0.1.0"; - sha256 = "05l305423njds2cmmxg67swpdnp3zibs36dq4cfjk47i4byvipjz"; + version = "0.3.0"; + sha256 = "1srnnlw94q1av8rzy8753fk4vazv5ldbimgr9gd51vrmpvmlgxas"; }; scaleway = { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - version = "1.4.1"; - sha256 = "1zxb3981w30hv1aax28ayiy0sl0vzrrwkynp4lmwwhfjyhyagnm1"; + version = "1.5.1"; + sha256 = "1b42fh7mwj2cx3g16lgp4sw6ca5qqj0mhm6i7qid8agwsga34v0y"; }; softlayer = { @@ -487,15 +494,22 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - version = "1.0.0"; - sha256 = "1p05wamv70mywfqf0b3nxpvxc0m8ydb5zcl2kpzsrii9mq21pjrf"; + version = "1.2.0"; + sha256 = "09k79xg5cbs4qhxr0b4f42qpxj6j2795z5vmwbxfkirb5bkpqdq1"; }; statuscake = { owner = "terraform-providers"; repo = "terraform-provider-statuscake"; - version = "0.1.0"; - sha256 = "084520cak2krwpks2ipqcjfw3k4rrzn6gqqncz8c4i6g01f1m7yg"; + version = "0.2.0"; + sha256 = "065izach0hq04664hz7rc3gd0r3l06lzwcbj5800zjfv1inp6pxs"; + }; + telefonicaopencloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-telefonicaopencloud"; + version = "1.0.0"; + sha256 = "1761wkjz3d2458xl7855lxklyxgyk05fddh92rp6975y0ca6xa5m"; }; template = { @@ -536,8 +550,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - version = "1.1.0"; - sha256 = "1g0cca662glqcz83l1skhj3nb7g386x65kwz95kyp59nvyxywvbq"; + version = "1.1.1"; + sha256 = "0kiqpnb4669xw9b8nf6a8ky0jhnp14bipaizml3gdh1hnda6hflw"; }; vcd = { diff --git a/pkgs/applications/networking/cluster/terraform/providers/default.nix b/pkgs/applications/networking/cluster/terraform/providers/default.nix index cf1649f7bb39..a535ab06f453 100644 --- a/pkgs/applications/networking/cluster/terraform/providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform/providers/default.nix @@ -16,10 +16,5 @@ let # if the versions are not provided via file paths. postBuild = "mv go/bin/${repo}{,_v${version}}"; }; - - maybeDrv = name: data: - # azure-classic is an archived repo - if name == "azure-classic" then null - else toDrv data; in - lib.mapAttrs maybeDrv list + lib.mapAttrs (n: v: toDrv v) list diff --git a/pkgs/applications/networking/cluster/terraform/providers/update-all b/pkgs/applications/networking/cluster/terraform/providers/update-all index e7ded437edb7..31a5a4a750dc 100755 --- a/pkgs/applications/networking/cluster/terraform/providers/update-all +++ b/pkgs/applications/networking/cluster/terraform/providers/update-all @@ -71,7 +71,7 @@ fi org=terraform-providers -repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-telefonicaopencloud | sort) +repos=$(get_org_repos "$org" | grep terraform-provider- | grep -v terraform-provider-scaffolding | grep -v terraform-provider-azure-classic | sort) # Get all the providers with index diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 996c994cf4cf..f35269eb2712 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terragrunt-${version}"; - version = "0.14.6"; + version = "0.16.6"; goPackagePath = "github.com/gruntwork-io/terragrunt"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "gruntwork-io"; repo = "terragrunt"; rev = "v${version}"; - sha256 = "14zg1h76wfg6aa78llcnza7kapnl5ks6m2vg73b90azfi49fmkwz"; + sha256 = "0fzn2ymk8x0lzwfqlvnry8s6wf3q0sqn76lfardjyz6wgxl8011i"; }; goDeps = ./deps.nix; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 721bc6cd6f56..3450ad720486 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -7,7 +7,7 @@ assert lib.elem stdenv.system platforms; # Dropbox client to bootstrap installation. # The client is self-updating, so the actual version may be newer. let - version = "52.3.56"; + version = "55.4.171"; arch = { "x86_64-linux" = "x86_64"; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 3dc154351d2f..9af105ad52eb 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue]; - configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; + configureFlags = [ + "--enable-nfq-module=yes" + "--with-dnet-includes=${libdnet}/includes" + "--with-dnet-libraries=${libdnet}/lib" + ]; meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index ff19a62ef306..0fdfbacb45cf 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -14,7 +14,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib"; + configureFlags = [ + "--disable-static-daq" + "--enable-control-socket" + "--with-daq-includes=${daq}/includes" + "--with-daq-libraries=${daq}/lib" + ]; postInstall = '' wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine" diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index e6ffd72afa5a..6ff51445718b 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -7,7 +7,11 @@ stdenv.mkDerivation { sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; }; - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --enable-static"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--enable-static" + ]; buildInputs = [which tcl tk xlibsWrapper libpng libjpeg makeWrapper]; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 2cd30ab9604b..3682097e302f 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2018-06-03"; + name = "dino-unstable-2018-07-08"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "52e116ee44be1667660c08858a28fe8fda125f79"; - sha256 = "1yybmjd50r41366clrsw21qybbpjfkvim2n5b3dkcagjnifak0zl"; + rev = "df8b5fcb722c4a33ed18cbbaafecb206f127b849"; + sha256 = "1r7h9pxix0sylnwab7a8lir9h5yssk98128x2bzva77id9id33vi"; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index f831ac0847ce..bcabdf43cd22 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; + license = licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix new file mode 100644 index 000000000000..be911f70f915 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix @@ -0,0 +1,71 @@ +{ stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl +, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, libX11 +, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes +, libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx +, libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss +, nwjs, pango, systemd }: + +let gitterDirectorySuffix = "opt/gitter"; + doELFPatch = target: '' + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ + $out/${gitterDirectorySuffix}/${target} + ''; + libPath = stdenv.lib.makeLibraryPath [ + alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib + gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage + libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3 + libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd + ]; +in stdenv.mkDerivation rec { + pname = "gitter"; + version = "4.1.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://update.gitter.im/linux64/${pname}_${version}_amd64.deb"; + sha256 = "1gny9i2pywvczzrs93k8krqn6hwm6c2zg8yr3xmjqs3p88817wbi"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + + unpackPhase = "dpkg -x $src ."; + + installPhase = '' + mkdir -p $out/{bin,opt/gitter,share/pixmaps} + mv ./opt/Gitter/linux64/* $out/opt/gitter + + ${doELFPatch "Gitter"} + ${doELFPatch "nacl_helper"} + ${doELFPatch "minidump_stackwalk"} + ${doELFPatch "nwjc"} + ${doELFPatch "chromedriver"} + ${doELFPatch "payload"} + + patchelf --set-rpath "$out/${gitterDirectorySuffix}/lib:${libPath}" \ + $out/${gitterDirectorySuffix}/lib/libnw.so + + wrapProgram $out/${gitterDirectorySuffix}/Gitter --prefix LD_LIBRARY_PATH : ${libPath} + + ln -s $out/${gitterDirectorySuffix}/Gitter $out/bin/ + ln -s $out/${gitterDirectorySuffix}/logo.png $out/share/pixmaps/gitter.png + ln -s "${desktopItem}/share/applications" $out/share/ + ''; + + desktopItem = makeDesktopItem { + name = pname; + exec = "Gitter"; + icon = pname; + desktopName = "Gitter"; + genericName = meta.description; + categories = "Network;InstantMessaging;"; + }; + + meta = with stdenv.lib; { + description = "Where developers come to talk"; + downloadPage = "https://gitter.im/apps"; + license = licenses.mit; + maintainers = [ maintainers.imalison ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 6a697790d8f9..d86d62021fbd 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -14,7 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ncurses glib loudmouth libotr gpgme ]; - configureFlags = "--with-openssl=${openssl.dev} --enable-modules --enable-otr"; + configureFlags = [ + "--with-openssl=${openssl.dev}" + "--enable-modules" + "--enable-otr" + ]; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 929277996c5e..cf9558b4b955 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -98,5 +98,6 @@ stdenv.mkDerivation rec { description = "Desktop client for the Matrix protocol"; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; + license = licenses.gpl3Plus; }; } diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 654c343caa8b..3f6b23d70a05 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, pythonPackages, openssl }: +{ stdenv, fetchFromGitHub, python2Packages, openssl }: -pythonPackages.buildPythonApplication rec { - name = "pybitmessage-${version}"; +python2Packages.buildPythonApplication rec { + pname = "pybitmessage"; - version = "0.6.2"; + version = "0.6.3.2"; src = fetchFromGitHub { owner = "bitmessage"; repo = "PyBitmessage"; - rev = "v${version}"; - sha256 = "04sgns9qczzw2152gqdr6bjyy4fmgs26cz8n3qck94l0j51rxhz8"; + rev = version; + sha256 = "1lmhbpwsqh1v93krlqqhafw2pc3y0qp8zby186yllbph6s8kdp35"; }; - propagatedBuildInputs = with pythonPackages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; + propagatedBuildInputs = with python2Packages; [ msgpack-python pyqt4 numpy pyopencl ] ++ [ openssl ]; preConfigure = '' # Remove interaction and misleading output diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index b6e9c9210251..7c630e522afe 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -37,4 +37,8 @@ stdenv.mkDerivation { mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications ''; + + inherit (rambox-bare.meta // { + platforms = [ "i686-linux" "x86_64-linux" ]; + }); } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 87ee10d0db7b..516abb4c9c00 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -3,9 +3,24 @@ , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib , cups, expat, udev +# Unfortunately this also overwrites the UI language (not just the spell +# checking language!): +, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" +# For a full list of available languages: +# $ cat pkgs/development/libraries/hunspell/dictionaries.nix | grep "dictFileName =" | awk '{ print $3 }' }: let + customLanguageWrapperArgs = (with lib; + let + # E.g. "de_DE" -> "de-de" (spellcheckerLanguage -> hunspellDict) + spellLangComponents = splitString "_" spellcheckerLanguage; + hunspellDict = elemAt spellLangComponents 0 + "-" + toLower (elemAt spellLangComponents 1); + in if spellcheckerLanguage != null + then '' + --set HUNSPELL_DICTIONARIES "${hunspellDicts.${hunspellDict}}/share/hunspell" \ + --set LC_MESSAGES "${spellcheckerLanguage}"'' + else ""); rpath = lib.makeLibraryPath [ alsaLib atk @@ -40,11 +55,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.14.4"; + version = "1.15.5"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0590r7748kv6g7zygq95v8qxf7vi2n5ypj6734x9yshrn8z6p8lr"; + sha256 = "1a63kyxbhdaz6izprg8wryvscmvfjii50xi1v5pxlf74x2pkxs8k"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -68,6 +83,7 @@ in stdenv.mkDerivation rec { --set-rpath ${rpath}:$out/libexec $out/libexec/signal-desktop wrapProgram $out/libexec/signal-desktop \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + ${customLanguageWrapperArgs} \ "''${gappsWrapperArgs[@]}" # Symlink to bin diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index dca7d1257f65..1219440bf833 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - configureFlags = "--with-ncurses=${ncurses.dev}"; + configureFlags = [ "--with-ncurses=${ncurses.dev}" ]; preConfigure = stdenv.lib.optionalString enablePlugin '' configureFlags="$configureFlags --with-silc-plugin=$out/lib/irssi" diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 39d664805fa9..e1ced2df9f37 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -14,5 +14,7 @@ in { stable = mkTelegram stableVersion; preview = mkTelegram (stableVersion // { stable = false; + version = "1.3.12"; + sha256Hash = "00z4ljs4fvbk7sf8wv1v50kln26gv8q12x6q41ai9gfzkvq5f69a"; }); } diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 525a8a313f44..a0cc73da46d8 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { checkInputs = [ dbus.daemon ]; - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = [ "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" ]; enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index 82ad57ae9272..f6e3baadb4e8 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { dbus telepathy-glib.python ]; - configureFlags = "--enable-call"; + configureFlags = [ "--enable-call" ]; preFixup = '' wrapProgram "$out/libexec/telepathy-logger" \ diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index bae7231e783f..68c81d380782 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libxslt pkgconfigUpstream ]; - configureFlags = "--disable-avahi-tests"; + configureFlags = [ "--disable-avahi-tests" ]; meta = with stdenv.lib; { description = "Link-local XMPP connection manager for Telepathy"; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix new file mode 100644 index 000000000000..ce73acf8d596 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -0,0 +1,66 @@ +{ stdenv, fetchurl, makeDesktopItem, makeWrapper, autoPatchelfHook +, xorg, gtk2, gtk3 , gnome2, gnome3, nss, alsaLib, udev, libnotify, xdg_utils }: + +with stdenv.lib; + +let + bits = "x86_64"; + + version = "3.14.10"; + + desktopItem = makeDesktopItem rec { + name = "Wavebox"; + exec = name; + icon = "wavebox"; + desktopName = name; + genericName = name; + categories = "Network;"; + }; + + tarball = "Wavebox_${replaceStrings ["."] ["_"] (toString version)}_linux_${bits}.tar.gz"; + +in stdenv.mkDerivation rec { + name = "wavebox-${version}"; + src = fetchurl { + url = "https://github.com/wavebox/waveboxapp/releases/download/v${version}/${tarball}"; + sha256 = "06ce349f561c6122b2d326e9a1363fb358e263c81a7d1d08723ec567235bbd74"; + }; + + # don't remove runtime deps + dontPatchELF = true; + + nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; + + buildInputs = with xorg; [ + libXScrnSaver libXtst + ] ++ [ + gtk3 nss gtk2 alsaLib gnome2.GConf + ]; + + runtimeDependencies = [ udev.lib libnotify ]; + + installPhase = '' + mkdir -p $out/bin $out/opt/wavebox + cp -r * $out/opt/wavebox + + # provide desktop item and icon + mkdir -p $out/share/applications $out/share/pixmaps + ln -s ${desktopItem}/share/applications/* $out/share/applications + ln -s $out/opt/wavebox/Wavebox-linux-x64/wavebox_icon.png $out/share/pixmaps/wavebox.png + ''; + + postFixup = '' + paxmark m $out/opt/wavebox/Wavebox + makeWrapper $out/opt/wavebox/Wavebox $out/bin/wavebox \ + --prefix PATH : ${xdg_utils}/bin + ''; + + meta = with stdenv.lib; { + description = "Wavebox messaging application"; + homepage = https://wavebox.io; + license = licenses.mpl20; + maintainers = with maintainers; [ rawkode ]; + platforms = ["x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix index 8c7e80b3ff8d..4b92d1212c55 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, xmpppy }: +{ stdenv, fetchFromGitHub, xmpppy, pydns, substituteAll, buildEnv }: stdenv.mkDerivation { name = "weechat-jabber-2017-08-30"; @@ -15,15 +15,14 @@ stdenv.mkDerivation { cp jabber.py $out/share/jabber.py ''; - buildInputs = [ xmpppy ]; - - postPatch = '' - substituteInPlace jabber.py \ - --replace "__NIX_OUTPUT__" "${xmpppy}/lib/python2.7/site-packages" - ''; - patches = [ - ./libpath.patch + (substituteAll { + src = ./libpath.patch; + env = "${buildEnv { + name = "weechat-xmpp-env"; + paths = [ pydns xmpppy ]; + }}/lib/python2.7/site-packages"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch index d3faab33a8e5..372c83944a27 100644 --- a/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch +++ b/pkgs/applications/networking/instant-messengers/weechat-xmpp/libpath.patch @@ -8,7 +8,7 @@ index 27006a3..e53c2c0 100644 +import sys + -+sys.path.append('__NIX_OUTPUT__') ++sys.path.append('@env@') + + import_ok = True diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 72812563b099..afc6f03edb4a 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -13,11 +13,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "2.2.128200.0702"; + version = "2.3.128305.0716"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0n9kyj94bj35gbpwiz4kq7hc8pwfqwnfqf003g4c8gx5pda3g56w"; + sha256 = "1jpw5sclr5bhif559hmnyiggjh6gkm1smiw34y3ad4k8xhag9dkh"; }; }; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 56dc9fc4d5a2..11cfa8f621d6 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.15"; + version = "0.4.17"; rev = "v${version}"; goPackagePath = "github.com/ipfs/go-ipfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "0bysfh2hd040i8lnyzhy96frflls4kdnlw748cl51ngqg3rwbhgz"; + sha256 = "0grdgnr67r3qh0ppc3flrhcw8zlvx10mxypd8q2mhkil9w4dpcna"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "1ry4a4pq26dbwy2b9cwi3xjaiyq6sng9lxnb1n30zxhp4w7rla2h"; + sha256 = "18skmchdqd54wfqhibscqvc360l5ig6vmxd73ivf3bcpj3zvgq7q"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index b5bab3585c5f..ff80df6523cb 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix index e7e199155d73..3376eebe5dc9 100644 --- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix @@ -81,8 +81,6 @@ stdenv.mkDerivation rec { ]; - buildInputs = [ gnome2.gnome-keyring ]; - nativeBuildInputs = [ makeWrapper ]; buildCommand = '' diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 047b1659642b..5097215d4366 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,595 +1,585 @@ { - version = "52.9.1"; + version = "60.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ar/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "9384c43cbac7d6b88fa160e22fb21e6f4250276b46d3fc0322dca45a6b5ebacfc39a431b54d34262a32f2a7cc9130b68b6dc4b636a737ecb7132e077592882a5"; + sha512 = "fd37e00c8b50d1dc932295288ad2865358da2f37f5b170a3a7f75d929e78486165a24f1967defcb4032546a7f712cd6887c7cf47257a4a08685df85f9ecf81bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ast/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "b1d0b26dc21c4487f016c60aa8560ff34c868c6e617040f963ff9e76b859d7d265cf529c0d70fcb736aa946ad50b1a0cae0dd66df1594e102a85cfa489b07358"; + sha512 = "64a14f40678a64def00597eb1bd7cc0c9759b56da4e72bfe24c3d4e50ef92414bb18346b8ecc9c0a834a063a2a2fe7920b72c2ce59c7cb7ba67442f7e8842b13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/be/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "635ad3d57463eb51830dfb66871258b69bcfcd9ed0c2b38956a25db242905113a6604812a6d6aa1778dde1783595e2b4cb6b3a51f48af6f6740e6613ba78adf7"; + sha512 = "6368f3693f0f54f4768d27a4b9f82015d4c789180db3d8ea5302053e2ff8d7bc5e50388b00b7b1d534c0145718255c84d43977361f5d8cff5f432a8336436e9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bg/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "573f0b63a16f62662958ff1884a2cf76436242f377258f39ea254732aaa4d1f358ee651b2e4f5eb2cd3c20f69ad6b6ea2bc6985fc3d99e23edeb75d3ca55ba27"; + sha512 = "b881105b39f5a3d66cf77105fb555af692477b387a4fe2c13c9c398968baa705cdf3753665b0e6d28bd8fdb21bc75e439672402dbe1185a9f8289b8236f505ef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/bn-BD/thunderbird-52.9.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-x86_64"; - sha512 = "d277706e699ebdbcc4ccbf8f6d5c4c256b0ed65ad7b604962e8cc2dffa5b06eeffad7dfd5dc5a08b87a25f0e728daa79d2e0ca0ab9ade7136057a3aef203f26f"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/br/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "11e362e77f4b5ce75823c3aa60fab68969d8b19b6fb9a51027c81ad4e1e4f46c4a5a4e3218361521d076859453523a30cf79ec715abfc59cca31c541f02562ef"; + sha512 = "c45a3dfb8ae5564071c2e59a623263f995a83f9ac20c84345be47935a337b863be3d334b2e0f40767842e9a53cbb1eb00dd87645cb0b8a737efce15cd81b9336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ca/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "7eba10d82c0b2bd58d87670c345ac8948c06f1b6a0ac853d40b1993fc101931dc581b3e252ebe0a22948f18738d60714aeabebc8dc1953f0199ccb6b2fa1af47"; + sha512 = "aec05cd7e9a5f529408bca9691ef68bb384b23b9cd464c9342336b96da0afe20473121128861c20d55bc3c4f5c33f779fe892681270d5b26df6b64aa27c13511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cs/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "2c05465bc32b6703ee930ccc17b7bebeba3e0eda37b959f08812d3a891fe17664862b7e981a37e43e0adf775d7cb929d866ebdbc044ff53ecf6b1066fcc2796b"; + sha512 = "e0286e388a1b9a273043bfbcfd2bdf9675bede43d6b3f364882a9f7a9bee1fccd76e5ada76aae309f961c3e0bcae6373cb40457a53d48a9ff37c9fb53245f889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/cy/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0cb9735931a29e098e707d27f22f412ba0d0d242799a10658b4ba41abc3ffae5fc2028f4efaf82ef1544f7ddc8efd8401b076945f8b5669231af62fb00cb2019"; + sha512 = "7f5f28836084132f044b3fcda749dec03fa6234a04eff73a8001f804c98be8df57eba564e864bf09a9938818bb86003d9fcf54cacba2d1efad7a330381e08b0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/da/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "906ae74d45a9915e76fb666a89b00c5378aa9498f29025088eddd3853a93b79ba0eab2d5678908e10f11fc5273dc15ebeee6714a02a70df6ab7bdc0fb7df4917"; + sha512 = "1b9b63abe185fc91ee2e0dea054bc5e94941bc2cdd59cd85c9997ef9d49eed0c93827265847a480845901af8b37e3547c9301896beb538aef724945bca2ed2b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/de/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "729a833d64df3d1270b07ba2bfdd963efaee4d0bba98d23d4b07f9924878806f59b916af117dd5b866fecba6715bf10b9586e2a34b6de66fce803a76eda07232"; + sha512 = "e499f327ed9f4536b7bd9659879b28a2282a6a2b9aeb4514b3a70f774d76427283379293d09e95271e54f7c68ab07beaa60e867936b9de8c09b600914d3e4156"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/dsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "420a61731fb8159104a14b9741166f250d689ca18f15ffb1e408366fd976e723a72b94cc5ed512895e1e0fc58cfcba2dd39c7c898a38cf996fd59a1de7967fd1"; + sha512 = "d862020f5ae7c50560ba4c58d67af4c0e54622f826934b90887efcff5ae1c97126bbce0bd42f7e1c1215258b92db6a012b184a2106f4beed0d7e8c79b84bae54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/el/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "7a7cccdf48c9fae667ea33294dbabfd2217cdcf6922a847dd93db3567e9d9d527015124d777e94db5a7c32a9d9f31ecc272978972dd07ada60c8bd3e323b1d12"; + sha512 = "88b98d3558400370b48f1e133147b8ba57fbb240ad6db1bbd79d7e0266c4a2814fc9cad5521ea8c0296b14857bd09cb4e8e0d86f625fc53d621008729f31e002"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-GB/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "a713653bc7da8347d2897ff522c8cb13983fd913ec987a81b9bcb1242dac14c0cd875e7bb5dfda14938953af0a526d24a54d40e1b88e31107498baf00aaeb6c9"; + sha512 = "02f1eecc4aff0a8691cdf131736c34fa93035d821a645c97213be41a95b4ff00d244411344089e56c24267984bc91d294f1250b1fd7e8c966ee9de9983794427"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/en-US/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "98a35a81f77b58e6f5fca79ee5a56330f8184072c118b571245c7f686d2a196e0cca6f4df131bee066651fcf69b83ca076bb9dd68fa71dd766962694df8e43a7"; + sha512 = "87be28d46f22885c730e89c0a945ed307b23da11e331a5911b21353a53536587f8e95658de591d44a9bdf617dc3d50099f537bebe85680dbf1b3f25c7f18fdfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-AR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "fde54338bcc99c98f9e8e77f30795252459f79037ed996f3bb055e3c650104a3f73878f72bf02c0a0db4d907322f896600e6f057c4a39888708183489f80f579"; + sha512 = "4d1651de4d4b3d5324ae5b07581634fc82399a2b0f9793d53797224d2f6b1205389bd0672b1c671fb956191312549b446c317ff98f187e1a7248aba901bd2499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/es-ES/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "08eb3b2c6422429e19e909dec8d7cc0cc2288e7b991e466f32618d2018ab4b9dbd8be78f469315645b5efe866f7014dadd3d5a6e997f6540422d6d8de61bbc39"; + sha512 = "6abc82968464377cb2c05bc09b1bc978af65d9423dcba78e73e8d0817a2dcc1dde89711acb1d5fd9e3539cd33c6e3813e6b00297f3a23ff1c4250771b40c8522"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/et/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "0a1e8496e256990715c11eadd7d1804336542215e4ac34615145fca02a30ca97f2f92220631bbb0f55cfd1579442064d1c0112665bd6e3a35719faefcdf13ea4"; + sha512 = "9e4bba499f39ee7a87676627fe3ec6da2dcba6a55e39aec897953abf00ad08216550d0fe94804a5426e2894970ad2db3f391dd09ae2768580ea05ac6a77ddbb1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/eu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "8696ed02d5bcfeb12ad1057c6a5e2558f3261189d7147bfa86e1043f13da58d60ae5b48a31f2113e1b699f049c9f06a946998cba766bb5faed9b1ba612ed2ec4"; + sha512 = "66aaf66011117c2f9e675f22a68317552ed7673c05dd56266e4a8719e853629648de3d88fd44448ac1d9674b0cdf6cbe48925328f633c1bc23cb5a7f005468ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "e60015623faff6c065ff719fbbdcaf81c48f5d9175a61c8a4920e27a51d8495db782b6916ba320717d36807f758bf5826f2f882cacfc25ba0bbb4fe1bddbce6c"; + sha512 = "8c61206e100182080859c45736d973975ae5e1055fc2df170828dc0715e04be5468ba815995be9d60530ba9600e187aed965a1d94f9887337789c8219e2cca6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "e5a276e8f53387f8acd939fbe158d594c7b5d9ebcd6f0a2ea92fede421d1584ef42e49bfcf84efe651d62ca60c311634e9fc4ee429fb38c70f82cfd0e3823fd7"; + sha512 = "1583081060580dc72d864ca88ae8f114a22db4d4f3177532a4345471bac6ca3a85397b5bd82cc32f85dbfdc4992f788dd15a4dfa9d6fa7b154d3921c0c23fa29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/fy-NL/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "1f98eec3b67b2aabde704fb14603df6258c0f996868c57490194b1e672b52b59026a17e2b7e35033b71d95f3d46968ad1eb7e46f35f9799af49781d7746d8b20"; + sha512 = "59deb0b3e32dc2dbcce96aed6558dee899e290a469ded997bd2b7b6b2832f5f7c358d44f128cc1fac2327e3c19c43400424dccf4a0478bcbfeae3401fbc93882"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ga-IE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "54c8c9484400749efb129630ab6a107da6ce1a77c8e8c43185fb84f98b13c33edfe512c63d571a5206c3600729eb644a8e8a0c325932d81579c8e8932a51abab"; + sha512 = "8bba0addc0d9d1000ddaed0702b5db0d797f3ac9fff0f04e645d6fb3747f961c2570ee058e53d4084e3c02cbb8490c2a32781517c57bf7971b8f1d4db0fe871d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gd/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4cd2140b0871ee144ba5996c98a67fc6b8c6f0beecc15a628968716d472e4b93286ad606e9b5a54b294329f83dec85f48f5008c30e1970ec2feb40f0bb0eed98"; + sha512 = "8e8f5df3aee5f1dbc1e6fd8c761b5d968dd35b9e29a8c04e013a7de08091f65cc2573109f0bfe201048f90a578ea84f1bb05826d7bd8e9fb7dd9110b45623034"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/gl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "e87fab8d479c847ec7110926ee7ac93668495caddc77bc8a4a3e382ee1aa12488221b6facabbbf74c0aeecdc226705d9cf4edd649a7b3a6410fa98c62ab37fc9"; + sha512 = "56a56179eddff5da07ce124f17ed08a6a033d7c2c3d139fd5b00afdb86f0c54215525c40f9c6c108384adeafdcc6f8dab87d72b07d88bd38e0c43c89aac4db0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/he/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "26766b3b37c3b13173cb06865185fa08d4e8a1c07c3f8ce958545b21b3ffe473885c6559a6799fc82c426702f1433d783b55c821cb1e30480456dc9352c9f3ef"; + sha512 = "6880b7ab22b3e642d10edce67458fe30935c87dad60f32ac32b443473e5a208a4df0645b2a18ef26d5ce40053b3a9119eb432e640afca8421c4e93815b28bdf9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "458500d47e73ccc2d8a370ea63826224cb1a8514a322a9c8b98aff16363e3807a1d4e4e0b007b3eccb8888def285831d1afdfd9004dcbf729779137b28bd9333"; + sha512 = "14b22f95559f1c9addf04d51dcf857c3cd59f3612743970bf9cbfc99c84a3d0fcb898be7e83858c0848e341039493a5aba4189d24941362327f4ef9982dd739e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "a612cf7e309437abd521b0964d254c3c980ad096f339da0db803d6bb739d9761796af2460ff989355102b628b4d383db412556dcf897c351ada417089703f2dd"; + sha512 = "5bbddd6bb288cc03015707bd2ed3ef38ff20c7b93b08907e1b90cd8a22725786a293fedb142f99e18e0cf66fa14529097399e95fd157c434414c8fd61c0ba70b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "49790909eb91f8862807fbd213974b906d4ca979646c11c7377c205cd6a7092ad9942900729ee90927261ff969a71773941b29a8be19dd4d8d7a325559f81500"; + sha512 = "4f751f64b1417022f6c1487e1f3d92edc0ea1cd603850a9f64b35a71a652be1e51dfa17babb66e3447bc5a8bb2693c6e2dae89a736dc2f070b4b6a9500cf9299"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/hy-AM/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "57285eb8916dfd90bb4bae2d791695f3bf2c2c82742f9040d20d8c0f6194adc493f36733a6a2b9d474c036ac25309330f96de17e49938a5f97ea9c369a02daed"; + sha512 = "c932b56abf6801bfb6ff90978343aea12f67f006ea71882fa7bbb469dd750371330c47581f48aec3ecfca9cfa51f7edfb2aed6a3da874041c2087b5c5ff60abc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/id/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "61313d060dc24b1e685aa434c6beefdd6b114a2ca24f19690e1cc712db75d238610c3a23ffddaa373bcbfd080e0bd53c8e3d05243c7d184535bbf95b5d0df00c"; + sha512 = "d8a61bb0c1c308d7ef89a9f938fd1c738ce8e66cebfdf4a236636e3c9469705c1012d19c3d3cf8837bdabefed01c744692aec2d749c7ec0adb472bc125e54cdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/is/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "28968973b8379c91dcb1e6c27127ab55a8044edd0c518defc9c2977ac728928bfd1c75e2e357e3faf71acc3b4bad6e90a1f588742cdb0abf9ace85cd424c288b"; + sha512 = "1fe98420d0ceda881b50e4dfff667de59b960c1d8a23b5f88140c076fa5bfc8cc01b636a3b9bd46987f87a30ba6cb510eeaeadbf83ada954a5681c3da68cf7a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/it/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "3231f2639940323db9a23c236be5ef8304ce953821971801bbea2d8674c2b54d1ead79041992d17609c6d1a9e86e352af84d76137a7728eb085aa54da0c02d38"; + sha512 = "79190716416c48bfaf486470a5f31ef881bce0b97e4c780126581a38ff39e6a14ae12487779ed219e55afa2467139b652f54e989b91f4d438685d1fb174f920d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ja/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "542aadd1a658f9e21fdf0bfa32069e5adfba58750fda943389ce4e3230cf063503c78353e739fb6771434b209b6c836f87c94f7831d50f2b41c8dd38dc6da198"; + sha512 = "c8c9d6a31664df4e7ad9668a73197da100f5c0b9bcd7bc500638f1d1c26e123a91cd370cd574185f0a2700c44564df7a048b6942265294c2326c8d0ae02f8c73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/kab/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f97fb7db2e055ccad2310d813a15086494d0815fc3cc48d49928c5642175f9db80b4deec8c4a4f5568417a26e898348ad10ec887b8a8be161586ff3c53ee3ff2"; + sha512 = "d76f7178edaee6d16045e332ecac4dd31d7eaa3e8688c24cc48cde48df7df9b1bf9bbc0d76a95e8c35923fe1fb743792bcadf8d3f705f76a8acc7d714b8b0bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ko/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-x86_64"; + sha512 = "f3d13ee3665e6345ea8295d616d227ade4be5af166af08b0a2094ae27a69eb82955933967f734e111930d802270f8c5ace57a9f16bc56b920ad9a3081f82acbb"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "1854d0c0365bca930a4480226dd54bee3e6798857e68cea3dfdce94247f298be6933f2ed8a7abd89e87ae063a7a14c9d7ad1998abb0fd07dfe9a2a0b2e63dd71"; + sha512 = "9ff20db6d945938868b5b9833519a93011d33804f5514f0f347814137f9f8e96b427658f1f086867c0b272ef8fa5c22e92b8093950b534f3ac0224f84bbf2779"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/lt/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "2979f9059f6dae5abd9ead9bc87052e7a4116d0f0001a3585b70e2a0609c85c1e6a38d547a8a187f9057d68f7a87a4875cc209f00a1dd1011ec7634cf0339aa0"; + sha512 = "cc0309a724a2b21bd6426af53e5ca6b8168f2e3f1293c16aba954c1484defd0a227a1d93c4d92e946d5327d5ce58fcc37f6848d180426e3cd9673de483676713"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-x86_64"; + sha512 = "59351da7225877be43a1e651afd089facd47675497d8f2c0d6bc1c8a2234058ef9362b30309d65b074c8b98faf19b9d4cf80e83cfec2f8e438fc0a7c6d60f899"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nb-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e9a61cf7cecf7026bd4aa7574ece60e9738f710a43733d7347a1ebdc460322b975ab86be81919a85faa01f728aab754825062da5642231658daa1a318e919c3b"; + sha512 = "94c5f139cda0a90bc575f32f6121441dd198455482a89d052227777759f912f26aa53d74a6232e3a78ecf1cd3062cadfb3c7f30e349dd59bb8797825dce825a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "07c3db2e75395059f735a17bd4db3a68ee7fa97fbad3dfafb0aa1371d360a8fd5b693bd6034afde2457e7e13fa6968d78df0f297c55fb8882e10f4311eb03244"; + sha512 = "f1fd359ab66f349643191efc5f112a4512acfb64cf088b963068e54688c34b4244a8b0d31135200a706122ed797e2d2b09237e96c1076bbf086d660b80d44dbb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/nn-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "1eaad3950f23e1e7a83bea070a8d5c4207b5c2443af11623872a446ab45ee8e2746be9de638828f951a47dd8966426a1d166eb98dc900de39d0a230d438bdd10"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pa-IN/thunderbird-52.9.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-x86_64"; - sha512 = "da0b4fca7428104c75650435efa2ab65edc6ca4518ed4b6274195465cbea5d5cf9bbb7f3aa22209f298afab970556f51638bc752ea50edf2a3fd7b562314af61"; + sha512 = "819c02852685cdebf0b3c3b86ab4261ac13ae6067f0a9c3610214d4cab05f3a913da58527be7d3fd2d06fbe9de13481c34c679b317fe0659383b31ac1fd19bec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "41c14a41b00b0a92ee8bce565ba2fe9a4ca1461ce5a1f54dbb40558bc2d871d07ee5edfbc6c8df1a7aba7e1a957cd11acd509e193b657473b14b745bbf06e3e1"; + sha512 = "e384e19a68ab56c16266d59abb6b22ad5b7bfef649c2a7537a5822753f856a6e90604e057a7a43b744487294475be6afca2b8484911044422fbf06d01df31e5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-BR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "146dcbef8d811cb1c295cc72349f10c8f345bd9b7c95a1347b68681cb5edd02d129f583338c0bf619b37df357fc000212894a6d28a3e833b0626bd1a62b02b3c"; + sha512 = "edf352970e3292c9f3eb17caf8de07edb924d14500c3dfc6d1864adebcfc174d1639b2d0ca5b4006cd952f9922e09fd220ef50c7ee3f15920d554dbae22eaff4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/pt-PT/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "aa60bb80a1a4df1800037a6dbde7f8deef9c4f7f1bc3926bbc5f223d4436caa62d5e9ded7eac0d91f766b35d6ae9a40fd2aabcc603e5d2276f1bf598b715b56c"; + sha512 = "2d91620bce2051d6c30a3b16f21f7c97b99e3ac4a239e22b582b37ce7e6ef4b6861d66e56e7e7f58cd71cd25fcddb5e161e66248d87fc9984e755f229dbd54b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/rm/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "4e109d618b6c6d9d578b90012a142d8ed8e16a430412c95e0a2567dfe7407f828ea70cf9088a4f9d5d33fe294618f052870630ae521feb0c474e76e6946d1bc0"; + sha512 = "0ee05046cef873313eea34cb5bc002f9231f015415ba97c23b06e7ed0ef9996e7cb77beab89cc1e312fc74122cbac179af430153b2426d885acef8fb7d1126b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ro/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0fbbf47332fccf2eea593f12751b5e1ec502dbfbae7e100d56906e2850191129f8fa5a51794f13f6225c2de6c219933e36074970b5b7698fcbcb58cab2abe6cf"; + sha512 = "c53a2bdfbda8cda335d2a9fe03476090034ebfdbd8a8eb345a9fa5d3c0f1422a0e1c2d95bb5a0b75cf84f8338679068436cc90c857a3547f297f3294d5028b70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ru/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "8d26c8c5248418cbf329c3ea6ff0fa60baf9b12110048327beb15073d2398aa7d31c97acc33d1b6bcc65e38b651d619f5a47007961ac1adb290783ad22c4be64"; + sha512 = "ffc6c2729291d8d1c7f32cca8933d3d8adbd54e278940ccd7cb844778b8a55123af0bcc9d435480077551de49d1c2200250209311579d2a34a5609a336eb32b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/si/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "17cfaacbafbaa98cf73f6df074c99c40faf6687576cd44315ce4360bb725d8ab0b2fcdbda08f160441449e779b3d769765063079b3fee8c0b4a366799f0c38c6"; + sha512 = "9f708d01d6a6492d10ff058bd2425172bb90ff9c2827cf88a4307de0df20c6cdac9d8c135daddbca132fc55e89c68924fddfe9ca8cb49d77ca6c874283c49a8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d22d8d46f3a3d3206368225b7691cf4c6fa235ec1d2e2476f46c1982d2fe071909d66cb180ef2fdb81ba494e25ce3d4d20a30fa579e27c2e2327b60b5c2f44a3"; + sha512 = "44e3dd85654dd91ac9b0bd1f1d7f6f74341e3f39be8f01b028353d3425938825877b8f8b0c296ebf269cc5b1e78dbdde18bc49153ada0065dbc1de3079096ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "00a89b3dfd33979d5a7c9f256b57add0d91504a00712effa8ed3a14dae80e92aead5bc5857507810b1b99a77cfea709e07454a3834193677fbefa68db46edd50"; + sha512 = "2d77bebf1e3a6466fdddf32f21cbb5d28e46f4b70fbd07eec701559a0accb6f78ed9ed8a3b969d0eb3e249907208ffe8ab096e6bb035bdfb8c91e268ba228992"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sq/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3bf0024db0d43d26bec31eb40fd7a2fe42d105072663c21a5e7f8f38cd718a555d7796cbc2d28da426db01dcf003cb2c351237e67a0cc9b4b3f3cf7b6c37e522"; + sha512 = "f705fad8b3a3ec5f760f28205caeb19986cd90084c8db0d921569553aa3cef668443e30594a82a32cb684e4cb2444057d04355b39a2dc02ac2dfc0ad5273bd68"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "f3e6ba6a80976bcdd37539d78829bd16344069082dee68ada14ec1de611a3e65f132431c074107b43fe855e46f15504766c9dda536c7112de081d0c450d8fd04"; + sha512 = "37dd80ec39ea566e66d8ace889bdf0353ec63682356472a1d0352f556814bee38793a263b285c65e9a68e62b782caf064d7b530b503e1222a490ad81798b2a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/sv-SE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "5eb1d2ce97320961c3d70403f8f81a36d0d686cec8cb518065d4ea950d7b2ae1588ef64a6b2276c6f8a0fc59136108a4fa50f44ed890742aea2fb77e14886b2c"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/ta-LK/thunderbird-52.9.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-x86_64"; - sha512 = "e59d4e4797aa96a8edfeac79bd9720f4a893c548b66efcef365a92cde1e1f9bbdd4c9046d7483a148e28f9377ca2eebda42683769fb4e02f4a56ce629596280e"; + sha512 = "3685b1788f7da31032b5b16a974af87d729a05aad8f906f6692d7dd688684c6f745fe766a1c5baaaaecac4d1b417d3e91d78ca082a41704a6f9caff29b64d842"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/tr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ca29daa1d9f255e3a5748259fe632382937d51c593412e28cb6d99d7339cf5b9482ebcc0e76120d0988519538e10484187d13134c27335ea708a5a115b9bc2d1"; + sha512 = "3b1de9eb1371ac686c1d28253bab5b5a3c5ee3b91739bd9e272ed496266fbad01fafe5015f257cd0dc6ef553d47d674bf13e5a53444d030f50572c929d0b3c75"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/uk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ff02ebaa4d8d9174387b7ad777e5372361567b077882a9cea84c30dc1e430e76f8cc07e14f7b32c8340c893e6aa395dbc249decd89f6facdb05ed9e2e14d34a2"; + sha512 = "0cbd6f8ad5f0bf49e62efeed2d52b3c22ec0dc4701d84771465f3650ca2ca2736acb1e9d83fead6ecba4dbbd64eb883bd9cce9ece31b5e1ec28da4a410db196c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/vi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "210b9f8f70ac499305e0bb66b9dfa294c4c0f6784520e8238874ea7ade9d6ef58760e3beaeb5f0ab14554fe34618cfbfb023ba5486c8ec12ba57f5e72d3fd069"; + sha512 = "0e0440d0640b7c50aea0a6a6983779524007897dee8996fbf898d110881920041c99891ba282cdd5bd02060d4f8606e57bf9ebd25531ef9cdb87659aa1150e55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-CN/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "bc41f53a3c37e2aa7f8d960aa7d2f7b90d25971ce34eb664476c92a4b7db3753c96f22f5b0157a1298ab2b65e03b85b8268ff5fb0fbbce7aa3364fb587a17549"; + sha512 = "3fd66874bbb9853da447cd4a4495f848d1ead3a1ef1ceca36590082f4ccec8985280d25f42a643b52f955290a4b9649709909080db8b6a592a943ee1ba4bbb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-x86_64/zh-TW/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-x86_64/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "b400036ddd90488b7cf67e98b2530e4d4594637f9259f20a92a7a3c62b2f7a60ce390b9907a1b2efa44af29941938faed4e10ff6bda0c67656b8907638578712"; + sha512 = "8e716f938a146a14c9f5ad8d99da463a6b5ea8d1705c26a575a4e34de89e1e9a36e1a288f60bd67b87a2560fae7646dd9157c4d60e9a35f7e977d20d55756f0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ar/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ar/thunderbird-60.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1c8f71b60a0b5088d3d8b4576e02727a939a60b821aeb3015f9aa5b65231ca93b14894fb506fe2acbf579ad4686e83cf1e0d3179575a0510d571de146c4bb7f8"; + sha512 = "2076cd84255a8ad52521a752b8444cafd3490932b69a3ec632d8815a5215d08d4efcbebb888f76b26232eb6edd66c4b9ce2233107de32603d6a7a37b87f3595e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ast/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ast/thunderbird-60.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3d78cdd28deda66fd42a2981d66c765f6ff4af8a37d166712094a7959541ac6f42fabd240307d2189d7bbe24c2d850bb99d7fbca5ccc9820ef68210c3dead49c"; + sha512 = "a070d8bf3771ae9a9e09f40888b3c7cf391eef4966bbf437f547eb8a914290d2da918e7a824558aa5a506ce1941fc95ad738bb9ba56cc7418004da6658c42344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/be/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/be/thunderbird-60.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "d08e59550f24a1303c7591fd0b8028c49613b3f0fbfc9adbdf0100955e35fb2569b5159df7847cc514249b25eaf5fce71e7902fb1c13824a9eabe650fa438e5e"; + sha512 = "f9c92aec1316decc523e8bb9136004ef74e184f2213c1ae92541416c36c9f3aa1a8adbe9f875b25120597026dd948a1ca68a9e1074643088d2698f8483a04762"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bg/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/bg/thunderbird-60.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "c78340650a7f19d14335cd35cc80938f0e5fbfc94063d600d7dd441b925dc2b6270e85369ac293f0addbbe74e10802dbc69bb76e0cec2a6af8648a5ca0481322"; + sha512 = "a576991acf9129ab9a365e80b90fca7aef01e66ce3d06dffb8ecdc0ae3d8dc2902470a99a0293a87c9f112fd13658b71a86e6fb045fa7cefb7773de1cdbbe31c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/bn-BD/thunderbird-52.9.1.tar.bz2"; - locale = "bn-BD"; - arch = "linux-i686"; - sha512 = "5909ede1236341f07d00d3dba5d3297b7bc24cb9c08d133851fe5e412638a3b9e00291dc40fd927b73095dcc9a239441b3c71ec7a5ab3210fecbd4e4a5a229dc"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/br/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/br/thunderbird-60.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "9682db4630a840c676c0b68f010da21a65ae9f81c4373def81effe08c9c2b8759626d54e8923e6bb1381453acbac8942c4ab07f2491d3d3027e91c8fe9275f2d"; + sha512 = "d63edb38305e2ee76df5c05dda275ee45ba419bfc6776d007fa39dec36d202158f7eacff9611aee44d3681b0db5b200a6706e8034fffcf1ca7d575787240a5ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ca/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ca/thunderbird-60.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "3937ecef0ad33e43bc8822bb22f8c3398d51b37278c195dd9b4f4ed9c5d49e53cfb79c9a0b1c684a72735d44dd7865097b716268e7d6280b70e46b219b87302e"; + sha512 = "d5ae9f8478c638fb50af671dbd12e95b338333e87b31a7cd42d99e8deb200ec23841ac9b93b0ab26b39306067203d8645976cb99292e3a028149ca549c9d43c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cs/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cs/thunderbird-60.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "88f958ef60ac5b73fd29ccd40d9e2794dc8d57df2c15f426aa32a5d605d6b4702e2350003b394d19ad13fe3215552070947ff0ab2851698162946221b3ff1a88"; + sha512 = "9284fd6b7757c4ba331f2d2e713c247f7fbdecb7724c1d66df1d1f0c81e3803dea4cee6fc4a905020b00ec5b281a4c959eb56ef401af5b8ec5cbf05252d7ab66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/cy/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/cy/thunderbird-60.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "0301925a7378a706ad12225aad4d10ff15962426c02a294b1e9ea9e1f779c429bd2994c964d4f05048b371b71f0c6c0ab1b37204b242990b931a3a774a05b04f"; + sha512 = "182e1c8878e53af87b5b83fe00ba5a8fa7c72ee35002e843d3e1cbbcebb1d2e82c37e90a44c411b238b9c843be6594aa75d34deaa576d213c23af4e2e8b0fe23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/da/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/da/thunderbird-60.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "960996c312b862bab9447985e1cc9b1f09a61989e538ac3eac2a95b06496102b5387cfe1e762128f1b521844f4515335f4ad4bd9078771f9c2245159eb39a8ae"; + sha512 = "10f22a40283a4202c0e6612a27022ffdd3d2c45727cd170ebeaab6678f59f624c6d2520ddf2c9540e98030c6813760b5d56c70882caada0166985f3206fef4c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/de/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/de/thunderbird-60.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "3ab75cb50218db215a1c7d4c39b6038ea3dd52ebe17b5d3fb0cafc74a02dba143d6e4c0efab7c6c1c494ee83297878d82355bd4639f6aa1625be3af5f0b514a4"; + sha512 = "42709aa4778e93ebd61ff44d027eb0445028f036c735943d71ad355870d03da6dabb763367123156922aa56fe66d6968ba9c93e7b9a8b58197624f984c36437b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/dsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/dsb/thunderbird-60.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "157b25d20020c4159708790e50b09eac2b814a817655540abf878910b53ac2c1040790e8aa115bccd54797a5068954b08daa5c28f70c7ac161eb2be78f82cedc"; + sha512 = "6b82976526b862c9cae1a056b04f36c6d6cbc4ca91308a1f02a808d88272326c10f34cc77aef00b6f6c1863de42ed9a03328a667e4a0b985ecf837765557f982"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/el/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/el/thunderbird-60.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "52c0be75e9979a08f1335da437cb47fc17cd928fbea5af85283b5d07f07fdb4ac6e2f924d53f7db9e31cc0b9e7659f48f8d6e06a28d609760a0f8e6641bc96e8"; + sha512 = "4314dc7d8fcffa4c4f498d41657332bc476d79f934b4f46181fac4b6cd93d3161271fcd0575f07139186d502c5b833b53ff26d2f8728c9a73765e551963c45d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-GB/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-GB/thunderbird-60.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "53e66c5e9c98a6af311732341073b553c577dcfe35178996c7a27ee0cc0dddfc7774a065fdebbfa0a4cd4f6f3f422e9fe67fac07a586342e9dde33b59d6bd17a"; + sha512 = "0840f23683c8c109ac802415b4216f778d6e1c2487e0e8d179def2a3b56308a7d9888c46a96d8d509f99fa4aa296213e2772bf1e74a97330c5e2bea97dce7c70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/en-US/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/en-US/thunderbird-60.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "69121dd8b2445e6304f4437c06e1b7f423b19d4069290c0709a3356680613964df138c417c3d258bc978d8709b9ada28548b43c93ea9122b64daa046d96a6d78"; + sha512 = "baf0334ba9803cdb79e1a05a6745f6a87575d52bf86f6169b664903608236eda8ba8965481a58b660fb1edb567c681211f328c3f0b9b298e267b5e572b41f642"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-AR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-AR/thunderbird-60.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "e557b6249af266de41863b49a811f4c5c979e88dc15ccce6fe60694b98dfd9f09d8ae7316652626c19e5379f20b27e58f4f1be465f4df896a3aab693cb0ef5b9"; + sha512 = "c7a7ba5a547cbb7b839191b14a0a78835935cf589f82d3ee28e144032e0d94d9209348a45502b7e2da67314427b23d88fabf61db1ea78e55dda9bd1ef97abe9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/es-ES/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/es-ES/thunderbird-60.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "779d6a4a793f4bca441f8ed8ffbeabf20a7ba8555b0fa36229814db68f98d35dd15855446c7dfb8aa9509b40dd5cbabbb0ad66a604d6205daa9fdb4b1a4b9295"; + sha512 = "ae3c7211dea682e133f960a147169e0a7b615a0fd4ad2fd28fed3976a395f16ebbe1184c872746e2872a09466ca84646cfdddd270ecb3567725dab24201297d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/et/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/et/thunderbird-60.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "7da30d3e48b520c74562d11719d1988ad94cbdf676f244ffd9527475f696b54f50a1e14905a045b7d5375e1b99ba3d0459acac1e72d22ada24b0e91e74e7c2cc"; + sha512 = "e08db3e430bc90b5af7fa5d979d694d38de1bcfbb89d68613f5b3abc2abe135ca19071890fcaa5e08e2c42d7486a113345ec24ce5555d963ef2c072a3f4b77ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/eu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/eu/thunderbird-60.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "d8c50713410ee2fe8896e603cba9e04685c8dd277aba9dc2270a2e0d282a609e1feab44398007e9aa96cc0e43997598c6aa702a231d568dafa7f96a8be548e31"; + sha512 = "f3e5ab6e80ef67fb7b05e08dcaab138475f4feede719939a055c0c548a719902a1bd9b7c18c4a76d5e7173f5a01a319c56579c41059a1888fd29bd43f78666ca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fi/thunderbird-60.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "215394b3f4cab3b44d337adb56308b432c62000a592b9ee3b8e985636a6f3fec9189de64c9aba32ae1753b0ea085dca312b1696844aa658356ca9f96a0b7f255"; + sha512 = "b034c2fc5f633e4cc5b9f3258d7073439e805371833e7dccea9e8a7c9bc52ea7bb862642eb32bc02cacf2f114ff9b379edc22eb0df52ce676db52f67a3d48672"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fr/thunderbird-60.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "041c325d7015725fd81c31a1709017ee3091321187c39f84173fa5fa9c963a111e3a3bd0eb85f63a246c5a101e94d536bd0cf4a5d22b6e6bbd5fc284dcb3c965"; + sha512 = "bdc4222ef8f15ec73297b0b1382e2e6da638d103e70c0a00adb5f3aff3b4944be1149f4099cde60e7e0daab273775959110e2354834641f6c85ddcc3f1b8303f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/fy-NL/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/fy-NL/thunderbird-60.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "6f18bf01a6ca108f13b02b8cff1175640efd9c945827f28301c859858b47f238db7a5481a495c18ae5fab2639e8e3799441e0690ff52dd03d8772ca41f03c641"; + sha512 = "d4ccbbed8cd929c385369c7df9b9d031e4e06600cf8d08449d9e60844aad2ccafbb6517327882cecf1e25786a573e2878f15d841851cf30c72646eea7cd028d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ga-IE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ga-IE/thunderbird-60.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "da5509e03c4ecb8f8ab4e6e5c23218af04f4415eec33f62b5f9a48f5d7bd6cbd4d7c583439ae6fe71f009f4287a9a02b188c37a326e3a0683654c766849d25c5"; + sha512 = "c89c2ff0a5c06ce0df29300ac2e1ba034b39b021487ddf86e870138dd165459a71dc250a066df1622e4ebec1813b1c315eaeadaad5da6afa522ca2208222f1d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gd/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gd/thunderbird-60.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "56b1ed5fd7f63e68ee8ae7d291ebbca6881ccbb9c0481430dac23851ac4bd23ec98ffb93ba846f58d216094f55781ca2197717dcc21427dc3873f6e992b67032"; + sha512 = "5f1ab74c7492a6a52b1ddbd38f7b9f85f59bd911cf8a64084d1eb35715f0b9cd45a7650dcfa9771679ac6255eed99dafc0becb8b3e32e315e7d186e118b56afb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/gl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/gl/thunderbird-60.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5a6bbd8729b1c263bee0e31f544b2137a0166e07d6ebf015573e8da51e91735c467c065ab40e2c330c62a0e9c86d2b2cb302949234d746c7c743f6864f3eabe4"; + sha512 = "690915f4e182b5ecab32675aa03616a2f51f7a4e795991cdfece82f63f074e2d8057d6e87ebf9f74dcc5acd149b1dc844517bee19de3d959a493cb64b51e6158"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/he/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/he/thunderbird-60.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "90998ad6963a3258a5790caf4d36a34348fcacbbf9ba9ef87a8aa8ad1fde35bf146835434754f9421282ea1e36084660d149f28b75c8d422b84232d420810a35"; + sha512 = "ea589ef7a9b4897beb23b4595c830fa14e7021472dbab815fb15325e99cf858a28b7265d43df0629d2196c1563a769f36beae1ca048fa3c006cd97d54e923ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hr/thunderbird-60.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "727f2ec4f04b32adc2a2dd1b9e5af6de0963334abeeb4582a68fbacaabf7720251a3d5280fd7b1d8e6660747b5ea9ffc94a658d1d95651b8d3a232b15437fe23"; + sha512 = "e5b8e4cf40819c9b83339520e832773e3161c9c38c802ca37fe512616f128163bcc2d1e7a40ea6e0bb754973a782f141ed044c4be3a0cb7a39685326a1c3a8e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hsb/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hsb/thunderbird-60.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "213cfe86cf7025f76dca4af15d42d5d9fd676411d8fd64069f82ef34de7ae3de6208b0ea21c77604e6c19b9c015b9c4fe8de783de625a4345bb69f2a69a6ea3c"; + sha512 = "81382e35b825b65f95508cf04bdeb1a8709f2cd7b408f3dc068cb75d4c5ec31bdbead8807008c78599bc11043f77437013242f9969333c46e10d9ba4a8e563cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hu/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hu/thunderbird-60.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "97ad1bc5c2c29e7fac01832d44337c79b05e3ddf6dccbc41caece5c249f9ab46ca0a9ae469d0b5a923ecbd43ec4f910b70af81010d9f9b8f35a9741efbc9bc6f"; + sha512 = "190794f6fa1ffdbfc2b8516cf0c954a9abf8408aa04c1d9c51e1a601f8a1d3d8fc32e2ca9644bcd1e11e8cfc47982c55995b2daadbbbafcc713b4c6f5c8aa63e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/hy-AM/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/hy-AM/thunderbird-60.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "7738216dd50fc7a837080770fee652db2091a156623097f04e038a94c456e334af4939973960593ca915da14573263668b08dc7359e3d5a77ddb6c89c18c7efa"; + sha512 = "a6cc1ebcf284fb7b4fa0873768713dc569efdb39982f37131499434577ab5515448caaa5fac776987bc008074ac6c04eb29e2f60e21626b06dac2dfd17ee09c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/id/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/id/thunderbird-60.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "bef209d87eff0a4ba061c50c1a20937e6052941e3655d92c17eccd79657542db5a6deb68fbb2b25b2c0d5add872d86f4414b761c4f167c289d58238e21dea59e"; + sha512 = "4333f727d2e310bb24e6f266b748d757683523d6c3414c68169bc1a7852edad8d76bc3021aea01bc08e7d95c5fe4da16281306236cb6eca6f3e339cd5cc11fa0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/is/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/is/thunderbird-60.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "7f939bdca0369eb70a47d8df6f3e453a9b5472f7f3c78bce73380d6f72ec46c74bceab5087ecd4f4516fd0a405a6c70ebc19295da819e037f553f688df33b213"; + sha512 = "f26d7117241a090de6675e3a336b5b0c9b5462acc80248d6e41bf43f8c990a761ce36e6d0a4620a1733d06f5bf7cd8511c88f686b9ae0806f23f5a852be3c0d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/it/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/it/thunderbird-60.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "289a0db383c7d5ee0fc064867f8821c7f445facb37387229289a1f507174df7cffb390c19bbfec438a4e20c727769688f64000e0e2fbf17273fa21419c770070"; + sha512 = "33dfd7890b6c156b907e40c5442795c8549053362d65272bd08a5ddaeda61783ec914d8c917a7b9731885aff766011b9a667307ee01cac79614eb84133bc8675"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ja/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ja/thunderbird-60.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5b9920d334675cea0d603cf2eac923c55f234af5fab69f0002f3a2ae0afbb0a003e8f228448d5485d14543b65494ae7f5add6b28305bde1fa8a4792102d948d9"; + sha512 = "4ed858b1a1411472bc2029ce1396b78a00f25cabfc2232f6e3daf0acfe91898df769c2397f908db52759c32efc25a79d9d39efa99891a68e2b7d5b7c13820a23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/kab/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kab/thunderbird-60.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "6ad1cdef0c168d5a7e4d1e26f01354f12c7249440319132fdc07398a395074916576b7047762c231b05b039fa250c5f2fd4e9f6f85f85d2626fcd4fe58ae64b2"; + sha512 = "61e8b05c0c952eb493fb5f35b7ce6ee1da586a7a4d25f27224f36b7afae75a0f217717f5afac17b43f763b2f6403f4c50ed01c1d1dc6dd084d24f8821566b552"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ko/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/kk/thunderbird-60.0.tar.bz2"; + locale = "kk"; + arch = "linux-i686"; + sha512 = "507ad5d46263ada1fb9b3d05f2c6d1a00b76f5d25fe9459edafcb2793070b6771ff52b338bc9963c1810a46740ea1e22ed330a5b935bfef72437b572f0214e67"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ko/thunderbird-60.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "090a467a7d8ef9f3ba759684cbea8625624f5481b890bd47098e7bbc94017934457cc2ec0a7225f6486a537860c08f695cef60c3ea4bf32b1937c87a66c66c7a"; + sha512 = "2550ae6cd5e8ee1fb6fc0b3fd974c1028edf8b292da72b57d6e27fe2e600d6418c6f4ca2c9d5535cbf1f1c67b20713cfef5732beae79ceebe328f44a73023b69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/lt/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/lt/thunderbird-60.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "cd0190ffa07115f584718eb8a6c9e94dbe0c883ae48e5f4d5a86caf8db599d37d8e47d2402bd35625c0fdf752194d86a3bfb6a24f3010f0db2e5fcc5aab823fe"; + sha512 = "29e47bd8306507fd65d27892863b9cd0b58cff4d2035f7c0d3df8cfb98ddc890e922c0e54e0177b255b6bda70116a72fa630494b7ead05683f928c1a3f6bfed3"; + } + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ms/thunderbird-60.0.tar.bz2"; + locale = "ms"; + arch = "linux-i686"; + sha512 = "fec173bea9f579e605ea3b40510f26d0cd94ae96ca465f2b6b829eb710fd3154ce6b997c3951b12165491b8d57af8371517a23ec73615b3b53e463b6077efe96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nb-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nb-NO/thunderbird-60.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "6efb9bbd8f0fee9ab584d2b78425bf89d4dac2b2e7c1da745b922202691698add874b1b3d61b93a17de6256851667c25e7f13cd62591e7a47102c3ac07f8bc1d"; + sha512 = "1f15c20580104e6bbfcf07d234ac987e2d35eadeff5437369f62b34acb8b47dd646c365c31e2c5601c675a413cc0d2d73fff6f4a663436b426331d373725aee5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nl/thunderbird-60.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "ff2860ebe75ae4d542de0f9d7d7351140097367db16728054a97ae23d74c1c357d02bcbd4e05f0f98364ee80fb6054ae7cfdf60307d43da198b2bba20b17bd6f"; + sha512 = "5f1b20753423ed3882625309ad91e3a6c0931984b502e395cd56d5701eaa6612ba547d996c608b5d87f521989900eb4f02a419036b4f1c9312f9d763bf68e89d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/nn-NO/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/nn-NO/thunderbird-60.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "96a61cbbeb647820e92c268d2a6ffd1578e56a8517a415689c97548f3d218fb26711cd737d6fd682127f9704a6f4ef11f0722620f8ed44379e08cef3945f727d"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pa-IN/thunderbird-52.9.1.tar.bz2"; - locale = "pa-IN"; - arch = "linux-i686"; - sha512 = "83dbd6b5d49ebbcb7b5fbccb0c120b85adaa6085664416921bd06659deeece1a7d27bcd567a47322e81da4793da62c8b54e4f6a751645e8c7add0c362b473d84"; + sha512 = "2a7964d792058c973940cb99add2862f61e66e6ce0cf6988c6b0395274b8791a09f81730a403748962b56be8a183c5d8e063cc8b7e93e166a1d508c8f274ad16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pl/thunderbird-60.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "dd2bc656bc7ab1e21121eaa9903c63056647c31da6fa55c816c458684235559a2b2d9668e200e73f54e9b7c34bb6d0c905c0a31c6153494e16131f7e0ce9c9ed"; + sha512 = "49e372e264e902eac027db402d5e53683efcdf67faa41696113f7e963dabb85e6fbb8f58759460bb3fefc67ad52100a1d204884dcbafc39ab08e46059f72124e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-BR/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-BR/thunderbird-60.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "83c09f9b314ff82ff59ced594709eff7a0d55c9a7f1c064917ebc3820946ef69aaf509da79cf447f618b3afaab648e4990797724c671ba850655559190a1647f"; + sha512 = "201398c2c58e55b9d311f87d445727a0a3c455167febe23a597ec97fe80ca189aff3557d8ac0e1957443251af184542d071229664f0a78de2faf31dcf337d951"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/pt-PT/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/pt-PT/thunderbird-60.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "bf6c986e8b43f725a1541c0ac7c880384be40f2c90ffc87e598c177644bd32b2b07bc56be58c2db4f1aca64c4c6590a30199d9f93b7a5fd2d52a9d916ca309f1"; + sha512 = "88ba0c8dc4665305c85e00a0f50ff4247abf1a5925436d717c082c4934a6df41f9d45c45ac458598167bfae8633e3fa2c12f938e32480b956b2a61527c677af2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/rm/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/rm/thunderbird-60.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "3f07918c0f7ae7117daccd382220aea3e132fa759c25948883c1d97b936e4302fbe6fe176ca4c109f9a35c580d46a7578561c2d2909364b5e915c66d80308cd1"; + sha512 = "f121ad8ca5ee662a9b815d547352b21f7cf46bbabcf12f21617f857821e8a2b303a915fb1b3b3676684a0e79b30c9d97ba34a9223794616b4fd79f85f562d264"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ro/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ro/thunderbird-60.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "5c0a230ee4d49e6c5d6234480f288788a0b01bea44f85e29f336c5280cbc507da30e681df26938acf8f7d1b67ddd52fc5082d1019df0474ade399a27f1fdff26"; + sha512 = "a0bff4872cb8186eb187fb7b366a5469cb2f8bbc5c42296195a104432b91e99b4729515d4808651f61faa585979966be903453a75524001b619350b66a6f2349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ru/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/ru/thunderbird-60.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "43ac720dedc608f49107d29119d699c9c1ab4e7d0f62608e44ba4ae55f9c669d5adacf9e11e7fcdc9e8dcddaf87b1a237202e3a6805a0cbaf803df28ddff13ad"; + sha512 = "e5eb22490436cb0c1456af5f7019b2b1b77dbdc4b68fb9d0d693a8502acde51027a90335ea4adb1b030cb4557ffdcefc8caec423110fbdc40f0c30bd269e1e45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/si/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/si/thunderbird-60.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "338af5daa9c2ba21c47c0aaa449172c3ce315fb8c1d04e522ed77fc986d539c2c15ebe5bda80688d568fa3671b3e32579b00fa4c834c0950db5773109e7aae7e"; + sha512 = "830965b9d551665e84646e865e66aeabe6082308278669fce95e005643ba5807a0fc17ec294043f5ce908676a53b88ac64d9234b56571dbbb22b5a5de66aefac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sk/thunderbird-60.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "30e69e3c3252f3fc2bf8a9efbc19ece01728a8a79deafc42bcc5dfe92d15174816e510a9324e950cb3135f84bdb6587d00eb31a330b94dd330eab0cf35342724"; + sha512 = "40fca2d6bc9d2dea9df6ad7c153bcffcd30687c0fcce17b78583501dda379994ad706f28003248ed2cb62b0a3f0d510c203b7d4eca2f071be6f2d670f7f04c76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sl/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sl/thunderbird-60.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "0bd8ff9143652e5363a7c5e1fca0d0694c3891f83c63b2c3c06d4fac245efed31bdb486cdc41f4c5a615fcb1d1a502e6cbac3bdafa7d6e906f19ae6bd215fdc7"; + sha512 = "0881ee4832639fe79201260f8c0c755bd2d4bdac7ce5a422a37b9798901815b5b7ee1eefda9d3f82c1d49fbd0c6174ffa3aa5cc850aa260af7133d60b0685ad3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sq/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sq/thunderbird-60.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "294d17e1b5157fc7e168cf29bed2c9750775f6913375e745a66fdc7d70cf7ed783b7cf731c5090cd38803f60b0839e76ee4f260c248b73b675f4a78e5e301bab"; + sha512 = "df1d0639030a33ecd4e0e336aff064dc87daf423ce7c8a6a0279f1a92d3cec4406ff0054eec1c911812f0ec6074308c8e66180e1adf919d366a8b6f138a6ef36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sr/thunderbird-60.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "93f8a5c9e17ae9f577ee9746849fc46158e54d6bd550b5ce20e056707b3c05361f717b40637e1539aecc95f223318dd4311aff34dc511dee8507bf2622cf883d"; + sha512 = "ce264e4a8b5bc11396832533c1dfcfe43b601d4b4e8dad3d3b03c285732ab6b5fba50b90e28dfd883468cdab06e4f726d46478aa8b9e2b3a244c515288fef0bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/sv-SE/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/sv-SE/thunderbird-60.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "3555a2d623ece9921bd6acbff45459da7a51de28494f0915639c76066b3b3bf91279716f2c42b5e5d78d09216a6fe6f5be88ab4dba1d2172852ca51d93a634b6"; - } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/ta-LK/thunderbird-52.9.1.tar.bz2"; - locale = "ta-LK"; - arch = "linux-i686"; - sha512 = "203bb717b4fa77522dcee2a85cf0c0d8997abc6ac565ad908ab4eba8f7bb37e848fb94a0526c0fd8360569c9cf3c98cb82196e38cd930b11d82cad6cd88d8f5d"; + sha512 = "da5e8ee2e9fc35a605481f7351b0391d8ca056ce7f152a5e46b3b91b539f5e35b1ecb0067cd8fdd26f249393d45e22e61d318c9687d66b52accb59e8b3283e13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/tr/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/tr/thunderbird-60.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "214b140e3c18a2fd4b936558f4bb80441bec9d2afc79e0a949365d2e20b3fa1a092aab332b307c674b7a1cd3822e428459992fdfa5f56b534733021e5fcc11c9"; + sha512 = "546c6ed7113af0c52aaa69630561637789381a5e97f2edea3415d14a88edc25124a64427c3a1e1a75e8c4019468aed0ebf4d6ff56ecf26ed1c64eee6b69ee777"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/uk/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/uk/thunderbird-60.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "28a003f1c5c0135a978187e68779500caff1eed42b4da846cd2d5025835fe80ac6ef9cb0424d4a4bd339680666d9a2ca2526b46ffd9ba6b5b0bb725c5c4a7e71"; + sha512 = "ce3386e90c77fae05c79d4e30abb723fba507e4655bee6667edca9de048c8854184af5c8775b10f2b7560dc9e6e95bbe7b8db79a345e590211cb56ad313f288a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/vi/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/vi/thunderbird-60.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e2e79d972802b9c9b6319e147b741814f63dc7c5ecb663461483a5fcec45184c9a245752486f4411d961cf7d4da3ad41aeeb52364605ed78058bf53826fb0667"; + sha512 = "9bce245422e162e017198782778995ecc1ac1e2760ca91864605e3002042576a9c53519f085f6159e1654a4dff7dddc19f9fd1dda0a9f4cb9b616baeba8845d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-CN/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-CN/thunderbird-60.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "05554421534038c4a02cefc68ee9e116d15aa8b607be06de2be7cb7ef794157f6b01533f5a670d739284632faea10b374ad6912f6c332ca4fd5f0e8d0346efe8"; + sha512 = "db756f120fc2ecfa3478cf07935b12414f79f746a96b0e30f75496f2cb8a7d880b9f3017b12122f0cdc0f64d10ae738da9c026aa9c533dbdaa6e0f38e5a71ee7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/52.9.1/linux-i686/zh-TW/thunderbird-52.9.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/60.0/linux-i686/zh-TW/thunderbird-60.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "e2b3081e08f87891a0559456fc74d8d3647d49cd14176abd5155aa8ca5d1e1394638386c6c27b433e581d539ac76d151e37dd4942df2e8646134a0218ef54e77"; + sha512 = "b589e9f472681bc9ddb5909197db2acf8b54e610998d00df4731c6a1403c5b865334aef2e072b3c7ac0694175f0e7cda6864809fc6079f95681b508267d90a59"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 85c98742af38..d925838e642c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -6,6 +6,7 @@ , icu, libpng, jemalloc , autoconf213, which, m4 , writeScript, xidel, common-updater-scripts, coreutils, gnused, gnugrep, curl +, cargo, rustc, llvmPackages , enableGTK3 ? false, gtk3, gnome3, wrapGAppsHook, makeWrapper , enableCalendar ? true , debugBuild ? false @@ -20,22 +21,16 @@ let wrapperTool = if enableGTK3 then wrapGAppsHook else makeWrapper; + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; in stdenv.mkDerivation rec { name = "thunderbird-${version}"; - version = "52.9.1"; + version = "60.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "0ipvhllvlkcjshf2h938d531wpgnhbvdw1k088iazqamb3vrspxpfb4dhfrxvff995nym0gs7j5wa6bjd36nm4wajlabs5i6r80ms0d"; + sha512 = "1933csh6swcx1z35lbxfkxlln36mx2mny28rzxz53r480wcvar8zcj77gwb06hzn6j5cvqls7qd5n6a7x43sp7w9ykkf4kf9gmlccya"; }; - # New sed no longer tolerates this mistake. - postPatch = '' - for f in mozilla/{js/src,}/configure; do - substituteInPlace "$f" --replace '[:space:]*' '[[:space:]]*' - done - ''; - # from firefox, but without sound libraries buildInputs = [ gtk2 zip libIDL libjpeg zlib bzip2 @@ -50,11 +45,11 @@ in stdenv.mkDerivation rec { ++ lib.optionals enableGTK3 [ gtk3 gnome3.defaultIconTheme ]; # from firefox + m4 + wrapperTool - nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool ]; + nativeBuildInputs = [ m4 autoconf213 which gnused pkgconfig perl python wrapperTool cargo rustc ]; configureFlags = [ # from firefox, but without sound libraries (alsa, libvpx, pulseaudio) - "--enable-application=mail" + "--enable-application=comm/mail" "--disable-alsa" "--disable-pulseaudio" @@ -66,6 +61,7 @@ in stdenv.mkDerivation rec { "--with-system-libevent" "--with-system-png" # needs APNG support "--with-system-icu" + "--enable-rust-simd" "--enable-system-ffi" "--enable-system-hunspell" "--enable-system-pixman" @@ -79,18 +75,29 @@ in stdenv.mkDerivation rec { "--enable-jemalloc" "--disable-gconf" "--enable-default-toolkit=cairo-gtk${if enableGTK3 then "3" else "2"}" + "--enable-js-shell" ] ++ lib.optional enableCalendar "--enable-calendar" ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] else [ "--disable-debug" "--enable-release" "--disable-debug-symbols" "--enable-optimize" "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; + ++ lib.optional enableOfficialBranding "--enable-official-branding" + ++ lib.optionals (lib.versionAtLeast version "56" && !stdenv.hostPlatform.isi686) [ + # on i686-linux: --with-libclang-path is not available in this configuration + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + ]; enableParallelBuilding = true; preConfigure = '' + cxxLib=$( echo -n ${gcc}/include/c++/* ) + archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine ) + + test -f layout/style/ServoBindings.toml && sed -i -e '/"-DRUST_BINDGEN"/ a , "-cxx-isystem", "'$cxxLib'", "-isystem", "'$archLib'"' layout/style/ServoBindings.toml + configureScript="$(realpath ./configure)" mkdir ../objdir cd ../objdir @@ -106,14 +113,14 @@ in stdenv.mkDerivation rec { postInstall = '' # For grsecurity kernels - paxmark m $out/lib/thunderbird-[0-9]*/thunderbird + paxmark m $out/lib/thunderbird/thunderbird # TODO: Move to a dev output? rm -rf $out/include $out/lib/thunderbird-devel-* $out/share/idl # $binary is a symlink to $target. # We wrap $target by replacing the $binary symlink. - local target="$out/lib/thunderbird-${version}/thunderbird" + local target="$out/lib/thunderbird/thunderbird" local binary="$out/bin/thunderbird" # Wrap correctly, this is needed to @@ -139,7 +146,7 @@ in stdenv.mkDerivation rec { name = "thunderbird"; exec = "thunderbird %U"; desktopName = "Thunderbird"; - icon = "$out/lib/thunderbird-${version}/chrome/icons/default/default256.png"; + icon = "$out/lib/thunderbird/chrome/icons/default/default256.png"; genericName = "Mail Reader"; categories = "Application;Network"; mimeType = stdenv.lib.concatStringsSep ";" [ @@ -163,8 +170,8 @@ in stdenv.mkDerivation rec { # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. '' patchelf --set-rpath "${lib.getLib libnotify - }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird-*/libxul.so)" \ - "$out"/lib/thunderbird-*/libxul.so + }/lib:$(patchelf --print-rpath "$out"/lib/thunderbird*/libxul.so)" \ + "$out"/lib/thunderbird*/libxul.so ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 94e8bd34087d..2372685dc278 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; name = "${pname}-${version}"; - version = "1.6.6"; + version = "1.6.8"; src = fetchurl { - url = "mirror://sourceforge/msmtp/${name}.tar.xz"; - sha256 = "0ppvww0sb09bnsrpqnvlrn8vx231r24xn2iiwpy020mxc8gxn5fs"; + url = "https://marlam.de/msmtp/releases/${name}.tar.xz"; + sha256 = "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm"; }; patches = [ @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = http://msmtp.sourceforge.net/; + homepage = https://marlam.de/msmtp/; license = licenses.gpl3; maintainers = with maintainers; [ garbas peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index a82891a8f35f..6e87735a9f65 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -6,13 +6,13 @@ let pname = "liferea"; - version = "1.12.3"; + version = "1.12.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0wm2c8qrgnadq63fivai53xm7vl05wgxc0nk39jcriscdikzqpcg"; + sha256 = "12852qp174nsg770cry7y257vfzl53hpy46h5agaimrfsc41mgln"; }; nativeBuildInputs = [ wrapGAppsHook python3Packages.wrapPython intltool pkgconfig ]; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index d761be2d7ac5..9f775f0db656 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation { -e "s|/bin/rm|rm|" ''; - configureFlags = "--with-slang=${slang.dev} --with-ssl=${openssl.dev}"; + configureFlags = [ + "--with-slang=${slang.dev}" + "--with-ssl=${openssl.dev}" + ]; buildInputs = [ slang ncurses openssl ]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index d5966845a0b7..9bb266665a63 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = https://owncloud.org; maintainers = [ maintainers.qknight ]; platforms = platforms.unix; + license = licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index ca4014ed31c3..f58f7e04e00b 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -18,7 +18,8 @@ pythonPackages.buildPythonPackage rec { ]; propagatedBuildInputs = with pythonPackages; [ - pyGtkGlade libtorrentRasterbar twisted Mako chardet pyxdg pyopenssl service-identity + pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity + libtorrentRasterbar.dev libtorrentRasterbar.python ]; nativeBuildInputs = [ intltool ]; diff --git a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix index 01672aa71a80..d1d3bf880cc5 100644 --- a/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix +++ b/pkgs/applications/networking/p2p/frostwire/frostwire-bin.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "6.7.0"; + version = "6.7.1"; name = "frostwire-${version}"; src = fetchurl { url = "https://dl.frostwire.com/frostwire/${version}/frostwire-${version}.noarch.tar.gz"; - sha256 = "1qvk4w2ly2nz3ibsd6qdxaqb3g1a3l9f5a15b5zpzhsziln1fbxf"; + sha256 = "1crhiksgky65wvb4fvqablsvixj04hbaacz23mskwrc63n4jaz0p"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index a1f275723966..b69906f8eb79 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig , boost, libtorrentRasterbar, qtbase, qttools, qtsvg , debugSupport ? false # Debugging , guiSupport ? true, dbus ? null # GUI (disable to run headless) @@ -10,15 +10,23 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "09bf1jr2sfdps8cb154gjw7zhdcpsamhnfbgacdmkfyd7qgcbykf"; + sha256 = "1756hr92rvh4xlf6bk2wl24ypczhwf1rv1pdq05flk118jciqb05"; }; + patches = [ + (fetchpatch { + name = "fix-desktop-file-regression.patch"; + url = "https://github.com/qbittorrent/qBittorrent/commit/078325a3eb85c286b9a3454192ed2deadeda604c.patch"; + sha256 = "1xhpd4ncy2m9zxsllizkry2013ij0ii9p8b8jbb35sazw5p50c96"; + }) + ]; + # NOTE: 2018-05-31: CMake is working but it is not officially supported nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index e525c564c509..44e434aa8ee9 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -2,41 +2,59 @@ , fetchurl , dbus , zlib, fontconfig +, qtbase, qtmultimedia +, libjson, libgpgerror , libX11, libxcb, libXau, libXdmcp, freetype, libbsd +, pythonPackages, squashfsTools, makeDesktopItem }: with stdenv.lib; let libPath = makeLibraryPath - [ stdenv.cc.cc dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd ]; + [ stdenv.cc.cc qtbase qtmultimedia dbus libX11 zlib libX11 libxcb libXau libXdmcp freetype fontconfig libbsd libjson libgpgerror]; - version = "2016-1-17"; + version = "2018-1-30"; mainbin = "SoulseekQt-" + (version) +"-"+ (if stdenv.is64bit then "64bit" else "32bit"); srcs = { - "i686-linux" = fetchurl { - url = "https://www.dropbox.com/s/kebk1b5ib1m3xxw/${mainbin}.tgz"; - sha256 = "0r9rhnfslkgbw3l7fnc0rcfqjh58amgh5p33kwam0qvn1h1frnir"; - }; - "x86_64-linux" = fetchurl { - url = "https://www.dropbox.com/s/7qh902qv2sxyp6p/${mainbin}.tgz"; - sha256 = "05l3smpdvw8xdhv4v8a28j0yi1kvzhrha2ck23g4bl7x9wkay4cc"; + url = "https://www.dropbox.com/s/0vi87eef3ooh7iy/${mainbin}.tgz"; + sha256 = "0d1cayxr1a4j19bc5a3qp9pg22ggzmd55b6f5av3lc6lvwqqg4w6"; }; }; + desktopItem = makeDesktopItem { + name = "SoulseekQt"; + exec = "soulseekqt"; + icon = "$out/share/soulseekqt/"; + comment = "Official Qt SoulSeek client"; + desktopName = "SoulseekQt"; + genericName = "SoulseekQt"; + categories = "Network;"; + }; + in stdenv.mkDerivation rec { name = "soulseekqt-${version}"; inherit version; src = srcs."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}"); - sourceRoot = "."; - buildPhase = ":"; # nothing to build + dontBuild = true; + + buildInputs = [ pythonPackages.binwalk squashfsTools ]; + + # avoid usage of appimagetool + unpackCmd = '' + export HOME=$(pwd) # workaround for binwalk + tar xvf $curSrc && binwalk --quiet \ + ${mainbin}.AppImage -D 'squashfs:.squashfs:unsquashfs %e' + ''; installPhase = '' - mkdir -p $out/bin - cp ${mainbin} $out/bin/soulseekqt + mkdir -p $out/{bin,share/soulseekqt} + cd squashfs-root/ + cp -R soulseek.png translations $out/share/soulseekqt + cp SoulseekQt $out/bin/soulseekqt ''; fixupPhase = '' @@ -50,6 +68,6 @@ in stdenv.mkDerivation rec { homepage = http://www.soulseekqt.net; license = licenses.unfree; maintainers = [ maintainers.genesis ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix new file mode 100644 index 000000000000..a4a127db73bf --- /dev/null +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchurl, lib, qtbase, qtmultimedia, qtsvg, qtdeclarative, qttools, full, + libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: + +let + version = "1.0.6-1"; + + description = '' + An application that runs on your computer in the background and seamlessly encrypts + and decrypts your mail as it enters and leaves your computer. + + To work, gnome-keyring service must be enabled. + ''; + + desktopItem = makeDesktopItem { + name = "Desktop-Bridge"; + exec = "Desktop-Bridge"; + icon = "desktop-bridge"; + comment = stdenv.lib.replaceStrings ["\n"] [" "] description; + desktopName = "ProtonMail Bridge"; + genericName = "ProtonMail Bridge for Linux"; + categories = "Utility;Security;Network;Email"; + }; +in stdenv.mkDerivation rec { + name = "protonmail-bridge-${version}"; + + src = fetchurl { + url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; + sha256 = "1as4xdsik2w9clbrwp1k00491324cg6araz3jq2m013yg1cild28"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + sourceRoot = "."; + + unpackCmd = '' + ar p "$src" data.tar.xz | tar xJ + ''; + + installPhase = '' + mkdir -p $out/{bin,lib,share/applications} + # mkdir -p $out/share/{applications,icons/hicolor/scalable/apps} + + cp -r usr/lib/protonmail/bridge/Desktop-Bridge{,.sh} $out/lib + # cp usr/share/icons/protonmail/Desktop-Bridge.svg $out/share/icons/hicolor/scalable/apps/desktop-bridge.svg + cp ${desktopItem}/share/applications/* $out/share/applications + + ln -s $out/lib/Desktop-Bridge $out/bin/Desktop-Bridge + ''; + + postFixup = let + rpath = lib.makeLibraryPath [ + stdenv.cc.cc.lib + qtbase + qtmultimedia + qtsvg + qtdeclarative + qttools + libGL + libsecret + libpulseaudio + glib + ]; + + qtPath = prefix: "${full}/${prefix}"; + in '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" \ + $out/lib/Desktop-Bridge + + wrapProgram $out/lib/Desktop-Bridge \ + --set QT_PLUGIN_PATH "${qtPath qtbase.qtPluginPrefix}" \ + --set QML_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ + --set QML2_IMPORT_PATH "${qtPath qtbase.qtQmlPrefix}" \ + ''; + + meta = with stdenv.lib; { + homepage = https://www.protonmail.com/bridge; + license = licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ lightdiscord ]; + + inherit description; + }; +} diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index c4e73f3f2fa9..8d0022e3c8b3 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -39,50 +39,6 @@ let }); versionInfo = { - "13.4.0" = rec { - major = "13"; - minor = "4"; - patch = "0"; - x64hash = "133brs0sq6d0mgr19rc6ig1n9ahm3ryi23v5nrgqfh0hgxqcrrjb"; - x86hash = "0r7jfl5yqv1s2npy8l9gsn0gbb82f6raa092ppkc8xy5pni5sh7l"; - x64suffix = "10109380"; - x86suffix = x64suffix; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-4.html; - }; - - "13.5.0" = rec { - major = "13"; - minor = "5"; - patch = "0"; - x64hash = "1r24mhkpcc0z95n597p07fz92pd1b8qqzp2z6w07rmb9wb8mpd4x"; - x86hash = "0pwxshlryzhkl86cj9ryybm54alhzjx0gpp67fnvdn5r64wy1nd1"; - x64suffix = "10185126"; - x86suffix = x64suffix; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-latest-13-5.html; - }; - - "13.6.0" = rec { - major = "13"; - minor = "6"; - patch = "0"; - x64hash = "6e423be41d5bb8186bcca3fbb4ede54dc3f00b8d2aeb216ae4aabffef9310d34"; - x86hash = "0ba3eba208b37844904d540b3011075ed5cecf429a0ab6c6cd52f2d0fd841ad2"; - x64suffix = "10243651"; - x86suffix = x64suffix; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-136.html; - }; - - "13.7.0" = { - major = "13"; - minor = "7"; - patch = "0"; - x64hash = "18fb374b9fb8e249b79178500dddca7a1f275411c6537e7695da5dcf19c5ba91"; - x86hash = "4c68723b0327cf6f12da824056fce2b7853c38e6163a48c9d222b93dd8da75b6"; - x64suffix = "10276927"; - x86suffix = "10276925"; - homepage = https://www.citrix.com/downloads/citrix-receiver/legacy-receiver-for-linux/receiver-for-linux-137.html; - }; - "13.8.0" = { major = "13"; minor = "8"; @@ -156,7 +112,7 @@ let ''; }; - phases = [ "unpackPhase" "installPhase" ]; + dontBuild = true; sourceRoot = "."; @@ -203,6 +159,8 @@ let }; installPhase = '' + runHook preInstall + export ICAInstDir="$out/opt/citrix-icaclient" sed -i \ @@ -262,13 +220,15 @@ let # We introduce a dependency on the source file so that it need not be redownloaded everytime echo $src >> "$out/share/nix_dependencies.pin" + + runHook postInstall ''; meta = with stdenv.lib; { license = stdenv.lib.licenses.unfree; inherit homepage; description = "Citrix Receiver"; - maintainers = with maintainers; [ obadz a1russell ]; + maintainers = with maintainers; [ obadz a1russell ma27 ]; platforms = platforms.linux; }; }; diff --git a/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix b/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix new file mode 100644 index 000000000000..63587030b38e --- /dev/null +++ b/pkgs/applications/networking/remote/citrix-receiver/wrapper.nix @@ -0,0 +1,19 @@ +{ citrix_receiver, extraCerts ? [], symlinkJoin }: + +let + + mkCertCopy = certPath: + "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/"; + +in + +if builtins.length extraCerts == 0 then citrix_receiver else symlinkJoin { + name = "citrix-with-extra-certs-${citrix_receiver.version}"; + paths = [ citrix_receiver ]; + + postBuild = '' + ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)} + + sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica + ''; +} diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 4c1ddcef5cc8..e07bf7958f3f 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, autoconf, automake, pkgconfig, libtool -, gtk2, halibut, ncurses, perl }: +, gtk2, halibut, ncurses, perl +, hostPlatform, lib }: stdenv.mkDerivation rec { version = "0.70"; @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1gmhwwj1y7b5hgkrkxpf4jddjpk9l5832zq5ibhsiicndsfs92mv"; }; - preConfigure = '' + preConfigure = lib.optionalString hostPlatform.isUnix '' perl mkfiles.pl ( cd doc ; make ); sed -e '/AM_PATH_GTK(/d' \ @@ -21,13 +22,25 @@ stdenv.mkDerivation rec { -e '/AC_OUTPUT/iAM_PROG_AR' -i configure.ac ./mkauto.sh cd unix + '' + lib.optionalString hostPlatform.isWindows '' + cd windows ''; + TOOLPATH = stdenv.cc.targetPrefix; + makefile = if hostPlatform.isWindows then "Makefile.mgw" else null; + + installPhase = if hostPlatform.isWindows then '' + for exe in *.exe; do + install -D $exe $out/bin/$exe + done + '' else null; + nativeBuildInputs = [ autoconf automake halibut libtool perl pkgconfig ]; - buildInputs = [ gtk2 ncurses ]; + buildInputs = [] + ++ lib.optionals hostPlatform.isUnix [ gtk2 ncurses ]; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A Free Telnet/SSH Client"; longDescription = '' PuTTY is a free implementation of Telnet and SSH for Windows and Unix @@ -36,6 +49,6 @@ stdenv.mkDerivation rec { ''; homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix ++ platforms.windows; }; } diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6b0ddb371205..ed093c6e65db 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -10,7 +10,7 @@ }: let - version = "1.2.30.1"; + version = "1.2.31.2"; desktopItem = makeDesktopItem { name = "remmina"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "1jz20yv84a8m9gm9fsz0jii8ag90v1scmbkkx9gk38ax5il7ilvn"; + sha256 = "09jdrs2hbr9wyd5yqw5bri41rnfnxxyh98mlv6ig2phlvs9cg73d"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index 14ed2587e636..cd697f107b35 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -17,5 +17,6 @@ stdenv.mkDerivation rec { description = "A masquerading SIP Proxy Server"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 74ffb14f4ade..b0315ee3477d 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -1,18 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake, lua, pkgconfig, rsync, +{ stdenv, fetchFromGitHub, fetchpatch, cmake, lua, pkgconfig, rsync, asciidoc, libxml2, docbook_xml_dtd_45, docbook_xsl, libxslt }: stdenv.mkDerivation rec { name = "lsyncd-${version}"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "axkibe"; repo = "lsyncd"; rev = "release-${version}"; - sha256 = "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y"; + sha256 = "1hbsih5hfq9lhgnxm0wb5mrj6xmlk2l0i9a79wzd5f6cnjil9l3x"; }; - patchPhase = '' + patches = [ + (fetchpatch { + sha256 = "0b0h2qxh73l502p7phf6qgl8576nf6fvqqp2x5wy3nz7sc9qb1z8"; + name = "fix-non-versioned-lua-not-search-in-cmake.patch"; + url = "https://github.com/axkibe/lsyncd/pull/500/commits/0af99d8d5ba35118e8799684a2d4a8ea4b0c6957.patch"; + }) + ]; + + postPatch = '' substituteInPlace default-rsync.lua \ --replace "/usr/bin/rsync" "${rsync}/bin/rsync" ''; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 30fa41de12d1..ca5624d5b73f 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -24,10 +24,13 @@ stdenv.mkDerivation rec { ++ optional withTcl tcl ++ optional withCyrus cyrus_sasl; - configureFlags = optionalString withPerl "--enable-perl " - + optionalString withPython "--enable-python " - + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " - + optionalString withCyrus "--enable-cyrus "; + configureFlags = [ + (stdenv.lib.enableFeature withPerl "perl") + (stdenv.lib.enableFeature withPython "python") + (stdenv.lib.enableFeature withTcl "tcl") + (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") + (stdenv.lib.enableFeature withCyrus "cyrus") + ]; meta = with stdenv.lib; { description = "Advanced IRC bouncer"; diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix index b4e962ce3fcf..9aa4cc643159 100644 --- a/pkgs/applications/office/gnucash/2.4.nix +++ b/pkgs/applications/office/gnucash/2.4.nix @@ -27,7 +27,13 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ gconf ]; - configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking"; + configureFlags = [ + "CFLAGS=-O3" + "CXXFLAGS=-O3" + "--disable-dbi" + "--enable-ofx" + "--enable-aqbanking" + ]; postInstall = '' # Auto-updaters don't make sense in Nix. diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index badc02a36463..e196b1bd0d77 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { sha256 = "26cceb7fa97dc7eee7181a79a6251a85b1f1464dcaaaf7624829f7439c5f7d3f"; }; - configureFlags = "--disable-component"; + configureFlags = [ "--disable-component" ]; prePatch = '' substituteInPlace doc/C/gnumeric.xml \ diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix new file mode 100644 index 000000000000..fdc6c58213a1 --- /dev/null +++ b/pkgs/applications/office/jameica/default.nix @@ -0,0 +1,85 @@ +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, xmlstarlet, gtk2, glib, xorg, Cocoa }: + +let + _version = "2.8.1"; + _build = "449"; + version = "${_version}-${_build}"; + name = "jameica-${version}"; + + swtSystem = if stdenv.system == "i686-linux" then "linux" + else if stdenv.system == "x86_64-linux" then "linux64" + else if stdenv.system == "x86_64-darwin" then "macos64" + else throw "Unsupported system: ${stdenv.system}"; + + desktopItem = makeDesktopItem { + name = "jameica"; + exec = "jameica"; + comment = "Free Runtime Environment for Java Applications."; + desktopName = "Jameica"; + genericName = "Jameica"; + categories = "Application;Office;"; + }; +in +stdenv.mkDerivation rec { + inherit name version; + + nativeBuildInputs = [ ant jdk makeWrapper xmlstarlet ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ gtk2 glib xorg.libXtst ] + ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + + src = fetchFromGitHub { + owner = "willuhn"; + repo = "jameica"; + rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; + sha256 = "1w25lxjskn1yxllbv0vgvcc9f9xvgv9430dm4b59ia9baf98syd2"; + }; + + # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries + # and is not able to build the application itself + buildPhase = '' + (cd build; ant init compile jar) + ''; + + # jameica itself loads ./plugin.xml to determine it's version. + # Unfortunately, the version attribute there seems to be wrong, + # so it thinks it's older than it really is, + # and refuses to load plugins destined for its version. + # Set version manually to workaround that. + postPatch = '' + xml ed -u '/system/@version' -v '${version}' plugin.xml > plugin.xml.new + mv plugin.xml.new plugin.xml + ''; + + installPhase = '' + mkdir -p $out/libexec $out/lib $out/bin $out/share/{applications,${name},java}/ + + # copy libraries except SWT + cp $(find lib -type f -iname '*.jar' | grep -ve 'swt/.*/swt.jar') $out/share/${name}/ + # copy platform-specific SWT + cp lib/swt/${swtSystem}/swt.jar $out/share/${name}/ + + install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/ + install -Dm644 plugin.xml $out/share/java/ + install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png + cp ${desktopItem}/share/applications/* $out/share/applications/ + + makeWrapper ${jre}/bin/java $out/bin/jameica \ + --add-flags "-cp $out/share/java/jameica.jar:$out/share/${name}/* ${ + stdenv.lib.optionalString stdenv.isDarwin ''-Xdock:name="Jameica" -XstartOnFirstThread'' + } de.willuhn.jameica.Main" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath buildInputs} \ + --run "cd $out/share/java/" + ''; + + meta = with stdenv.lib; { + homepage = https://www.willuhn.de/products/jameica/; + description = "Free Runtime Environment for Java Applications."; + longDescription = '' + Runtime Environment for plugins like Hibiscus (HBCI Online Banking), + SynTAX (accounting) and JVerein (club management). + ''; + license = licenses.gpl2Plus; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/applications/office/ledger/2.6.3.nix b/pkgs/applications/office/ledger/2.6.3.nix index 6fb8f6ca903e..49b258c43fdb 100644 --- a/pkgs/applications/office/ledger/2.6.3.nix +++ b/pkgs/applications/office/ledger/2.6.3.nix @@ -10,7 +10,11 @@ stdenv.mkDerivation rec { buildInputs = [ emacs gmp pcre expat ]; - configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3"; + configureFlags = [ + "CPPFLAGS=-DNDEBUG" + "CFLAGS=-O3" + "CXXFLAGS=-O3" + ]; doCheck = true; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index e44106f7b65e..8037cc636ae0 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -14,10 +14,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { pname = "tryton"; - version = "4.8.2"; + version = "4.8.4"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "02jnqxwsqk7hn52hc4jd59nd94d810i4psaa3lqqig3br5blp8yx"; + sha256 = "6cf3091424853e1270d61f3a9b15ad8e6b36a44c28becf216c324ca8dc1474b0"; }; nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; propagatedBuildInputs = with python2Packages; [ diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index 59c58a3af13a..36a547699616 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -5,10 +5,10 @@ with stdenv.lib; python2Packages.buildPythonApplication rec { pname = "trytond"; - version = "4.8.1"; + version = "4.8.3"; src = python2Packages.fetchPypi { inherit pname version; - sha256 = "8e72a24bdf2fd090c5e12ce5f73a00322e31519608b31db44d7bb76382078db9"; + sha256 = "11d01dc984d9274229b5c80f883679d130a55e14e9124b051274fce9aea4ef77"; }; # Tells the tests which database to use diff --git a/pkgs/applications/science/astronomy/gildas/aarch64.patch b/pkgs/applications/science/astronomy/gildas/aarch64.patch new file mode 100644 index 000000000000..40696a03dec7 --- /dev/null +++ b/pkgs/applications/science/astronomy/gildas/aarch64.patch @@ -0,0 +1,12 @@ +diff -ruN gildas-src-jul18a/admin/define-system.sh gildas-src-jul18a.aarch64/admin/define-system.sh +--- gildas-src-jul18a/admin/define-system.sh 2018-06-12 15:22:32.000000000 +0200 ++++ gildas-src-jul18a.aarch64/admin/define-system.sh 2018-07-21 13:05:52.000000000 +0200 +@@ -174,7 +174,7 @@ + DEFAULT_CONFIG= # Default config is empty + case `uname` in + Linux) +- if [ `uname -m | grep -c "x86_64"` -ne 0 ]; then ++ if [ `uname -m | grep -c "64"` -ne 0 ]; then + GAG_MACHINE=x86_64 + else + GAG_MACHINE=pc diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index bd4587bf2276..ee19077065e0 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { - srcVersion = "jun18a"; - version = "20180601_a"; + srcVersion = "aug18a"; + version = "20180801_a"; name = "gildas-${version}"; src = fetchurl { url = "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.gz"; - sha256 = "0k4x0g69fphb1759cwcw6bbs8imwmq0qwj6zqixxk60skk4n4jvb"; + sha256 = "0mg3wijrj8x1p912vkgrhxbypjx7aj9b1492yxvq2y3fxban6bj1"; }; enableParallelBuilding = true; @@ -22,20 +22,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2-x11 lesstif cfitsio python27Env ]; - patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ]; + patches = [ ./wrapper.patch ./return-error-code.patch ./clang.patch ./aarch64.patch ]; configurePhase='' substituteInPlace admin/wrapper.sh --replace '%%OUT%%' $out substituteInPlace admin/wrapper.sh --replace '%%PYTHONHOME%%' ${python27Env} + substituteInPlace utilities/main/gag-makedepend.pl --replace '/usr/bin/perl' ${perl}/bin/perl source admin/gildas-env.sh -c gfortran -o openmp echo "gag_doc: $out/share/doc/" >> kernel/etc/gag.dico.lcl ''; - buildPhase='' - make depend - make - ''; - postInstall='' mkdir -p $out/bin cp -a ../gildas-exe-${srcVersion}/* $out diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 24d6246e90cd..cb7b2fbff3cb 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { name = "stellarium-${version}"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "0srwi08azzzayf50dr4dr1zcdcc8hwribzv7xvb7hbp6xp51c813"; + sha256 = "17764i52dmipaz62k5n23fyx07d7cjir0dgav0s5b6sjd8gbjwbf"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 2df8b188f785..89e38104feb5 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "igv-${version}"; - version = "2.4.13"; + version = "2.4.14"; src = fetchurl { url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "0cl6fs1v9rqkzjq4syx0m1pr71hbhvidwa3ym57pvz8ardfs3qa1"; + sha256 = "0z9hk01czkdgi55b0qdvvi43jsqkkx6gl7wglamv425c6rklcvhc"; }; buildInputs = [ unzip jre ]; diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 821a80230e50..1c24ef092542 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { sha256 = "1b2v0dcdqn3bysgdkj57sxmd6s0hc9wpnxssviz399g6plhxggbr"; }; - configureFlags = "--without-debug --with-bin-release --with-dll --without-static"; + configureFlags = [ + "--without-debug" + "--with-bin-release" + "--with-dll" + "--without-static" + ]; buildInputs = [ cpio ]; meta = { diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index a08a54c94ecd..0ddbdab4c1b1 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "picard-tools-${version}"; - version = "2.18.10"; + version = "2.18.11"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1px5ar6iizm4czpc66hyyafandw6g9x9s1abj8klc78alvihciw4"; + sha256 = "03wkyz3bjx3n8bwambhz9lr09271r1wxycmx4p7m2naqs4afxb89"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix new file mode 100644 index 000000000000..4bbd6a320035 --- /dev/null +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchFromGitHub, cmake, zlib, ncurses}: + +stdenv.mkDerivation rec { + name = "somatic-sniper-${version}"; + version = "1.0.5.0"; + + src = fetchFromGitHub { + owner = "genome"; + repo = "somatic-sniper"; + rev = "v${version}"; + sha256 = "0lk7p9sp6mp50f6w1nppqhr40fcwy1asw06ivw8w8jvvnwaqf987"; + }; + + patches = [ ./somatic-sniper.patch ]; + + buildInputs = [ cmake zlib ncurses ]; + + enableParallelBuilding = false; + + meta = with stdenv.lib; { + description = "Identify single nucleotide positions that are different between tumor and normal"; + license = licenses.mit; + homepage = https://github.com/genome/somatic-sniper; + maintainers = with maintainers; [ jbedo ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch b/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch new file mode 100644 index 000000000000..9af04c0a0696 --- /dev/null +++ b/pkgs/applications/science/biology/somatic-sniper/somatic-sniper.patch @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d5a180..7254292 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH + ) + + include(TestHelper) +-include(VersionHelper) ++#include(VersionHelper) + include(ProjectHelper) + + # NOTE: for sniper we want the exe suffix to be like 0.7.4, not just 0.7 +diff --git a/vendor/samtools.patch b/vendor/samtools.patch +index f173017..654f878 100644 +--- a/vendor/samtools.patch ++++ b/vendor/samtools.patch +@@ -6,7 +6,7 @@ diff -Nuar a/Makefile b/Makefile + + samtools:lib $(AOBJS) + - $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -lz -L. -lbam +-+ $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -L. -lbam -lz +++ $(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lncurses -L. -lbam -lz + + razip:razip.o razf.o + $(CC) $(CFLAGS) -o $@ razf.o razip.o -lz diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index 394973692dca..a6f52ae97b59 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "vcftools"; - version = "0.1.15"; + version = "0.1.16"; src = fetchFromGitHub { repo = pname; owner = "vcftools"; rev = "v${version}"; - sha256 = "15yxr4kidqb42gkbd6rjra6b07wpl6rgivlh9q73yavh5myafqk4"; + sha256 = "0msb09d2cnm8rlpg8bsc1lhjddvp3kf3i9dsj1qs4qgsdlzhxkyx"; }; buildInputs = [ autoreconfHook pkgconfig zlib perl ]; diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 4f028e0053af..6ea6be52fce4 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -2,11 +2,11 @@ with stdenv.lib; +let version = "2.48"; in stdenv.mkDerivation { name = "gwyddion-${version}"; - version = "2.48"; src = fetchurl { - url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/2.48/gwyddion-2.48.tar.xz"; + url = "http://sourceforge.net/projects/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz"; sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index 0d8ab0d0e191..e79e21707d4f 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -3,7 +3,7 @@ }: let - version = "8.1"; + version = "8.2"; fftwAll = symlinkJoin { name ="ftw-dev-out"; paths = [ fftw.dev fftw.out ]; }; in stdenv.mkDerivation { @@ -11,20 +11,20 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.tddft.org/programs/octopus/down.php?file=${version}/octopus-${version}.tar.gz"; - sha256 = "0rxwvcp22364nnhwhqlr38w4rwv1yl60snxi2f8nqdflx1143n10"; + sha256 = "0z74q17lzyga44m5pbsr1hmq12ly96y44pcz7glfvc4vbaq3jd8p"; }; nativeBuildInputs = [ perl procps fftw.dev ]; buildInputs = [ libyaml gfortran libxc openblas gsl fftw.out netcdf arpack ]; - configureFlags = '' - --with-yaml-prefix=${libyaml} - --with-blas=-lopenblas - --with-lapack=-lopenblas - --with-fftw-prefix=${fftwAll} - --with-gsl-prefix=${gsl} - --with-libxc-prefix=${libxc} - ''; + configureFlags = [ + "--with-yaml-prefix=${libyaml}" + "--with-blas=-lopenblas" + "--with-lapack=-lopenblas" + "--with-fftw-prefix=${fftwAll}" + "--with-gsl-prefix=${gsl}" + "--with-libxc-prefix=${libxc}" + ]; doCheck = false; checkTarget = "check-short"; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix new file mode 100644 index 000000000000..5e1628a4fba7 --- /dev/null +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -0,0 +1,72 @@ +{ stdenv, pkgs, fetchFromGitLab, cmake, gfortran, perl +, openblas, hdf5-cpp, python3, texlive +, armadillo, openmpi, globalarrays, openssh +, makeWrapper +} : + +let + version = "20180529"; + gitLabRev = "b6b9ceffccae0dd7f14c099468334fee0b1071fc"; + + python = python3.withPackages (ps : with ps; [ six pyparsing ]); + +in stdenv.mkDerivation { + name = "openmolcas-${version}"; + + src = fetchFromGitLab { + owner = "Molcas"; + repo = "OpenMolcas"; + rev = gitLabRev; + sha256 = "1wbjjdv07lg1x4kdnf28anyrjgy33gdgrd5d7zi1c97nz7vhdjaz"; + }; + + nativeBuildInputs = [ perl cmake texlive.combined.scheme-minimal makeWrapper ]; + buildInputs = [ + gfortran + openblas + hdf5-cpp + python + armadillo + openmpi + globalarrays + openssh + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DOPENMP=ON" + "-DGA=ON" + "-DMPI=ON" + "-DLINALG=OpenBLAS" + "-DTOOLS=ON" + "-DHDF5=ON" + "-DFDE=ON" + "-DOPENBLASROOT=${openblas}" + ]; + + GAROOT=globalarrays; + + postConfigure = '' + # The Makefile will install pymolcas during the build grrr. + mkdir -p $out/bin + export PATH=$PATH:$out/bin + ''; + + postFixup = '' + # Wrong store path in shebang (no Python pkgs), force re-patching + sed -i "1s:/.*:/usr/bin/env python:" $out/bin/pymolcas + patchShebangs $out/bin + + wrapProgram $out/bin/pymolcas --set MOLCAS $out + ''; + + meta = with stdenv.lib; { + description = "Advanced quantum chemistry software package"; + homepage = https://gitlab.com/Molcas/OpenMolcas; + maintainers = [ maintainers.markuskowa ]; + license = licenses.lgpl21; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index e080569e56fb..93fe7b6ba77a 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "08dpa506xk4gjbbi8vnxcb640wq4ihlgmhzlssl52nhvxwx7gx5v"; }; - configureFlags = "--disable-update-xdg-database"; + configureFlags = [ + "--disable-update-xdg-database" + ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ guile gtk2 flex gawk perl ]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 78c981ded56f..c0048740193f 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gtkwave-${version}"; - version = "3.3.92"; + version = "3.3.93"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${name}.tar.gz"; - sha256 = "08916gv5vl7dgvlsq098mxljbciby9miyh8jqwn1q8sfdhzvmxak"; + sha256 = "0a92zlwvshp75k7cv11rc4ab11fzsy0a5qfvxkh0bjvrq1k946ys"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index ba2a170e6255..418144e6af7b 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -17,7 +17,11 @@ in stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook automake pkgconfig ]; hardeningDisable = [ "format" ]; - configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib --with-ngspice=${getBin ngspice}/bin/ngspice"; + configureFlags = [ + "--with-tcl=${tcl}/lib" + "--with-tk=${tk}/lib" + "--with-ngspice=${getBin ngspice}/bin/ngspice" + ]; buildInputs = with xorg; [ cairo ghostscript libSM libXt libICE libX11 libXpm tcl tk zlib ]; diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 1a60c5e148cc..03524fc6b222 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -13,18 +13,15 @@ stdenv.mkDerivation rec { configurePhase = '' # Set up picosat, so we can build 'aigbmc' - echo $(pwd) - ls .. mkdir ../picosat ln -s ${picosat}/include/picosat/picosat.h ../picosat/picosat.h ln -s ${picosat}/lib/picosat.o ../picosat/picosat.o ln -s ${picosat}/share/picosat.version ../picosat/VERSION - ls .. ./configure.sh ''; installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $dev/include $lib/lib # Do the installation manually, as the Makefile has odd # cyrillic characters, and this is easier than adding @@ -41,8 +38,13 @@ stdenv.mkDerivation rec { for x in ''${BINS[*]}; do install -m 755 -s $x $out/bin/$x done + + cp -v aiger.o $lib/lib + cp -v aiger.h $dev/include ''; + outputs = [ "out" "dev" "lib" ]; + meta = { description = "And-Inverter Graph (AIG) utilities"; homepage = http://fmv.jku.at/aiger/; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index aa815e48db41..8e0ad22bba18 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -1,41 +1,50 @@ -{ stdenv, fetchurl, writeShellScriptBin }: +{ stdenv, fetchFromGitHub +, cmake, lingeling, btor2tools +}: stdenv.mkDerivation rec { name = "boolector-${version}"; - version = "2.4.1"; - src = fetchurl { - url = "http://fmv.jku.at/boolector/boolector-${version}-with-lingeling-bbc.tar.bz2"; - sha256 = "0mdf7hwix237pvknvrpazcx6s3ininj5k7vhysqjqgxa7lxgq045"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "boolector"; + repo = "boolector"; + rev = "refs/tags/${version}"; + sha256 = "15i3ni5klss423m57wcy1gx0m5wfrjmglapwg85pm7fb3jj1y7sz"; }; - prePatch = - let - lingelingPatch = writeShellScriptBin "lingeling-patch" '' - sed -i -e "1i#include <stdint.h>" lingeling/lglib.h - - ${crossFix}/bin/crossFix lingeling - ''; - crossFix = writeShellScriptBin "crossFix" '' - # substituteInPlace not available here - sed -i $1/makefile.in \ - -e 's@ar rc@$(AR) rc@' \ - -e 's@ranlib@$(RANLIB)@' - ''; - in '' - sed -i -e 's@mv lingeling\* lingeling@\0 \&\& ${lingelingPatch}/bin/lingeling-patch@' makefile - sed -i -e 's@mv boolector\* boolector@\0 \&\& ${crossFix}/bin/crossFix boolector@' makefile - ''; + nativeBuildInputs = [ cmake ]; + buildInputs = [ lingeling btor2tools ]; + + cmakeFlags = + [ "-DSHARED=ON" + "-DUSE_LINGELING=YES" + "-DBTOR2_INCLUDE_DIR=${btor2tools.dev}/include" + "-DBTOR2_LIBRARIES=${btor2tools.lib}/lib/libbtor2parser.so" + "-DLINGELING_INCLUDE_DIR=${lingeling.dev}/include" + "-DLINGELING_LIBRARIES=${lingeling.lib}/lib/liblgl.a" + ]; installPhase = '' - mkdir $out - mv boolector/bin $out + mkdir -p $out/bin $lib/lib $dev/include + + cp -vr bin/* $out/bin + cp -vr lib/* $lib/lib + + rm -rf $out/bin/{examples,test} + + cd ../src + find . -iname '*.h' -exec cp --parents '{}' $dev/include \; + rm -rf $dev/include/tests ''; - meta = { - license = stdenv.lib.licenses.unfreeRedistributable; + outputs = [ "out" "dev" "lib" ]; + + meta = with stdenv.lib; { description = "An extremely fast SMT solver for bit-vectors and arrays"; - homepage = "http://fmv.jku.at/boolector"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + homepage = https://boolector.github.io; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/btor2tools/default.nix b/pkgs/applications/science/logic/btor2tools/default.nix new file mode 100644 index 000000000000..ed3d9e638121 --- /dev/null +++ b/pkgs/applications/science/logic/btor2tools/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "btor2tools-${version}"; + version = "pre55_8c150b39"; + + src = fetchFromGitHub { + owner = "boolector"; + repo = "btor2tools"; + rev = "8c150b39cdbcdef4247344acf465d75ef642365d"; + sha256 = "1r5pid4x567nms02ajjrz3v0zj18k0fi5pansrmc2907rnx2acxx"; + }; + + configurePhase = "./configure.sh -shared"; + + installPhase = '' + mkdir -p $out $dev/include/btor2parser/ $lib/lib + + cp -vr bin $out + cp -v src/btor2parser/btor2parser.h $dev/include/btor2parser + cp -v build/libbtor2parser.* $lib/lib + ''; + + outputs = [ "out" "dev" "lib" ]; + + meta = with stdenv.lib; { + description = "Fast SAT solver"; + homepage = http://fmv.jku.at/lingeling/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 95f5385fac3d..0e978f2d5c9d 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's/ *CC *= *gcc$//' -i Makefile.vars ''; - configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man"; + configureFlags = [ + "--exec-prefix=$(out)" + "--man-prefix=$(out)/share/man" + ]; meta = with stdenv.lib; { description = "Automated theorem prover for full first-order logic with equality"; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index 5eb33daefe80..d6a1eb6cbf71 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -15,7 +15,7 @@ in let polymlEnableShared = with pkgs; lib.overrideDerivation polyml (attrs: { - configureFlags = "--enable-shared"; + configureFlags = [ "--enable-shared" ]; }); in diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix new file mode 100644 index 000000000000..000587a22e67 --- /dev/null +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub +, aiger +}: + +stdenv.mkDerivation rec { + name = "lingeling-${version}"; + # This is the version used in satcomp2018, which was + # relicensed, and also known as version 'bcj' + version = "pre1_03b4860d"; + + src = fetchFromGitHub { + owner = "arminbiere"; + repo = "lingeling"; + rev = "03b4860d14016f42213ea271014f2f13d181f504"; + sha256 = "1lw1yfy219p7rrk88sbq4zl24b70040zapbjdrpv5a6i0jsblksx"; + }; + + configurePhase = '' + ./configure.sh + + # Rather than patch ./configure, just sneak in use of aiger here, since it + # doesn't handle real build products very well (it works on a build-time + # dir, not installed copy)... This is so we can build 'blimc' + substituteInPlace ./makefile \ + --replace 'targets: liblgl.a' 'targets: liblgl.a blimc' \ + --replace '$(AIGER)/aiger.o' '${aiger.lib}/lib/aiger.o' \ + --replace '$(AIGER)/aiger.h' '${aiger.dev}/include/aiger.h' \ + --replace '-I$(AIGER)' '-I${aiger.dev}/include' + ''; + + installPhase = '' + mkdir -p $out/bin $lib/lib $dev/include + + cp lglib.h $dev/include + cp liblgl.a $lib/lib + + cp lingeling plingeling treengeling ilingeling blimc $out/bin + ''; + + outputs = [ "out" "dev" "lib" ]; + + meta = with stdenv.lib; { + description = "Fast SAT solver"; + homepage = http://fmv.jku.at/lingeling/; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thoughtpolice ]; + }; +} diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 51ea9b9c0e76..426f1928938c 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -7,7 +7,12 @@ stdenv.mkDerivation { sha256 = "10jd93xgarik7xwys5lq7fx4vqp7c0yg1gfin9cqfch1k1v8ap4b"; }; buildInputs = [ ghc spass ]; - patches = [ ./patch ]; + patches = [ + ./patch + # Since the LTS 12.0 update, <> is an operator in Prelude, colliding with + # the <> operator with a different meaning defined by this package + ./monoid.patch + ]; postPatch = '' substituteInPlace Alice/Main.hs --replace init.opt $out/init.opt ''; @@ -23,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A program for automated proving of mathematical texts"; longDescription = '' - The system for automated deduction is intended for automated processing of formal mathematical texts + The system for automated deduction is intended for automated processing of formal mathematical texts written in a special language called ForTheL (FORmal THEory Language) or in a traditional first-order language ''; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/logic/sad/monoid.patch b/pkgs/applications/science/logic/sad/monoid.patch new file mode 100644 index 000000000000..da9c21bcae91 --- /dev/null +++ b/pkgs/applications/science/logic/sad/monoid.patch @@ -0,0 +1,51 @@ +diff --git a/Alice/Core/Check.hs b/Alice/Core/Check.hs +index 0700fa0388f..69815864710 100644 +--- a/Alice/Core/Check.hs ++++ b/Alice/Core/Check.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Check (fillDef) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.Maybe + +diff --git a/Alice/Core/Reason.hs b/Alice/Core/Reason.hs +index c361bcf220d..4e493d8c91b 100644 +--- a/Alice/Core/Reason.hs ++++ b/Alice/Core/Reason.hs +@@ -17,9 +17,12 @@ + - You should have received a copy of the GNU General Public License + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} ++{-# LANGUAGE NoImplicitPrelude #-} + + module Alice.Core.Reason where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + + import Alice.Core.Base +diff --git a/Alice/Core/Verify.hs b/Alice/Core/Verify.hs +index 4f8550bdf11..0f59d135b16 100644 +--- a/Alice/Core/Verify.hs ++++ b/Alice/Core/Verify.hs +@@ -18,8 +18,12 @@ + - along with this program. If not, see <http://www.gnu.org/licenses/>. + -} + ++{-# LANGUAGE NoImplicitPrelude #-} ++ + module Alice.Core.Verify (verify) where + ++import Prelude hiding ((<>)) ++ + import Control.Monad + import Data.IORef + import Data.Maybe diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 2580b9b0fbe0..946f65d944b3 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "symbiyosys-${version}"; - version = "2018.05.03"; + version = "2018.07.26"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "35d956c7bb77c0602d198035b2d73a9c61cb4de4"; - sha256 = "02zg3nkwp3fdjwz1agvsn55k1xipwh2rradb0bgjrjpsmmw63gda"; + rev = "2fef25f93dd1cb5137a08e71f507e3eee8100fb1"; + sha256 = "103fga0n11h4n2q346xyz3k0615d9lgx2b8sqr1pwn2hx26kchav"; }; buildInputs = [ python3 yosys ]; diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index fb76699b0c83..96613f4e38a6 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -1,11 +1,9 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, ncurses, pillow, pytest }: +{ stdenv, python3, fetchFromGitHub, ncurses }: -let +with python3.pkgs; buildPythonApplication rec { + pname = "almonds"; version = "1.25b"; -in -buildPythonApplication { - name = "almonds-${version}"; src = fetchFromGitHub { owner = "Tenchi2xh"; repo = "Almonds"; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 8db4bd157df6..61eb1fd3ce4e 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchFromGitHub, python3Packages }: +{ stdenv, fetchFromGitHub, python3Packages, readline }: with stdenv.lib; stdenv.mkDerivation rec { name = "bcal-${version}"; - version = "1.8"; + version = "1.9"; src = fetchFromGitHub { owner = "jarun"; repo = "bcal"; rev = "v${version}"; - sha256 = "0jdn46wzwq7yn3x6p1xyqarp52pcr0ghnfhkm7nyxv734g1abw7r"; + sha256 = "0h6qi5rvzl6c6fsfdpdb3l4jcgip03l18i0b1x08z1y89i56y8mm"; }; nativeBuildInputs = [ python3Packages.pytest ]; + buildInputs = [ readline ]; + doCheck = true; checkPhase = '' python3 -m pytest test.py diff --git a/pkgs/applications/science/math/caffe/darwin.patch b/pkgs/applications/science/math/caffe/darwin.patch new file mode 100644 index 000000000000..e8fa6a683f73 --- /dev/null +++ b/pkgs/applications/science/math/caffe/darwin.patch @@ -0,0 +1,47 @@ +diff --git a/Makefile b/Makefile +index c823f66e..65b90c5e 100644 +--- a/Makefile ++++ b/Makefile +@@ -32,9 +32,9 @@ SRC_DIRS := $(shell find * -type d -exec bash -c "find {} -maxdepth 1 \ + LIBRARY_NAME := $(PROJECT) + LIB_BUILD_DIR := $(BUILD_DIR)/lib + STATIC_NAME := $(LIB_BUILD_DIR)/lib$(LIBRARY_NAME).a +-DYNAMIC_VERSION_MAJOR := 1 +-DYNAMIC_VERSION_MINOR := 0 +-DYNAMIC_VERSION_REVISION := 0 ++DYNAMIC_VERSION_MAJOR := 1 ++DYNAMIC_VERSION_MINOR := 0 ++DYNAMIC_VERSION_REVISION := 0 + DYNAMIC_NAME_SHORT := lib$(LIBRARY_NAME).so + #DYNAMIC_SONAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR) + DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION) +diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake +index c48255c8..cf4c580e 100644 +--- a/cmake/Dependencies.cmake ++++ b/cmake/Dependencies.cmake +@@ -105,7 +105,6 @@ if(USE_OPENCV) + endif() + + # ---[ BLAS +-if(NOT APPLE) + set(BLAS "Atlas" CACHE STRING "Selected BLAS library") + set_property(CACHE BLAS PROPERTY STRINGS "Atlas;Open;MKL") + +@@ -123,17 +122,6 @@ if(NOT APPLE) + list(APPEND Caffe_LINKER_LIBS PUBLIC ${MKL_LIBRARIES}) + list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_MKL) + endif() +-elseif(APPLE) +- find_package(vecLib REQUIRED) +- list(APPEND Caffe_INCLUDE_DIRS PUBLIC ${vecLib_INCLUDE_DIR}) +- list(APPEND Caffe_LINKER_LIBS PUBLIC ${vecLib_LINKER_LIBS}) +- +- if(VECLIB_FOUND) +- if(NOT vecLib_INCLUDE_DIR MATCHES "^/System/Library/Frameworks/vecLib.framework.*") +- list(APPEND Caffe_DEFINITIONS PUBLIC -DUSE_ACCELERATE) +- endif() +- endif() +-endif() + + # ---[ Python + if(BUILD_python) diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index d7357c5048d5..e56c63e01bf0 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -1,27 +1,39 @@ -{ stdenv, lib +{ stdenv, lib, runCommand , fetchFromGitHub +, fetchurl , cmake , boost , google-gflags , glog , hdf5-cpp -, leveldb -, lmdb , opencv3 , protobuf -, snappy , doxygen , openblas -, cudaSupport ? true, cudatoolkit +, Accelerate, CoreGraphics, CoreVideo +, lmdbSupport ? true, lmdb +, leveldbSupport ? true, leveldb, snappy +, cudaSupport ? stdenv.isLinux, cudatoolkit , cudnnSupport ? false, cudnn ? null , ncclSupport ? false, nccl ? null , pythonSupport ? false, python ? null, numpy ? null }: +assert leveldbSupport -> (leveldb != null && snappy != null); assert cudnnSupport -> cudaSupport; assert ncclSupport -> cudaSupport; assert pythonSupport -> (python != null && numpy != null); +let + toggle = bool: if bool then "ON" else "OFF"; + + test_model_weights = fetchurl { + url = "http://dl.caffe.berkeleyvision.org/bvlc_reference_caffenet.caffemodel"; + sha256 = "472d4a06035497b180636d8a82667129960371375bd10fcb6df5c6c7631f25e0"; + }; + +in + stdenv.mkDerivation rec { name = "caffe-${version}"; version = "1.0"; @@ -44,19 +56,27 @@ stdenv.mkDerivation rec { "-DCUDA_ARCH_NAME=All" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" ] else [ "-DCPU_ONLY=ON" ]) - ++ lib.optional ncclSupport "-DUSE_NCCL=ON"; + ++ ["-DUSE_NCCL=${toggle ncclSupport}"] + ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] + ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost google-gflags glog protobuf hdf5-cpp lmdb leveldb snappy opencv3 openblas ] + buildInputs = [ boost google-gflags glog protobuf hdf5-cpp opencv3 openblas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn + ++ lib.optional lmdbSupport lmdb ++ lib.optional ncclSupport nccl - ++ lib.optionals pythonSupport [ python numpy ]; + ++ lib.optionals leveldbSupport [ leveldb snappy ] + ++ lib.optionals pythonSupport [ python numpy ] + ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreVideo ] + ; propagatedBuildInputs = lib.optional pythonSupport python.pkgs.protobuf; outputs = [ "bin" "out"]; propagatedBuildOutputs = []; # otherwise propagates out -> bin cycle + patches = [ ./darwin.patch ]; + preConfigure = lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") '' # CUDA 9.0 doesn't support sm_20 sed -i 's,20 21(20) ,,' cmake/Cuda.cmake @@ -71,6 +91,9 @@ stdenv.mkDerivation rec { # Internal static library. rm $out/lib/libproto.a + # Install models + cp -a ../models $out/share/Caffe/models + moveToOutput "bin" "$bin" '' + lib.optionalString pythonSupport '' mkdir -p $out/${python.sitePackages} @@ -78,6 +101,16 @@ stdenv.mkDerivation rec { rm -rf $out/python ''; + doInstallCheck = false; # build takes more than 30 min otherwise + installCheckPhase = '' + model=bvlc_reference_caffenet + m_path="$out/share/Caffe/models/$model" + $bin/bin/caffe test \ + -model "$m_path/deploy.prototxt" \ + -solver "$m_path/solver.prototxt" \ + -weights "${test_model_weights}" + ''; + meta = with stdenv.lib; { description = "Deep learning framework"; longDescription = '' @@ -88,6 +121,6 @@ stdenv.mkDerivation rec { homepage = http://caffe.berkeleyvision.org/; maintainers = with maintainers; [ jb55 ]; license = licenses.bsd2; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index 689261abc661..93aefbca2160 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1w8axdzm05xf5y13c31w7rc5z6ywxqxiwafnxcq3p195kgj0915a"; }; - configureFlags = "-C"; + configureFlags = [ "-C" ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/cplex/default.nix b/pkgs/applications/science/math/cplex/default.nix new file mode 100644 index 000000000000..fe3913648f87 --- /dev/null +++ b/pkgs/applications/science/math/cplex/default.nix @@ -0,0 +1,82 @@ +{ stdenv, makeWrapper, openjdk, gtk2, xorg, glibcLocales, releasePath }: + +# To use this package, you need to download your own cplex installer from IBM +# and override the releasePath attribute to point to the location of the file. +# +# Note: cplex creates an individual build for each license which screws +# somewhat with the use of functions like requireFile as the hash will be +# different for every user. + +stdenv.mkDerivation rec { + name = "cplex-${version}"; + version = "128"; + + src = + if builtins.isNull releasePath then + throw '' + This nix expression requires that the cplex installer is already + downloaded to your machine. Get it from IBM: + https://developer.ibm.com/docloud/blog/2017/12/20/cplex-optimization-studio-12-8-now-available/ + + Set `cplex.releasePath = /path/to/download;` in your + ~/.config/nixpkgs/config.nix for `nix-*` commands, or + `config.cplex.releasePath = /path/to/download;` in your + `configuration.nix` for NixOS. + '' + else + releasePath; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ openjdk gtk2 xorg.libXtst glibcLocales ]; + + unpackPhase = "cp $src $name"; + + patchPhase = '' + sed -i -e 's|/usr/bin/tr"|tr" |' $name + ''; + + buildPhase = '' + sh $name -i silent -DLICENSE_ACCEPTED=TRUE -DUSER_INSTALL_DIR=$out + ''; + + installPhase = '' + mkdir -p $out/bin + ln -s $out/opl/bin/x86-64_linux/oplrun\ + $out/opl/bin/x86-64_linux/oplrunjava\ + $out/opl/oplide/oplide\ + $out/cplex/bin/x86-64_linux/cplex\ + $out/cpoptimizer/bin/x86-64_linux/cpoptimizer\ + $out/bin + ''; + + fixupPhase = + let + libraryPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc gtk2 xorg.libXtst ]; + in '' + interpreter=${stdenv.glibc}/lib/ld-linux-x86-64.so.2 + + for pgm in $out/opl/bin/x86-64_linux/oplrun $out/opl/bin/x86-64_linux/oplrunjava $out/opl/oplide/oplide; + do + patchelf --set-interpreter "$interpreter" $pgm; + wrapProgram $pgm \ + --prefix LD_LIBRARY_PATH : $out/opl/bin/x86-64_linux:${libraryPath} \ + --set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive; + done + + for pgm in $out/cplex/bin/x86-64_linux/cplex $out/cpoptimizer/bin/x86-64_linux/cpoptimizer $out/opl/oplide/jre/bin/*; + do + if grep ELF $pgm > /dev/null; + then + patchelf --set-interpreter "$interpreter" $pgm; + fi + done + ''; + + meta = with stdenv.lib; { + description = "Optimization solver for mathematical programming"; + homepage = "https://www.ibm.com/be-en/marketplace/ibm-ilog-cplex"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ bfortz ]; + }; +} diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 65d551f39a71..d2d1ddb65846 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -9,15 +9,20 @@ stdenv.mkDerivation rec { sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56"; }; - makeFlags = ''PREFIX=$(out) CC=cc CXX=c++ cddnoprefix=1''; - buildInputs = [gmp mpir cddlib]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" + ''; + + buildFlags = [ "CC=cc" "CXX=c++" "cddnoprefix=1" ]; + installFlags = [ ''PREFIX=$(out)'' ]; + buildInputs = [ gmp mpir cddlib ]; meta = { inherit version; description = ''A software package for computing Gröbner fans and tropical varieties''; license = stdenv.lib.licenses.gpl2 ; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html; }; } diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 944460de9c75..18b13e11d350 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "patchShebangs ginsh"; - configureFlags = "--disable-rpath"; + configureFlags = [ "--disable-rpath" ]; meta = with stdenv.lib; { description = "GiNaC is Not a CAS"; diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 4c7df4412e4f..e9fd21b46d8a 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { "strictoverflow" # causes runtime failure (tested in checkPhase) ]; + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace GNUmakefile --replace gcc cc + ''; + preBuild = '' echo Building PALP optimized for ${dim} dimensions sed -i "s/^#define[^a-zA-Z]*POLY_Dmax.*/#define POLY_Dmax ${dim}/" Global.h @@ -77,6 +81,6 @@ stdenv.mkDerivation rec { # the right license. license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 7990088ffbe9..59dbfdb509dc 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "qalculate-gtk-${version}"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "19jw1w29x0r1qq5r8gmqrqr00ml2pfi2w433723vjzxpfg2pp70r"; + sha256 = "1yzw6avhka7bbi071z9d8cipcghyjq2bg9x3arv1cf395xlnrmb9"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 82a6836bd623..2dd4778234df 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -1,20 +1,36 @@ -{stdenv, fetchurl, gmp}: +{ stdenv, fetchurl, fetchpatch, gmp }: stdenv.mkDerivation rec { name = "ratpoints-${version}"; - version = "2.1.3"; + version = "2.1.3.p4"; + src = fetchurl { url = "http://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${version}.tar.gz"; sha256 = "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4"; }; - buildInputs = [gmp]; - makeFlags = "INSTALL_DIR=$(out)"; + + enableParallelBuilding = true; + + patches = [ + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a"; + sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl"; + }) + ]; + + buildInputs = [ gmp ]; + + makeFlags = [ "CC=cc" ]; + buildFlags = stdenv.lib.optional stdenv.isDarwin ["CCFLAGS2=-lgmp -lc -lm" "CCFLAGS=-UUSE_SSE"]; + installFlags = [ "INSTALL_DIR=$(out)" ]; + preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; + meta = { inherit version; description = ''A program to find rational points on hyperelliptic curves''; license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://www.mathe2.uni-bayreuth.de/stoll/programs/; updateWalker = true; }; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index 651ad8a2c0f8..21948a279d07 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -13,10 +13,10 @@ assert useGoogleHashmap -> sparsehash != null; let inherit (stdenv.lib) optional; + version = "1.0"; in stdenv.mkDerivation { name = "ripser-${version}"; - version = "1.0"; src = fetchFromGitHub { owner = "Ripser"; diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 0bbf2cec0dcb..7e62f0cf75ee 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -8,10 +8,6 @@ let # https://trac.sagemath.org/ticket/15980 for tracking of python3 support python = nixpkgs.python2.override { packageOverrides = self: super: { - cypari2 = super.cypari2.override { inherit pari; }; - - cysignals = super.cysignals.override { inherit pari; }; - # python packages that appear unmaintained and were not accepted into the nixpkgs # tree because of that. These packages are only dependencies of the more-or-less # deprecated sagenb. However sagenb is still a default dependency and the doctests @@ -24,7 +20,7 @@ let pybrial = self.callPackage ./pybrial.nix {}; sagelib = self.callPackage ./sagelib.nix { - inherit flint ecl pari eclib ntl arb; + inherit flint ecl arb; inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; linbox = nixpkgs.linbox.override { withSage = true; }; }; @@ -38,20 +34,20 @@ let }; env-locations = self.callPackage ./env-locations.nix { - inherit pari_data ecl pari; + inherit pari_data ecl; inherit singular; three = nodePackages_8_x.three; mathjax = nodePackages_8_x.mathjax; }; sage-env = self.callPackage ./sage-env.nix { - inherit sage-src python rWrapper openblas-cblas-pc ecl singular eclib pari palp flint pynac pythonEnv giac ntl; + inherit sage-src python rWrapper openblas-cblas-pc ecl singular palp flint pynac pythonEnv; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig }; sage-with-env = self.callPackage ./sage-with-env.nix { - inherit pari eclib pythonEnv ntl; - inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular giac; + inherit pythonEnv; + inherit sage-src openblas-blas-pc openblas-cblas-pc openblas-lapack-pc pynac singular; pkg-config = nixpkgs.pkgconfig; # not to confuse with pythonPackages.pkgconfig three = nodePackages_8_x.three; }; @@ -106,41 +102,18 @@ let }); }; - # https://trac.sagemath.org/ticket/25532 - ntl = nixpkgs.ntl.overrideAttrs (oldAttrs: rec { - name = "ntl-10.5.0"; - sourceRoot = "${name}/src"; - src = fetchurl { - url = "http://www.shoup.net/ntl/${name}.tar.gz"; - sha256 = "1lmldaldgfr2b2a6585m3np5ds8bq1bis2s1ajycjm49vp4kc2xr"; - }; - }); - - giac = nixpkgs.giac.override { inherit ntl; }; arb = nixpkgs.arb.override { inherit flint; }; - # update causes issues - # https://groups.google.com/forum/#!topic/sage-packaging/cS3v05Q0zso - # https://trac.sagemath.org/ticket/24735 - singular = (nixpkgs.singular.override { inherit ntl flint; }).overrideAttrs (oldAttrs: { - name = "singular-4.1.0p3"; - src = fetchurl { - url = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/4-1-0/singular-4.1.0p3.tar.gz"; - sha256 = "105zs3zk46b1cps403ap9423rl48824ap5gyrdgmg8fma34680a4"; - }; - }); + singular = nixpkgs.singular.override { inherit flint; }; # *not* to confuse with the python package "pynac" - # https://trac.sagemath.org/ticket/24838 (depends on arb update) pynac = nixpkgs.pynac.override { inherit singular flint; }; - eclib = nixpkgs.eclib.override { inherit pari ntl; }; - # With openblas (64 bit), the tests fail the same way as when sage is build with # openblas instead of openblasCompat. Apparently other packages somehow use flints # blas when it is available. Alternative would be to override flint to use # openblasCompat. - flint = nixpkgs.flint.override { withBlas = false; inherit ntl; }; + flint = nixpkgs.flint.override { withBlas = false; }; # Multiple palp dimensions need to be available and sage expects them all to be # in the same folder. @@ -165,15 +138,6 @@ let # https://trac.sagemath.org/ticket/22191 ecl = nixpkgs.ecl_16_1_2; - - # sage currently uses an unreleased version of pari - pari = (nixpkgs.pari.override { withThread = false; }).overrideAttrs (attrs: rec { - version = "2.10-1280-g88fb5b3"; # on update remove pari-stackwarn patch from `sage-src.nix` - src = fetchurl { - url = "mirror://sageupstream/pari/pari-${version}.tar.gz"; - sha256 = "19gbsm8jqq3hraanbmsvzkbh88iwlqbckzbnga3y76r7k42akn7m"; - }; - }); in python.pkgs.sage-wrapper // { doc = python.pkgs.sagedoc; diff --git a/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch b/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch deleted file mode 100644 index a20f1670a256..000000000000 --- a/pkgs/applications/science/math/sage/patches/arb-2.13.0.patch +++ /dev/null @@ -1,427 +0,0 @@ -commit c885927e25b29bd23869e02379c2918da430323e -Author: Timo Kaufmann <timokau@zoho.com> -Date: Sat Jun 30 02:26:15 2018 +0200 - -diff --git a/build/pkgs/arb/checksums.ini b/build/pkgs/arb/checksums.ini -index 1924ee03c3..9323b97391 100644 ---- a/build/pkgs/arb/checksums.ini -+++ b/build/pkgs/arb/checksums.ini -@@ -1,4 +1,4 @@ - tarball=arb-VERSION.tar.gz --sha1=27476d0529e48a07d92da90bd0fb80dd18f443e3 --md5=733285d9705d10b8024e551ffa81952f --cksum=2391183744 -+sha1=44eda7bf8eaa666c45b1fc2c1b5bd08756d94b58 -+md5=fa24de9fffe4394fb6a7a6792e2ecc5f -+cksum=3689220688 -diff --git a/build/pkgs/arb/package-version.txt b/build/pkgs/arb/package-version.txt -index c8810e9bdb..fb2c0766b7 100644 ---- a/build/pkgs/arb/package-version.txt -+++ b/build/pkgs/arb/package-version.txt -@@ -1 +1 @@ --2.12.0.p0 -+2.13.0 -diff --git a/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch b/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch -deleted file mode 100644 -index 3e5c0e708b..0000000000 ---- a/build/pkgs/arb/patches/arb-pie-hardening-conflict.patch -+++ /dev/null -@@ -1,17 +0,0 @@ --In newer binutils, ld options -r and -pie conflict. --Patch due to Jörg-Volker Peetz --(source : https://groups.google.com/d/msg/sage-devel/TduebNoZuBE/sEULolL0BQAJ), --packaged by Emmanuel Charpentier -- --diff -ru arb-2.8.1-orig/Makefile.subdirs arb-2.8.1-new/Makefile.subdirs ----- arb-2.8.1-orig/Makefile.subdirs 2015-12-31 17:30:01.000000000 +0100 --+++ arb-2.8.1-new/Makefile.subdirs 2016-11-07 18:50:34.540051779 +0100 --@@ -52,7 +52,7 @@ -- $(QUIET_CC) $(CC) $(CFLAGS) $(INCS) -c $< -o $@ -MMD -MP -MF "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$(BUILD_DIR)/$(MOD_DIR)_$*.d" -MT "$@" -- -- $(MOD_LOBJ): $(LOBJS) --- $(QUIET_CC) $(CC) $(ABI_FLAG) -Wl,-r $^ -o $@ -nostdlib --+ $(QUIET_CC) $(CC) $(ABI_FLAG) -r $^ -o $@ -nostdlib -- -- -include $(LOBJS:.lo=.d) -- -diff --git a/src/sage/rings/complex_arb.pyx b/src/sage/rings/complex_arb.pyx -index 70d51e655a..00e7caea2c 100644 ---- a/src/sage/rings/complex_arb.pyx -+++ b/src/sage/rings/complex_arb.pyx -@@ -857,14 +857,14 @@ class ComplexBallField(UniqueRepresentation, Field): - [0.500000000000000 +/- 2.09e-16] - - sage: CBF.integral(lambda x, _: x.gamma(), 1 - CBF(i), 1 + CBF(i)) -- [+/- 3.95e-15] + [1.5723926694981 +/- 4.53e-14]*I -+ [+/- 4...e-15] + [1.5723926694981 +/- 4...e-14]*I - - sage: C = ComplexBallField(100) - sage: C.integral(lambda x, _: x.cos() * x.sin(), 0, 1) - [0.35403670913678559674939205737 +/- 8.89e-30] - - sage: CBF.integral(lambda x, _: (x + x.exp()).sin(), 0, 8) -- [0.34740017266 +/- 6.36e-12] -+ [0.34740017266 +/- 6...e-12] - - sage: C = ComplexBallField(2000) - sage: C.integral(lambda x, _: (x + x.exp()).sin(), 0, 8) # long time -@@ -879,14 +879,14 @@ class ComplexBallField(UniqueRepresentation, Field): - ....: else: - ....: return z.sqrt() - sage: CBF.integral(my_sqrt, -1 + CBF(i), -1 - CBF(i)) -- [+/- 1.14e-14] + [-0.4752076627926 +/- 5.18e-14]*I -+ [+/- 1.14e-14] + [-0.4752076627926 +/- 5...e-14]*I - - Note, though, that proper handling of the ``analytic`` flag is required - even when the path does not touch the branch cut:: - - sage: correct = CBF.integral(my_sqrt, 1, 2); correct - [1.21895141649746 +/- 3.73e-15] -- sage: RBF(integral(sqrt(x), x, 1, 2)) -+ sage: RBF(integral(sqrt(x), x, 1, 2)) # long time - [1.21895141649746 +/- 1.79e-15] - sage: wrong = CBF.integral(lambda z, _: z.sqrt(), 1, 2) # WRONG! - sage: correct - wrong -@@ -915,9 +915,9 @@ class ComplexBallField(UniqueRepresentation, Field): - the integrand is unbounded:: - - sage: CBF.integral(lambda x, _: 1/x, -1, 1) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - sage: CBF.integral(lambda x, _: 1/x, 10^-1000, 1) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - sage: CBF.integral(lambda x, _: 1/x, 10^-1000, 1, abs_tol=1e-10) - [2302.5850930 +/- 1.26e-8] - -@@ -928,14 +928,15 @@ class ComplexBallField(UniqueRepresentation, Field): - sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, abs_tol=1e-450) - [2.304377150950e-439 +/- 9.74e-452] - sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, abs_tol=0) -- [2.304377150949e-439 +/- 7.53e-452] -- sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, rel_tol=1e-4, abs_tol=0) -- [2.30438e-439 +/- 3.90e-445] -+ [2.304377150950e-439 +/- 7...e-452] -+ sage: CBF.integral(lambda x, _: x.exp(), -1020, -1010, rel_tol=1e-2, abs_tol=0) -+ [2.30438e-439 +/- 5.94e-445] - -- sage: CBF.integral(lambda x, _: x*(1/x).sin(), 0, 1) -- [+/- 0.644] -- sage: CBF.integral(lambda x, _: x*(1/x).sin(), 0, 1, use_heap=True) -- [0.3785300 +/- 4.32e-8] -+ sage: epsi = CBF(1e-10) -+ sage: CBF.integral(lambda x, _: x*(1/x).sin(), epsi, 1) -+ [0.38 +/- 8.54e-3] -+ sage: CBF.integral(lambda x, _: x*(1/x).sin(), epsi, 1, use_heap=True) -+ [0.37853002 +/- 8.73e-9] - - ALGORITHM: - -@@ -951,12 +952,12 @@ class ComplexBallField(UniqueRepresentation, Field): - - sage: i = QuadraticField(-1).gen() - sage: CBF.integral(lambda x, _: (1 + i*x).gamma(), -1, 1) -- [1.5723926694981 +/- 4.53e-14] + [+/- 3.95e-15]*I -+ [1.5723926694981 +/- 4...e-14] + [+/- 4...e-15]*I - -- sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, rel_tol=1e-400) -- [0.459... +/- ...e-4...] -+ sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, rel_tol=1e-300) -+ [0.459... +/- ...e-3...] - sage: CBF.integral(lambda x, _: x.sin(), 0, 100, rel_tol=10) -- [+/- 7.61] -+ [0.138 +/- 5.53e-4] - - sage: ComplexBallField(10000).integral(lambda x, _: x.sin(), 0, 1, abs_tol=1e-400) - [0.459697... +/- ...e-4...] -@@ -2389,9 +2390,9 @@ cdef class ComplexBall(RingElement): - sage: ~CBF(i/3) - [-3.00000000000000 +/- 9.44e-16]*I - sage: ~CBF(0) -- [+/- inf] -+ nan - sage: ~CBF(RIF(10,11)) -- [0.1 +/- 9.53e-3] -+ [0.1 +/- 9.10e-3] - """ - cdef ComplexBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -2512,9 +2513,9 @@ cdef class ComplexBall(RingElement): - sage: CBF(-2, 1)/CBF(1, 1/3) - [-1.500000000000000 +/- 8.83e-16] + [1.500000000000000 +/- 5.64e-16]*I - sage: CBF(2+I)/CBF(0) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - sage: CBF(1)/CBF(0) -- [+/- inf] -+ nan - sage: CBF(1)/CBF(RBF(0, 1.)) - nan - """ -@@ -2543,9 +2544,9 @@ cdef class ComplexBall(RingElement): - sage: CBF(0)^(1/3) - 0 - sage: CBF(0)^(-1) -- [+/- inf] -+ nan - sage: CBF(0)^(-2) -- [+/- inf] + [+/- inf]*I -+ nan + nan*I - - TESTS:: - -@@ -2656,12 +2657,12 @@ cdef class ComplexBall(RingElement): - sage: CBF(1).rising_factorial(5) - 120.0000000000000 - sage: CBF(1/3, 1/2).rising_factorial(300) -- [-3.87949484514e+612 +/- 5.23e+600] + [-3.52042209763e+612 +/- 5.55e+600]*I -+ [-3.87949484514e+612 +/- 5...e+600] + [-3.52042209763e+612 +/- 5...e+600]*I - - sage: CBF(1).rising_factorial(-1) - nan - sage: CBF(1).rising_factorial(2**64) -- [+/- 2.30e+347382171305201370464] -+ [+/- 2.30e+347382171326740403407] - sage: ComplexBallField(128)(1).rising_factorial(2**64) - [2.343691126796861348e+347382171305201285713 +/- 4.71e+347382171305201285694] - sage: CBF(1/2).rising_factorial(CBF(2,3)) -@@ -2700,7 +2701,7 @@ cdef class ComplexBall(RingElement): - [1.000000000000000 +/- 2.83e-16] + [-0.441271200305303 +/- 2.82e-16]*I - - sage: CBF('inf').log() -- nan + nan*I -+ [+/- inf] - sage: CBF(2).log(0) - nan + nan*I - """ -@@ -2808,7 +2809,7 @@ cdef class ComplexBall(RingElement): - sage: CBF(pi/2, 1/10).tan() - [+/- 2.87e-14] + [10.0333111322540 +/- 2.36e-14]*I - sage: CBF(pi/2).tan() -- [+/- inf] -+ nan - """ - cdef ComplexBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -2825,7 +2826,7 @@ cdef class ComplexBall(RingElement): - sage: CBF(pi, 1/10).cot() - [+/- 5.74e-14] + [-10.0333111322540 +/- 2.81e-14]*I - sage: CBF(pi).cot() -- [+/- inf] -+ nan - """ - cdef ComplexBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -3211,9 +3212,9 @@ cdef class ComplexBall(RingElement): - 1.000000000000000*I - - sage: CBF(2+3*I).hypergeometric([1/4,1/3],[1/2]) -- [0.7871684267473 +/- 7.34e-14] + [0.2749254173721 +/- 9.23e-14]*I -+ [0.7871684267473 +/- 7...e-14] + [0.2749254173721 +/- 9...e-14]*I - sage: CBF(2+3*I).hypergeometric([1/4,1/3],[1/2],regularized=True) -- [0.4441122268685 +/- 3.96e-14] + [0.1551100567338 +/- 5.75e-14]*I -+ [0.4441122268685 +/- 3...e-14] + [0.1551100567338 +/- 5...e-14]*I - - sage: CBF(5).hypergeometric([2,3], [-5]) - nan + nan*I -@@ -4041,9 +4042,9 @@ cdef class ComplexBall(RingElement): - - sage: phi = CBF(1,1) - sage: (CBF.pi()/2).elliptic_e_inc(phi) -- [1.283840957898 +/- 3.23e-13] + [-0.5317843366915 +/- 7.79e-14]*I -+ [1.283840957898 +/- 3...e-13] + [-0.5317843366915 +/- 7...e-14]*I - sage: phi.elliptic_e() -- [1.2838409578982 +/- 5.90e-14] + [-0.5317843366915 +/- 3.35e-14]*I -+ [1.2838409578982 +/- 5...e-14] + [-0.5317843366915 +/- 3...e-14]*I - - sage: phi = CBF(2, 3/7) - sage: (CBF.pi()/2).elliptic_e_inc(phi) -@@ -4312,8 +4313,7 @@ cdef class ComplexBall(RingElement): - sage: CBF(10).laguerre_L(3, 2) - [-6.666666666667 +/- 4.15e-13] - sage: CBF(5,7).laguerre_L(CBF(2,3), CBF(1,-2)) -- [5515.315030271 +/- 4.37e-10] + [-12386.942845271 +/- 5.47e-10]*I -- -+ [5515.315030271 +/- 4...e-10] + [-12386.942845271 +/- 5...e-10]*I - """ - cdef ComplexBall my_n = self._parent.coerce(n) - cdef ComplexBall my_m = self._parent.coerce(m) -@@ -4357,9 +4357,9 @@ cdef class ComplexBall(RingElement): - EXAMPLES:: - - sage: CBF(1/2).legendre_P(5) -- [0.08984375000000000 +/- 4.5...e-18] -+ [0.0898437500000000 +/- 7...e-17] - sage: CBF(1,2).legendre_P(CBF(2,3), CBF(0,1)) -- [0.10996180744364 +/- 7.45e-15] + [0.14312767804055 +/- 8.38e-15]*I -+ [0.10996180744364 +/- 7.12e-15] + [0.14312767804055 +/- 8.07e-15]*I - sage: CBF(-10).legendre_P(5, 325/100) - [-22104403.487377 +/- 6.81e-7] + [53364750.687392 +/- 7.25e-7]*I - sage: CBF(-10).legendre_P(5, 325/100, type=3) -@@ -4393,9 +4393,9 @@ cdef class ComplexBall(RingElement): - sage: CBF(1/2).legendre_Q(5) - [0.55508089057168 +/- 2.79e-15] - sage: CBF(1,2).legendre_Q(CBF(2,3), CBF(0,1)) -- [0.167678710 +/- 4.60e-10] + [-0.161558598 +/- 7.47e-10]*I -+ [0.167678710 +/- 3.91e-10] + [-0.161558598 +/- 6.77e-10]*I - sage: CBF(-10).legendre_Q(5, 325/100) -- [-83825154.36008 +/- 4.94e-6] + [-34721515.80396 +/- 5.40e-6]*I -+ [-83825154.36008 +/- 5.02e-6] + [-34721515.80396 +/- 5.42e-6]*I - sage: CBF(-10).legendre_Q(5, 325/100, type=3) - [-4.797306921692e-6 +/- 6.82e-19] + [-4.797306921692e-6 +/- 6.57e-19]*I - -diff --git a/src/sage/rings/polynomial/polynomial_complex_arb.pyx b/src/sage/rings/polynomial/polynomial_complex_arb.pyx -index c436d4705b..ef611a566b 100644 ---- a/src/sage/rings/polynomial/polynomial_complex_arb.pyx -+++ b/src/sage/rings/polynomial/polynomial_complex_arb.pyx -@@ -543,7 +543,7 @@ cdef class Polynomial_complex_arb(Polynomial): - sage: (1 - x/3).inverse_series_trunc(3) - ([0.1111111111111111 +/- 5.99e-17])*x^2 + ([0.3333333333333333 +/- 7.04e-17])*x + 1.000000000000000 - sage: x.inverse_series_trunc(1) -- [+/- inf] -+ nan - sage: Pol(0).inverse_series_trunc(2) - (nan + nan*I)*x + nan + nan*I - -@@ -671,7 +671,7 @@ cdef class Polynomial_complex_arb(Polynomial): - sage: pol._sqrt_series(2) - ([+/- 7.51e-3] + [+/- 0.501]*I)*x + [+/- 5.01e-3] + [+/- 1.01]*I - sage: x._sqrt_series(2) -- ([+/- inf] + [+/- inf]*I)*x -+ (nan + nan*I)*x - """ - cdef Polynomial_complex_arb res = self._new() - if n < 0: -diff --git a/src/sage/rings/real_arb.pyx b/src/sage/rings/real_arb.pyx -index c9f68e38d7..76e3037a9a 100644 ---- a/src/sage/rings/real_arb.pyx -+++ b/src/sage/rings/real_arb.pyx -@@ -161,7 +161,7 @@ values and should be preferred:: - - sage: RBF(NaN) < RBF(infinity) - False -- sage: 1/RBF(0) <= RBF(infinity) -+ sage: RBF(0).add_error(infinity) <= RBF(infinity) - True - - TESTS:: -@@ -252,6 +252,8 @@ cdef void mpfi_to_arb(arb_t target, const mpfi_t source, const long precision): - (+infinity, +infinity) - sage: RBF(RIF(-infinity)).endpoints() - (-infinity, -infinity) -+ sage: RBF(RIF(-infinity, infinity)).endpoints() -+ (-infinity, +infinity) - sage: RIF(RBF(infinity)).endpoints() - (+infinity, +infinity) - sage: RIF(RBF(-infinity)).endpoints() -@@ -266,10 +268,11 @@ cdef void mpfi_to_arb(arb_t target, const mpfi_t source, const long precision): - if _do_sig(precision): sig_on() - mpfi_get_left(left, source) - mpfi_get_right(right, source) -- arb_set_interval_mpfr(target, left, right, precision) -- # Work around weakness of arb_set_interval_mpfr(tgt, inf, inf) -- if mpfr_equal_p(left, right): -- mag_zero(arb_radref(target)) -+ if mpfr_inf_p(left) and mpfr_inf_p(right) and mpfr_sgn(left) < 0 < mpfr_sgn(right): -+ # Work around a weakness of arb_set_interval_mpfr(tgt, -inf, inf) -+ arb_zero_pm_inf(target) -+ else: -+ arb_set_interval_mpfr(target, left, right, precision) - if _do_sig(precision): sig_off() - - mpfr_clear(left) -@@ -649,17 +652,15 @@ class RealBallField(UniqueRepresentation, Field): - EXAMPLES:: - - sage: RBF.some_elements() -- [1.000000000000000, -- [0.3333333333333333 +/- 7.04e-17], -+ [0, 1.000000000000000, [0.3333333333333333 +/- 7.04e-17], - [-4.733045976388941e+363922934236666733021124 +/- 3.46e+363922934236666733021108], -- [+/- inf], -- [+/- inf], -- nan] -+ [+/- inf], [+/- inf], [+/- inf], nan] - """ - import sage.symbolic.constants -- return [self(1), self(1)/3, -+ inf = self(sage.rings.infinity.Infinity) -+ return [self(0), self(1), self(1)/3, - -self(2)**(Integer(2)**80), -- self(sage.rings.infinity.Infinity), ~self(0), -+ inf, -inf, self.zero().add_error(inf), - self.element_class(self, sage.symbolic.constants.NotANumber())] - - def _sum_of_products(self, terms): -@@ -881,7 +882,7 @@ class RealBallField(UniqueRepresentation, Field): - sage: RBF.gamma(5) - 24.00000000000000 - sage: RBF.gamma(10**20) -- [+/- 5.92e+1956570551809674821757] -+ [+/- 5.50e+1956570552410610660600] - sage: RBF.gamma(1/3) - [2.678938534707747 +/- 8.99e-16] - sage: RBF.gamma(-5) -@@ -2247,7 +2248,7 @@ cdef class RealBall(RingElement): - sage: inf = RBF(+infinity) - sage: other_inf = RBF(+infinity, 42.r) - sage: neg_inf = RBF(-infinity) -- sage: extended_line = 1/RBF(0) -+ sage: extended_line = RBF(0).add_error(infinity) - sage: exact_nan = inf - inf - sage: exact_nan.mid(), exact_nan.rad() - (NaN, 0.00000000) -@@ -2659,7 +2660,7 @@ cdef class RealBall(RingElement): - sage: ~RBF(5) - [0.2000000000000000 +/- 4.45e-17] - sage: ~RBF(0) -- [+/- inf] -+ nan - sage: RBF(RIF(-0.1,0.1)) - [+/- 0.101] - -@@ -2739,7 +2740,7 @@ cdef class RealBall(RingElement): - sage: RBF(pi)/RBF(e) - [1.155727349790922 +/- 8.43e-16] - sage: RBF(2)/RBF(0) -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -2765,7 +2766,7 @@ cdef class RealBall(RingElement): - sage: RBF(-1)^(1/3) - nan - sage: RBF(0)^(-1) -- [+/- inf] -+ nan - sage: RBF(-e)**RBF(pi) - nan - -@@ -3129,7 +3130,7 @@ cdef class RealBall(RingElement): - sage: RBF(1).tan() - [1.557407724654902 +/- 3.26e-16] - sage: RBF(pi/2).tan() -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -3146,7 +3147,7 @@ cdef class RealBall(RingElement): - sage: RBF(1).cot() - [0.642092615934331 +/- 4.79e-16] - sage: RBF(pi).cot() -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() -@@ -3257,7 +3258,7 @@ cdef class RealBall(RingElement): - sage: RBF(1).coth() - [1.313035285499331 +/- 4.97e-16] - sage: RBF(0).coth() -- [+/- inf] -+ nan - """ - cdef RealBall res = self._new() - if _do_sig(prec(self)): sig_on() diff --git a/pkgs/applications/science/math/sage/patches/known-padics-bug.patch b/pkgs/applications/science/math/sage/patches/known-padics-bug.patch new file mode 100644 index 000000000000..bdccd73e0ce1 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/known-padics-bug.patch @@ -0,0 +1,15 @@ +diff --git a/build/pkgs/openblas/package-version.txt b/build/pkgs/openblas/package-version.txt +index 3bc45c25d4..7c7c224887 100644 +--- a/src/sage/schemes/elliptic_curves/padics.py ++++ b/src/sage/schemes/elliptic_curves/padics.py +@@ -292,8 +292,8 @@ def padic_regulator(self, p, prec=20, height=None, check_hypotheses=True): + + sage: max_prec = 30 # make sure we get past p^2 # long time + sage: full = E.padic_regulator(5, max_prec) # long time +- sage: for prec in range(1, max_prec): # long time +- ....: assert E.padic_regulator(5, prec) == full # long time ++ sage: for prec in range(1, max_prec): # known bug (#25969) # long time ++ ....: assert E.padic_regulator(5, prec) == full # known bug (#25969) # long time + + A case where the generator belongs to the formal group already + (:trac:`3632`):: diff --git a/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch b/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch deleted file mode 100644 index fad434e52ada..000000000000 --- a/pkgs/applications/science/math/sage/patches/maxima-5.41.0-doctests.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/sage/interfaces/maxima_abstract.py b/src/sage/interfaces/maxima_abstract.py -index 961c20aaac..3d601d8939 100644 ---- a/src/sage/interfaces/maxima_abstract.py -+++ b/src/sage/interfaces/maxima_abstract.py -@@ -1743,7 +1743,7 @@ class MaximaAbstractElement(ExtraTabCompletion, InterfaceElement): - sage: y,d = var('y,d') - sage: f = function('f') - sage: latex(maxima(derivative(f(x*y), x))) -- \left(\left.{{{\it \partial}}\over{{\it \partial}\, {\it t_0}}}\,f\left({\it t_0}\right) \right|_{{\it t_0}={\it x}\, {\it y}}\right)\,{\it y} -+ \left(\left.{{{\it \partial}}\over{{\it \partial}\, {\it t}_{0}}}\,f\left({\it t}_{0}\right) \right|_{{\it t}_{0}={\it x}\, {\it y}}\right)\,{\it y} - sage: latex(maxima(derivative(f(x,y,d), d,x,x,y))) - {{{\it \partial}^4}\over{{\it \partial}\,{\it d}\, {\it \partial}\,{\it x}^2\,{\it \partial}\, {\it y}}}\,f\left({\it x} , {\it y} , {\it d}\right) - sage: latex(maxima(d/(d-2))) -diff --git a/src/sage/manifolds/differentiable/metric.py b/src/sage/manifolds/differentiable/metric.py -index 3cd6ad3235..1e18af1a6b 100644 ---- a/src/sage/manifolds/differentiable/metric.py -+++ b/src/sage/manifolds/differentiable/metric.py -@@ -993,7 +993,7 @@ class PseudoRiemannianMetric(TensorField): - 2-dimensional differentiable manifold S^2 - sage: g.riemann()[:] - [[[[0, 0], [0, 0]], [[0, sin(th)^2], [-sin(th)^2, 0]]], -- [[[0, (cos(th)^2 - 1)/sin(th)^2], [1, 0]], [[0, 0], [0, 0]]]] -+ [[[0, -1], [1, 0]], [[0, 0], [0, 0]]]] - - In dimension 2, the Riemann tensor can be expressed entirely in terms of - the Ricci scalar `r`: -diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx -index dfb8751467..27402e54ab 100644 ---- a/src/sage/symbolic/expression.pyx -+++ b/src/sage/symbolic/expression.pyx -@@ -7154,7 +7154,7 @@ cdef class Expression(CommutativeRingElement): - sage: ex = lcm(sin(x)^2 - 1, sin(x)^2 + sin(x)); ex - (sin(x)^2 + sin(x))*(sin(x)^2 - 1)/(sin(x) + 1) - sage: ex.simplify_full() -- -cos(x)^2*sin(x) -+ sin(x)^3 - sin(x) - - TESTS: - -@@ -10004,7 +10004,7 @@ cdef class Expression(CommutativeRingElement): - - sage: f=tan(3*x) - sage: f.simplify_trig() -- (4*cos(x)^2 - 1)*sin(x)/(4*cos(x)^3 - 3*cos(x)) -+ -(4*cos(x)^2 - 1)*sin(x)/(4*cos(x)*sin(x)^2 - cos(x)) - sage: f.simplify_trig(False) - sin(3*x)/cos(3*x) - diff --git a/pkgs/applications/science/math/sage/patches/pari-no-threads.patch b/pkgs/applications/science/math/sage/patches/pari-no-threads.patch new file mode 100644 index 000000000000..13b47dbdd31b --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/pari-no-threads.patch @@ -0,0 +1,18 @@ +diff --git a/src/sage/libs/pari/__init__.py b/src/sage/libs/pari/__init__.py +index e451766474..77eda66097 100644 +--- a/src/sage/libs/pari/__init__.py ++++ b/src/sage/libs/pari/__init__.py +@@ -205,6 +205,13 @@ def _get_pari_instance(): + # messages in Sage. + P.default("debugmem", 0) + ++ # Make sure pari doesn't use threads, regardless of how it was compiled. ++ # Threads cause some doctest failures (memory issues). Those could probably ++ # be solved without disabling threads. But that would require figuring out ++ # some sensible values for `threadsizemax`. See ++ # https://pari.math.u-bordeaux.fr/dochtml/html/GP_defaults.html ++ P.default("nbthreads", 1) ++ + return P + + pari = _get_pari_instance() diff --git a/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch b/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch deleted file mode 100644 index 22f274d608d4..000000000000 --- a/pkgs/applications/science/math/sage/patches/pynac-0.7.22.patch +++ /dev/null @@ -1,479 +0,0 @@ -diff --git a/src/sage/calculus/calculus.py b/src/sage/calculus/calculus.py -index 3a417d9d5c..fadaadbaf6 100644 ---- a/src/sage/calculus/calculus.py -+++ b/src/sage/calculus/calculus.py -@@ -231,7 +231,7 @@ Another example:: - sage: f(x=3) - arcsinh(1) - sage: f.derivative(x) -- 1/3/sqrt(1/9*x^2 + 1) -+ 1/sqrt(x^2 + 9) - - We compute the length of the parabola from 0 to 2:: - -@@ -1509,8 +1509,8 @@ def laplace(ex, t, s, algorithm='maxima'): - Testing SymPy:: - - sage: laplace(t^n, t, s, algorithm='sympy') -- (s^(-n)*gamma(n + 1)/s, 0, -re(n) < 1) -- -+ (gamma(n + 1)/(s*s^n), 0, -re(n) < 1) -+ - Testing Maxima:: - - sage: laplace(t^n, t, s, algorithm='maxima') -diff --git a/src/sage/functions/hypergeometric.py b/src/sage/functions/hypergeometric.py -index 1fc2db5c94..f3e49b9cdb 100644 ---- a/src/sage/functions/hypergeometric.py -+++ b/src/sage/functions/hypergeometric.py -@@ -34,7 +34,7 @@ Simplification (note that ``simplify_full`` does not yet call - sage: a.simplify_hypergeometric() - 1/((-e^x + 1)^e^x) - sage: a.simplify_hypergeometric(algorithm='sage') -- (-e^x + 1)^(-e^x) -+ 1/((-e^x + 1)^e^x) - - Equality testing:: - -@@ -145,7 +145,7 @@ Series expansions of confluent hypergeometric functions:: - - sage: hypergeometric_M(2, 2, x).series(x, 3) - 1 + 1*x + 1/2*x^2 + Order(x^3) -- sage: hypergeometric_U(2, 2, x).series(x == 3, 100).subs(x=1).n() -+ sage: hypergeometric_U(2, 2, x).series(x == 3, 100).subs(x=1).n() # known bug (see :trac:`25688`) - 0.403652637676806 - sage: hypergeometric_U(2, 2, 1).n() - 0.403652637676806 -@@ -773,7 +773,7 @@ def closed_form(hyp): - sage: closed_form(hypergeometric([], [], z)) - e^z - sage: closed_form(hypergeometric([a], [], z)) -- (-z + 1)^(-a) -+ 1/((-z + 1)^a) - sage: closed_form(hypergeometric([1, 1, 2], [1, 1], z)) - (z - 1)^(-2) - sage: closed_form(hypergeometric([2, 3], [1], x)) -@@ -1121,7 +1121,7 @@ class Hypergeometric_U(BuiltinFunction): - sage: var('a b z') - (a, b, z) - sage: hypergeometric_U(a, b, z).generalized() -- z^(-a)*hypergeometric((a, a - b + 1), (), -1/z) -+ hypergeometric((a, a - b + 1), (), -1/z)/z^a - sage: hypergeometric_U(1, 3, 1/2).generalized() - 2*hypergeometric((1, -1), (), -2) - sage: hypergeometric_U(3, I, 2).generalized() -diff --git a/src/sage/functions/log.py b/src/sage/functions/log.py -index 75d1bf8060..61968582af 100644 ---- a/src/sage/functions/log.py -+++ b/src/sage/functions/log.py -@@ -518,17 +518,17 @@ class Function_polylog(GinacFunction): - - sage: BF = RealBallField(100) - sage: polylog(2, BF(1/3)) -- [0.36621322997706348761674629766 +/- 4.51e-30] -+ [0.36621322997706348761674629766... +/- ...] - sage: polylog(2, BF(4/3)) -- nan -+ [2.27001825336107090380391448586 +/- 5.64e-30] + [-0.90377988538400159956755721265 +/- 8.39e-30]*I - sage: parent(_) -- Real ball field with 100 bits of precision -+ Complex ball field with 100 bits of precision - sage: polylog(2, CBF(1/3)) -- [0.366213229977063 +/- 5.85e-16] -+ [0.366213229977063 +/- ...] - sage: parent(_) - Complex ball field with 53 bits of precision - sage: polylog(2, CBF(1)) -- [1.644934066848226 +/- 6.59e-16] -+ [1.644934066848226 +/- ...] - sage: parent(_) - Complex ball field with 53 bits of precision - """ -diff --git a/src/sage/functions/trig.py b/src/sage/functions/trig.py -index e7e7a311cd..1f2926d6c9 100644 ---- a/src/sage/functions/trig.py -+++ b/src/sage/functions/trig.py -@@ -529,13 +529,8 @@ class Function_arcsin(GinacFunction): - arcsin - sage: asin(complex(1,1)) - (0.6662394324925152+1.0612750619050357j) -- -- Check that :trac:`22823` is fixed:: -- -- sage: bool(asin(SR(2.1)) == NaN) -- True -- sage: asin(SR(2.1)).is_real() -- False -+ sage: asin(SR(2.1)) -+ 1.57079632679490 - 1.37285914424258*I - """ - GinacFunction.__init__(self, 'arcsin', latex_name=r"\arcsin", - conversions=dict(maxima='asin', sympy='asin', fricas="asin", giac="asin")) -@@ -595,13 +590,8 @@ class Function_arccos(GinacFunction): - arccos - sage: acos(complex(1,1)) - (0.9045568943023814-1.0612750619050357j) -- -- Check that :trac:`22823` is fixed:: -- -- sage: bool(acos(SR(2.1)) == NaN) -- True -- sage: acos(SR(2.1)).is_real() -- False -+ sage: acos(SR(2.1)) -+ 1.37285914424258*I - """ - GinacFunction.__init__(self, 'arccos', latex_name=r"\arccos", - conversions=dict(maxima='acos', sympy='acos', fricas='acos', giac='acos')) -@@ -807,7 +797,7 @@ class Function_arcsec(GinacFunction): - sage: arcsec(2).n(100) - 1.0471975511965977461542144611 - sage: arcsec(1/2).n(100) -- NaN -+ 1.3169578969248167086250463473*I - sage: RDF(arcsec(2)) # abs tol 1e-15 - 1.0471975511965976 - sage: arcsec(1 + I) -@@ -958,7 +948,9 @@ class Function_arctan2(GinacFunction): - sage: atan2(0,0,hold=True) - arctan2(0, 0) - sage: atan2(0,0,hold=True).n() -- NaN -+ Traceback (most recent call last): -+ ... -+ RuntimeError: atan2(): division by zero - - Check if :trac:`10062` is fixed, this was caused by - ``(I*I).is_positive()`` returning ``True``:: -diff --git a/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py b/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py -index 3b5c8d1729..1c6b73a16c 100644 ---- a/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py -+++ b/src/sage/geometry/hyperbolic_space/hyperbolic_geodesic.py -@@ -1422,8 +1422,10 @@ class HyperbolicGeodesicUHP(HyperbolicGeodesic): - expressions do not generate runtime errors. :: - - sage: g=HyperbolicPlane().UHP().get_geodesic(-1+I,1+I) -- sage: g.midpoint() -- Point in UHP 1/2*(sqrt(2)*e^(1/2*arccosh(3)) - sqrt(2) + (I - 1)*e^(1/2*arccosh(3)) + I - 1)/((1/4*I - 1/4)*sqrt(2)*e^(1/2*arccosh(3)) - (1/4*I - 1/4)*sqrt(2) + 1/2*e^(1/2*arccosh(3)) + 1/2) -+ sage: point = g.midpoint(); point -+ Point in UHP -1/2*(sqrt(2)*... -+ sage: QQbar(point.coordinates()).radical_expression() -+ I*sqrt(2) - - Check that floating points remain floating points - in :meth:`midpoint` :: -diff --git a/src/sage/interfaces/fricas.py b/src/sage/interfaces/fricas.py -index 82aae78e37..8501ea2a18 100644 ---- a/src/sage/interfaces/fricas.py -+++ b/src/sage/interfaces/fricas.py -@@ -1084,14 +1084,14 @@ class FriCASElement(ExpectElement): - 0.451026811796262, - 0.732815101786507, - 0.837981225008390, -- NaN, -- NaN, -+ 1.57079632679490 - 0.467145308103262*I, -+ 0.467145308103262*I, - 1.11976951499863, - 0.451026811796262, - 0.732815101786507, - 0.837981225008390, -- NaN, -- NaN] -+ 1.57079632679490 - 0.467145308103262*I, -+ 0.467145308103262*I] - sage: l = [tanh, sinh, cosh, coth, sech, csch, asinh, acosh, atanh, acoth, asech, acsch, arcsinh, arccosh, arctanh, arccoth, arcsech, arccsch] - sage: [f(x)._fricas_().sage().subs(x=0.9) for f in l] # optional - fricas - [0.716297870199024, -diff --git a/src/sage/libs/pynac/pynac.pyx b/src/sage/libs/pynac/pynac.pyx -index 9e9d8f664b..e3406f007e 100644 ---- a/src/sage/libs/pynac/pynac.pyx -+++ b/src/sage/libs/pynac/pynac.pyx -@@ -1824,7 +1824,7 @@ cdef py_atan2(x, y): - sage: atan2(CC(I), CC(I+1)) - 0.553574358897045 + 0.402359478108525*I - sage: atan2(CBF(I), CBF(I+1)) -- [0.55357435889705 +/- 5.58e-15] + [0.402359478108525 +/- 7.11e-16]*I -+ [0.55357435889705 +/- ...] + [0.402359478108525 +/- ...]*I - - Check that :trac:`23776` is fixed and RDF input gives real output:: - -diff --git a/src/sage/matrix/matrix_symbolic_dense.pyx b/src/sage/matrix/matrix_symbolic_dense.pyx -index 46a15e53eb..7a0beb437b 100644 ---- a/src/sage/matrix/matrix_symbolic_dense.pyx -+++ b/src/sage/matrix/matrix_symbolic_dense.pyx -@@ -200,7 +200,7 @@ cdef class Matrix_symbolic_dense(Matrix_generic_dense): - sage: eval, [evec], mult = es[0] - sage: delta = eval*evec - evec*A - sage: abs(abs(delta)) < 1e-10 -- sqrt(9/25*((2*sqrt(6) - 3)*(sqrt(6) - 2) + 7*sqrt(6) - 18)^2 + 9/25*((sqrt(6) - 2)*(sqrt(6) - 4) + 6*sqrt(6) - 14)^2) < (1.00000000000000e-10) -+ 3/5*sqrt(((2*sqrt(6) - 3)*(sqrt(6) - 2) + 7*sqrt(6) - 18)^2 + ((sqrt(6) - 2)*(sqrt(6) - 4) + 6*sqrt(6) - 14)^2) < (1.00000000000000e-10) - sage: abs(abs(delta)).n() < 1e-10 - True - -diff --git a/src/sage/modules/matrix_morphism.py b/src/sage/modules/matrix_morphism.py -index 17a1d6e290..03892ceec0 100644 ---- a/src/sage/modules/matrix_morphism.py -+++ b/src/sage/modules/matrix_morphism.py -@@ -214,9 +214,9 @@ class MatrixMorphism_abstract(sage.categories.morphism.Morphism): - sage: f((1, 0)) - Traceback (most recent call last): - ... -- TypeError: Unable to coerce entries (=[1.00000000000000*I, 0.000000000000000]) to coefficients in Real Field with 53 bits of precision -+ TypeError: Unable to coerce entries (=[1.00000000000000*I, 0]) to coefficients in Real Field with 53 bits of precision - sage: f((1, 0), coerce=False) -- (1.00000000000000*I, 0.000000000000000) -+ (1.00000000000000*I, 0) - - """ - if self.domain().is_ambient(): -diff --git a/src/sage/plot/plot.py b/src/sage/plot/plot.py -index 77cdeb8c46..e501e74036 100644 ---- a/src/sage/plot/plot.py -+++ b/src/sage/plot/plot.py -@@ -2061,7 +2061,7 @@ def _plot(funcs, xrange, parametric=False, - plot properly (:trac:`13246`):: - - sage: parametric_plot((x, arcsec(x)), (x, -2, 2)) -- Graphics object consisting of 1 graphics primitive -+ Graphics object consisting of 2 graphics primitives - - """ - from sage.plot.colors import Color -diff --git a/src/sage/repl/display/formatter.py b/src/sage/repl/display/formatter.py -index 8ce2e839d7..948207c95e 100644 ---- a/src/sage/repl/display/formatter.py -+++ b/src/sage/repl/display/formatter.py -@@ -25,11 +25,11 @@ generally, all sage expression as an ASCII art object:: - sage: shell = get_test_shell() - sage: shell.run_cell('%display ascii_art') - sage: shell.run_cell('integral(x^2/pi^x, x)') -- / 2 2 \ -x*log(pi) -- -\x *log (pi) + 2*x*log(pi) + 2/*e -- --------------------------------------------- -- 3 -- log (pi) -+ -x / 2 2 \ -+ -pi *\x *log (pi) + 2*x*log(pi) + 2/ -+ -------------------------------------- -+ 3 -+ log (pi) - sage: shell.run_cell("i = var('i')") - sage: shell.run_cell('sum(i*x^i, i, 0, 10)') - 10 9 8 7 6 5 4 3 2 -diff --git a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py -index d8ebbf4f76..8c60f65e99 100644 ---- a/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py -+++ b/src/sage/rings/asymptotic/asymptotics_multivariate_generating_functions.py -@@ -151,8 +151,8 @@ A multiple point example (Example 6.5 of [RaWi2012]_):: - [(x + 2*y - 1, 1), (2*x + y - 1, 1)]) - sage: F1 = decomp[1] - sage: F1.asymptotics(p, alpha, 2) -- (-3*((2*a^2 - 5*a*b + 2*b^2)*r^2 + (a + b)*r + 3)*((1/3)^(-a)*(1/3)^(-b))^r, -- (1/3)^(-a)*(1/3)^(-b), -3*(2*a^2 - 5*a*b + 2*b^2)*r^2 - 3*(a + b)*r - 9) -+ (-3*((2*a^2 - 5*a*b + 2*b^2)*r^2 + (a + b)*r + 3)*(1/((1/3)^a*(1/3)^b))^r, -+ 1/((1/3)^a*(1/3)^b), -3*(2*a^2 - 5*a*b + 2*b^2)*r^2 - 3*(a + b)*r - 9) - sage: alpha = [4, 3] - sage: decomp = F.asymptotic_decomposition(alpha) - sage: F1 = decomp[1] -@@ -2159,7 +2159,7 @@ class FractionWithFactoredDenominator(RingElement): - sage: p = {x: 1/3, y: 1/3} - sage: alpha = (var('a'), var('b')) - sage: F.asymptotics_multiple(p, alpha, 2, var('r')) # long time -- (3*((1/3)^(-a)*(1/3)^(-b))^r*e^(2/3), (1/3)^(-a)*(1/3)^(-b), 3*e^(2/3)) -+ (3*(1/((1/3)^a*(1/3)^b))^r*e^(2/3), 1/((1/3)^a*(1/3)^b), 3*e^(2/3)) - """ - from itertools import product - from sage.calculus.functions import jacobian -diff --git a/src/sage/stats/basic_stats.py b/src/sage/stats/basic_stats.py -index 16a268a02c..5fd244e93b 100644 ---- a/src/sage/stats/basic_stats.py -+++ b/src/sage/stats/basic_stats.py -@@ -183,7 +183,7 @@ def std(v, bias=False): - sage: std([]) - NaN - sage: std([I, sqrt(2), 3/5]) -- sqrt(1/450*(10*sqrt(2) - 5*I - 3)^2 + 1/450*(5*sqrt(2) - 10*I + 3)^2 + 1/450*(5*sqrt(2) + 5*I - 6)^2) -+ 1/15*sqrt(1/2)*sqrt((10*sqrt(2) - 5*I - 3)^2 + (5*sqrt(2) - 10*I + 3)^2 + (5*sqrt(2) + 5*I - 6)^2) - sage: std([RIF(1.0103, 1.0103), RIF(2)]) - 0.6998235813403261? - sage: import numpy -diff --git a/src/sage/symbolic/expression.pyx b/src/sage/symbolic/expression.pyx -index ab4c05de3a..60f0dc549a 100644 ---- a/src/sage/symbolic/expression.pyx -+++ b/src/sage/symbolic/expression.pyx -@@ -622,7 +622,7 @@ cdef class Expression(CommutativeRingElement): - sage: x^(-5) - x^(-5) - sage: x^(-y) -- x^(-y) -+ 1/(x^y) - sage: 2*x^(-1) - 2/x - sage: i*x -@@ -3621,14 +3621,14 @@ cdef class Expression(CommutativeRingElement): - sage: repl_dict = {b_0: b_0, b_3: b_1, b_2: b_3, b_1: b_2} - sage: P = precomp.substitute(repl_dict) - sage: P.expand() -- -2^(-b_0)*2^(-b_2)*2^b_3 - 2^b_0*2^(-b_2)*2^b_3 - -- 2^(-b_0)*2^b_2*2^b_3 + 2^b_0*2^b_2*2^b_3 - 2*2^(-b_0)*2^(-b_2) -- - 2*2^b_0*2^(-b_2) - 2*2^(-b_0)*2^b_2 + 2*2^b_0*2^b_2 + -- 2^(-b_0)*2^b_3 + 2^b_0*2^b_3 + 2^(-b_2)*2^b_3 + 2^b_2*2^b_3 + -- 2*2^(-b_0) + 2*2^b_0 + 2*2^(-b_2) + 2*2^b_2 - 9*2^b_3 - -- 2^(-b_0)*2^(-b_2)/2^b_3 - 2^b_0*2^(-b_2)/2^b_3 - -- 2^(-b_0)*2^b_2/2^b_3 + 2^b_0*2^b_2/2^b_3 + 2^(-b_0)/2^b_3 + -- 2^b_0/2^b_3 + 2^(-b_2)/2^b_3 + 2^b_2/2^b_3 - 9/2^b_3 - 18 -+ 2^b_0*2^b_2*2^b_3 + 2*2^b_0*2^b_2 + 2^b_0*2^b_3 + 2^b_2*2^b_3 + -+ 2*2^b_0 + 2*2^b_2 - 9*2^b_3 + 2^b_0*2^b_2/2^b_3 - -+ 2^b_0*2^b_3/2^b_2 - 2^b_2*2^b_3/2^b_0 - 2*2^b_0/2^b_2 - -+ 2*2^b_2/2^b_0 + 2^b_0/2^b_3 + 2^b_2/2^b_3 + 2^b_3/2^b_0 + -+ 2^b_3/2^b_2 + 2/2^b_0 + 2/2^b_2 - 2^b_0/(2^b_2*2^b_3) - -+ 2^b_2/(2^b_0*2^b_3) - 9/2^b_3 - 2^b_3/(2^b_0*2^b_2) - -+ 2/(2^b_0*2^b_2) + 1/(2^b_0*2^b_3) + 1/(2^b_2*2^b_3) - -+ 1/(2^b_0*2^b_2*2^b_3) - 18 - - sage: _0,b_1,b_2=var('b_0,b_1,b_2') - sage: f = 1/27*b_2^2/(2^b_2)^2 + 1/27*b_1^2/(2^b_1)^2 + \ -@@ -3809,7 +3809,7 @@ cdef class Expression(CommutativeRingElement): - - sage: x = SR.symbol('x', domain='real') - sage: (x^3)^(1/3) -- (x^3)^(1/3) -+ x - sage: (x^4)^(1/4) - abs(x) - sage: (x^8)^(1/4) -@@ -3872,7 +3872,7 @@ cdef class Expression(CommutativeRingElement): - sage: 2^(x/log(2)) - e^x - sage: 2^(-x^2/2/log(2)) -- e^(-1/2*x^2) -+ 1/e^(1/2*x^2) - sage: x^(x/log(x)) - x^(x/log(x)) - sage: assume(x > 0) -@@ -4816,18 +4816,24 @@ cdef class Expression(CommutativeRingElement): - sage: ((x+y)^(x+y)).match(w0^w0) - {$0: x + y} - sage: t = ((a+b)*(a+c)).match((a+w0)*(a+w1)) -- sage: t[w0], t[w1] -- (c, b) -+ sage: set([t[w0], t[w1]]) == set([b, c]) -+ True - sage: ((a+b)*(a+c)).match((w0+b)*(w0+c)) - {$0: a} - sage: t = ((a+b)*(a+c)).match((w0+w1)*(w0+w2)) -- sage: t[w0], t[w1], t[w2] -- (a, c, b) -- sage: print(((a+b)*(a+c)).match((w0+w1)*(w1+w2))) -- None -+ sage: t[w0] -+ a -+ sage: set([t[w1], t[w2]]) == set([b, c]) -+ True -+ sage: t = ((a+b)*(a+c)).match((w0+w1)*(w1+w2)) -+ sage: t[w1] -+ a -+ sage: set([t[w0], t[w2]]) == set([b, c]) -+ True - sage: t = (a*(x+y)+a*z+b).match(a*w0+w1) -- sage: t[w0], t[w1] -- (x + y, a*z + b) -+ sage: s = set([t[w0], t[w1]]) -+ sage: s == set([x+y, a*z+b]) or s == set([z, a*(x+y)+b]) -+ True - sage: print((a+b+c+d+f+g).match(c)) - None - sage: (a+b+c+d+f+g).has(c) -@@ -4836,7 +4842,7 @@ cdef class Expression(CommutativeRingElement): - {$0: a + b + d + f + g} - sage: (a+b+c+d+f+g).match(c+g+w0) - {$0: a + b + d + f} -- sage: (a+b).match(a+b+w0) -+ sage: (a+b).match(a+b+w0) # known bug - {$0: 0} - sage: print((a*b^2).match(a^w0*b^w1)) - None -@@ -5009,7 +5015,7 @@ cdef class Expression(CommutativeRingElement): - a^3 + b^3 + (x + y)^3 - - sage: t.subs(w0 == w0^2) -- (x^2 + y^2)^18 + a^16 + b^16 -+ a^8 + b^8 + (x^2 + y^2)^6 - - sage: t.subs(a == b, b == c) - (x + y)^3 + b^2 + c^2 -@@ -8392,9 +8398,13 @@ cdef class Expression(CommutativeRingElement): - sage: SR(I).arctan2(1) - arctan2(I, 1) - sage: SR(CDF(0,1)).arctan2(1) -- NaN + +infinity*I -- sage: SR(1).arctan2(CDF(0,1)) # known bug -- 0.7853981633974484 - 19.012501686914433*I -+ Traceback (most recent call last): -+ ... -+ ValueError: power::eval(): division by zero -+ sage: SR(1).arctan2(CDF(0,1)) -+ Traceback (most recent call last): -+ ... -+ ValueError: power::eval(): division by zero - - sage: arctan2(0,oo) - 0 -@@ -8656,7 +8666,7 @@ cdef class Expression(CommutativeRingElement): - 1/2*I*pi - sage: SR(1/2).arccosh() - arccosh(1/2) -- sage: SR(CDF(1/2)).arccosh() # rel tol 1e-15 -+ sage: SR(CDF(1/2)).arccosh() # rel tol 1e-15 - 1.0471975511965976*I - sage: maxima('acosh(0.5)') - 1.04719755119659...*%i -@@ -11687,7 +11697,7 @@ cdef class Expression(CommutativeRingElement): - sage: a.solve(t) - [] - sage: b = a.canonicalize_radical(); b -- -23040.0*(-2.0*e^(1800*t) + 25.0*e^(900*t) - 32.0)*e^(-2400*t) -+ (46080.0*e^(1800*t) - 576000.0*e^(900*t) + 737280.0)*e^(-2400*t) - sage: b.solve(t) - [] - sage: b.solve(t, to_poly_solve=True) -@@ -12163,14 +12173,14 @@ cdef class Expression(CommutativeRingElement): - - sage: (n,k,j)=var('n,k,j') - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -- -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) -+ -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) - sage: assume(j>-1) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) - 1 - sage: forget() - sage: assume(n>=j) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -- -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) -+ -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) - sage: forget() - sage: assume(j==-1) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -@@ -12178,7 +12188,7 @@ cdef class Expression(CommutativeRingElement): - sage: forget() - sage: assume(j<-1) - sage: sum(binomial(n,k)*binomial(k-1,j)*(-1)**(k-1-j),k,j+1,n) -- -(-1)^(-j)*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) -+ -(-1)^j*sum((-1)^k*binomial(k - 1, j)*binomial(n, k), k, j + 1, n) - sage: forget() - - Check that :trac:`16176` is fixed:: -diff --git a/src/sage/symbolic/relation.py b/src/sage/symbolic/relation.py -index da6f0eef42..4bd65ef572 100644 ---- a/src/sage/symbolic/relation.py -+++ b/src/sage/symbolic/relation.py -@@ -895,7 +895,7 @@ def solve(f, *args, **kwds): - sage: (r[0][x], r[0][y]) - (2*lambert_w(1/2), 1) - sage: solve(-2*x**3 + 4*x**2 - 2*x + 6 > 0, x, algorithm='sympy') -- [x < (1/6*sqrt(77) + 79/54)^(1/3) + 1/9/(1/6*sqrt(77) + 79/54)^(1/3) + 2/3] -+ [x < 1/3*(1/2)^(1/3)*(9*sqrt(77) + 79)^(1/3) + 2/3*(1/2)^(2/3)/(9*sqrt(77) + 79)^(1/3) + 2/3] - sage: solve(sqrt(2*x^2 - 7) - (3 - x),x,algorithm='sympy') - [x == -8, x == 2] - sage: solve(sqrt(2*x + 9) - sqrt(x + 1) - sqrt(x + 4),x,algorithm='sympy') diff --git a/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch b/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch deleted file mode 100644 index ff1dcd22acf3..000000000000 --- a/pkgs/applications/science/math/sage/patches/python3-syntax-without-write.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/sage/tests/py3_syntax.py b/src/sage/tests/py3_syntax.py -index e564860b48..86ab3725f9 100644 ---- a/src/sage/tests/py3_syntax.py -+++ b/src/sage/tests/py3_syntax.py -@@ -179,15 +179,30 @@ class Python3SyntaxTest(SortedDirectoryWalkerABC): - sage: py3_syntax = Python3SyntaxTest() - sage: py3_syntax.test(src.name) - Invalid Python 3 syntax found: -- File "...py", line 1 -- print "invalid print statement" -- ^ -- SyntaxError: Missing parentheses in call to 'print' -+ Missing parentheses in call to 'print'... - sage: os.unlink(src.name) - """ -+ -+ # compile all given files in memory, printing all errors -+ # inspired by the py_compile module (but without writing to file) -+ script = """ -+import sys -+import importlib.machinery -+rv = 0 -+for file in sys.argv[1:]: -+ loader = importlib.machinery.SourceFileLoader('<sage_test>', file) -+ source_bytes = loader.get_data(file) -+ try: -+ code = loader.source_to_code(source_bytes, file) -+ except Exception as err: -+ print(err) -+ rv = 1 -+sys.exit(rv) -+""" - cmd = [ - 'python3', -- '-m', 'py_compile' -+ '-c', -+ script, - ] + list(filenames) - process = subprocess.Popen( - cmd, diff --git a/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch b/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch deleted file mode 100644 index 42deef4eab0c..000000000000 --- a/pkgs/applications/science/math/sage/patches/sagenb-sphinx-1.7.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7419e0246230594ebfd5e7a2fe6b80d67abfc98a Mon Sep 17 00:00:00 2001 -From: Jeroen Demeyer <jdemeyer@cage.ugent.be> -Date: Tue, 20 Mar 2018 10:40:41 +0100 -Subject: Fix sphinxify doctests - ---- - sagenb/misc/sphinxify.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/sagenb/misc/sphinxify.py b/sagenb/misc/sphinxify.py -index 4f76d41..15623d9 100644 ---- a/sagenb/misc/sphinxify.py -+++ b/sagenb/misc/sphinxify.py -@@ -47,11 +47,11 @@ def sphinxify(docstring, format='html'): - - sage: from sage.misc.sphinxify import sphinxify - sage: sphinxify('A test') -- '...<div class="docstring">\n \n <p>A test</p>\n\n\n</div>' -+ '<div class="docstring">\n \n <p>A test</p>\n\n\n</div>' - sage: sphinxify('**Testing**\n`monospace`') -- '...<div class="docstring"...<strong>Testing</strong>\n<span class="math"...</p>\n\n\n</div>' -+ '<div class="docstring"...<strong>Testing</strong>\n<span class="math notranslate"...</p>\n\n\n</div>' - sage: sphinxify('`x=y`') -- '...<div class="docstring">\n \n <p><span class="math">x=y</span></p>\n\n\n</div>' -+ '<div class="docstring">\n \n <p><span class="math notranslate">x=y</span></p>\n\n\n</div>' - sage: sphinxify('`x=y`', format='text') - 'x=y\n' - sage: sphinxify(':math:`x=y`', format='text') --- -cgit v1.0-1-gd88e - diff --git a/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch b/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch new file mode 100644 index 000000000000..4c8df92904ed --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/singular-4.1.1p2.patch @@ -0,0 +1,274 @@ +diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py +index 9d65c9fa6c..a028bbe719 100644 +--- a/src/sage/interfaces/singular.py ++++ b/src/sage/interfaces/singular.py +@@ -654,7 +654,7 @@ class Singular(ExtraTabCompletion, Expect): + + s = Expect.eval(self, x, **kwds) + +- if s.find("error") != -1 or s.find("Segment fault") != -1: ++ if s.find("error occurred") != -1 or s.find("Segment fault") != -1: + raise SingularError('Singular error:\n%s'%s) + + if get_verbose() > 0: +@@ -1079,7 +1079,7 @@ class Singular(ExtraTabCompletion, Expect): + sage: S = singular.ring('real', '(a,b)', 'lp') + sage: singular.current_ring() + polynomial ring, over a field, global ordering +- // coefficients: float ++ // coefficients: Float() + // number of vars : 2 + // block 1 : ordering lp + // : names a b +@@ -1157,7 +1157,7 @@ class Singular(ExtraTabCompletion, Expect): + sage: singular._tab_completion() + ['exteriorPower', + ... +- 'flintZ'] ++ 'crossprod'] + """ + p = re.compile("// *([a-z0-9A-Z_]*).*") #compiles regular expression + proclist = self.eval("listvar(proc)").splitlines() +@@ -1183,7 +1183,7 @@ class Singular(ExtraTabCompletion, Expect): + EXAMPLES:: + + sage: singular.version() +- "Singular ... version 4.1.0 ... ++ "Singular ... version 4... + """ + return singular_version() + +@@ -1562,7 +1562,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + elif charstr[0] in ['0', 'QQ']: + from sage.all import QQ + br = QQ +- elif charstr[0]=='real': ++ elif charstr[0].startswith('Float'): + from sage.all import RealField, ceil, log + prec = singular.eval('ringlist(basering)[1][2][1]') + br = RealField(ceil((ZZ(prec)+1)/log(2,10))) +@@ -1750,7 +1750,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + + # Singular 4 puts parentheses around floats and sign outside them + charstr = self.parent().eval('charstr(basering)').split(',',1) +- if charstr[0] in ['real', 'complex']: ++ if charstr[0]=='complex' or charstr[0].startswith('Float'): + for i in range(coeff_start, 2 * coeff_start): + singular_poly_list[i] = singular_poly_list[i].replace('(','').replace(')','') + +@@ -1992,7 +1992,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + sage: S = singular.ring('real', '(a,b)', 'lp') + sage: singular.current_ring() + polynomial ring, over a field, global ordering +- // coefficients: float ++ // coefficients: Float() + // number of vars : 2 + // block 1 : ordering lp + // : names a b +@@ -2072,7 +2072,7 @@ class SingularElement(ExtraTabCompletion, ExpectElement): + sage: R._tab_completion() + ['exteriorPower', + ... +- 'flintZ'] ++ 'crossprod'] + """ + return self.parent()._tab_completion() + +@@ -2358,7 +2358,7 @@ def singular_version(): + EXAMPLES:: + + sage: singular.version() +- "Singular ... version 4.1.0 ... ++ "Singular ... version 4... + """ + return singular.eval('system("--version");') + +diff --git a/src/sage/libs/singular/decl.pxd b/src/sage/libs/singular/decl.pxd +index 4b658c4807..d863740419 100644 +--- a/src/sage/libs/singular/decl.pxd ++++ b/src/sage/libs/singular/decl.pxd +@@ -170,7 +170,7 @@ cdef extern from "singular/Singular/libsingular.h": + + int n_NumberOfParameters(const n_Procs_s* r) + +- ctypedef struct poly "polyrec": ++ ctypedef struct poly "spolyrec": + poly *next + number *coef + unsigned long exp[1] +@@ -630,9 +630,13 @@ cdef extern from "singular/Singular/libsingular.h": + # return p*q, destroys p and q + poly *p_Mult_q(poly *p, poly *q, ring *r) + ++ # polynomial division, ignoring the rest ++ # via singclap_pdivide resp. idLift, destroys p,q ++ poly *p_Divide(poly *p, poly *q, ring *r) ++ + # divide monomial p by monomial q, p,q const + +- poly *pDivide(poly *p,poly *q) ++ poly *pMDivide(poly *p,poly *q) + + # return the i-th power of p; p destroyed, requires global ring + +diff --git a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +index 2a8d9ae021..aeff53af6c 100644 +--- a/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx ++++ b/src/sage/rings/polynomial/multi_polynomial_libsingular.pyx +@@ -190,8 +190,8 @@ from sage.libs.singular.decl cimport ( + n_IsUnit, n_Invers, + p_ISet, rChangeCurrRing, p_Copy, p_Init, p_SetCoeff, p_Setm, p_SetExp, p_Add_q, + p_NSet, p_GetCoeff, p_Delete, p_GetExp, pNext, rRingVar, omAlloc0, omStrDup, +- omFree, pDivide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy, +- pDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy, ++ omFree, pMDivide, p_Divide, p_SetCoeff0, n_Init, p_DivisibleBy, pLcm, p_LmDivisibleBy, ++ pMDivide, p_IsConstant, p_ExpVectorEqual, p_String, p_LmInit, n_Copy, + p_IsUnit, p_Series, p_Head, idInit, fast_map_common_subexp, id_Delete, + p_IsHomogeneous, p_Homogen, p_Totaldegree,pLDeg1_Totaldegree, singclap_pdivide, singclap_factorize, + idLift, IDELEMS, On, Off, SW_USE_CHINREM_GCD, SW_USE_EZGCD, +@@ -1693,8 +1693,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base): + if not g._poly: + raise ZeroDivisionError + +- if r!=currRing: rChangeCurrRing(r) # pDivide +- res = pDivide(f._poly, g._poly) ++ if r!=currRing: rChangeCurrRing(r) # pMDivide ++ res = pMDivide(f._poly, g._poly) + if coeff: + if r.cf.type == n_unknown or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf): + n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf) +@@ -1853,8 +1853,8 @@ cdef class MPolynomialRing_libsingular(MPolynomialRing_base): + and (<MPolynomial_libsingular>g) \ + and g.parent() is self \ + and p_LmDivisibleBy((<MPolynomial_libsingular>g)._poly, m, r): +- if r!=currRing: rChangeCurrRing(r) # pDivide +- flt = pDivide(f._poly, (<MPolynomial_libsingular>g)._poly) ++ if r!=currRing: rChangeCurrRing(r) # pMDivide ++ flt = pMDivide(f._poly, (<MPolynomial_libsingular>g)._poly) + #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((<MPolynomial_libsingular>g)._poly, r), r), r) + p_SetCoeff(flt, n_Init(1, r), r) + return new_MP(self,flt), g +@@ -4023,16 +4023,6 @@ cdef class MPolynomial_libsingular(MPolynomial): + Traceback (most recent call last): + ... + NotImplementedError: Division of multivariate polynomials over non fields by non-monomials not implemented. +- +- TESTS:: +- +- sage: P.<x,y> = ZZ[] +- sage: p = 3*(-x^8*y^2 - x*y^9 + 6*x^8*y + 17*x^2*y^6 - x^3*y^2) +- sage: q = 7*(x^2 + x*y + y^2 + 1) +- sage: p*q//q == p +- True +- sage: p*q//p == q +- True + """ + cdef MPolynomialRing_libsingular parent = self._parent + cdef ring *r = self._parent_ring +@@ -4052,13 +4042,18 @@ cdef class MPolynomial_libsingular(MPolynomial): + _right = <MPolynomial_libsingular>right + + if r.cf.type != n_unknown: ++ if r.cf.type == n_Z: ++ P = parent.change_ring(RationalField()) ++ f = P(self)//P(right) ++ CM = list(f) ++ return parent(sum([c.floor()*m for c,m in CM])) + if _right.is_monomial(): + p = _self._poly + quo = p_ISet(0,r) +- if r != currRing: rChangeCurrRing(r) # pDivide ++ if r != currRing: rChangeCurrRing(r) # pMDivide + while p: + if p_DivisibleBy(_right._poly, p, r): +- temp = pDivide(p, _right._poly) ++ temp = pMDivide(p, _right._poly) + p_SetCoeff0(temp, n_Copy(p_GetCoeff(p, r), r), r) + quo = p_Add_q(quo, temp, r) + p = pNext(p) +@@ -4794,6 +4789,8 @@ cdef class MPolynomial_libsingular(MPolynomial): + sage: p = -x*y + x*z + 54*x - 2 + sage: (5*p^2).lcm(3*p) == 15*p^2 + True ++ sage: lcm(2*x,2*x*y) ++ 2*x*y + """ + cdef ring *_ring = self._parent_ring + cdef poly *ret +@@ -4821,9 +4818,7 @@ cdef class MPolynomial_libsingular(MPolynomial): + if _ring!=currRing: rChangeCurrRing(_ring) # singclap_gcd + gcd = singclap_gcd(p_Copy(self._poly, _ring), p_Copy(_g._poly, _ring), _ring ) + prod = pp_Mult_qq(self._poly, _g._poly, _ring) +- ret = singclap_pdivide(prod , gcd , _ring) +- p_Delete(&prod, _ring) +- p_Delete(&gcd, _ring) ++ ret = p_Divide(prod, gcd, _ring) + if count >= 20: + sig_off() + return new_MP(self._parent, ret) +@@ -4866,7 +4861,7 @@ cdef class MPolynomial_libsingular(MPolynomial): + sage: f.quo_rem(y) + (2*x^2, x + 1) + sage: f.quo_rem(3*x) +- (2*x*y + 1, -4*x^2*y - 2*x + 1) ++ (0, 2*x^2*y + x + 1) + + TESTS:: + +@@ -4888,7 +4883,7 @@ cdef class MPolynomial_libsingular(MPolynomial): + if right.is_zero(): + raise ZeroDivisionError + +- if not self._parent._base.is_field() and not is_IntegerRing(self._parent._base): ++ if not self._parent._base.is_field(): + py_quo = self//right + py_rem = self - right*py_quo + return py_quo, py_rem +diff --git a/src/sage/rings/polynomial/plural.pyx b/src/sage/rings/polynomial/plural.pyx +index d5439f7f08..ad20ebcca0 100644 +--- a/src/sage/rings/polynomial/plural.pyx ++++ b/src/sage/rings/polynomial/plural.pyx +@@ -998,7 +998,7 @@ cdef class NCPolynomialRing_plural(Ring): + if not g._poly: + raise ZeroDivisionError + +- res = pDivide(f._poly,g._poly) ++ res = pMDivide(f._poly,g._poly) + if coeff: + if (r.cf.type == n_unknown) or r.cf.cfDivBy(p_GetCoeff(f._poly, r), p_GetCoeff(g._poly, r), r.cf): + n = r.cf.cfDiv( p_GetCoeff(f._poly, r) , p_GetCoeff(g._poly, r), r.cf) +@@ -1193,7 +1193,7 @@ cdef class NCPolynomialRing_plural(Ring): + if isinstance(g, NCPolynomial_plural) \ + and (<NCPolynomial_plural>g) \ + and p_LmDivisibleBy((<NCPolynomial_plural>g)._poly, m, r): +- flt = pDivide(f._poly, (<NCPolynomial_plural>g)._poly) ++ flt = pMDivide(f._poly, (<NCPolynomial_plural>g)._poly) + #p_SetCoeff(flt, n_Div( p_GetCoeff(f._poly, r) , p_GetCoeff((<NCPolynomial_plural>g)._poly, r), r), r) + p_SetCoeff(flt, n_Init(1, r), r) + return new_NCP(self,flt), g +diff --git a/src/sage/rings/polynomial/polynomial_singular_interface.py b/src/sage/rings/polynomial/polynomial_singular_interface.py +index 9331169f8b..f753610fd3 100644 +--- a/src/sage/rings/polynomial/polynomial_singular_interface.py ++++ b/src/sage/rings/polynomial/polynomial_singular_interface.py +@@ -81,8 +81,8 @@ class PolynomialRing_singular_repr: + sage: R.<x,y> = PolynomialRing(CC) + sage: singular(R) + polynomial ring, over a field, global ordering +- // coefficients: float[I](complex:15 digits, additional 0 digits)/(I^2+1) +- // number of vars : 2 ++ // coefficients: real[I](complex:15 digits, additional 0 digits)/(I^2+1) ++ // number of vars : 2 + // block 1 : ordering dp + // : names x y + // block 2 : ordering C +@@ -90,8 +90,8 @@ class PolynomialRing_singular_repr: + sage: R.<x,y> = PolynomialRing(RealField(100)) + sage: singular(R) + polynomial ring, over a field, global ordering +- // coefficients: float +- // number of vars : 2 ++ // coefficients: Float() ++ // number of vars : 2 + // block 1 : ordering dp + // : names x y + // block 2 : ordering C diff --git a/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch b/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch deleted file mode 100644 index c67b8942e28b..000000000000 --- a/pkgs/applications/science/math/sage/patches/sphinx-1.7.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/src/bin/sage b/src/bin/sage -index 397f30cbed..3fc473c343 100755 ---- a/src/bin/sage -+++ b/src/bin/sage -@@ -980,8 +980,11 @@ if [ "$1" = '-rsyncdist' -o "$1" = "--rsyncdist" ]; then - fi - - if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then -+ # Redirect stdin from /dev/null. This helps with running TeX which -+ # tends to ask interactive questions if something goes wrong. These -+ # cause the build to hang. If stdin is /dev/null, TeX just aborts. - shift -- exec sage-python23 -m "sage_setup.docbuild" "$@" -+ exec sage-python23 -m sage_setup.docbuild "$@" </dev/null - fi - - if [ "$1" = '-gdb' -o "$1" = "--gdb" ]; then -diff --git a/src/doc/common/conf.py b/src/doc/common/conf.py -index 25f94f7b7d..3f07474d9b 100644 ---- a/src/doc/common/conf.py -+++ b/src/doc/common/conf.py -@@ -627,7 +627,7 @@ def call_intersphinx(app, env, node, contnode): - sage: for line in open(thematic_index).readlines(): - ....: if "padics" in line: - ....: sys.stdout.write(line) -- <li><a class="reference external" href="../reference/padics/sage/rings/padics/tutorial.html#sage-rings-padics-tutorial" title="(in Sage Reference Manual: p-Adics ...)"><span>Introduction to the -adics</span></a></li> -+ <li><a class="reference external" href="../reference/padics/sage/rings/padics/tutorial.html#sage-rings-padics-tutorial" title="(in Sage Reference Manual: p-Adics v...)"><span>Introduction to the -adics</span></a></li> - """ - debug_inf(app, "???? Trying intersphinx for %s"%node['reftarget']) - builder = app.builder -diff --git a/src/sage/misc/sphinxify.py b/src/sage/misc/sphinxify.py -index 4f76d4113a..8f426b5989 100644 ---- a/src/sage/misc/sphinxify.py -+++ b/src/sage/misc/sphinxify.py -@@ -47,11 +47,11 @@ def sphinxify(docstring, format='html'): - - sage: from sage.misc.sphinxify import sphinxify - sage: sphinxify('A test') -- '...<div class="docstring">\n \n <p>A test</p>\n\n\n</div>' -+ '<div class="docstring">\n \n <p>A test</p>\n\n\n</div>' - sage: sphinxify('**Testing**\n`monospace`') -- '...<div class="docstring"...<strong>Testing</strong>\n<span class="math"...</p>\n\n\n</div>' -+ '<div class="docstring"...<strong>Testing</strong>\n<span class="math...</p>\n\n\n</div>' - sage: sphinxify('`x=y`') -- '...<div class="docstring">\n \n <p><span class="math">x=y</span></p>\n\n\n</div>' -+ '<div class="docstring">\n \n <p><span class="math notranslate nohighlight">x=y</span></p>\n\n\n</div>' - sage: sphinxify('`x=y`', format='text') - 'x=y\n' - sage: sphinxify(':math:`x=y`', format='text') -diff --git a/src/sage_setup/docbuild/sphinxbuild.py b/src/sage_setup/docbuild/sphinxbuild.py -index fda76a4174..d3413239dd 100644 ---- a/src/sage_setup/docbuild/sphinxbuild.py -+++ b/src/sage_setup/docbuild/sphinxbuild.py -@@ -207,7 +207,7 @@ def runsphinx(): - try: - sys.stdout = SageSphinxLogger(sys.stdout, os.path.basename(output_dir)) - sys.stderr = SageSphinxLogger(sys.stderr, os.path.basename(output_dir)) -- sphinx.cmdline.main(sys.argv) -+ sphinx.cmdline.main(sys.argv[1:]) - finally: - sys.stdout = saved_stdout - sys.stderr = saved_stderr diff --git a/pkgs/applications/science/math/sage/patches/spkg-scripts.patch b/pkgs/applications/science/math/sage/patches/spkg-scripts.patch new file mode 100644 index 000000000000..4d37998b288b --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/spkg-scripts.patch @@ -0,0 +1,46 @@ +commit f02714d4aea80e17cb8df62bab75d7c1a1b61a8e +Author: Timo Kaufmann <timokau@zoho.com> +Date: Mon Jul 9 18:26:18 2018 +0200 + + Don't attempt to create dirs when showing pkg info + + The script dir cannot be assumed to be writeable after installation. + +diff --git a/build/bin/sage-spkg b/build/bin/sage-spkg +index f3e02aeae5..190d558ad1 100755 +--- a/build/bin/sage-spkg ++++ b/build/bin/sage-spkg +@@ -167,14 +167,6 @@ if [ -z "$SAGE_BUILD_DIR" ]; then + export SAGE_BUILD_DIR="$SAGE_LOCAL/var/tmp/sage/build" + fi + +-for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS"; do +- mkdir -p "$dir" +- if [ $? -ne 0 ]; then +- error_msg "Error creating directory $dir" +- exit 1 +- fi +-done +- + + # Remove '.' from PYTHONPATH, which may also come from SAGE_PATH, to avoid + # trouble with setuptools / easy_install (cf. #10192, #10176): +@@ -563,11 +555,13 @@ fi + # Setup directories + ################################################################## + +-mkdir -p "$SAGE_BUILD_DIR" +-if [ $? -ne 0 ]; then +- error_msg "Error creating directory $SAGE_BUILD_DIR" +- exit 1 +-fi ++for dir in "$SAGE_SPKG_INST" "$SAGE_SPKG_SCRIPTS" "$SAGE_BUILD_DIR"; do ++ mkdir -p "$dir" ++ if [ $? -ne 0 ]; then ++ error_msg "Error creating directory $dir" ++ exit 1 ++ fi ++done + + # Trac #5852: check write permissions + if [ ! -w "$SAGE_BUILD_DIR" ]; then diff --git a/pkgs/applications/science/math/sage/patches/zn_poly_version.patch b/pkgs/applications/science/math/sage/patches/zn_poly_version.patch deleted file mode 100644 index 92ea4303e477..000000000000 --- a/pkgs/applications/science/math/sage/patches/zn_poly_version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py -index 7ff4f21675..1d72168833 100644 ---- a/src/sage/misc/package.py -+++ b/src/sage/misc/package.py -@@ -350,7 +350,7 @@ def package_versions(package_type, local=False): - sage: 'gap' in std - True - sage: std['zn_poly'] -- ('0.9.p11', '0.9.p11') -+ ('0.9', '0.9.p11') - """ - return {pkg['name']: (pkg['installed_version'], pkg['remote_version']) for pkg in list_packages(package_type, local=local).values()} - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index c97785c574cb..096f2212cc49 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -3,17 +3,20 @@ , fetchpatch }: stdenv.mkDerivation rec { - version = "8.2"; + version = "8.3"; name = "sage-src-${version}"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0d7vc16s7dj23an2cb8v5bhbnc6nsw20qhnnxr0xh8qg629027b8"; + sha256 = "0mbm99m5xry21xpi4q3q96gx392liwbifywf5awvl0j85a7rkfyx"; }; nixPatches = [ + # https://trac.sagemath.org/ticket/25809 + ./patches/spkg-scripts.patch + # https://trac.sagemath.org/ticket/25309 (fetchpatch { name = "spkg-paths.patch"; @@ -26,14 +29,7 @@ stdenv.mkDerivation rec { sha256 = "14s50yg3hpw9cp3v581dx7zfmpm2j972im7x30iwki8k45mjvk3i"; }) - # https://trac.sagemath.org/ticket/25328 - # https://trac.sagemath.org/ticket/25546 # https://trac.sagemath.org/ticket/25722 - (fetchpatch { - name = "install-jupyter-kernel-in-correct-prefix.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=72167b98e3f64326df6b2c78785df25539472fcc"; - sha256 = "0pscnjhm7r2yr2rxnv4kkkq626vwaja720lixa3m3w9rwlxll5a7"; - }) ./patches/test-in-tmpdir.patch # https://trac.sagemath.org/ticket/25358 @@ -43,27 +39,13 @@ stdenv.mkDerivation rec { sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; }) - # https://trac.sagemath.org/ticket/25357 rebased on 8.2 - ./patches/python3-syntax-without-write.patch - - # https://trac.sagemath.org/ticket/25314 - (fetchpatch { - name = "make-qepcad-test-optional.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=fe294c58bd035ef427e268901d54a6faa0058138"; - sha256 = "003d5baf5c0n5rfg010ijwkwz8kg0s414cxwczs2vhdayxdixbix"; - }) - + # Unfortunately inclusion in upstream sage was rejected. Instead the bug was + # fixed in python, but of course not backported to 2.7. So we'll probably + # have to keep this around until 2.7 is deprecated. # https://trac.sagemath.org/ticket/25316 + # https://github.com/python/cpython/pull/7476 ./patches/python-5755-hotpatch.patch - # https://trac.sagemath.org/ticket/25354 - # https://trac.sagemath.org/ticket/25531 - (fetchpatch { - name = "cysignals-include.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=28778bd25a37c80884d2b24e0683fb2989300cef"; - sha256 = "0fiiiw91pgs8avm9ggj8hb64bhqzl6jcw094d94nhirmh8w2jmc5"; - }) - # https://trac.sagemath.org/ticket/25315 (fetchpatch { name = "find-libraries-in-dyld-library-path.patch"; @@ -71,16 +53,13 @@ stdenv.mkDerivation rec { sha256 = "1k3afq3qlzmgqwx6rzs5wv153vv9dsf5rk8pi61g57l3r3npbjmc"; }) - # Pari upstream has since accepted a patch, so this patch won't be necessary once sage updates pari. - # https://trac.sagemath.org/ticket/25312 - ./patches/pari-stackwarn.patch - - # https://trac.sagemath.org/ticket/25311 - ./patches/zn_poly_version.patch - # https://trac.sagemath.org/ticket/25345 # (upstream patch doesn't apply on 8.2 source) ./patches/dochtml-optional.patch + + # work with pari with threads enabled at compile time (disable them at runtime) + # https://trac.sagemath.org/ticket/26002 + ./patches/pari-no-threads.patch ]; packageUpgradePatches = [ @@ -106,87 +85,62 @@ stdenv.mkDerivation rec { # the last version. ./patches/eclib-regulator-precision.patch - # sphinx 1.6 -> 1.7 upgrade - # https://trac.sagemath.org/ticket/24935 - ./patches/sphinx-1.7.patch - - # Adapt hashes to new boost version - # https://trac.sagemath.org/ticket/22243 - # (this ticket doesn't only upgrade boost but also avoids this problem in the future) - (fetchpatch { - name = "boost-upgrade.patch"; - url = "https://git.sagemath.org/sage.git/patch?id=a24a9c6b30b93957333a3116196214a931325b69"; - sha256 = "0z3870g2ms2a81vnw08dc2i4k7jr62w8fggvcdwaavgd1wvdxwfl"; - }) - - # gfan 0.6.2 - # https://trac.sagemath.org/ticket/23353 - (fetchpatch { - name = "gfan-update.patch"; - url = "https://git.sagemath.org/sage.git/patch/?h=420215fc469cde733ec7a339e59b78ad6eec804c&id=112498a293ea2bf563e41aed35f1aa608f01b349"; - sha256 = "0ga3hkx8cr23dpc919lgvpi5lmy0d728jkq9z6kf0fl9s8g31mxb"; - }) - # New glpk version has new warnings, filter those out until upstream sage has found a solution # https://trac.sagemath.org/ticket/24824 + ./patches/pari-stackwarn.patch # not actually necessary since tha pari upgrade, but necessary for the glpk patch to apply (fetchpatch { url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/dt-version-glpk-4.65-ignore-warnings.patch"; sha256 = "0b9293v73wb4x13wv5zwyjgclc01zn16msccfzzi6znswklgvddp"; stripLen = 1; }) - # https://trac.sagemath.org/ticket/25329 + # Only formatting changes. + # https://trac.sagemath.org/ticket/25260 + ./patches/numpy-1.14.3.patch + + # https://trac.sagemath.org/ticket/25862 + ./patches/eclib-20180710.patch + + # https://trac.sagemath.org/ticket/24735 + ./patches/singular-4.1.1p2.patch + + # https://trac.sagemath.org/ticket/25567 and dependency #25635 (fetchpatch { - name = "dont-check-exact-glpk-version.patch"; - url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=89d068d8d77316bfffa6bf8e9ebf70b3b3b88e5c"; - sha256 = "00knwxs6fmymfgfl0q5kcavmxm9sf90a4r76y35n5s55gj8pl918"; + name = "pari-upgrade-dependency.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=6995e7cae1b3476ad0145f8dfc897cf91f0c3c4d"; + sha256 = "1dvhabl1c9pwd9xkjvbjjg15mvb14b24p1f3cby1mlqk34d4lrs6"; }) - - # https://trac.sagemath.org/ticket/25355 (fetchpatch { - name = "maxima-5.41.0.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=87328023c4739abdf24108038201e3fa9bdfc739"; - sha256 = "0hxi7qr5mfx1bc32r8j7iba4gzd7c6v63asylyf5cbyp86azpb7i"; + name = "pari-2.11.0.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=7af4748cab37d651eaa88be501db88f4a5ffc584"; + sha256 = "13f740ly3c19gcmhjngiycvmc3mcfj61y00i6jv0wmfgpm2z3ank"; }) - # Update cddlib from 0.94g to 0.94h. - # https://trac.sagemath.org/ticket/25341 (doesn't apply to 8.2 sources) + # ntl upgrade (fetchpatch { - url = "https://salsa.debian.org/science-team/sagemath/raw/58bbba93a807ca2933ca317501d093a1bb4b84db/debian/patches/u2-version-cddlib-094h.patch"; - sha256 = "0fmw7pzbaxs2dshky6iw9pr8i23p9ih2y2lw661qypdrxh5xw03k"; - stripLen = 1; + name = "lcalc-c++11.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/sagemath-lcalc-c++11.patch?h=packages/sagemath&id=0e31ae526ab7c6b5c0bfacb3f8b1c4fd490035aa"; + sha256 = "0p5wnvbx65i7cp0bjyaqgp4rly8xgnk12pqwaq3dqby0j2bk6ijb"; }) + + # cddlib 0.94i -> 0.94j (fetchpatch { - name = "revert-cddlib-doctest-changes.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=269c1e1551285566b8ba7a2b890989e5590e9f11"; - sha256 = "12bcjhq7hm2pmmj2bgjvcffjyls2x7q61ivlnaj5v5bsvhc183iy"; - revert = true; + name = "cddlib-0.94j.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=2ab1546b3e21d1d0ab3b4fcd58576848b3a2d888"; + sha256 = "1c5gnasq7y9xxj762bn79bis0zi8d9bgg7jzlf64ifixsrc5cymb"; }) - - # Only formatting changes. - # https://trac.sagemath.org/ticket/25260 - ./patches/numpy-1.14.3.patch - - # https://trac.sagemath.org/ticket/24374 + # arb 2.13.0 -> 2.14.0 (fetchpatch { - name = "networkx-2.1.patch"; - url = "https://salsa.debian.org/science-team/sagemath/raw/487df9ae48ca1d93d9b1cb3af8745d31e30fb741/debian/patches/u0-version-networkx-2.1.patch"; - sha256 = "1xxxawygbgxgvlv7b4w8hhzgdnva4rhmgdxaiaa3pwdwln0yc750"; - stripLen = 1; + name = "arb-2.14.0.patch"; + url = "https://git.sagemath.org/sage.git/patch?id2=8.4.beta0&id=8bef4fd2876a61969b516fe4eb3b8ad7cc076c5e"; + sha256 = "00p3hfsfn3w2vxgd9fjd23mz7xfxjfravf8ysjxkyd657jbkpjmk"; }) - - # https://trac.sagemath.org/ticket/24927 rebased - ./patches/arb-2.13.0.patch - - # https://trac.sagemath.org/ticket/24838 rebased - ./patches/pynac-0.7.22.patch - - # https://trac.sagemath.org/ticket/25862 - ./patches/eclib-20180710.patch ]; - patches = nixPatches ++ packageUpgradePatches; + patches = nixPatches ++ packageUpgradePatches ++ [ + ./patches/known-padics-bug.patch + ]; postPatch = '' # make sure shebangs etc are fixed, but sage-python23 still works diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index ad0231d37b0e..dacd3e730736 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -3,7 +3,7 @@ let name = "scilab-bin-${ver}"; - ver = "5.5.2"; + ver = "6.0.1"; majorVer = builtins.elemAt (lib.splitString "." ver) 0; @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { url = "https://www.scilab.org/download/${ver}/scilab-${ver}.bin.linux-${architecture}.tar.gz"; sha256 = if stdenv.system == "i686-linux" then - "6143a95ded40411a35630a89b365875a6526cd4db1e2865ac5612929a7db937a" + "0fgjc2ak3b2qi6yin3fy50qwk2bcj0zbz1h4lyyic9n1n1qcliib" else if stdenv.system == "x86_64-linux" then - "c0dd7a5f06ec7a1df7a6b1b8b14407ff7f45e56821dff9b3c46bd09d4df8d350" + "1scswlznc14vyzg0gqa1q9gcpwx05kz1sbn563463mzkdp7nd35d" else badArch; }; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 6063a45a3efb..96b7dec19c21 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -29,35 +29,29 @@ stdenv.mkDerivation rec { /* --with-atlas-library=DIR Atlas library files are in DIR and we use Atlas */ - configureFlags = "" - # use gcc C compiler and gnu Fortran compiler (g77 or gfortran) - + " --with-gcc --with-g77" - # use Xaw3d widgets given with Scilab - + (lib.optionalString (!withXaw3d) " --with-local-xaw") - # do not compile with PVM library - + " --without-pvm" - # compile with GTK - + (if withGtk then " - --with-gtk --with-gtk2 - " else " - --without-gtk --without-gtk2 - ") - # compile with TCL/TK - + (lib.optionalString withTk " - --with-tk - --with-tcl-library=${tcl}/lib - --with-tcl-include=${tcl}/include - --with-tk-library=${tk}/lib - --with-tk-include=${tk}/include - ") - # do not use Gtk widgets - + " --without-gtk --without-gtk2" - # compile with ocaml - + (if withOCaml then " --with-ocaml" else " --without-ocaml") - # do not compile Java interface - + " --without-java" - # use the X Window System - + lib.optionalString withX "--with-x" + configureFlags = [ + # use gcc C compiler and gnu Fortran compiler (g77 or gfortran) + "--with-gcc" "--with-g77" + # do not compile with PVM library + "--without-pvm" + # compile with GTK + (stdenv.lib.enableFeature withGtk "gtk") + (stdenv.lib.enableFeature withGtk "gtk2") + # compile with ocaml + (stdenv.lib.withFeature withOCaml "ocaml") + # do not compile Java interface + "--without-java" + # use the X Window System + (stdenv.lib.withFeature withX "x") + # compile with TCL/TK + ] ++ lib.optionals withTk [ + "--with-tk" + "--with-tcl-library=${tcl}/lib" + "--with-tcl-include=${tcl}/include" + "--with-tk-library=${tk}/lib" + "--with-tk-include=${tk}/include" + ] # use Xaw3d widgets given with Scilab + ++ lib.optional (!withXaw3d) "--with-local-xaw" ; makeFlags = "all"; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index 98b75cd22d05..24063216db04 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, gmp, bison, perl, ncurses, readline, coreutils, pkgconfig , lib +, fetchpatch , autoreconfHook , file , flint @@ -36,6 +37,18 @@ stdenv.mkDerivation rec { patchShebangs . ''; + patches = [ + # NTL error handler was introduced in the library part, preventing users of + # the library from implementing their own error handling + # https://www.singular.uni-kl.de/forum/viewtopic.php?t=2769 + (fetchpatch { + name = "move_error_handler_out_of_libsingular.patch"; + # rebased version of https://github.com/Singular/Sources/commit/502cf86d0bb2a96715be6764774b64a69c1ca34c.patch + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/singular/patches/singular-ntl-error-handler.patch?h=50b9ae2fd233c30860e1cbb3e63a26f2cc10560a"; + sha256 = "0vgh4m9zn1kjl0br68n04j4nmn5i1igfn28cph0chnwf7dvr9194"; + }) + ]; + # For reference (last checked on commit 75f460d): # https://github.com/Singular/Sources/blob/spielwiese/doc/Building-Singular-from-source.md # https://github.com/Singular/Sources/blob/spielwiese/doc/external-packages-dynamic-modules.md diff --git a/pkgs/applications/science/math/symmetrica/default.nix b/pkgs/applications/science/math/symmetrica/default.nix index 6123fd7306d9..a641993b393b 100644 --- a/pkgs/applications/science/math/symmetrica/default.nix +++ b/pkgs/applications/science/math/symmetrica/default.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { name = "symmetrica-${version}"; version = "2.0"; + src = fetchurl { url = "http://www.algorithm.uni-bayreuth.de/en/research/SYMMETRICA/SYM2_0_tar.gz"; sha256 = "1qhfrbd5ybb0sinl9pad64rscr08qvlfzrzmi4p4hk61xn6phlmz"; name = "symmetrica-2.0.tar.gz"; }; + sourceRoot = "."; - installPhase = '' - mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica} - ar crs libsymmetrica.a *.o - ranlib libsymmetrica.a - cp libsymmetrica.a "$out/lib" - cp *.h "$out/include/symmetrica" - cp README *.doc "$out/share/doc/symmetrica" - ''; + patches = [ # don't show banner ("SYMMETRICA VERSION X - STARTING) # it doesn't contain very much helpful information and a banner is not ideal for a library @@ -34,13 +29,34 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/int32.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba"; sha256 = "0p33c85ck4kd453z687ni4bdcqr1pqx2756j7aq11bf63vjz4cyz"; }) + + (fetchpatch { + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/symmetrica/patches/return_values.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a"; + sha256 = "0dmczkicwl50sivc07w3wm3jpfk78wm576dr25999jdj2ipsb7nk"; + }) ]; + + postPatch = '' + substituteInPlace makefile --replace gcc cc + ''; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p "$out"/{lib,share/doc/symmetrica,include/symmetrica} + ar crs libsymmetrica.a *.o + ranlib libsymmetrica.a + cp libsymmetrica.a "$out/lib" + cp *.h "$out/include/symmetrica" + cp README *.doc "$out/share/doc/symmetrica" + ''; + meta = { inherit version; description = ''A collection of routines for representation theory and combinatorics''; license = stdenv.lib.licenses.publicDomain; maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; homepage = http://www.symmetrica.de/; }; } diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index a1b8769617c9..01bd1c6fd80c 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = "--disable-server"; + configureFlags = [ "--disable-server" ]; meta = { description = "Free software for distributed and grid computing"; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 17a1719ba1ed..b6cd8c294c1b 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, cmake, elfutils, perl, python3, boost, valgrind +{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 , fortranSupport ? false, gfortran , buildDocumentation ? false, transfig, ghostscript, doxygen , buildJavaBindings ? false, openjdk -, modelCheckingSupport ? false, libunwind, libevent # Inside elfutils - , libelf, libevent, libdw +, modelCheckingSupport ? false, libunwind, libevent, elfutils # Inside elfutils: libelf and libdw , debug ? false , moreTests ? false }: @@ -18,20 +18,20 @@ in stdenv.mkDerivation rec { name = "simgrid-${version}"; - version = "3.19.1"; + version = "3.20"; src = fetchFromGitHub { owner = "simgrid"; repo = "simgrid"; rev = "v${version}"; - sha256 = "0vpgcp40xv20hcpslx5wz2mf2phaq41f7x8yr0bm7mknqd3zwxih"; + sha256 = "0xb20qhvsah2dz2hvn850i3w9a5ghsbcx8vka2ap6xsdkxf593gy"; }; - nativeBuildInputs = [ cmake perl elfutils python3 boost valgrind ] + nativeBuildInputs = [ cmake perl python3 boost valgrind ] ++ optionals fortranSupport [ gfortran ] ++ optionals buildJavaBindings [ openjdk ] ++ optionals buildDocumentation [ transfig ghostscript doxygen ] - ++ optionals modelCheckingSupport [ libunwind libevent ]; + ++ optionals modelCheckingSupport [ libunwind libevent elfutils ]; #buildInputs = optional luaSupport lua5; @@ -83,13 +83,15 @@ stdenv.mkDerivation rec { ''; doCheck = true; - + checkPhase = '' runHook preCheck - ctest --output-on-failure -E smpi-replay-multiple + + ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple + runHook postCheck ''; - + enableParallelBuilding = true; meta = { diff --git a/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch b/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch new file mode 100644 index 000000000000..a34ab0c6eb10 --- /dev/null +++ b/pkgs/applications/version-management/bazaar/CVE-2017-14176.patch @@ -0,0 +1,149 @@ +diff --git a/bzrlib/tests/test_ssh_transport.py b/bzrlib/tests/test_ssh_transport.py +index 9e37c3b..fe9f219 100644 +--- a/bzrlib/tests/test_ssh_transport.py ++++ b/bzrlib/tests/test_ssh_transport.py +@@ -22,6 +22,7 @@ from bzrlib.transport.ssh import ( + SSHCorpSubprocessVendor, + LSHSubprocessVendor, + SSHVendorManager, ++ StrangeHostname, + ) + + +@@ -161,6 +162,19 @@ class SSHVendorManagerTests(TestCase): + + class SubprocessVendorsTests(TestCase): + ++ def test_openssh_command_tricked(self): ++ vendor = OpenSSHSubprocessVendor() ++ self.assertEqual( ++ vendor._get_vendor_specific_argv( ++ "user", "-oProxyCommand=blah", 100, command=["bzr"]), ++ ["ssh", "-oForwardX11=no", "-oForwardAgent=no", ++ "-oClearAllForwardings=yes", ++ "-oNoHostAuthenticationForLocalhost=yes", ++ "-p", "100", ++ "-l", "user", ++ "--", ++ "-oProxyCommand=blah", "bzr"]) ++ + def test_openssh_command_arguments(self): + vendor = OpenSSHSubprocessVendor() + self.assertEqual( +@@ -171,6 +185,7 @@ class SubprocessVendorsTests(TestCase): + "-oNoHostAuthenticationForLocalhost=yes", + "-p", "100", + "-l", "user", ++ "--", + "host", "bzr"] + ) + +@@ -184,9 +199,16 @@ class SubprocessVendorsTests(TestCase): + "-oNoHostAuthenticationForLocalhost=yes", + "-p", "100", + "-l", "user", +- "-s", "host", "sftp"] ++ "-s", "--", "host", "sftp"] + ) + ++ def test_openssh_command_tricked(self): ++ vendor = SSHCorpSubprocessVendor() ++ self.assertRaises( ++ StrangeHostname, ++ vendor._get_vendor_specific_argv, ++ "user", "-oProxyCommand=host", 100, command=["bzr"]) ++ + def test_sshcorp_command_arguments(self): + vendor = SSHCorpSubprocessVendor() + self.assertEqual( +@@ -209,6 +231,13 @@ class SubprocessVendorsTests(TestCase): + "-s", "sftp", "host"] + ) + ++ def test_lsh_command_tricked(self): ++ vendor = LSHSubprocessVendor() ++ self.assertRaises( ++ StrangeHostname, ++ vendor._get_vendor_specific_argv, ++ "user", "-oProxyCommand=host", 100, command=["bzr"]) ++ + def test_lsh_command_arguments(self): + vendor = LSHSubprocessVendor() + self.assertEqual( +@@ -231,6 +260,13 @@ class SubprocessVendorsTests(TestCase): + "--subsystem", "sftp", "host"] + ) + ++ def test_plink_command_tricked(self): ++ vendor = PLinkSubprocessVendor() ++ self.assertRaises( ++ StrangeHostname, ++ vendor._get_vendor_specific_argv, ++ "user", "-oProxyCommand=host", 100, command=["bzr"]) ++ + def test_plink_command_arguments(self): + vendor = PLinkSubprocessVendor() + self.assertEqual( +diff --git a/bzrlib/transport/ssh.py b/bzrlib/transport/ssh.py +index eecaa26..6f22341 100644 +--- a/bzrlib/transport/ssh.py ++++ b/bzrlib/transport/ssh.py +@@ -46,6 +46,10 @@ else: + from paramiko.sftp_client import SFTPClient + + ++class StrangeHostname(errors.BzrError): ++ _fmt = "Refusing to connect to strange SSH hostname %(hostname)s" ++ ++ + SYSTEM_HOSTKEYS = {} + BZR_HOSTKEYS = {} + +@@ -360,6 +364,11 @@ class SubprocessVendor(SSHVendor): + # tests, but beware of using PIPE which may hang due to not being read. + _stderr_target = None + ++ @staticmethod ++ def _check_hostname(arg): ++ if arg.startswith('-'): ++ raise StrangeHostname(hostname=arg) ++ + def _connect(self, argv): + # Attempt to make a socketpair to use as stdin/stdout for the SSH + # subprocess. We prefer sockets to pipes because they support +@@ -424,9 +433,9 @@ class OpenSSHSubprocessVendor(SubprocessVendor): + if username is not None: + args.extend(['-l', username]) + if subsystem is not None: +- args.extend(['-s', host, subsystem]) ++ args.extend(['-s', '--', host, subsystem]) + else: +- args.extend([host] + command) ++ args.extend(['--', host] + command) + return args + + register_ssh_vendor('openssh', OpenSSHSubprocessVendor()) +@@ -439,6 +448,7 @@ class SSHCorpSubprocessVendor(SubprocessVendor): + + def _get_vendor_specific_argv(self, username, host, port, subsystem=None, + command=None): ++ self._check_hostname(host) + args = [self.executable_path, '-x'] + if port is not None: + args.extend(['-p', str(port)]) +@@ -460,6 +470,7 @@ class LSHSubprocessVendor(SubprocessVendor): + + def _get_vendor_specific_argv(self, username, host, port, subsystem=None, + command=None): ++ self._check_hostname(host) + args = [self.executable_path] + if port is not None: + args.extend(['-p', str(port)]) +@@ -481,6 +492,7 @@ class PLinkSubprocessVendor(SubprocessVendor): + + def _get_vendor_specific_argv(self, username, host, port, subsystem=None, + command=None): ++ self._check_hostname(host) + args = [self.executable_path, '-x', '-a', '-ssh', '-2', '-batch'] + if port is not None: + args.extend(['-P', str(port)]) diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 72e010fd283c..fea6fb358303 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,5 +1,4 @@ { stdenv, fetchurl, python2Packages -, fetchpatch , withSFTP ? true }: @@ -21,11 +20,7 @@ python2Packages.buildPythonApplication rec { patches = [ # Bazaar can't find the certificates alone ./add_certificates.patch - (fetchpatch { - url = "https://bazaar.launchpad.net/~brz/brz/trunk/revision/6754"; - sha256 = "0mdqa9w1p6cmli6976v4wi0sw9r4p5prkj7lzfd1877wk11c9c73"; - name = "CVE-2017-14176.patch"; - }) + ./CVE-2017-14176.patch ]; postPatch = '' substituteInPlace bzrlib/transport/http/_urllib2_wrappers.py \ diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 71fb7612b339..2063149dd784 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -32,9 +32,10 @@ stdenv.mkDerivation { doCheck = false; # fails 1 of 1 tests - meta = { + meta = with stdenv.lib; { homepage = http://cvs.nongnu.org; description = "Concurrent Versions System - a source control system"; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; # library is GPLv2, main is GPLv1 + platforms = platforms.all; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 1373e13c4147..396ed10392ca 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { preCheck = stdenv.lib.optional doCheck '' export TCLLIBPATH="${tcllib}/lib/tcllib${tcllib.version}" ''; - configureFlags = if withJson then "--json" else ""; + configureFlags = stdenv.lib.optional withJson "--json"; preBuild='' export USER=nonexistent-but-specified-user diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 284a1cc649a8..3fb227909040 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -6,19 +6,19 @@ stdenv.mkDerivation rec { name = "cgit-${version}"; - version = "1.1"; + version = "1.2.1"; src = fetchurl { url = "https://git.zx2c4.com/cgit/snapshot/${name}.tar.xz"; - sha256 = "142qcgs8dwnzhymn0a7xx47p9fc2z5wrb86ah4a9iz0mpqlsz288"; + sha256 = "1gw2j5xc5qdx2hwiwkr8h6kgya7v9d9ff9j32ga1dys0cca7qm1w"; }; # cgit is tightly coupled with git and needs a git source tree to build. # IMPORTANT: Remember to check which git version cgit needs on every version # bump (look for "GIT_VER" in the top-level Makefile). gitSrc = fetchurl { - url = "mirror://kernel/software/scm/git/git-2.10.2.tar.xz"; - sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; + url = "mirror://kernel/software/scm/git/git-2.18.0.tar.xz"; + sha256 = "14hfwfkrci829a9316hnvkglnqqw1p03cw9k56p4fcb078wbwh4b"; }; nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index e4db75c8ad7a..1ea60272c338 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "git-extras-${version}"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "059680bvblbhrlkybg1yisr5zq62pir1rnaxz5izhfsw2ng9s2fb"; + sha256 = "1jp5wi2h4jqbrjv0iqa45s0f9h3n5k1dxs89jkhg5n5k9jjs7fp3"; }; dontBuild = true; diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 5b0ba0aba7d9..6d2753e45437 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "tig"; - version = "2.4.0"; + version = "2.4.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = name; - sha256 = "1d5clkdgj0ip1j0k335pr4dabcnap6jr016q90i49p1jxixy96pb"; + sha256 = "0i26yfn2vjgsg1kdvhhv55jwzds7ih7cnad1xqvilqm83zh47ksd"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 85514ed47867..592b348d03fd 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.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; rev = "v${version}"; - sha256 = "0rl20dhj3in8w3ngix42qly077zrwg578aa2nxxznmn9k8xdvfpd"; + sha256 = "0gp777x8yjbqvz9i79qv3bn3hrlp1bn7ib57r7w5a7jmr9rd0nca"; }; patches = [ ./static-root-path.patch ]; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 9a7609684b58..80f0786af4d2 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "gitkraken-${version}"; - version = "3.6.6"; + version = "4.0.1"; src = fetchurl { url = "https://release.gitkraken.com/linux/v${version}.deb"; - sha256 = "01ir325ls1fb6ml79c02c7dyi910lxw0avlwc0nzv8fy4aqavl6p"; + sha256 = "0y4r5d21mxwnwla9ggy9c4pm3zbz67yi9z06znkdz9x2chv1ci3n"; }; libPath = makeLibraryPath [ diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix index 8f8930424a94..4282f48654e6 100644 --- a/pkgs/applications/version-management/monotone/default.nix +++ b/pkgs/applications/version-management/monotone/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "124cwgi2q86hagslbk5idxbs9j896rfjzryhr6z63r6l485gcp7r"; }; - patches = [ ]; + patches = [ ./monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ boost zlib botan libidn lua pcre sqlite expect diff --git a/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch b/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch new file mode 100644 index 000000000000..1ecda436c251 --- /dev/null +++ b/pkgs/applications/version-management/monotone/monotone-1.1-Adapt-to-changes-in-pcre-8.42.patch @@ -0,0 +1,66 @@ +From 70f209ad582121750d54e3692b1e62c7f36af6f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com> +Date: Mon, 7 May 2018 14:09:06 +0200 +Subject: [PATCH] Adapt to changes in pcre-8.42 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +pcre-8.42 replaced internal real_pcre with real_pcre8_or_16. This +broke monotone that decided not to use the public "pcre" type. + +This patch adapts monotone to the pcre >= 8.42. + +Signed-off-by: Petr PÃsaÅ™ <ppisar@redhat.com> +--- + src/pcrewrap.cc | 4 ++-- + src/pcrewrap.hh | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/pcrewrap.cc b/src/pcrewrap.cc +index 8c0c9d1..30bafff 100644 +--- a/src/pcrewrap.cc ++++ b/src/pcrewrap.cc +@@ -74,7 +74,7 @@ get_capturecount(void const * bd) + namespace pcre + { + typedef map<char const *, +- pair<struct real_pcre const *, struct pcre_extra const *> > ++ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> > + regex_cache; + + class regex_cache_manager +@@ -86,7 +86,7 @@ public: + } + + void store(char const * pattern, +- pair<struct real_pcre const *, struct pcre_extra const *> ++ pair<struct real_pcre8_or_16 const *, struct pcre_extra const *> + data) + { + cache[pattern] = data; +diff --git a/src/pcrewrap.hh b/src/pcrewrap.hh +index 3359cdd..5008e88 100644 +--- a/src/pcrewrap.hh ++++ b/src/pcrewrap.hh +@@ -18,7 +18,7 @@ + // definitions and so we don't actually expose it here. Unfortunately, this + // means we have to hope this pair of forward declarations will not change... + +-struct real_pcre; ++struct real_pcre8_or_16; + struct pcre_extra; + + namespace pcre +@@ -61,7 +61,7 @@ namespace pcre + regex & operator=(regex const &); + + // data +- struct real_pcre const * basedat; ++ struct real_pcre8_or_16 const * basedat; + struct pcre_extra const * extradat; + + // used by constructors +-- +2.14.3 + diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 3fd665723159..8dd46405d31f 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git -, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto +, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy , bazaar ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null , subversion ? null, cvs_fast_export ? null }: with stdenv; with lib; let - inherit (python27Packages) python cython; + inherit (python27Packages) python; in mkDerivation rec { name = "reposurgeon-${meta.version}"; meta = { description = "A tool for editing version-control repository history"; - version = "3.28"; + version = "3.44"; license = licenses.bsd3; homepage = http://www.catb.org/esr/reposurgeon/; maintainers = with maintainers; [ dfoxfranke ]; @@ -19,17 +19,15 @@ in mkDerivation rec { }; src = fetchurl { - url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.28.tar.gz"; - sha256 = "3225b44109b8630310a0ea6fe63a3485d27aa46deaf80e8d07820e01a6f62626"; + url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.44.tar.xz"; + sha256 = "0il6hwrsm2qgg0vp5fcjh478y2x4zyw3mx2apcwc7svfj86pf7pn"; }; - # See https://gitlab.com/esr/reposurgeon/issues/17 - patches = [ ./fix-preserve-type.patch ]; + # install fails because the files README.md, NEWS, and TODO were not included in the source distribution + patches = [ ./fix-makefile.patch ]; buildInputs = - [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++ - optional (cython != null) cython - ; + [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper pypy ]; preBuild = '' makeFlagsArray=( @@ -40,12 +38,6 @@ in mkDerivation rec { ) ''; - buildFlags = "all" + (if cython != null then " cyreposurgeon" else ""); - - installTargets = - "install" + (if cython != null then " install-cyreposurgeon" else "") - ; - postInstall = let binpath = makeBinPath ( diff --git a/pkgs/applications/version-management/reposurgeon/fix-makefile.patch b/pkgs/applications/version-management/reposurgeon/fix-makefile.patch new file mode 100644 index 000000000000..0a659c93406d --- /dev/null +++ b/pkgs/applications/version-management/reposurgeon/fix-makefile.patch @@ -0,0 +1,12 @@ +diff -Naur reposurgeon-3.44/Makefile reposurgeon-3.44-new/Makefile +--- reposurgeon-3.44/Makefile 2018-04-29 12:27:43.000000000 -0700 ++++ reposurgeon-3.44-new/Makefile 2018-08-01 17:38:15.582789739 -0700 +@@ -36,7 +36,7 @@ + MANPAGES = reposurgeon.1 repotool.1 repodiffer.1 repomapper.1 repocutter.1 + HTMLFILES = $(MANPAGES:.1=.html) \ + dvcs-migration-guide.html features.html reporting-bugs.html +-SHARED = README.md NEWS TODO reposurgeon-git-aliases $(HTMLFILES) ++SHARED = reposurgeon-git-aliases $(HTMLFILES) + + all: $(MANPAGES) $(HTMLFILES) + diff --git a/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch b/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch deleted file mode 100644 index ef3568b7b927..000000000000 --- a/pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru reposurgeon-3.28/reposurgeon reposurgeon-3.28-new/reposurgeon ---- reposurgeon-3.28/reposurgeon 2015-07-05 15:17:13.000000000 -0400 -+++ reposurgeon-3.28-new/reposurgeon 2015-08-25 18:23:11.347591137 -0400 -@@ -193,7 +193,7 @@ - importer=b"git fast-import --quiet", - checkout=b"git checkout", - lister=b"git ls-files", -- preserve=(b'.git/config', b'.git/hooks'), -+ preserve=set((b'.git/config', b'.git/hooks')), - authormap=b".git/cvs-authors", - ignorename=b".gitignore", - dfltignores=b"", # Has none diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fc98b398213c..981f25f00f84 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -42,17 +42,19 @@ let # https://gcc.gnu.org/gcc-5/porting_to.html CPPFLAGS = "-P"; - configureFlags = '' - ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"} - ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} - ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} - --disable-keychain - ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} - ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} - --with-zlib=${zlib.dev} - --with-sqlite=${sqlite.dev} - ''; + configureFlags = [ + (stdenv.lib.withFeature bdbSupport "berkeley-db") + (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") + (stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) + (stdenv.lib.withFeatureAs saslSupport "sasl" sasl) + (stdenv.lib.withFeatureAs httpSupport "serf" serf) + "--disable-keychain" + "--with-zlib=${zlib.dev}" + "--with-sqlite=${sqlite.dev}" + ] ++ stdenv.lib.optionals javahlBindings [ + "--enable-javahl" + "--with-jdk=${jdk}" + ]; preBuild = '' makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) @@ -91,11 +93,12 @@ let doCheck = false; # fails 10 out of ~2300 tests - meta = { + meta = with stdenv.lib; { description = "A version control system intended to be a compelling replacement for CVS in the open source community"; + license = licenses.asl20; homepage = http://subversion.apache.org/; - maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with maintainers; [ eelco lovek323 ]; + platforms = platforms.linux ++ platforms.darwin; }; } // stdenv.lib.optionalAttrs stdenv.isDarwin { diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 3d2bf1f1a4f5..6c473e2d8dca 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages - configureFlags = "--enable-local-ffmpeg=no"; + configureFlags = [ "--enable-local-ffmpeg=no" ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 559972d9e793..81b48e25b96b 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpc-qt-${version}"; - version = "18.03"; + version = "18.08"; src = fetchFromGitHub { owner = "cmdrkotori"; repo = "mpc-qt"; rev = "v${version}"; - sha256 = "0mhzdgjgv08cvnscbfndpr0s8ndbcf91b61zfqspa1qv4wlqd716"; + sha256 = "1rxlkg3vsrapazdlb1i6c5a1vvf2114bsqwzcm3n2wc5c93yqsna"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index a6f7f55cad74..c384455d6722 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ stdenv, fetchpatch, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg_4 , freefont_ttf, freetype, libass, libpthreadstubs , lua, luasocket, libuchardet, libiconv ? null, darwin @@ -21,6 +21,7 @@ , sdl2Support ? true, SDL2 ? null , alsaSupport ? true, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null +, cmsSupport ? true, lcms2 ? null , vdpauSupport ? true, libvdpau ? null , dvdreadSupport ? true, libdvdread ? null , dvdnavSupport ? true, libdvdnav ? null @@ -34,7 +35,7 @@ , youtubeSupport ? true, youtube-dl ? null , vaapiSupport ? true, libva ? null , drmSupport ? true, libdrm ? null -, openalSupport ? true, openalSoft ? null +, openalSupport ? false, openalSoft ? null , vapoursynthSupport ? false, vapoursynth ? null , archiveSupport ? false, libarchive ? null , jackaudioSupport ? false, libjack2 ? null @@ -53,6 +54,7 @@ assert xvSupport -> x11Support && available libXv; assert sdl2Support -> available SDL2; assert alsaSupport -> available alsaLib; assert screenSaverSupport -> available libXScrnSaver; +assert cmsSupport -> available lcms2; assert vdpauSupport -> available libvdpau; assert dvdreadSupport -> available libdvdread; assert dvdnavSupport -> available libdvdnav; @@ -91,6 +93,13 @@ in stdenv.mkDerivation rec { sha256 = "0i2nl65diqsjyz28dj07h6d8gq6ix72ysfm0nhs8514hqccaihs3"; }; + # FIXME: Remove this patch for building on macOS if it gets released in + # the future. + patches = optional stdenv.isDarwin (fetchpatch { + url = https://github.com/mpv-player/mpv/commit/dc553c8cf4349b2ab5d2a373ad2fac8bdd229ebb.patch; + sha256 = "0pa8vlb8rsxvd1s39c4iv7gbaqlkn3hx21a6xnpij99jdjkw3pg8"; + }); + postPatch = '' patchShebangs ./TOOLS/ ''; @@ -105,6 +114,7 @@ in stdenv.mkDerivation rec { "--disable-libmpv-static" "--disable-static-build" "--disable-build-date" # Purity + "--disable-macos-cocoa-cb" # Disable whilst Swift isn't supported (enableFeature archiveSupport "libarchive") (enableFeature dvdreadSupport "dvdread") (enableFeature dvdnavSupport "dvdnav") @@ -136,11 +146,11 @@ in stdenv.mkDerivation rec { ++ optional pulseSupport libpulseaudio ++ optional rubberbandSupport rubberband ++ optional screenSaverSupport libXScrnSaver + ++ optional cmsSupport lcms2 ++ optional vdpauSupport libvdpau ++ optional speexSupport speex ++ optional bs2bSupport libbs2b ++ optional openalSupport openalSoft - ++ optional (openalSupport && stdenv.isDarwin) darwin.apple_sdk.frameworks.OpenAL ++ optional libpngSupport libpng ++ optional youtubeSupport youtube-dl ++ optional sdl2Support SDL2 @@ -149,20 +159,24 @@ in stdenv.mkDerivation rec { ++ optional drmSupport libdrm ++ optional vapoursynthSupport vapoursynth ++ optional archiveSupport libarchive + ++ optional stdenv.isDarwin libiconv ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm libXrandr ] ++ optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - CoreFoundation libiconv Cocoa CoreAudio + CoreFoundation Cocoa CoreAudio ]); enableParallelBuilding = true; buildPhase = '' python3 ${waf} build + '' + optionalString stdenv.isDarwin '' + python3 TOOLS/osxbundle.py -s build/mpv ''; - installPhase = + # Ensure youtube-dl is available in $PATH for mpv + wrapperFlags = let getPath = type : "${luasocket}/lib/lua/${lua.luaversion}/?.${type};" + "${luasocket}/share/lua/${lua.luaversion}/?.${type}"; @@ -170,24 +184,32 @@ in stdenv.mkDerivation rec { luaCPath = getPath "so"; in '' - python3 ${waf} install - - # Use a standard font - mkdir -p $out/share/mpv - ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf - # Ensure youtube-dl is available in $PATH for MPV - wrapProgram $out/bin/mpv \ --prefix LUA_PATH : "${luaPath}" \ --prefix LUA_CPATH : "${luaCPath}" \ '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" - '' + '' + ''; + + installPhase = '' + python3 ${waf} install + + # Use a standard font + mkdir -p $out/share/mpv + ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf + wrapProgram "$out/bin/mpv" \ + ${wrapperFlags} cp TOOLS/umpv $out/bin wrapProgram $out/bin/umpv \ --set MPV "$out/bin/mpv" + + '' + optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + cp -r build/mpv.app $out/Applications + wrapProgram "$out/Applications/mpv.app/Contents/MacOS/mpv" \ + ${wrapperFlags} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index e98ba9bdc3fb..c72714598d6a 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpv-mpris-${version}.so"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; - rev = "v${version}"; - sha256 = "0rsbrbv5q7vki59wdlx4cdkd0vvd79qgbjvdb3fn3li7aznvjwiy"; + rev = version; + sha256 = "06hq3j1jjlaaz9ss5l7illxz8vm5bng86jl24kawglwkqayhdnjx"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 62c4eba4db52..7a06e25f8a73 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { name = "obs-linuxbrowser-${version}"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "bazukas"; repo = "obs-linuxbrowser"; rev = version; - sha256 = "1nqi04ici9n1xjliy1gaqy2bq8zj1z32dffk890x2hi7ml688y9h"; + sha256 = "0jgh377yv69wbcqg7m7axi22x2p9jmcirws1pgrz22vaw7zbbdzl"; }; nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix new file mode 100644 index 000000000000..7386d95d0c2b --- /dev/null +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchFromGitHub, fetchurl, makeDesktopItem, pkgconfig, cmake, python3 +, libX11, libXrandr, qtbase, qtwebchannel, qtwebengine, qtx11extras +, libvdpau, SDL2, mpv, libGL }: +let + # During compilation, a CMake bundle is downloaded from `artifacts.plex.tv`, + # which then downloads a handful of web client-related files. To enable + # sandboxed builds, we manually download them and save them so these files + # are fetched ahead-of-time instead of during the CMake build. Whenever + # plex-media-player is updated, the versions for these files are changed, + # so the build IDs (and SHAs) below will need to be updated! + depSrcs = rec { + webClientBuildId = "56-23317d81e49651"; + webClientDesktopBuildId = "3.57.1-1e49651"; + webClientTvBuildId = "3.60.1-23317d8"; + + webClient = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; + sha256 = "1a48a65zzdx347kfnxriwkb0yjlhvn2g8jkda5pz10r3lwja0gbi"; + }; + webClientDesktopHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; + sha256 = "04wdgpsh33y8hyjhjrfw6ymf9g002jny7hvhld4xp33lwxhd2j5w"; + }; + webClientDesktop = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; + sha256 = "1asw9f84z9sm3w7ifnc7j631j84rgx23c6msmn2dnw48ckv3bj2z"; + }; + webClientTvHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; + sha256 = "0d1hsvmpwczwx442f8qdvfr8c3w84630j9qwpg2y4qm423sgdvja"; + }; + webClientTv = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; + sha256 = "1ih3l5paf1jl68b1xq3iqqmvs3m07fybz57hcz4f78v0gwq2kryq"; + }; + }; +in stdenv.mkDerivation rec { + name = "plex-media-player-${version}"; + version = "2.14.1.880"; + vsnHash = "301a4b6c"; + + src = fetchFromGitHub { + owner = "plexinc"; + repo = "plex-media-player"; + rev = "v${version}-${vsnHash}"; + sha256 = "0xz41r697vl6s3qvy6jwriv3pb9cfy61j6sydvdq121x5a0jnh9a"; + }; + + nativeBuildInputs = [ pkgconfig cmake python3 ]; + buildInputs = [ libX11 libXrandr qtbase qtwebchannel qtwebengine qtx11extras + libvdpau SDL2 mpv libGL ]; + + desktopItem = makeDesktopItem { + name = "plex-media-player"; + exec = "plexmediaplayer"; + icon = "plex-media-player"; + comment = "View your media"; + desktopName = "Plex Media Player"; + genericName = "Media Player"; + categories = "AudioVideo;Video;Player;TV;"; + }; + + preConfigure = with depSrcs; '' + mkdir -p build/dependencies + ln -s ${webClient} build/dependencies/buildid-${webClientBuildId}.cmake + ln -s ${webClientDesktopHash} build/dependencies/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1 + ln -s ${webClientDesktop} build/dependencies/web-client-desktop-${webClientDesktopBuildId}.tar.xz + ln -s ${webClientTvHash} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz.sha1 + ln -s ${webClientTv} build/dependencies/web-client-tv-${webClientTvBuildId}.tar.xz + ''; + + postInstall = '' + mkdir -p $out/share/{applications,pixmaps} + cp ${src}/resources/images/icon.png $out/share/pixmaps/plex-media-player.png + cp ${desktopItem}/share/applications/* $out/share/applications + ''; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + + meta = with stdenv.lib; { + description = "Streaming media player for Plex"; + license = licenses.gpl2; + maintainers = with maintainers; [ kylewlacy ]; + homepage = https://plex.tv; + }; +} diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 1fce30edbdf4..2dd76b36d057 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,20 +1,29 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview -, cmake, ninja, libxml2, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils -, libv4l, pcre }: +{ stdenv, lib, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 +, gettext, pkgconfig, libgphoto2, gphoto2, v4l_utils, libv4l, pcre +, qwt, extra-cmake-modules }: stdenv.mkDerivation rec { pname = "qstopmotion"; - version = "2.3.2"; + version = "2.4.0"; name = "${pname}-${version}"; src = fetchurl { - url = "mirror://sourceforge/project/${pname}/Version_2_3_2/${name}-Source.tar.gz"; - sha256 = "1vbiznwyc05jqg0dpmgxmvf7kdzmlck0i8v2c5d69kgrdnaypcrf"; + url = "mirror://sourceforge/project/${pname}/Version_2_4_0/${name}-Source.tar.gz"; + sha256 = "0pbyq6nrr9g3crlsng660768167s0fybvcpzbfc0w9kkhs2jwrr2"; }; - buildInputs = [ qt5.qtbase ffmpeg guvcview v4l_utils libv4l pcre ]; + buildInputs = with qt5; [ v4l_utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview + qwt qtquickcontrols qtimageformats qtxmlpatterns ]; - nativeBuildInputs = [ pkgconfig cmake ninja gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja + gettext libgphoto2 gphoto2 libxml2 libv4l ]; + + patchPhase = '' + substituteInPlace CMakeLists.txt \ + --replace "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \ + "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" + grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g' + ''; meta = with stdenv.lib; { homepage = http://www.qstopmotion.org; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 0df5d42ee0ea..950cd27937cc 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, SDL2, frei0r, gettext, mlt, jack1, pkgconfig, qtbase , qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols , qtgraphicaleffects, libmlt -, qmake, makeWrapper, fetchpatch, qttools }: +, qmake, makeWrapper, qttools }: assert stdenv.lib.versionAtLeast libmlt.version "6.8.0"; assert stdenv.lib.versionAtLeast mlt.version "6.8.0"; stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "18.06.02"; + version = "18.08"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1pqpgsb8ix1akq326chf46vvl5h02dwmdskskf2n6impygsy4x7v"; + sha256 = "1p2s4avm3bl5ippmgfzkkbb2w0xs4vhk2wbcd22g7bh1zq9w190n"; }; enableParallelBuilding = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; - qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" ]; + qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp @@ -35,12 +35,6 @@ stdenv.mkDerivation rec { sed "s_/usr/bin/nice_''${NICE}_" -i src/jobs/meltjob.cpp src/jobs/ffmpegjob.cpp ''; - patches = [ (fetchpatch { - url = https://github.com/mltframework/shotcut/commit/f304b7403cc7beb57b1610afd9c5c8173749e80b.patch; - name = "qt511.patch"; - sha256 = "1ynvyjchcb33a33x4w1ddnah2gyzmnm125ailgg6xy60lqsnsmp9"; - } ) ]; - postInstall = '' mkdir -p $out/share/shotcut cp -r src/qml $out/share/shotcut/ diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 1b1bb8147d31..5bc9ad8852a1 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -12,8 +12,9 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${linux}/lib/modules/${linux.modDirVersion}/build" ''; - configureFlags="--prefix="; - NIX_LDFLAGS="-lgcc_s"; + configureFlags= [ "--prefix=" ]; + + NIX_LDFLAGS = "-lgcc_s"; makeFlags = "SUID_ROOT= DESTDIR=\$(out) PREFIX="; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index b75145a3e4a3..69fc68a69deb 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c''; - configureFlags = "--with-readline=${readline.dev}"; + configureFlags = [ "--with-readline=${readline.dev}" ]; LIRC_CFLAGS="-I${lirc}/include"; LIRC_LIBS="-L ${lirc}/lib -llirc_client"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 6c739b32c5fb..882ee3047f0b 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0pk1kii8bmlvziblrqwb88w5cd486pmb7vw8p7kcyn9lqsw32ria"; + sha256 = "1rp015cm5fw9kfarcmfhfkr1sh0iz7kvqls6f8nfhwrrz5armd5v"; }; hardeningDisable = [ "fortify" ]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 742c2fb03f7c..1ff61129b0f9 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -22,8 +22,8 @@ with stdenv.lib; let - version = "2.12.0"; - sha256 = "17377xxbmwbrnh895a108z944pqi39hzrbw4jzgj8pcipi3s3x69"; + version = "2.12.1"; + sha256 = "1jp5y56682bgpfjapagxjfrjdvqkal34pj9qzn6kj8fqaad80l21"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -71,8 +71,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "ga" ]; - patches = [ ./no-etc-install.patch ] - ++ optional nixosTestRunner ./force-uid0-on-9p.patch + patches = [ + ./no-etc-install.patch + ./fix-qemu-ga.patch + ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optional pulseSupport ./fix-hda-recording.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch new file mode 100644 index 000000000000..c2f051e2b944 --- /dev/null +++ b/pkgs/applications/virtualization/qemu/fix-qemu-ga.patch @@ -0,0 +1,22 @@ +diff --git a/qga/commands-posix.c b/qga/commands-posix.c +index 0dc219d..9d020d3 100644 +--- a/qga/commands-posix.c ++++ b/qga/commands-posix.c +@@ -102,6 +102,8 @@ void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) + reopen_fd_to_null(1); + reopen_fd_to_null(2); + ++ execle("/run/current-system/sw/bin/shutdown", "shutdown", "-h", shutdown_flag, "+0", ++ "hypervisor initiated shutdown", (char*)NULL, environ); + execle("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", + "hypervisor initiated shutdown", (char*)NULL, environ); + _exit(EXIT_FAILURE); +@@ -189,6 +191,8 @@ void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp) + + /* Use '/sbin/hwclock -w' to set RTC from the system time, + * or '/sbin/hwclock -s' to set the system time from RTC. */ ++ execle("/run/current-system/sw/bin/hwclock", "hwclock", has_time ? "-w" : "-s", ++ NULL, environ); + execle("/sbin/hwclock", "hwclock", has_time ? "-w" : "-s", + NULL, environ); + _exit(EXIT_FAILURE); diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index ff05cb757066..cc543d2e94a1 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { name = "singularity-${version}"; - version = "2.5.2"; + version = "2.6.0"; enableParallelBuilding = true; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - configureFlags = "--localstatedir=/var"; + configureFlags = [ "--localstatedir=/var" ]; installFlags = "CONTAINER_MOUNTDIR=dummy CONTAINER_FINALDIR=dummy CONTAINER_OVERLAY=dummy SESSIONDIR=dummy"; fixupPhase = '' @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "singularityware"; repo = "singularity"; rev = version; - sha256 = "09wv8xagr5fjfhra5vyig0f1frfp97g99baqkh4avbzpg296q933"; + sha256 = "0bi7acgppbkfbra8r29s1ldq02lazdww0z2h1rfvv8spr8dzzi94"; }; nativeBuildInputs = [ autoreconfHook makeWrapper ]; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 33e12d109854..beecf72fd0b0 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -13,12 +13,12 @@ with stdenv.lib; stdenv.mkDerivation rec { baseName = "virt-viewer"; - version = "6.0"; + version = "7.0"; name = "${baseName}-${version}"; src = fetchurl { url = "http://virt-manager.org/download/sources/${baseName}/${name}.tar.gz"; - sha256 = "1chqrf658niivzfh85cbwkbv9vyg8sv1mv3i31vawkfsfdvvsdwh"; + sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index f9770435aaf0..94fc9697e54e 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -6,7 +6,7 @@ , xorriso, makeself, perl , javaBindings ? false, jdk ? null , pythonBindings ? false, python2 ? null -, enableExtensionPack ? false, requireFile ? null, fakeroot ? null +, extensionPack ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false @@ -19,30 +19,9 @@ with stdenv.lib; let python = python2; buildType = "release"; - # Manually sha256sum the extensionPack file, must be hex! - # Do not forget to update the hash in ./guest-additions/default.nix! - extpack = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e"; - extpackRev = "123301"; + # Remember to change the extpackRev and version in extpack.nix as well. main = "ee3af129a581ec4c1a3e777e98247f8943e976ce6edd24962bcaa5c53ed1f644"; version = "5.2.14"; - - # See https://github.com/NixOS/nixpkgs/issues/672 for details - extensionPack = requireFile rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; - sha256 = extpack; - message = '' - In order to use the extension pack, you need to comply with the VirtualBox Personal Use - and Evaluation License (PUEL) available at: - - https://www.virtualbox.org/wiki/VirtualBox_PUEL - - Once you have read and if you agree with the license, please use the - following command and re-run the installation: - - nix-prefetch-url http://download.virtualbox.org/virtualbox/${version}/${name} - ''; - }; - in stdenv.mkDerivation { name = "virtualbox-${version}"; @@ -174,7 +153,7 @@ in stdenv.mkDerivation { ln -s "$libexec/$file" $out/bin/$file done - ${optionalString enableExtensionPack '' + ${optionalString (extensionPack != null) '' mkdir -p "$share" "${fakeroot}/bin/fakeroot" "${stdenv.shell}" <<EXTHELPER "$libexec/VBoxExtPackHelperApp" install \ diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix new file mode 100644 index 000000000000..bd7a0c0f0993 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, lib}: + +with lib; + +let extpackRev = "123301"; + version = "5.2.14"; +in +fetchurl rec { + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${toString extpackRev}.vbox-extpack"; + url = "http://download.virtualbox.org/virtualbox/${version}/${name}"; + sha256 = "d90c1b0c89de19010f7c7fe7a675ac744067baf29a9966b034e97b5b2053b37e"; + + meta = { + description = "Oracle Extension pack for VirtualBox"; + license = licenses.virtualbox-puel; + homepage = https://www.virtualbox.org/; + maintainers = with maintainers; [ flokli sander cdepillabout ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 9f1e565d1666..bf2ab8bbdbe7 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -3,19 +3,19 @@ rustPlatform.buildRustPackage rec { name = "dwm-status-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "0k6r72qgns8i2y1ks0k9fwlabgndww5rssd13mis5bvkqla8j9i9"; + sha256 = "1nyi0p9snx9hddb4hliihskj4gdp933xs0f8kydyiprckikwiyjk"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "13ibcbk8shfajk200d8v2p6y3zfrz5dlvxqfw1zsm630s5dmy6qx"; + cargoSha256 = "1ngdzzxnv4y6xprmkawf6s2696zgwiwgb6ykj5adb4knlx5c634d"; postInstall = lib.optionalString enableAlsaUtils '' wrapProgram $out/bin/dwm-status \ diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index ba304ad0c817..be51a5c46bf3 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -7,13 +7,13 @@ in python27Packages.buildPythonApplication rec { name = "qtile-${version}"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "qtile"; repo = "qtile"; rev = "v${version}"; - sha256 = "1jw6mh9m5yrijhm218lc51sc89lc2ihvyx30jhrkxy2mzllhjgrs"; + sha256 = "0ynmmnh12mr3gwgz0j7l2hvm8c0y5gzsw80jszdkp4s5bh1q0nrj"; }; patches = [ diff --git a/pkgs/applications/window-managers/taffybar/default.nix b/pkgs/applications/window-managers/taffybar/default.nix index dfb2eec5dc55..681a5baec82c 100644 --- a/pkgs/applications/window-managers/taffybar/default.nix +++ b/pkgs/applications/window-managers/taffybar/default.nix @@ -15,5 +15,6 @@ in stdenv.mkDerivation { meta = { platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index f2acf03958b6..96f742df3105 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,45 +1,46 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, glib, dbus-glib -, desktopSupport -, gtk2, gnome2_panel, GConf2 +, desktopSupport, xlibs +, gtk2 +, gtk3, gnome3, mate , libxfce4util, xfce4-panel }: -assert desktopSupport == "gnome2" || desktopSupport == "gnome3" || desktopSupport == "xfce4"; +assert desktopSupport == "gnomeflashback" || desktopSupport == "mate" || desktopSupport == "xfce4"; stdenv.mkDerivation rec { - version = "2.1.0"; + version = "unstable-2017-09-15"; pname = "xmonad-log-applet"; - name = "${pname}-${version}-${desktopSupport}"; + name = "${pname}-${desktopSupport}-${version}"; src = fetchFromGitHub { - owner = "alexkay"; + owner = "kalj"; repo = pname; - rev = "${version}"; - sha256 = "1g1fisyaw83v72b25fxfjln8f4wlw3rm6nyk27mrqlhsc1spnb5p"; + rev = "a1b294cad2f266e4f18d9de34167fa96a0ffdba8"; + sha256 = "042307grf4zvn61gnflhsj5xsjykrk9sjjsprprm4iij0qpybxcw"; }; - buildInputs = with stdenv.lib; - [ glib dbus-glib ] - ++ optionals (desktopSupport == "gnome2") [ gtk2 gnome2_panel GConf2 ] - # TODO: no idea where to find libpanelapplet-4.0 - ++ optionals (desktopSupport == "gnome3") [ ] - ++ optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] - ; - + buildInputs = [ glib dbus-glib xlibs.xcbutilwm ] + ++ stdenv.lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ stdenv.lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] + ++ stdenv.lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] + ; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; - + configureFlags = [ "--with-panel=${desktopSupport}" ]; - + patches = [ ./fix-paths.patch ]; + # Setup hook replaces ${prefix} in pc files so we cannot use + # --define-variable=prefix=$prefix + PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib"; + meta = with stdenv.lib; { - homepage = https://github.com/alexkay/xmonad-log-applet; + homepage = https://github.com/kalj/xmonad-log-applet; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - - broken = desktopSupport == "gnome3"; }; } diff --git a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch index 031843afb172..5e1fc7114dc8 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch +++ b/pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch @@ -1,50 +1,57 @@ -diff --git a/Makefile.am b/Makefile.am -index 619012d..dcc6d3c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,5 @@ - plugindir = $(PLUGIN_DIR) -+SESSION_BUS_SERVICES_DIR = $(prefix)/share/dbus-1/services - plugin_PROGRAMS = xmonad-log-applet - - xmonad_log_applet_SOURCES = main.c -diff --git a/configure.ac b/configure.ac -index ad4cffb..110c953 100644 --- a/configure.ac +++ b/configure.ac -@@ -27,28 +27,28 @@ AC_ARG_WITH( +@@ -20,7 +20,7 @@ + PKG_CHECK_MODULES(XCB, xcb xcb-ewmh) + + PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.80) +-SESSION_BUS_SERVICES_DIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` ++SESSION_BUS_SERVICES_DIR=$prefix/share/dbus-1/services + AC_SUBST([SESSION_BUS_SERVICES_DIR]) + + AC_ARG_WITH( +@@ -32,35 +32,35 @@ AS_IF( [test "x$panel" = xgnome2], [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets - PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/gnome-panel/applets -+ PLUGIN_DIR=${prefix}/libexec ++ LIBPANEL_APPLET_DIR=$prefix/share/gnome-panel/applets ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_GNOME, 1, [panel type])] [AC_DEFINE(PANEL_GNOME2, 1, [panel type])] , [test "x$panel" = xgnome3], [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0` - PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec -+ PLUGIN_DIR=${prefix}/libexec ++ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanelapplet-4.0` ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_GNOME, 1, [panel type])] [AC_DEFINE(PANEL_GNOME3, 1, [panel type])] , + [test "x$panel" = xgnomeflashback], + [PKG_CHECK_MODULES(LIBPANEL, libpanel-applet >= 3.0.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet` +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanel-applet`/libexec ++ LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanel-applet` ++ PLUGIN_DIR=$prefix/libexec + [AC_DEFINE(PANEL_GNOME, 1, [panel type])] + [AC_DEFINE(PANEL_GNOMEFLASHBACK, 1, [panel type])] + , [test "x$panel" = xmate], - [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-3.0 >= 1.4.0)] -- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets -- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec -+ LIBPANEL_APPLET_DIR=${prefix}/share/mate-panel/applets -+ PLUGIN_DIR=${prefix}/libexec + [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-4.0 >= 1.4.0)] +- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/share/mate-panel/applets +- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/libexec ++ LIBPANEL_APPLET_DIR=$prefix/share/mate-panel/applets ++ PLUGIN_DIR=$prefix/libexec [AC_DEFINE(PANEL_MATE, 1, [panel type])] , [test "x$panel" = xxfce4], [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)] - LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins - PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins -+ LIBPANEL_APPLET_DIR=${prefix}/share/xfce4/panel-plugins -+ PLUGIN_DIR=${prefix}/lib/xfce4/panel/plugins ++ LIBPANEL_APPLET_DIR=$prefix/share/xfce4/panel-plugins ++ PLUGIN_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins [AC_DEFINE(PANEL_XFCE4, 1, [panel type])] , - [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, mate or xfce4])] + [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, gnomeflashback, mate or xfce4])] |