diff options
Diffstat (limited to 'pkgs')
157 files changed, 3827 insertions, 2077 deletions
diff --git a/pkgs/applications/altcoins/parity/beta.nix b/pkgs/applications/altcoins/parity/beta.nix index cce0b1c648831..5670a0b767c11 100644 --- a/pkgs/applications/altcoins/parity/beta.nix +++ b/pkgs/applications/altcoins/parity/beta.nix @@ -1,6 +1,6 @@ let - version = "2.5.4"; - sha256 = "103kg0lrijf6d0mc1nk4pdgwgkmp9ga51rwfqrkkm133lylrr0lf"; - cargoSha256 = "1w9p43v76igb62mbjk2rl7fynk13l4hpz25jd4f4hk5b2y2wf3r7"; + version = "2.6.0"; + sha256 = "1v0wc6l09nr42ljlq5lq1dgignm53hq3pmrgp2sld9zfxy3vdy0x"; + cargoSha256 = "1bkcvziz0diy76nbcgykajpnp6akva0m7ka7q6w3s9k7awxjxkx3"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/default.nix b/pkgs/applications/altcoins/parity/default.nix index 57b1faf71f70d..8f81cdd854488 100644 --- a/pkgs/applications/altcoins/parity/default.nix +++ b/pkgs/applications/altcoins/parity/default.nix @@ -1,6 +1,6 @@ let - version = "2.4.9"; - sha256 = "0pj3yyjzc3fq0r7g8j22anzqxvm377pbcy27np1g7ygkzapzb2v6"; - cargoSha256 = "1dxn00zxivmgk4a61nxwhjlv7fjsy2ngadyw0br1ssrkgz9k7af2"; + version = "2.5.5"; + sha256 = "193fnrf1pr67wblyxd5gbrg1rgflphnfaxgm3kb4iawjh18br6c6"; + cargoSha256 = "1w9p43v76igb62mbjk2rl7fynk13l4hpz25jd4f4hk5b2y2wf3r7"; in import ./parity.nix { inherit version sha256 cargoSha256; } diff --git a/pkgs/applications/altcoins/parity/parity.nix b/pkgs/applications/altcoins/parity/parity.nix index 011a44fe17097..79831f3304df4 100644 --- a/pkgs/applications/altcoins/parity/parity.nix +++ b/pkgs/applications/altcoins/parity/parity.nix @@ -3,9 +3,10 @@ , cargoSha256 }: -{ stdenv +{ lib , fetchFromGitHub , rustPlatform + , pkgconfig , openssl , systemd @@ -14,7 +15,8 @@ }: rustPlatform.buildRustPackage rec { - name = "parity-${version}"; + pname = "parity"; + inherit version; inherit cargoSha256; src = fetchFromGitHub { @@ -34,11 +36,11 @@ rustPlatform.buildRustPackage rec { # test result: FAILED. 80 passed; 12 failed; 0 ignored; 0 measured; 0 filtered out doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast, light, robust Ethereum implementation"; homepage = "http://parity.io"; license = licenses.gpl3; - maintainers = [ maintainers.akru ]; + maintainers = with maintainers; [ akru xrelkd ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 6d186cccde342..bc7c2ff9a24ff 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { name = "mixxx-${version}"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = "release-${version}"; - sha256 = "1q6c2wfpprsx7s7nz1w0mhm2yhikj54jxcv61kwylxx3n5k2na9r"; + sha256 = "0dmkvcsgq7abxqd4wms8c4w0mr5c53z7n5r8jgzp4swz9nmfjpfg"; }; buildInputs = [ diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b3a7c2c817c7d..7f691b304181e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "03c5f01dqjvz55l8vyrpypjmmip96kc27p8sw0c5jky0igiyym5j"; }; latestVersion = { # canary & dev - version = "3.6.0.3"; # "Android Studio 3.6 Canary 3" - build = "191.5618338"; - sha256Hash = "0ryf61svn6ra8gh1rvfjqj3j282zmgcvkjvgfvql1wgkjlz21519"; + version = "3.6.0.6"; # "Android Studio 3.6 Canary 6" + build = "192.5787298"; + sha256Hash = "1rri8b5nkxj65hq13s5d31fy08llf3ad9s5mn56ridd4nsy2c5df"; }; in rec { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 6bbdaf77a69bb..d1ecaae373bba 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { name = "nano-${version}"; - version = "3.2"; + version = "4.3"; src = fetchurl { url = "mirror://gnu/nano/${name}.tar.xz"; - sha256 = "0jb3zq0v84xb0chyynkcp2jhs9660wmpkic294p4p6c96npp69yi"; + sha256 = "108dzj6azqmini9bvgl26r0q1y59s3nnrw75hfzv91bs50davlq0"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index ec2d75ffaf668..369184a35e23b 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -27,13 +27,13 @@ in stdenv.mkDerivation rec { name = "macvim-${version}"; - version = "8.1.1517"; + version = "8.1.1722"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-156"; - sha256 = "17plmqcn49gqwr1km77mkxflrg0f4sn06r3n0fbxa8zcz9zmb1q2"; + rev = "snapshot-157"; + sha256 = "1gmgc4pwaqy78gj4p7iib94n7j52ir0aa03ks595h3vy1hkcwwky"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index e582b5ee05247..4e61fccaa372c 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -45,8 +45,6 @@ stdenv.mkDerivation rec { "-DUSE_PYTHON=OFF" "-DUSE_QT=OFF" # GNUInstallDirs - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" - "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include" "-DCMAKE_INSTALL_LIBDIR=lib" # needs relative path for pkgconfig ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 00b33b6521643..7225efadebd9e 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -23,8 +23,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_PYTHON=OFF" - # GNUInstallDirs - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" ]; makeFlags = [ diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 5d3564f38e6a8..e401a7c0b8e00 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "barrier"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "debauchee"; repo = pname; rev = "v${version}"; - sha256 = "1fy7xjwqyisapf8wv50gwpbgbv5b4ldf7766w453h5iw10d18kh0"; + sha256 = "1dakpgs4jcwg06f45xg6adc83jd2qnpywmjm1z7g0hzd2vd0qg4k"; }; buildInputs = [ cmake curl xorg.libX11 xorg.libXext xorg.libXtst avahiWithLibdnssdCompat qtbase ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 0b66be1f84c1d..c82b00e66e803 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { name = "calibre-${version}"; - version = "3.45.2"; + version = "3.46.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1379g375s3h0fgv9qg43hrg16knd76ym7qkffpn1qyc7kkhv8a05"; + sha256 = "1dlss01kaz2qlg9ji8c9dn9rd73mmpm5yjg50zp49cwx9y2vjiz9"; }; patches = [ diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix new file mode 100644 index 0000000000000..e93d0ab69a7b8 --- /dev/null +++ b/pkgs/applications/misc/firestarter/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, python3, cudatoolkit, + withCuda ? true +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "firestarter"; + version = "1.7.3"; + + src = fetchFromGitHub { + owner = "tud-zih-energy"; + repo = "FIRESTARTER"; + rev = "v${version}"; + sha256 = "1gc7kmzx9nw22lyfmpyz72p974jf1hvw5nvszcaq7x6h8cz9ip15"; + }; + + nativeBuildInputs = [ python3 ]; + buildInputs = optionals withCuda [ cudatoolkit ]; + preBuild = '' + mkdir -p build + cd build + python ../code-generator.py ${optionalString withCuda "--enable-cuda"} + ''; + makeFlags = optionals withCuda [ "LINUX_CUDA_PATH=${cudatoolkit}" ]; + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin + cp FIRESTARTER $out/bin/firestarter + ''; + + meta = with stdenv.lib; { + homepage = https://tu-dresden.de/zih/forschung/projekte/firestarter; + description = "Processor Stress Test Utility"; + platforms = platforms.linux; + maintainers = with maintainers; [ astro ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 9a12ba2bfd556..6cd77318754c0 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -36,7 +36,7 @@ GEM mime-types-data (3.2019.0331) mini_portile2 (2.4.0) mustache (0.99.8) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) posix-spawn (0.3.13) rack (1.6.11) diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 6de5553ac7cfa..f9bdf94db179e 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -151,10 +151,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; posix-spawn = { groups = ["default"]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix new file mode 100644 index 0000000000000..b84053b94adc1 --- /dev/null +++ b/pkgs/applications/misc/gsctl/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "gsctl"; + version = "0.15.4"; + + goPackagePath = "github.com/giantswarm/gsctl"; + + src = fetchFromGitHub { + owner = "giantswarm"; + repo = pname; + rev = version; + sha256 = "0s5bli08wfd9xszx3kc90k51vlgjc00r0qg4mikb6qdc4pxpgsxj"; + }; + + meta = with stdenv.lib; { + description = "The Giant Swarm command line interface"; + homepage = https://github.com/giantswarm/gsctl; + license = licenses.asl20; + maintainers = with maintainers; [ joesalisbury ]; + }; +} diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 7954b6dc03ed5..00088aef8ad50 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -17,7 +17,7 @@ GEM ffi (1.11.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.11.0) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -36,8 +36,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-mentions (1.5.1) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -49,7 +49,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.0) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) @@ -62,7 +62,7 @@ GEM mercenary (0.3.6) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) @@ -70,7 +70,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.0) ffi (~> 1.0) - rouge (3.5.1) + rouge (3.8.0) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix index 741b5e2a06914..1107ba745fdaa 100644 --- a/pkgs/applications/misc/jekyll/basic/gemset.nix +++ b/pkgs/applications/misc/jekyll/basic/gemset.nix @@ -98,10 +98,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -141,10 +141,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-mentions = { dependencies = ["html-pipeline" "jekyll"]; @@ -207,10 +207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; @@ -279,10 +279,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; pathutil = { dependencies = ["forwardable-extended"]; @@ -331,10 +331,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.5.1"; + version = "3.8.0"; }; ruby_dep = { groups = ["default"]; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index 7baf6a45fc543..7b9b74ef1b79c 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -28,7 +28,7 @@ GEM ffi (1.11.1) forwardable-extended (2.6.0) gemoji (3.0.1) - html-pipeline (2.11.0) + html-pipeline (2.12.0) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -47,8 +47,8 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) + jekyll-avatar (0.7.0) + jekyll (>= 3.0, < 5.0) jekyll-coffeescript (1.2.2) coffee-script (~> 2.2) coffee-script-source (~> 1.12) @@ -70,7 +70,7 @@ GEM jekyll (>= 3.7, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - jemoji (0.11.0) + jemoji (0.11.1) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) @@ -90,7 +90,7 @@ GEM minitest (5.11.3) multi_json (1.13.1) multipart-post (2.1.1) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) octokit (4.14.0) sawyer (~> 0.8.0, >= 0.5.3) @@ -104,8 +104,8 @@ GEM ffi (~> 1.0) rdiscount (2.2.0.1) rdoc (6.1.1) - redcarpet (3.4.0) - rouge (3.5.1) + redcarpet (3.5.0) + rouge (3.8.0) ruby_dep (1.5.0) safe_yaml (1.0.5) sass (3.7.4) diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix index 63209d4ff45ae..917ba51caabed 100644 --- a/pkgs/applications/misc/jekyll/full/gemset.nix +++ b/pkgs/applications/misc/jekyll/full/gemset.nix @@ -195,10 +195,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14659ap360gzmrxl8mb28ys6mld7xw3q4q7pqy0l1cn67szdq779"; + sha256 = "0f7x70p3fda7i5wfjjljjgjgqwx8m12345bs4xpnh7fhnis42fkk"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; "http_parser.rb" = { groups = ["default"]; @@ -238,10 +238,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "124624r83pmn7sp2idnsph9m1bbdiha5jnza4ypna8w2inpih51p"; + sha256 = "03bys2pl60vq92skfhlfqr2j68zhfjc86jffpg32f94wzjk8n0wk"; type = "gem"; }; - version = "0.6.0"; + version = "0.7.0"; }; jekyll-coffeescript = { dependencies = ["coffee-script" "coffee-script-source"]; @@ -358,10 +358,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0x463l6a8ikaf6pzap0dgh4gfvlkx56g6kdasj9jfb1ld3fvl99k"; + sha256 = "1yd77r5jvh9chf5qcp6z63gg40yp5n1sr7nv1hlmbq3xjzlhs6h6"; type = "gem"; }; - version = "0.11.0"; + version = "0.11.1"; }; kramdown = { groups = ["default"]; @@ -518,10 +518,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; octokit = { dependencies = ["sawyer"]; @@ -648,20 +648,20 @@ }]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; type = "gem"; }; - version = "3.4.0"; + version = "3.5.0"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfhazlhjc4abgzhkgq8zqmdphvkh52211widkl4zhsbhqh8wg2q"; + sha256 = "10cyx03qjdajkkr1gfqhah4n632ma8k8g6hcf0c60pfp6iii8ffs"; type = "gem"; }; - version = "3.5.1"; + version = "3.8.0"; }; ruby_dep = { groups = ["default"]; diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index b60454c4a42de..4f4741ce0bdf6 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -4,7 +4,7 @@ enableGuile ? false, guile ? null , enablePython ? false, python ? null , enablePerl ? (stdenv.hostPlatform == stdenv.buildPlatform), perl ? null -, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey_1_8_5 ? null +, enableSpidermonkey ? (stdenv.hostPlatform == stdenv.buildPlatform), spidermonkey ? null }: assert enableGuile -> guile != null; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ ./gc-init.patch ]; - buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey_1_8_5 gpm ] + buildInputs = [ ncurses xlibsWrapper bzip2 zlib openssl spidermonkey gpm ] ++ stdenv.lib.optional enableGuile guile ++ stdenv.lib.optional enablePython python ++ stdenv.lib.optional enablePerl perl @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional enableGuile "--with-guile" ++ stdenv.lib.optional enablePython "--with-python" ++ stdenv.lib.optional enablePerl "--with-perl" - ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey_1_8_5}" + ++ stdenv.lib.optional enableSpidermonkey "--with-spidermonkey=${spidermonkey}" ; meta = { diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 133c37d060603..02087ae01ac98 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,935 +1,935 @@ { - version = "69.0b10"; + version = "69.0b14"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ach/firefox-69.0b14.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "1a7b57f59dc6503e2c457955d48609fd06e6b86b23a508ae15304e19fdf1b347f209a58075c24041ddfb4c80a5aaf9e66d5e721cf57815d16f43741b5184dca1"; + sha512 = "69f7a54d9e458d67fc554e282bd3d25a97e78e9e1aef70db3ca1ab63eec572da1746ffd405cd722243e12bede511b98fe5dd6d8fe70d39660c9e08cdde5d5704"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/af/firefox-69.0b14.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5f037bb80ebeb5da5eecc94bdeab4e1809e09d6aa93bded34dd87d929e72237e69cee896ef02b51d5dc2a272a4fe40739fcf683ccc9806dd8039f5ee403534cf"; + sha512 = "367200eb6731ecc4934f98abccdce40ddf4a73324162e8c76ac3903593f7eb8a73c9abc34d36ce7502be4f55e865a1cc39d629b9f026e25ce56af8d76edab915"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/an/firefox-69.0b14.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "f48b2f24cbac76fee0a6b6eb1f77f13234acc283f3213c7c5d776410c4c23a17207ff7b857d609d25eb80a3f1c3c6dd4742d5c7a3216ae0a6193831ff428dd3c"; + sha512 = "4d146e92193945daada5e3db6e3de0beb5b453bd237b07c036a8bf3dfa92894b74e0cf956e5eb5217cc1872794f7f40dc58f9b1fd21b2ff89c6122a580ef5422"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ar/firefox-69.0b14.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "be8961705ad1f8c90c5a5550b7fe6d3427d53cdad5e3c4f629f5f6267cdf6085a35d03ed49851e54413a7b00230ab66d7348b751fdab2d1ca52e9e9a156c4b1f"; + sha512 = "ead64f65522c0775fe58dba27df1cdbc589dee666e2ffcd1ffa84b2285205afbe86f6d6b1b59b74eb6add2dd8332e2488165d6af21819269f2bdf394d0a32c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ast/firefox-69.0b14.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "d323bda4f61c784179484cc85171ec802c4fb3a559cc177937f0862ace8359d91d0b205ab289b724a0545f82dd36a8e7e1312053747b8ff64ac920effdf2eedb"; + sha512 = "c5e1faa329fe3c37eb4b2856280011d8750f0c5e1cd638b409277826d612421b35b14682e553bab41a856d8dbb9104edc32a08ee612830b2292c991860c0404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/az/firefox-69.0b14.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "afe1a5359ef53315d8c27db657ac578613d392d3d946e02456e03fcbbea756f014ec500639d6560b4bd8d096e23699650118657d0b08d8858b89cab9a102ace8"; + sha512 = "dd48ea7a7334798dcd26a9d15ee101936d603fc0f3374f6e36653ffadd8bb623081e232d1aef682caa31ce2409cc508a51bdeb6388f43d47b946e74bd2022238"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/be/firefox-69.0b14.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "4ad1e8dc3f5f28ec0ab9f652a1d49dc0d0103b1e3c2462a9cb8754c444fa31bda76ea24b3608efcdddcab8ad2a1248214462c60c5348cf918c133152e7c33177"; + sha512 = "de23e64ae742d96ffefcbe3abe1a39f62dd1df291c023d71b361ceaa596e9972ffe07b24a10203497024b575b2223ea4bf695b6561717e879dcc03d7b6b8915a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bg/firefox-69.0b14.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d510f03564876531f7406b210b60a4076c9c48d403f6a80901bae6495beff9d2bdcce953ad02245b20389c38d9b0843e76356cb52cf081ddd46738e703335b2e"; + sha512 = "4e4dcc3e755b6b721ea005043310220f67e525e4c2339f7fcf12b078c2e611dac8b4fad6b734cf7207641b3823fa2d0d1f271e71103f8cff184d6669b1b1c883"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bn/firefox-69.0b14.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "23c1674ba24c7d6abd7159ec422fbe718bc706424ff243623dc9852ad3867281e54aa1b6129cf9a5d5de56d267558cd6abaf6821ffd51265bbb7202914ab950f"; + sha512 = "766f354fe5a168b902fa7c418e0f328f0e95ef0754db29740c6093bad202caad443cfe02e5c3841fe818b1f6b9b53e1b2ae84e29d72346260b5a07cf5ca24ea4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/br/firefox-69.0b14.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "bc3589a09d40bf7e2e538a408a1fbe0c3fcb373b0b0002e5ca039b60d655492283830530b251d5acbf1152dd64f95097aa99f37965819fb19386014fcdef9cf1"; + sha512 = "c5457927947a378e3778cc01e706deaf02a01e6ca4406270d6e4f5973e0f00ea3bbd27aca09b65c0dcfa5b430c600ec1e0d71cce48a796575d9c469e44679d9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/bs/firefox-69.0b14.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "a9c60dd3ec3d00a171eb66506d514560b3c09b5a2650b17207bc841dd5b365d0f545dba75b37c0e84e18321cc92932ac25ff9859a76a4be2f8174fcc594b8211"; + sha512 = "50605bd4bb4583fe7835f31e3f21186e6ce8738bdb55fc4a2832442cb4b21d5bdfcf3bae7905636e37c132db6c4561dcd93ce208a12b1a9c52d8d8248df2c4af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ca/firefox-69.0b14.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "98cc03135c40f3c827b7bf583925cdc11d4595fc4fe8868f52616efb2ae72b26145964a97c01e199a65cb643642c558802dea6f4c1c45a1daf2f201a82467eda"; + sha512 = "baf2c5fc6e752a5d3f8b2e5a39a89f709e3203c53caef5bf3d649027bed2dfc5191b31998074f5ba7a437c8d8f2c911b5c6bb653ac1e6cf1d2594772431b0c68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cak/firefox-69.0b14.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "74ea91936aa49ac7edc9d91917de7ca9ff15226d95375d02c6d687ee3effab8dc3c47c38378953cd55486e2c0d4fb2a00431178ea45309d1a20301310c42c89d"; + sha512 = "8117c621252a9a6ce9eabdaf7dae8ab9499a20c407b9d48bdc49b17fb72659889b038296f6af11e66a3dd5a9f6fcca9581396812753b7ea80a9299c1f558693a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cs/firefox-69.0b14.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "be3c5fb9f0fa30a8fa9fff4df91f622dc222546aa8aaaa8e64f13dabc86a9475c1e2ccca1426457d287cac2c3159f048b5246cf7a9372bbb46c67d529e126bbe"; + sha512 = "7c9103c4938e57bfc7b47a9cd0c07e38775edc50a001fb24f91def01a8c3c7a3de1330173fd3842e8b0ec42d001d2cd5c9b4a4caf60613edaf331059d6cde524"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/cy/firefox-69.0b14.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b60163ce4fdc726507b2899bee66dbe03a3b700c4a59c42d7cc3c131648588ec1b29664cf716b176fac73b9749f630505ecf65248110779b2cb55a2ef05bd9dc"; + sha512 = "10ad0c39925c53381a5e8ccc6fdacb3939e2f32c17a6382f6279fea32bebb8a2a43f326e2467fcb48f4df1ea96c445cfcf0f413b436814da1074f6f5b353cf89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/da/firefox-69.0b14.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "8cd36e2c99f8e15e27cc5263d9f7c329b3421184ac017d34e286492190e0d74cd521849376d72bfe5d718c81ad4ebc0bfdf7d892a810639e212530184c9f457a"; + sha512 = "8bc4c854a68db46280e0e9d561cf507ee5c334f3ba70d2834906face0540a47b77fc45d526024bd106c233f8e5245f3258279810a9fc2949e5e24d21fc17ef0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/de/firefox-69.0b14.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "b7b8fdf8caf159bd2a10c2a827b2d89cafd97cd29554f7b837dec9f3b10b393010b3fde927c2a54be02b232b2d105d71753c94b15be7de29cc226ab03c860a05"; + sha512 = "d793e9da3997aaa0318d1b1c22586d31b65bb1eaa21049a86878fe32acbc75161f1a48f9307c3c73bed9d15808252e644622648c150f5cb52a1480a418921b90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/dsb/firefox-69.0b14.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "9932ee55b2d0ca583b9120260592569fffbecdf10745b3d320ff1c68f3866dd1f89643cf6c8df3ec585fd34530bf2a0d49f4a5f835d7a65b10ecb7da7af7067d"; + sha512 = "e9ab9d16d1eff15d049beb6b9293322b425e6da4fc1f1286c2bc785d7235b1d672df1f476a6949371af687ffa3af3b7cc214bb886a1147f96fca4b6821aabbdd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/el/firefox-69.0b14.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "6a0afb7e5ab4323957acaa6b53062d0a85cdebca058270a2486310e50157b8028b2c77a4d366a503f44034a5879aa135bfbe1f95a4a3c6ddc9498ca1fbc558ca"; + sha512 = "31cc046a58bbbbc2bba80131bfb456019c1b38f6a5efec72d140743e5e1f61b0cf10094d61fbd9f76806ea03461365a27aaf3b15531004baee5b431a59e32539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-CA/firefox-69.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "431c6f3d28a2331628ef0a762736bbc4d1bc4e68a73de39e4e3798618201c579f0bcf9fd61ac26fada5c7ca0b112e9f9d3cae96ad981ab677e88805f8b5d2bcf"; + sha512 = "eb9b3b8278c589f1b693bae1f48d86a4611b377c3949d51d75f534f133d85436b277f5acee1bd419a3f24faca245abb5d4d9f9fbd95b2adf05c03af72f37cdc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-GB/firefox-69.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f3c852da6abad331eb3f0e168736aeaef9172a258f949d150f729bb295e76674bd74715671950e338542fb9ab08331d5d53883db449438814a1378e2c0c7cb5d"; + sha512 = "03ba44f4957abf9e2c36ad394af34354c0674b8e20a7e75d40b516434b3428fc3ad1d42ded42bd0587f282637ab663175a217eedf41f444d7e2e77d9d08c0dec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/en-US/firefox-69.0b14.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "64d49769e3e908510b4539f39765ff3eb7b108b24e7f431be837116a6b83ef13a02bc3f5f40232a87c9ba25305d75f30f2ad830a9a37cdb30e5cb58bac567fc5"; + sha512 = "e61379736128667d1b4e5271037b3dff8f2c6425678791ce2883345a672023665573177019001364324bb4b166989bcc475844ef30ea5a8703a949d3c08882e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eo/firefox-69.0b14.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "2e078e519874deca4790e1f97c56d8d7f51988e321a676ee347fc30fa51b6ea25d14dc7f5f79d8a0dfd4c76fb4540599fbc0fd7ba16460907e8a1ec661b6eecd"; + sha512 = "081d2573b5674e28e7cd04f0e856909ce7b1d2d16ec61bdf99cc5e0fd8aa5abb3624e220d609bf7dbb0b9d2db6367d7c67a64ffc470700896ed7520a250d06af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-AR/firefox-69.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "7d3b797c0dd0c13867786dfe2779a264a9fa5b4626f9db97beba08c69f0d63de425b6dc6447554ca9a5fa36bbd942510c2565405469d1e4aa64737de7f024231"; + sha512 = "12fb861ad3e36473e4384f8574d479b2beb4d036dde78478b391381afccc1fb1e7888e08d0de366acc8c537f141187a0075438cf53601fd0bb4356ad7a76484c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-CL/firefox-69.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "e8382333581d1a30db66941950b2ecb02d0b93a48d2da79a63c36b66f093da20e03943a51aae9ff6cbd65252a7cd0b4b6760b8b27ed536f1f5f058411b8ac4fe"; + sha512 = "6adf0c82bf246e256db530a4abff51e6389ec5ef899abf406fdf78c2c81831bccdf88cf133e2b8fb5a4ce4d843b947703dcf7a5aa721a6bb4913b6d07d04dbca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-ES/firefox-69.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "312295d067a1aede3ee947c1423b8dac575610e24bb8f0b5c5bc981d009e669d8185978ae3f3b17fa9fe655f4b3a01bcd3aec2afb3adf8b916ac2abefde302cb"; + sha512 = "6b31621b8d8f0aa090839fb4db7c10618374551b04b66b1696fff7ece4de9cdc7da06243f2f6a0be931a201cd984b9c8a4ff4332d0ae8ad2a42e08fe0de0f709"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/es-MX/firefox-69.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "147deb688909ffc381ad43b2311d30815601d48030ba6e381ddfecd9a2ea9b299ccf1337adb12907664a30157a0dacd19311f311f3765d23ce5dfe85cd469d2a"; + sha512 = "e1efaa7059a8e7c4b9dabc5481ef9ad14235e310ee42a8f28cf3eedc1907484be9fec8fea7dfc76e11fd531fdaa4933b581425d826ac41e040a855a3d2bdbc6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/et/firefox-69.0b14.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "82847b67b0c1b758682aee0a404f27f04e935eeb77e62ad7636e8ae6671e4bbdbb369b38115c0d66567029929f00841eaa254cb180653f730f34446fd45df57d"; + sha512 = "f8683048d0b87c0dcb0d929298e7b6429540edcc9308a1fd8dd6c40e47a39011c9abd4fc495bfe9fa8702f68717cbb06611e6f023d43f84cda623e23b67d2331"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/eu/firefox-69.0b14.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "79e6551219630ad521e67a7f5669ccdbe7346a5dd0ac6b1aab2654d13430d971b4e455b52900e82e0a9fcc7ab6f27f4433d90ddedb57f199cbf6bbc6217770b1"; + sha512 = "6ec1a27c6d786d3af512f03836f1b795df14dba63c935274fb601228af012eb6063c035d3cd5c9e7b24976be57f0d62e03f7f136bc322e667adf8612cca08b25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fa/firefox-69.0b14.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "67e80ad128ba1251fbafc483be98365e80b8ef888448e6e56fc06e901f93e2f10de9683bdb1e24b77717bfec0428be30769ff8676c7f52b8004159a77181b05c"; + sha512 = "0ef5ceebf4c144ba6b6fe8c999f97b78f6bfc18667229a85ed2093fe3838d5b1f7213ecfd004af95cb18b2a6dedd8675d1365d6b9a09b2976a771d96b61954be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ff/firefox-69.0b14.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "3b888ba947259b334ae018d3cfd03168686abecf00b75fa1630491f3f190fd59a62af7e06bfec135410b1ee78cf82acc387bf9b13d5c7971b25d82a92733053d"; + sha512 = "c17d2f95b4e1441e7f5efcf597c7c4ca362aeb837debd788933c52d6803bfc987bc8eb218391dd71a0581bfd386e625eaa2f4e3ac678f74a9ad3ec4f6ae34ca0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fi/firefox-69.0b14.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "70c13e5d110c1508b66cd48baf81652860196d9d350e36e51631fb6f4e979f8fb4df9f712f15b13c54b2c2651661eb2465599cfbc294a94e137dbe93ec15dbda"; + sha512 = "ab77f83eb23cc32fc5bdc4bec4f5c5710d53d7e46df6004e6a4751f9ba111366ee96742862fa5b76b438fe693b06245874ea9ddb2fa3575b4966bb1ebb66bf12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fr/firefox-69.0b14.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "3c0da7e5784b34cfee62e4b66e347132f02c22ba7fcef9b384643ddbe1121a2865169079e064e157193ba006c720ddec3d59e85df6c806226a5185142eca9c73"; + sha512 = "1c78f9c50efbaa3336503c6810260fd9b8d7478fcafde0a54155fd177d22a8988e35edfb26ea9e3e0d6b37984ecf72a98b2928f14d39a7927b53c76df1d60bcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/fy-NL/firefox-69.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "387aa2fa548820dd9e4a1b4ec374b500946dac4f93aa743b2166f08b78cdf8d34c86bdda25e7c4b17df0d94773b94c88a76472a27ca6d522adcdcfb4ef579874"; + sha512 = "396d65f9647de3d46d6936143dd1173e91a2d023e82bd51d6b22fcd0a06d87e376f83c33ae983f3d192cdd34dda8f97b38a6a9b0a3c49dcc75db7ff913131172"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ga-IE/firefox-69.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "968455b9e61db7b669ff4a34fd085508930576d4e1009431c5207b1c76a66de776eed3cb6f0370d26d9b44d9c3e4e710537e57c86ce5b28d90c5f80a828a3594"; + sha512 = "c66a6cda941dfefaafaaa6e674110e4825032d468dcd0f299ff9795a7ade24e89524badeb27d6ee9decae81ed63ae1c4df1ca0f9f8c7f1d35d50ac4cc36450b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gd/firefox-69.0b14.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "557937a63061312bf3371e2f257c9463667182a28e4f4488caa39ed57185344cffac6a937817cf058538e39ce4087f6734c2e00a2a1cedff253736480818dd5e"; + sha512 = "077423578f0acb3ab6dcafac6394a5a75110252532e7552e1c81976298fa50187cc9f93f43ff8745f2cf2e148f0a4ba3d206607396dec83021fb7c825295d02e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gl/firefox-69.0b14.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "ad568ee3c89d7e869bdbdf2a50e611ccbeb6c6446b2e314e474c43c6f0d470290bca3534e2cba917b1ed77b7c8480a756cc0c2a3d4907ef91809f21f6dbbfbfe"; + sha512 = "52dbe9d4f88cf6d2d5710fecc95f0ea78519034ffc9d4f111cf96e99296ae77617a11735dcae3ebff552ba1fe741c11f4f767cb9710e4fea4d4ff961d42fbf99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gn/firefox-69.0b14.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "52440609480bb73b62d4ce0d35e68f459153ecd815233c70cb5a2f2f5555d56cee0bc548eb68f6e2d4f3979fc14c8a101ca9a9506a3ed592341a1f818962d325"; + sha512 = "cb38005b6db3b58559baed9c427d19b36550bae82d6b6049c7c705df67ce736a772f868d4d770fcadf37e7a19cf2d02f221b2472ea9fafe26d00f3ddb0798079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/gu-IN/firefox-69.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "d6d445097510f45d9c320b19cd0db97e69f8e5de8f31a532e1b929d0bcb04c86dfe38b20bcc5ff320581d7febba06f1ef5e3ddc61641dca382b66f0f2d7fa942"; + sha512 = "776f81e4aa1c01d8bbbc7ff83f6c0eae549ca7b6b86aeb6b346280a7188704502c1f62790eaafda06defb73744930ab61aef97b9ddbe16581de2129da88c6eb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/he/firefox-69.0b14.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "ee81c7847efcb09ad9603194641798e200558b4dca7f19b93ccd918e4f63fe0400e9a91583444f1c017112dcf56d73506c29a94eb0694bdb58f226ef2973088a"; + sha512 = "fa0a8beb4edc5363d339502aa132f257a6a78c2c96a5c9cf43ebc5522e43ccb96940acfcef0c06b2e9e5325860f2b93a5cbc3d77553e8c7f7a39ed010b1b69cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hi-IN/firefox-69.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "8c7044bfc7dde901dbd2ba7e719da6d5385d260a6473a1e0f3f9af99f1ea3add4382bb2683264a1cfe60379e9fae4b68a41f30fa183d54c83502a173b55a1db5"; + sha512 = "114d157b3e2b4891544fd1c4496c8c2b2e697250c71210f0ad034c6eacf2b35157c18146ce843d2bd2927fb9e7f71f2854e8bda221d4af91b2d50df21747d0e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hr/firefox-69.0b14.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b680b30f2fc0f4f82f8cdc3eb7849d4a29b667a8cda453395b28499581edb785cb1bfb3ec39efe032f150e5b502955579803459a2dbd2f32264d677ef190de34"; + sha512 = "701470a4164010d28590f53008568b01017c4d0047d815f51b0fd1781c037f110c4fdec0820ef6ebda01efec1c0acddb7938ed40e946ee77ded662e760b2b61f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hsb/firefox-69.0b14.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8c4ac8f04d933bb104b533b2a8a512e2f30bbb6219f4d5622ca873a42a4d365131083cf9ff7a0be879c098b2b434cacfaa76106f432e3b609e1bc92b3ad674a6"; + sha512 = "625488b1e226d36b4995d81215128d647cb780062ab450a7df05c13edfa71ca5ded4d8d778876721228bb16c3545fcc069af692eb962d7a1028c0defe74a189e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hu/firefox-69.0b14.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7ad2b72826cf5d98afd1dd65fc30cf9e5525656271f3d1be3b40b2c0a1321694cc6ca36eafc0c51f77e1ca8a6408fdd6d3be528923789564d2ca8bdbab5a5cd5"; + sha512 = "5113917f0b5ac615fb68324acc6dc966a457262e40f49678c215184500cef1fdd300ddc18fd3bf62222f1fe2d00c916ac8dada8adf6060a2e2098cd96fc4607b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/hy-AM/firefox-69.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "fb850f1bad3f626f3272e9ae6e3a60d51b63ba221f341752334b490169874a44f2be3c9b3783fd523b3f4c0484bfc26999a84cc59c893100f21ece93f01b4b8b"; + sha512 = "70f989efad4fd4282a06e78a1a6cfc28159168428b24efd9d393f2ef7d02afc06eb3e52349797e9e5a8b6cacd13a2cf7e9bd0758dc203bcc7d0ba4a77a599b83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ia/firefox-69.0b14.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "796915bb31c4c18f22348dd7fb1e7c33f44938b5658fb32cb5a86e1470c8f2492642a81b0d2f59721f604cd785e5b56dd45c001d070b2e144b191ee0d0d6b21b"; + sha512 = "a8f01c33f945eb0377f2907811db68d912ea2e7a200e362c311a9ecb5b8c5621e05364a05fdc07a35a438d0ffd8e56f83341561823fffd0aae7d7e9794ea9079"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/id/firefox-69.0b14.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "5613ac6fe486517bede9fbeedbe64300e7be8bc1dd2a65bac94defd7c800e97c1a4ee5a2375fd0358de3a466a8ca75288b1b6b6c676e3ae02634aa35731bd8e2"; + sha512 = "359744507ac8c7acaa18ef5b81b7979777e1e860ae443b93b8b510389e198a4482f02d10e86996ccf9879748613a5a26aaea9fb5affc7ed8477891dbfdd6006d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/is/firefox-69.0b14.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "339bb54fde82ce43032d00b2245b114392a47a8eebc0be18a7a0d4cd1ec625412817303c48aad908d1bde88fd80e4a1a2245dbdf5ce9556c0a8b998025b1f58a"; + sha512 = "fa008324cb424c675bd5ed33eb886db661329254cd5809e3c1d51f4e530d034eabbdc607cc6fdcb3a332f5cf45078b0d49425c83e6985f9cc87b939c94391bf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/it/firefox-69.0b14.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4fda975595c299241a10ca325a828af6d5be420bc76c021dab815bda759010982213a55591cafc69139dc6a796df96c0eb35d7d7503c68e78ba71926576c40d1"; + sha512 = "406e361c1ef650cafec63b213f67ca016e251c50455866ac112039abb85bfe62ef6c56e7ac103afd87c05535f42767e937f99a045d456249f87187b00948cd71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ja/firefox-69.0b14.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "d620ac66a39e20439f1a83ba7aab904d78ef85355418d65e8a61b441f7f5e02f349201141fbc4a36e5810a4e2ccbedb624aba0e8071456acb0745ccbca05989d"; + sha512 = "d1c5d95ec4f8ca8e46dbe90e6c16d4e2da7b2c29664ee878be09c8aa46aa421f91c419cee4e8db0aff47c768df49ed316d789fb20c50a04390bc63bdc5e5cdb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ka/firefox-69.0b14.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "9c2025a3e57112adc9417bf27f16d596e1639531dc1ec2ac685c91ca79f27f3361f1d9c5b5f6e864391c62068561985e257c1bd8e63a80443521c9344fced2a0"; + sha512 = "623aee24ae26658971a1bc83b80fc45e296c9c17a82abf6956ea6f019db37b110d9642144c7c3fd05ee681a9953f9d4889dedb82c6b421d975d13f4d7e0c61b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kab/firefox-69.0b14.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "5ee9889fa241c9a4f9cce25d8ad557ff8d4112dbc620767ea8b874683b1026fbf65d6fa335a01e11c317d59523f43e7a7dd8ef7af60173104a0eeaede4c5f8cc"; + sha512 = "0405b91ea64f7840632b2c7f633af1ff478cee3910ffa32b6e49a87e4d7eda3f96f27eafca2c249f8ecf40ebbb89a615227ea011cd6269a7699bdf68b213f877"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kk/firefox-69.0b14.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "410790bd0e13444a0780a1dc3042daafef1d8594164d4062483d1c03cc6ba4f682602a5fa28310b1d64c26ff511766943bdb0f2787b9eac0a64668ea38914971"; + sha512 = "b8d170de3d7224c17e72d6c598f7d53184c0ac7437b93b3770df504789e862e68bbf0ba73727fb0cf8c3cbd177fd100c8c0039454a7c32bc33b6a4e05e1257df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/km/firefox-69.0b14.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "98936520579408e241575b802fb77247072cf832b0e6bb2bd0be75af246d211ddef7266cad5136e51e30395317985d4a4aa66647a20e3980cd2aee3e6a4a4de7"; + sha512 = "2d6d79109681322c73a9ca4b544e5764a0c6312d98dc46403a1d9f62285ea4fc2d88900a2a2c67f32ac61826d59f684ae4e0d9d3c09a5eca0938292e8acdf545"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/kn/firefox-69.0b14.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1060fdb60461684c0bd8625ed4f5e53f967619682ef920cffca663c70c395a211bdc940931f08de07814b5796f4fb6ef0b340543e4a1bdc526f6f4cb5a250e9e"; + sha512 = "9f143e23caa679ef6d7d5cd4abe3e078882bfab15cc18f1209b7a5b654208f5904a225eeb0be744de341954d076806679657546f2ad2560b5a7f8df1cca2d6ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ko/firefox-69.0b14.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4a88b46b972a90a8ae6c00ec23d4d4c00b18a6f5560f0514d939a135bf2c3f9207fc2bf84a19fb496182acfb95da70037ecfef0ceeb2f7a2220b5803957763e7"; + sha512 = "c1dc9b159da316ffc61a64684dde56aba305a7a17fe8a6ae32520ba950096e62c8e265bcf98124c45ab39ebbd6f9edf7ef63e8760b0b434810e7ef67eb9b7586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lij/firefox-69.0b14.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "a219c8f97158fdfd1bf0dfcbf40540c5adbdb861c3e8df131e826fa5feb73f33900024a8812a3ee648c63a8c8d69641f927ebb437745730a962db85bfde229d7"; + sha512 = "7a9077eb4d267646bdd0890d785d6378e91ee4af4b41af1f90384af3ee1274441a78fe80e33de7eca3dd10f7ac4d1fa43d9720a931ff5036264f8c0371c4a401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lt/firefox-69.0b14.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "4faa38c7fe80b3176ba1cff0153577adfd13480917659f8b45c70a1ff5650e29935ed10cec88059be602fbff64583153642acc9dbb419a8d269115659db55a37"; + sha512 = "a9fb3b19c7413da23783dbb79fb890293b9f9efaf0e50ed1f7b13aa0382dc971da247824450338564303473f735175131b3bcafbde8696b227671ffc6e2d1de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/lv/firefox-69.0b14.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "6334ac39f823a5a289dc60288eda76f2fe770d8eeb1c3e6b1265eb5c7b2f1affca0143b0311c8ff077f39e093b3ccfe743e4aded6384bd1e0d212067207df40c"; + sha512 = "805556c78f01629f44dcd960d29292b1da81082fd110101e36ad8d41b4972207ee201938413c24b623d891d2632575862f42ad96271c18f13f4f50d12d8d06bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mk/firefox-69.0b14.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "9b63449642f2e047b49e3a29528b4aa29565f72488c82f0086ee1d427d980fb64f913b3ddff1f1f799071b1fc542ee17e6822728bd0187b38fff28127229d63f"; + sha512 = "ad3373da3f42c2d4960433da7bfc2717ca39c39a4f9e3c539ca72feddcbd24bb4138d0cbc790ad0c8d5fa64a652e5750b4c95e363e125d852548164062f590cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/mr/firefox-69.0b14.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "be966949b09bf18819d34c774178b8eadade9b259082f9b6d6782fedadea6ef604382e8667ef49c479422f7c46df424d5e8d47beaae6b5139d2a4d372c2b59b7"; + sha512 = "9e9b07ddf0647977cf93d8be02eff0fcfcda2914e8c9fcea418dc03ed3bd0adb1bb71dfa9147d222866d9b86c2b2fdc8827304fb4099da6024c205ff9a564f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ms/firefox-69.0b14.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "71664b9bbbdc21da73698ed616bd6cd34fdccbad0212288d3eb6a332ebbe1578bced0ff4f4d587e4cadc076762235eacf568e0b5139a0b851b5d6bddb6a41807"; + sha512 = "a56f7c3b8c713b08e1f5e19b290fc1f0dd108d285b83fa3489bacad6757d02970368f4cbcad6ad78ef53c587989a8f96b23146024e705158a9c3b309bf530041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/my/firefox-69.0b14.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "9fb7a365fbdba50f664a1cada9fc26995f7b5809ec65334ba87127108c1e5027ce46f8c793d5da7cb32daf1788e2a98fe7aff0fac1b2d2f3f47ecac041538b2d"; + sha512 = "5be85980189d689fb1f16136c7ef0d427efdcacdd966a00c67527014588e62c20397483116e1728682be5eb6aea445c1cd3d8290452f05a32023ba593ce0b536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nb-NO/firefox-69.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "17f96fa38949bd3be40b3a6bf6e5ebe323819940946350ec535182f0197edb89af45500f54c76e51ac2fae1a95412b9f2a41b92e38803cc4af1097123e6233ab"; + sha512 = "008908a88d4c4edf535b3cfc009140da760e40de0b14377ab79320431229b0e9b27ad745aff2265fe7d689e1391b3af3467a70f4279b82033380e3b7d234a5d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ne-NP/firefox-69.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "e9cfc087a4c5ffcc223d873d26ec3203992e4ac8f418f5eea156f66bb92f14606da3cbc00cf7ec0524f549261153df9e40e402e73aded124b57c95feb6812740"; + sha512 = "7d7bdde40155ec5409b43cc150c44b6687f7ae8bbec411a5b1c257a0dc630d58c6dab289772804f632fece1a3dde5d613f939ff153486a8a38052d3f1abf312a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nl/firefox-69.0b14.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "19735c48e5da611d5f982bc7d295cf995d878b26ff35f55a7798ebd28689996c75fb8e5971c6db627e5cdd15423150dc146f8c03f4886fa50913cd8818a1bbd5"; + sha512 = "467e487abb563fb8354c0f3a3661951acd40c851b4f570bb9483580a9004758304eb35842b7d75b3a21f0108914487c56416584f02abfe0ec7180ccf0e9af166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/nn-NO/firefox-69.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "74a7eee4b310f9d893208f28ca0a03863f28daf95e1cb3197ff6805dc17ced77cd4e2b3d27bdbcf20982e71a6e60f36d9f0147c650623b7f79467f9a060f08e2"; + sha512 = "bd3ef206e3cc0f8674391940878f5b9bb9cffaa82013bd59d1bf924bfd20171df753ca51fc74f139c8bf4a977397ba8611cd90664de80b83a5eaf6ff3aec05e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/oc/firefox-69.0b14.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "ec7f830c37cf2e67d978038898df581bbb7fbedc3b98117bf4497104713c382261cac7921eb45898e23343deec775587a6f1f69aaddd788ac15cea293593a84c"; + sha512 = "5c955c03cb776dc6eb584d29197945ef22bc1be0074279947483750758b368a2a88f23b8412ac8e76ed209f37d35dd37f33726828bf33c8cb576cd5f7f51e7ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pa-IN/firefox-69.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "e5d72332e01f54c9576bd1aad7f54733c43061bd8e1813b8094cfab87d18f2144817270c572780f66b0fb0ae6a4bb7071221735317ede3b6eefe1f6204865766"; + sha512 = "48442fc58995e0f97ab255307dd6adf55b296316f19487f35635df4252547b3d3da3d76fce995918e9885a5fe79a68c0e711ec20dd22546f5dd5a4a531654009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pl/firefox-69.0b14.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "93cbf86c41086b81851e58a7b6a66f181a6baae871954664c088e3fcac956e4854b5590d1c5226b2cc286f12db85c21428ebc7a1c20c769dadb992936746f1aa"; + sha512 = "ab5f1d3e874d4cdacde0ef1978202fefb71ca602775ffc5d228729a6ea23c47b0efbaa3c554290b90030fd5145ad4d9a2a11b8e22973ec5923fc41edd86b666e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-BR/firefox-69.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "ea2f727cdbe67174939f736c6b23a9d88c902655f13445c74866a71f7a8f22e9037436e1589a52d258bc6d5f1338853de846542a6bab3dcf81d5e092e206e2d7"; + sha512 = "55f0f8539a4439c9e78ba794f9837f89cf9470cca827b036c69098c83a9cef91a1abe5dcc0b350358e707b274944a81600b90022e52884d3f2c7f7288b4a7d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/pt-PT/firefox-69.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6d6b8fdf32ea8ade420fd64f4c882d554433dd9743bcecd11986a70ca5d12f9150ae4feae6897a412bcad192098ccb44412fbca1329ded3b77e15ba06076434b"; + sha512 = "23b9a79b6fdfae7a61a9efee4e0624a925bd234cad98c3309fe8ae389e4d01cdfd3c4f77cd2283f9649d87daba59c383d476d3f6d4768e580cf3905f5ef9a943"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/rm/firefox-69.0b14.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "dfe161375554d9886b50220b4d33625c3779d542fa20e713d7dad8c1221c1bb9c4300a4d139ab57335fc021f237e3316404637d2a837095e247aaaf6650d20f7"; + sha512 = "b33e9e6a9d1fb694be1fb3990a790bf9fee990b1d45c8b3a318561c2417ba5fc0993349779b58aa2174f2fda9e610b0728a36c0d926a07f73275a5add8413f2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ro/firefox-69.0b14.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c3f6766f3f22acdae48cd340112b0248a21a580c68a473a311f6923340417487e16fb82c99648909e627be4cda63a779905f5a17b43379eeafb795b6c1dbf5f6"; + sha512 = "0dc002bd4872ed8907c0794430b44476e21d732624626bdb8f9cfd3c81b4b63ccd21b11456f660f58a05ffc91881903c510222b093c316f1182376eb051f5989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ru/firefox-69.0b14.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "49590d809c2883ce0eb7c5db156defb950c5bb6cc1106e4240c18cd4f17ea550952ac36d2ff8875cad4fb24cdded1e6d51881d5b9d6e360e44f780d884125e92"; + sha512 = "b29a6e02fb86387d1209b8aee76be34e5ab9e1848084d8f722a55bbc4f61801dd0e694ea6d284574ccb89c65ec0c12f395a97f4232b39c28ab7b75e730a436c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/si/firefox-69.0b14.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "66541feefd335e4b9f79e9165ace04f36decc46ec97b211a8f9af86517a197b09209e8f43bf9db449bfa3f1bfed37a8d3fc438514efbcce17dddb6577928b41b"; + sha512 = "a31294e1cb39c3949cdcf0b926edfd5f196e6e9a91e99c213d86129896c56b47e4f3a33b11c4b6b8d9d44a2b0fc767a87a67d9252cf1e3b4d2ae7f9716ccee4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sk/firefox-69.0b14.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "9967449c710e8a08e7936dc3a297fff5e254d1fcc960f04a6b349aa97526cf6924522975e750770ace0aa455265c6422ed97fda48afe25d254cbd9b30517171d"; + sha512 = "f736359f8f3086d560b84070f35a2184b316c5f6ebccf9665232b031a220d3d638e85c67ede20c3ec5836ef12251f77f4df429842c824ebd6961d58a99ba3c22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sl/firefox-69.0b14.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "7b3881eca1b35475c26806f29f9a7155e63e159cc139558366f8e1dcd92483be475de2b9075184a31fe1c7d3c8c0a7053b90e7f763f33c38adf8cc57722d7b9c"; + sha512 = "f5f0f3cfd91ca5a5201e3178a39d8ce0db3f01a36a4854dde16088c6b8423b5ff6e45793bc5221a02fe444a15d83078ab13ac48ae4b529144ac183aecfeb4811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/son/firefox-69.0b14.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "5fc0d6cf18760f577dcd2e606247a16c20b39a234d60e28880107e1324045db4a384d65c4e83da26d0296f2c89864d24c8bc24127dc5aff8fe080e7c727536ce"; + sha512 = "2ba05fbe3f440a9010f999bde29849976042f2874b6ccae408fea5e5057d812fd91879d5a288ccef6a4795101f854f74de794576706b90078e1f3c3887818592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sq/firefox-69.0b14.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7ca9d972c906796828deae1e79dfb1ea9455835ba1b870d3acbd484103db6d87e76011b55668da3a6e361239a8ad87d5acb7d25ba3ab474e28018bd8c768cc57"; + sha512 = "cac976f53f72a5eb974ef97727a5d6ed38a5a4b8e61094f8e5d76968d6afadf0daa68c7d6b29a45df6dddef8cf26973e0ab1a65c29f906f7e404cf0b152c5e08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sr/firefox-69.0b14.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "ae58799b2b20a91df60eaf452a0c81b1d608eeacddbf0a98d941abb8a9c7feba8857d9fed9e4c59fea2b24a7b6ba7e1193be826008450794fb710edb36ee2d9d"; + sha512 = "cb87cabbe1a9d5910354887b0a6eda4ee055b823a0ac35bc414d41f9fae636834344451e3a882c65cf581d21e875b400f5e3e054ab053ad1577fe48eed8dbfd6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/sv-SE/firefox-69.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "273973c93b118f70d0a83af1daa3ef64de77444172e668ae34df2b547e053047ce4fbb565b4ab5b0f2094ef7cd11d0f8f37b4ef205312e80e99b16f67eeb30e9"; + sha512 = "c4412a7488797482b3315a2872fed79ef033ef4fc32ea119e4a943999f5a892c430486a6e13236127c97af3c01f25724bd5ce6e84d4a9bce69d10b5ef84ffe7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ta/firefox-69.0b14.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "813cae155b3e8ab0f78542124648e8218705f5122f4a340dfb5ca15cdf3ed3f7505845a6ea23263e139b7f3713a0db304c360289d4989f91be8bfec45436af09"; + sha512 = "55729c9d755d83286dd88642cb130d75a827ecf98959cfc8e20f205e6c4c3ec31a03fe0a6f304662beae68677aacfaf8b993a4f79dac79c2b8157a3845bb022b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/te/firefox-69.0b14.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "4069f40d9ff366c3f126d77855344424c498b9e9c6e9fc78c78097b8d3b3087478f8c3964d46671474e98023c32fd44202d43967ac8c3d81b3debe5467a14788"; + sha512 = "2cd9b38b607b89b909216afc403e7394574e66abdafa327eed33edbac45eba850be22ff651b9581c53a7ab4735c29f1a4f2ee3fb3c220ef2f527f48d919b15fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/th/firefox-69.0b14.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "9e0a5a920856b492425a493aa85cacb465f4f59eb45a6c0ba2cfa631558650e40a9d23c12032b543487e78092730206862af1bc7345388803f992bc4fd5bc0a7"; + sha512 = "721711be47093f846b42d5bdae36ce083e05ad7edfbd75a32827189c4cab9da3af0b34551d55ebd67cecf8e04912c17f2a44b032f2a9a76e926a589381f3ebe3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/tr/firefox-69.0b14.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "1f97700f9c6b9996523c100b7393f3ac465c45adb1cefdb163b77b12d7679df2163296880e9004e4b6f8dcd8840cdee24eb752bc6a985f15e2d8f57db01d9e0b"; + sha512 = "36c4b39480b95152795ebe744c6d1390f38540c3cdd19cfaccca40f3da446a5afb6c5b8dcd3bbc87b15bcfb5214870104724d645cc630c87373b78d89c7acf94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uk/firefox-69.0b14.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "c8ad5621ce8c61e83aac7cd7b272ea7bd668d159872442aa80d88ed1b46ccf77de913e8cd7e339388b117d9d6797c36b9535dcb0efccd805410f804ebdd1f105"; + sha512 = "4b388a81e67390ff461681587914ab944230361790f5b48676df5d402aad2a3ff28c808a2c8ecb655f2540c3d6cbab8188c2b154c0e173625b7be121968e853d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/ur/firefox-69.0b14.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e1c056d287dc38be98db702869d16958379b8b56ddeb46770b175668f447d87b043773c3c9907e0d106abed7cdfe1f99dd871ac4510836664964b3a71d7a5289"; + sha512 = "43cb375b00bc335f5a5907796ffd84279799c8c907cf372968abb8a1e9c4ce4a4b9b199eb0384b548406a158216cb5e42efcc61836b5ece94fabe83d724bb26b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/uz/firefox-69.0b14.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "da694f4cc7f3250e88a8c54e94629749c30288776a1838c8f2183dad59107cceb3984aff23ef4e7d05bb7acd001e1b69adccce297695b206409214e9995b41da"; + sha512 = "33c0922104c4f0d6e9a5860738bb5e5001ef24c047d617b86d16f9a8668092ca0c3bf88676c448947e4c07c3d80fead8714291cf9e947698765fbce65247a488"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/vi/firefox-69.0b14.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "b120a6a272abc7c633de952415b35c13ca88f4263eb939f9040e9168154d7309c3e096827348407c36cb09d1ceb67fcefb4b3f3dd4e35da404a1ec44e103e126"; + sha512 = "d4fc27a2f69dcda6832bd0372c97381e3c47883b2f9abdb21b67b2c06f392cf2e2e8aaca8f0c5f67da87f8884b7be8d407b49a3caa04dd166165a8623f621cf7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/xh/firefox-69.0b14.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "68405955b821eca91f75943630104710a0ced12933b3c9fe84d836d10fce32cba1a0799be8de9f3cb58758ae627b5692c9e7e624b8fc62b0d70a16734b7a5e4e"; + sha512 = "c7d3c3975ccd4b2635f30aea2c2ef8e2c8197c52730fb60fc0a9adc5321a1f960565a442d73b68ab15367ff06f87ad09e463c8b9a0f871aca526716828795d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-CN/firefox-69.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ce80275c117902d0a2edc1e7a1b6f23f5b54e684f813e38696224151621f2ebfb2184bc018905051a07b0428e245380c630cac60d5bc927b4329e701cb0c174a"; + sha512 = "f6df2df60e020f07aa210e373d177a49204ac35912172a0885e9767eebf64f660d2288e3d9d3cdf574c22c4c0257c955faabc02721c34c59a113de94674d80fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-x86_64/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-x86_64/zh-TW/firefox-69.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "89ef19db13cd8da8e19612381c218a601429cf666f95c762510b300eb9140812c0adae9e5b7b4957eccdb8be7fc306deb9a089c19434b2410162265782e5226a"; + sha512 = "70d1cc8904f27509fc476b59a634eb7ac26cbf53c88069b104d00ddc3c596384d75bb5522bd38fa25f2aaebe2ade7453505622110a36f7f77f19062a846f01ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ach/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ach/firefox-69.0b14.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "bdee0f41ef6b4d2efbe13e256616820df048610af411befb91256bab040225530cec74b35c591ef740161d12a8fad6cf96e35e25bce7453be30ad8111c2ef3f6"; + sha512 = "74550f32169f07e5d551ed20ddc3f24f731a18966f75f80d40187496af4bffd1b0742c6ca001fa263b236826f2dfc6edd21e724bb1e4c8c8260e5526e20d031d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/af/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/af/firefox-69.0b14.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9268d6071ff9142579be3495edca6325dd283128f2a1ca60d6e249d0a963aba7dc3a897aea523804f5485843950db5901d4db9ce10c3ffb1273dfab5adbbfc72"; + sha512 = "2d305bfc2ad71d6c37a3de2e4427417c5ca67cd97eeecda91c8d5a84d72eb7f02c6d11a857af6af673caa5921abe8420b673c4ced79025eb5a639f466e0cc8d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/an/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/an/firefox-69.0b14.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "8b42c162402df67971c01ffd9087768b4e49dd60f069b88b154b3e1a237c0c4f9c7a7e4f752a83e8fff3eccaa87e7599a9c3ebdcc3fb70604032fbe7db524d62"; + sha512 = "0a6319ac1017a9c022da4d8a3a619e9243668090e8266b4778e767a9313aaba5c1d2d5174f640c3103220b5e0dc40ec4040690767062d8e6819ac0b3573ac464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ar/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ar/firefox-69.0b14.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "d4a0c3987c1bc8e304ff065bf1ca1dae66691e28a51beee4726bfa7a685b5efe17c19ec8f7520b982a1b88c631b126c8511abaddeaae2818515ac59b2781e830"; + sha512 = "dee2b757f449dab23baa5ff16cdc123564650c48cc4492bddd36e7ef4f99608c2a4077fe7478d035275aa3ab2368b54e2e171ab689537081b09de0388cdd0922"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ast/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ast/firefox-69.0b14.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "089557a50dd106d25e35eb72ff741c80e8aac36974c2d4a5c49842ce56078ffd8b9f67d829be48411b46d4f823bc1d9ebb2dae22e8293cc197e57eaf23099b72"; + sha512 = "1e92c8fb6965dfbc9dcfda7bdd44a8612487541930a0e758c0e8b8fd27e2a5984761a430420924adbffbc11f6523beb80a8995f1e6d0ab37cec9d130306f81f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/az/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/az/firefox-69.0b14.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "237af11c85728ea6d05dcbfe456a5dabc369b0fa690d23a05457b7541d787b149bff45e5b71be4c39ebd808f65badec902e657cb6cd3dbf7081fb4c962a27b00"; + sha512 = "e35e1e9a217a7a8da13297e7cc1d553b7a4698ddce0eef31bea85709c836f4ca5993cd4892bdcf0e61d6a37cf125a4b9b6a4df36cf19fd4f09ca63c802069bf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/be/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/be/firefox-69.0b14.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c9952ededa6dcf507969ed16ce47ea4f6e2694c1e9df207df5457ff92929ef195885a91ff1d160c1dbb8e72e6a7796ccf4ac36a9bc28efc3dfd4e34f5cc17907"; + sha512 = "cf65d94565d2b25ef90353dc686cc4780eeefb29cde142a735d10e8511e4d9d1db74ce57d80da35d1ad9b9cb3b8cb060fad01ea95b46a86231063f4559cb50b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bg/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bg/firefox-69.0b14.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "bebf78848ee8b81af5440ebdbe49dbf14de20d853f1e6bc6a8b7ace7d6c329ac28e3df2a754b7e5e2c1210f6cde54b539a11d676708ab36907ded0ac4025d6d3"; + sha512 = "09540c63919525169cfb3c2ef8d19115cabaa63b41b21de43e15335797761d1d452c80ebfce1768a88f3a0e135a222e30486708a8b2ef5c1327738f2d5bc8325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bn/firefox-69.0b14.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "8f4cc489cdcc348fa19c8129c8a9e83507e7f30dba3f2788b21e6573ca0228909612b8e158c8d9cd87dc8b69554bead47d9522fd754bf045964a1880a5deee06"; + sha512 = "47d497da9c178e675989b046acf7d35caa7a66090d8751090e86c5b9d9ddf6924767a586d43d33a7a093f1885f5477a8bc008e58eede27bd219e0acd6b00468e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/br/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/br/firefox-69.0b14.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "564878573b16470ab89f3ec82d2efcefa69708a2abcb9fcd7527fe6d3a0b1302a400eb121dd1041599942d436583cf931b6c13a9eeafd13d00ea15f3cfd1c524"; + sha512 = "bb313f01a39abb6687b71314755be566ec6944fbe0aeb5571321032ee814e4aecf57fbdae9847f4e72a8844813d086d7cdb2521a09578ad04a0f31891571d508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/bs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/bs/firefox-69.0b14.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "4ad5cca7ce623219abfd09f94a33753f909e344ddc8f2687d6a50386275728e13853106206e1261c6625328f5448578890e496752cc11796a30757e29fdeeb2a"; + sha512 = "3b6a6e000d6887604696014e82c8668f4dd5e798287bc2e60cab98a0a51a4446854fc78a606615fd760f731c70cd10bade6e6f07fca17c5abc4e50d2c1cdb893"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ca/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ca/firefox-69.0b14.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "83617e53c6b10b7668e7675ca0bd17d4a121eee25bf2381b2e97aae3f8bc2552422a18517f0112c938fc032f4dfc62c85844ac05f823b02346423339dc8f679d"; + sha512 = "ddde0c94dae1ef133d3312043271d7fc9d626900f5bbb473b7aa6c2ebb455d358736da2736271611f3e6b336f7c88a4e60d060101788bfc7ccccb9e2ff863259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cak/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cak/firefox-69.0b14.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "11b6a20036725b6e794a2d76e73cb6d2850d498d8bcae442fa31f663901931665a9e4bd21c6694317eb3a493bf6d33e00bc8e8ad98f151a2bd38daec404a9e5e"; + sha512 = "875439f58c7ccba85c6a59031d92344262de3fb27852fcc727b15ee0964d37eaedf6715dc5569cccd0f7d684e96052b84926c4b81c509fe456015eb67ff883d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cs/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cs/firefox-69.0b14.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "387f5bf3c18887cd89c977504a2fb956944d3bdefbbe17410edc541ab8ceb16a4118b0e98e7193a85c66826c684e636dab7e7ab5033d4fcc6304ac49d0d96997"; + sha512 = "c93a27a66889e2e2ced6dcea0495d9295c179b2aa2afc706196b84a4c4537e0499875bd2b2ec152a38d2c5afb5d1d45224086c2cc2bfa56907c9f9aa883deea2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/cy/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/cy/firefox-69.0b14.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "a0c139b58e15851ca69fc9e138df813912be6ecace6003a3dd474ace17f4f18125b74f247bd795b619e6964d238c162e16ee83c953fb3511369842ec6374b4e6"; + sha512 = "66059d9f6e059bbebf42ab3d29fc9103de639e5b1fd7f4b8b0648b98d86a030d668bf35852bbe83ff27dc3d1ababe47a74f1e37a227a61da6b4c90b12543207a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/da/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/da/firefox-69.0b14.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4a9459cef3d4c737652014d2b5a29801c3517e28d614cc1f8fd4707c7571e952a53c9bc0827308fa05272416f84e6db95b45bd27cfd7411f0bd15a75b17d5eab"; + sha512 = "a3943bc573c65a0c90a88ea76882a4b43ded06aa33c1bf1d861d3d6ababfef3c75104c7614b740860cd682c4d0cf3fdeaf54a41ef206f117ae8197a73431d362"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/de/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/de/firefox-69.0b14.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1aae6f492c3f7dc2194fdc923568bd8b77ee9f591e7ca9d8f8e6e6dd14f6873bb999340ff0c347a60982ae7a35a1e98ed5cdb07cd079493e06f5f248859b99aa"; + sha512 = "2635e6ab49e4545f562043cc56e56750a882943ee160b3f2bcc328ae53bbeda364746a3d97cec3d84086e90b554a98184d268b27efb9e51255a3778ce1f5abf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/dsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/dsb/firefox-69.0b14.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "283b212624768d1ffd58573f67e253a4f8d8b0ecc824fd666290b5424f1b1642d3d88fd0e1cc29f6259860718ab147bb371583fc5a8eebd408d5e73c7f8e1ed9"; + sha512 = "aa44a98135e4e5b3f28ac37eed0103876a817c07b231830271c2dd44351ac43da9139a3adbbc8a6ebf0cd28c87e802db27632d87e7f5afb0209f4816f35273db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/el/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/el/firefox-69.0b14.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "1ec29d5a50105d7f4d4b6d6cb2fec25a9fabb150a9de547fe13fd1c37a964ffb2bdc5a66599ba315fabca4bc833b8b12e48b218ff70711e06dca8b5d36332032"; + sha512 = "6c86717c1ec09829567ade584c4f114d6bc92c9ba85a4583670a038b5616521a4578ad97b023673125fe85b9a99fc7c3999fb7e4b50fd75540386b6024d26c69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-CA/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-CA/firefox-69.0b14.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "86658e29977df1dc66487d4f4550db41474ed8625c920763336e2a1ecf98da2f0ae0d765c7a0b7ecb5864b505d841789ab93868bc1bb0542c687e359662027d2"; + sha512 = "90af2b18f403b7fd25bf5d920c3eaca638a6fd5c75dd57afdb0c9e1a20a8404cd652d2c69b63bcbf4365af88d1483f02b929d3b825899eb465c142775e4eeea6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-GB/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-GB/firefox-69.0b14.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "c8b4401a307d72b27843fccf12d71f72aadaa12eaf373af78f80ba00fb27fd3f7b06a430ab17bf74955d4de673373dec25faac738cb2bb292a48134043d95a6d"; + sha512 = "4ff1dfe725977d16c23333b3f3c8ca035d4973fea2d7d1f49daaf75cf6597fa56690512636a19455e5fcda984a4ac887d4b987b45b811683cb65d40daee7b8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/en-US/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/en-US/firefox-69.0b14.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "291e666a59b9e26ba612a8cf75b04e82610d6818fe3aa034b09cd62052d52c3990eee25a808838348cdbb7606e2a9218c6a9478ef868207f0c920cab76bb393f"; + sha512 = "851e15abeda5a7d9faf74950e97b2decd6ef989c04acf8d57833f9172f0793f9741d9f1212c2aec41f017c8ccd491a1dc973beddee39ac7660e63f2a24463911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eo/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eo/firefox-69.0b14.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e056e31a8c364ebf56915967d54d0d24903adf32a751123171470bcd968779b3e58cec4731f9b126865b06bafc3aada52e6c0c4abadb981161c390b1ff75d916"; + sha512 = "623247002b82238eb05f4bc7fa6182aa5f68121a87af6cb78315b4f144a17a50899905d915dba41b5dc2d372ff97ff8dfbf0ed2a0a216c85cd45f65206ad23d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-AR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-AR/firefox-69.0b14.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b165b4626e4326b9a7b72d32497b935b14e470a8ec9731491762a4f2f5b020766a453a5d277a4b693ddba243c39a5145f6b1962cf65282f983ece1a58d9231f7"; + sha512 = "fe485782e38e7f0b74e96e2e06283b6ad30223ab1cdc3636fc15810b327ba564706d134ef00ab0a38d4f6d5639aa84a52cd46af4726e1fbfc9eb2ec19ce1862d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-CL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-CL/firefox-69.0b14.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "e50aa715b2197242e03890bd7d981b34bbe438e7b594d38637495d6c5c7bbbe14dfc345893e08eddd095a758528ffb9f8fd73dc197bcd68c6b3a9aaa8dd403cb"; + sha512 = "8520600de63e160c21f4edddefdf8f971c12456a5ffe967dd02ca00c7227b34f6b8acc569fa0c0d40c6f91bdfe97683444eb38cbda8d1cb1ba2b913c943038d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-ES/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-ES/firefox-69.0b14.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cf0900c6571046403fc0dc2369208ba65f580d6894b2e2888d50631480e2945129311e1a3f5971837c6afb3b558dfec83c0886802c7881c8840ea883a7049a38"; + sha512 = "0e36857acf8231b9be9983aac35b2090ccd85dd2f8cd7b37021f2d62b37b17eca4e29afa8afdc000ff608bc535b3583720c4111c6bc87a67b5928e25d1912f9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/es-MX/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/es-MX/firefox-69.0b14.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "321f06c0105c8d969f1ea04ca8065bbca76d4c42c8eb18b95fb3d859b0d0d0a5e7c1bf5d7c9894821987b2a4d46c08198faca5c03cb0a51b001039977d523ecf"; + sha512 = "4611aa1bf2f9717093027cd38e60afecd855f9bd6f5b90e57ec64ba61c2d3cfa38e94688e5b7e02e6ca40a9ccd03ea9c25543b03be297ab76a89db3395fd7dca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/et/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/et/firefox-69.0b14.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "db603e5489fd329fa7f9c7b8e5589d2b7d62ca8e295dcab1e7a3e838c125f1acdca7dc541f67366acc4550682a121e132e5aff8243fd5e0871ad94249f037941"; + sha512 = "94d4cbfcab4dc697462001946eb91733e7c9cad2d70d1d7070ed6d6e4cd83f364338a70f313c400ebd9f17bebc05d8297e27b5d662f0f940a66e63a97e549ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/eu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/eu/firefox-69.0b14.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c74c42da5f7b1b08d3f031b6f67bc4b8fb3d77c7364bfc5d8ad442e0883efc7488e1699c560ae0c7efb88e4c4f5a661d972489b431bd710211398334047d8c98"; + sha512 = "e140a1bb452d2a970d540b764ba41bd70f4042f7f6f2d8bdc3407cd3d428e009815c3fffe4dafe3964dce45d860c7960d0818acc6fc8878e323b4fa1dbc340cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fa/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fa/firefox-69.0b14.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fb791c52894ee901a54df353a7f4b3a16259689e05c4a18931c878665645d123cf493d25bfdaaa4641a6f925f2a23a77e585ec73f9f2bfb33b87ad3ffecc94cc"; + sha512 = "2ce77cb106e64e49b2605edd7f6ba19e7c0782356de0a38ee572e8b5f18020ff4e8235bd83749b578d67a40ac81b246a531e21ed24a944e562444344bb594121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ff/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ff/firefox-69.0b14.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f5c657a4d1ff42e772943ade151288fc8fad73e532ee11f00ad6098288483a3326eb00a80f13b38abf4165a1ec057f5fcff705ebf9c6d1a29a3fab491b08b63a"; + sha512 = "a3b44ae73ff9bb7ace9ddc7d7886b4362eb2265fe0f8d5b2e34fb929dc367a6be29a46d750cd33b7d03cd321827dc261f1d88cca91fbb180ee1dc72398c1281e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fi/firefox-69.0b14.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "1d758e4d9c472286d694c70075a0e9a6c955f42e21ef38057e9647a91722ffa15909a39e4c29ecf8d221c5ee3d464a0bdab80b9ce2e9b048a471295f0b6b4dfe"; + sha512 = "934f497203bde168237ba43d49400dc48c9082a24de8f74ce887cbbc1f35057a2419dc346b88f18ed7d78596ed220d4f65371fd2bc34a1ef005803109c7e77d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fr/firefox-69.0b14.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "12bc2af05bd45e5296340560fb9b1b5c3b970bf4f57a3425fc4e7a810a8a092637ecac20ac1fdc643a4d891754b93109bdb8214ba5fe93bc62137c296d667ae6"; + sha512 = "778509904c83b8c00c0b71331c770cad677ee487079710d9244d1bcc5a2e2f6e397b30c1c8ffd7f787f8fbbe87f509105bd2978d26f60406b8904245f170d79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/fy-NL/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/fy-NL/firefox-69.0b14.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "274c67f1acca9b79423da8366ed52036229917547dff79f740918818c379d21402eb0516ca8919cff136b6407950e6b4fb6fee3ce6c1bbc1d68092678f4f255c"; + sha512 = "8cd82fc3c7a2558f5408d2e18d8fffc01dc1a0c69f52e61e7da185a9b7d24c79e29d68c7e61386b6910aeb8f91276fc1fe5c142ca526112b1e0ab206ec3757dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ga-IE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ga-IE/firefox-69.0b14.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "537e1760621cdd5e0690db7ca1aa0fc935b0e1fcf1a037d988c38c7a5294e34cc904d44642234286b24e070b27ca67e41b7bef0e0983ef6909a977ce3b0ec52b"; + sha512 = "4e0184a5d0f6a8213d250b2210076e4857d27224b2d6ca27375a8951417ffc74e8fb02b9b571a12f34f59911f0663ff21d1abb09836bc0f4a1fac3c6894bf82d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gd/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gd/firefox-69.0b14.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1198fffefa0cfc1e4d9dc7058c840ee3aa6957022a988c3f39fb9da29b74650923153c563f1c5504f70bf8effeb35ed4d9b697e637613b145ae88d556002c064"; + sha512 = "f67a284aba28000a070f06c1b075dbf3edb60b4704c62fe80df4714df51395644507ebb89506ab2cb65ccd8d1c16e896da0c4dbac7fd3251026f0e00bcabe014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gl/firefox-69.0b14.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "5484eb61aa9d6103b9b44ca9dd0fd2ef1440b20a5c07392aa1a71127a0bba0867e55797429edf328a5c7fd207325df0deb04429e2224ed9faa1336c8d189f5db"; + sha512 = "c07c74904f845e2b740f6eabd334fa1aa0d74012e86fbc17624d671c7e2cb3d78143a499aabadeecdf276c3c6d4f2934a54240ec7078619491eeb28c8c50be9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gn/firefox-69.0b14.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "65d1b767146511e6c337cb18dffe1e1e8bbcc702aefb6dccdc31b6722a3f0146826e154b0255ede79f282a3fa3bb4b63d7350acbf49d752d2e8b58de484c2b34"; + sha512 = "426ceb6386da90c30726ff5318613bb88875c1b109bbd73f46f6c436b61a18b76a8272807323abf925e1ebbc6531c7d82ce1af5dbaa9a2941a8007cf8dffd3f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/gu-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/gu-IN/firefox-69.0b14.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "e8c3cd52bc402b56d04ae1be33a99197df8570d160fc415893f9d91ba7a4b64e20f345282eba8e1b71f9c486db4b37e84e6b56f63b8f6f15532a1ce9bdcee7e4"; + sha512 = "71217c32a6cf4fe5bdc922d09bc290537e58f26a75290bf23a5fc60be3e42b8b17d5b05dfc8ea4c547a149e795fc9449459d5f74efb4c7d9ab7068f5533c0bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/he/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/he/firefox-69.0b14.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b2b8b13ee803ffdb039bd656a8f7eebaf10cca29a49ddb2555bb2e561b39a7f76f3e65243e3b37ec31b182897a260ae801ce11223f888949677539b103561398"; + sha512 = "580b58ccefbc9f1d79027976dcb8b880c6608208322449146c99e1e6ceb18b0d9069891dccee5c37df48b8251984ad915228fdebd48d3770b54e47ee2433440b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hi-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hi-IN/firefox-69.0b14.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "e564b962cdef896bb6b7708c315b3ab07bb51c4d3813a9855d5ecfd774577808165c15db6f875894b6ca4d9ce01ade8b2eda64d12d2b03a507291ed235978691"; + sha512 = "52d0bf548b7cdf6db5bda320f8262d226adde14cab042458e591fa922e5c4cb66c7a10699ffd3a4e90b9be522c5dba77bb8bc787b4db73b6805a04b72d92f752"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hr/firefox-69.0b14.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "56ed53ccf263879995b79e9455a73fd7fa9cc082fa984f603d5b9347231232598f85f7c3abcd4e1ae243098ad338eb59efb544a1aef16f6c55e036ff4ea02324"; + sha512 = "8a24d6c60af65b624a3f577a984d237ac93582bc5630ec2fd7d3c39902ca73ea47ae34d41fe90dbdabf15872bfd679e029ec361ecb7d38c17be4441f3df298ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hsb/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hsb/firefox-69.0b14.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "9bd729f6d27874d73d4d174f8520dd5639d6e8e4c2284b67438b73b44eb715478a66d2be348b431007fc19ba7c347f914da59265369e80ff7ddb545e6fde25a7"; + sha512 = "085f6fe6b298047cd08c153c8fa9c3266c8fe69c0165647c863053e2b9836db9b5dd083c7fcedbb2100b22947a296da5b0894897eb801734430e153eddd168b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hu/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hu/firefox-69.0b14.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "872993e7f725c8ad3c360cfdaeed4ad0839857f52d88d5db040ec4dbfd829241a7aa0f4c786f2e5f174b4a3161000dd2bc962e9f290e8f67a0757db52ab3ec7c"; + sha512 = "06c2e59c69eabee03b5bf118d27fcc5b9ee3ca21e1596926c5e75200f47ee4b27c4bba5da0e3a67cf6acd7986dd066f2ca79089156559c2cb725023067dddbbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/hy-AM/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/hy-AM/firefox-69.0b14.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "a503a134cbde97990b0f733eb79a93454f668c490040b83a109200a3c54560730a1a1b9fce137af6ca5e1a37268b994f500030be8215222d442b651f319e3f75"; + sha512 = "94f95dc01d54875be32db75a8ba17202678aeb8f0dc471a356b73ff6cf2725d302dbb5bb41318b69e904d9a685e8b833bf0ad489818fdc4aec72617cf19e3221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ia/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ia/firefox-69.0b14.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "9ff8052382c08e4181c55706cf6612abf24ac8db22a64f7adacda83efbe3e17b8866a7536a9bfeec555ca0a8f3628e88effcc39998a13f382223551d111ac3ca"; + sha512 = "ad541cabe5f20fc90cccb932e4062d8088fd58b9bffdacf6da8c53cf9667d82363a8da70bb441881fd132bf0239adca681abad4ffc44808f4565eca9830ef387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/id/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/id/firefox-69.0b14.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "e03931527fb8a834973092e7cdc75fb1a03923a7ee26abb4e415a6eabef47a32a52accb1365030b4ee84687289a2b71c94faf633f39fa868ee0ffe235e1518f8"; + sha512 = "ccbba3cd4a34a2db26c81bd670b53e50279ee22b1e43203802112010024ab496077f2efab9f100f50dadfda7d35edad09cfee7e54997ee2034d84e8efa24dc3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/is/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/is/firefox-69.0b14.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "403339f6fffb70f1541b11840e38ef8ea52d2fbae4ccfe802dc1dbcfc1b2ab8ce50ef7eb3e20c485d86f3ec1c97cba9077a131b7db8d3ba42cec71778b09888f"; + sha512 = "11ef7c6e96d4fe5813bfa63a322b9a57f283e444a22be440ea14acc0d186314e57119642dae7d285122a17ede96eb8d37f8f879c22101f8a64ea5f0b97dd1a17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/it/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/it/firefox-69.0b14.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "518a661eb87dae3af75834198c6fb1d3f6836511dd532b3166f4b395ac0fb1ab602b56a0a8be06f3474e2c89da8ba04b09fc116b2391b11b229d2aef8ff31275"; + sha512 = "c568510a83c61f9472852f8c8fff0293bc7dff741f4ad8bdcb16caa5abdb2fc9cc0186ed13c95485775c8041e9ad0a4f6433fff933626f80eafea9ffa3fd3f61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ja/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ja/firefox-69.0b14.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "e1ad475114f41e22ef4eb38cff1870822920fe164a79791b21a9b7e9dfb4c7ede59f16578db71214d72270e18ed7eac759a2a978b9fa1c52b04b8b07468c9531"; + sha512 = "f04b5d728d9e319c2f88db4c283daba74cc36b03221a61c92dbd3301f1a2a8d725dd72fc9fc95e984082eb128a519e002bb62c59f82e6a529afbb36289be5e23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ka/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ka/firefox-69.0b14.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "4aa683433623ac70de7ba0377f8fecd9685a40f1ade072c70cfc2bba375158e04d54fcb25a170077e321d300de849a9e19eba464c619b9f911c25340aa636133"; + sha512 = "9c47c3e57913fa009e92858363a7384f9e71a9b6826c64edaa2772984be43c32e45c73b7599d45ff51dcb11a42fb70963ab95615f730a2f11d792e0ee1c0417a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kab/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kab/firefox-69.0b14.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "45f1b8a04b5a80c4e8207eb9c52b44228b176037aa47319325c0783dd6b5b09c07f76f12535d1f1eda265e0e6f160c24cfd087c699c24d628fbc4d007c156dec"; + sha512 = "aa7e4e641d79568af30845813ae6aed59d59964b37be672b9a18a0006f152dce7fdace65a6d4ae2626f80becfa56b32f0b18cc826cde2d555816a27c76b175da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kk/firefox-69.0b14.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6b327637688b45f61cabfa626fb8b23919142e8eba03db5727bd18b714d4671f6beca487c43fe95f48d9d6771e1775cda098197e41addd06979b480558bea85b"; + sha512 = "30817ac01333af478e9dc6be7db8e898705bc9020627b171de664e892ec13987f17e8e2a346cd94bf77bd9caae62cf8b37a1ee3714cdc034c648cdb424c72cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/km/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/km/firefox-69.0b14.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "de72e1d2164a102c063f6906678a739d70cd7e0b44dfac622ef94e79d7bf076e32fd166b12f9fc077b65592d97d5d6b2f13ba2e403c24c9f9a988f58c9ac3554"; + sha512 = "f0c6fac7c89b677eb2407b199d61690a3ad59128b9d1a06575dfe289718e0d5677573cb0ff3da8e313d24798a9776c4387e57a60bae3ba916383cc02a57612e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/kn/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/kn/firefox-69.0b14.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b505d91f5586a2aaa53824faeb65c31fdb85cd975e8ec659e63c1c95a71f96fa13350f93658455cb9000bc533551a4ca1cde49a0ea74a0d0a8927215b251c34d"; + sha512 = "5ac4a09bf82678f3d8bd53c8bd44c1f6c0811a942a99321cfca1d553d68ead2abe8ed2f4af3c50e9ee88ac1ede35e201fa4fa2ec399016b122389a51f16cd5be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ko/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ko/firefox-69.0b14.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "84fc13c778f38dec4399293bf8b4129d5d21596cb9442e2f6a6d9cf671917b762fee13509a817d272bb4883ae012692919eb62f8c83ae9620684a9f458ac85e9"; + sha512 = "dd1bdf3e30b3a43d196ec50870bc8f2abcacf703860dab5b21e9b50fad5dbf9ed7cf0bdedf0844a2d56e60f9fc461e397b48f12956e2d95ab6e941b760e6f5c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lij/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lij/firefox-69.0b14.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "afcc6d36a9186a24c7672bf0c3cc181e021ec2c08651a84b58e9f06e400394d8ccc7b4484d17909c3388714104ce3485005eef3911596dc23abf8ea9515a4908"; + sha512 = "5c9feb27b7ccec9a6594cf027b7ce55df4e0becb5871444bc24328401e3a764d7dadfa3a56b654b18b2e10ab8a8e03c96021a33de5cdc66b0d7e3d6992a2fb5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lt/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lt/firefox-69.0b14.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ad072bd72f7160d7bd9caa7e69d8b1cfd8744e6ead5e1ba0bce5c89a5e4c5193cc55b56018f9feda5d03041082eb5e054dac18ae78d280d7bba72fa5b12ef84a"; + sha512 = "ebbda17ab983261c9a593a4368696026f4743a79c6cf70e89184390b4c1966d474b75bd751a52dabe06e303b8f223c524494a6cb753dcd547cc8c93ba911088e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/lv/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/lv/firefox-69.0b14.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3b8bb275384540b32b29d32a72ebb54997aec84b2dabe26ce6f9a92ca60a461dac4368fc8ab816001664c1e8702c130aabf5ae3c39c107da034670aa52b9b616"; + sha512 = "059c241db15b20d4a5713b35fc7dec60d51253a0d3c9e9e1337defa2ec33e0a3e22b2be6346b6b7fa51e35fd48870a86c2315bedbc32669260195bdff3e5d9b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mk/firefox-69.0b14.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "519c24ac7757d8af7959dab1e88315f4e4c163003d9467c5d1c5606fe74e9972d35d54731eb46cb7de98be456094d047782c62bbd6e3880f6743c2b3441ce865"; + sha512 = "170ace7a442581946c8ab52b63c935ad58cd3e6415c109c564faeec9333025fb9647f0f049a192386a2d980b7c3f9ceea62e1d56cc90e8c8a4aec568f58e4dbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/mr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/mr/firefox-69.0b14.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7dfa0d85c946dec0190730c49b79a447311e632a58e467c5451c467fa870e6262077f89b2bbb57e29d9d35ae78fb182c4553d4f192aed45633776b6301a53a26"; + sha512 = "91e4aa884b26041047ab3bc0c3eb5bb14a62776982f7e1edfc53f1732c5fba9bdb97b77e5f9603cfdd4bb2f67ca5f5959ea61eb4827c6075d30b502c9282cb3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ms/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ms/firefox-69.0b14.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2e7201c05ebdf99e7dd87c1fd974a33fd8c5d56e34aab55da6af22237ea8a4caeb6367ffdbfdfb15e5726096b918ccb7512c77ab20e02f879f4cfd5be27caa3d"; + sha512 = "2c236d61824b559def24a9f96ff15075d17220893ce5500bf1f997d582b89b8948eeb88683997ffb64dd57c2fdc01961d877de28be6110da7ff4bddb129540be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/my/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/my/firefox-69.0b14.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "f5cb255dddc705083cd5c91daced163d4337b4162d9686d6c76ab935aabb6d3a651e3932189948115c1612ad5e864cc83ee17f107422d21eb9f8dd54e28d271b"; + sha512 = "909aee75dd8597d4c7d08cd28972c27fbe07aa774c93a6639d38ca152ea2d0a5330329a857b04100b67b35142689b3ab9f4376200b9d6efe8612a8dbaa19618b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nb-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nb-NO/firefox-69.0b14.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d0eeecb4147ef017c4301621ef7c04a14e1aa7af7e7de2882733ff77e8fde916f55d68573cad5d104eb631c60172b7fd886b4c896c1fe9805841ce5e40de6a38"; + sha512 = "a7b65f920dccfefb64e1d0a2425a8514e555089262f2d0d5300009c9d8b8ff343f387d0f3797819808a2d2b67c10ec026fd12f0306e23d8b31573a9ebbad726a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ne-NP/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ne-NP/firefox-69.0b14.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "db7f205b6c42575bbf1e69c256c2113d49a86388f58eb806e761024e73f70ced1a974e18b226c83936a601f428c54ac8deb663ca950960154c60e41fec37efcf"; + sha512 = "10e0715ca360b3299312c6f8c86b4d89ccc0788611c44e20d90b0cadb20e00f2071377fb934383d6d76cff49d0fcaeb155b68328fb5bc96fb09479a192df1464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nl/firefox-69.0b14.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "b5c4569a404b9b7cbf6b3c4e1b125c1b45fe228018b8513766726f00bf7e52fe2ed1d07f724f5cd2a37afce2c84201d30425d156eead9e02a47011c95fb045d8"; + sha512 = "1e688394daf56bc6900d765ae4d01941d9cc02457b95965cc9624be7ad5a50a8b8cdc6212d7270c8253d539ecbe60a21648cf13f61bfade3dafcd8e6273509b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/nn-NO/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/nn-NO/firefox-69.0b14.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "0d8661643f719055c88b057838fec06b19cc5c91d7975149dce7c61ada82dc7f40516622828c05cfc1a5bd44442f2677907b460770378b92bffdebba9dee3015"; + sha512 = "8fcaadfa9e895a97403c60a09e27282b0907346d20c8dbcc8bc9343c0bbba03d3bdf6fc22e52271d5edb9e1df214844f17dc81d3aa74adbc2623fc34f034dcb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/oc/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/oc/firefox-69.0b14.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "5064c9198ec7f2c2e83683405d0ec619f7f8243e326051e33fcd869499fe281836ad2d5e1b633a3f264f7968398ff5c8933c5f7fe95729db462395042673058c"; + sha512 = "d2edc1fc3fb685ec8f46b58559edac3e6fa3eda0df5ef7bc95c4b4ed444bfdbff43257e5cebb50ef438c7638ac3cde6411e9d5b0a93bd22876c0a13965403a30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pa-IN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pa-IN/firefox-69.0b14.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "3c52168910d6612a5cd6540b74d922624ed399bc6cdede95ca1ba83cd534acbf6673170687393d3f0ea9a04fbc5940e97062bdf25484a779bb93f914cf793865"; + sha512 = "535726a70b1d2e4562f4459df2873aff9b41ffc8e88bfe606465871e13ea4205431ce8846670b178e043e35b81ee8e71bcc896971dac2d8d538681ca8dd0db9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pl/firefox-69.0b14.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "b8e627cae2a2a2acb6b0dfab43ea501171165898196634ec435944d625ef8d1048ed02ac94aab9bdaf63ec5b2f3159d534db78801b1038fb493797ba27c2d7dc"; + sha512 = "1704e78bb2d0e9e8b50c078a52a01777f6df1fd4b2ed05a7226fe7f6eaaa38ae72a9ffd8780b0e6b9a51da40990de386e8acd518426ee89e61d16d6505e7befd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-BR/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-BR/firefox-69.0b14.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "263678f014c16c22edcf4139bcc443a02fd67dd41a8820f670c2a1a44f83bc3bc4532bbad92707525264baf687a17b6d5d3e46bd9d7228a3798c7387d218e17f"; + sha512 = "0cee5dc74c31ccd80b2cd81a83b909a77dc77c06f38af6290b7d6897d97e7aedf3036d03b1d42ef33dc3942566809388ca5b3e6d9b78a84793987db77fbb1fd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/pt-PT/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/pt-PT/firefox-69.0b14.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2113203fef6c17485784d4ecb03ac8ed249102a8bd231ef3c0a9c95c06e0d46ab3bd5af475ffbd9ce11036df0937e34a42ea560a3c056ea153607e93540fb91b"; + sha512 = "b43c1fe0fcdfac892b73a3ef7c3ecfbdb5b646f9badb0dc5d64f9614ad35686e1eaa1e6ccc2cccf9c9a9bf25cd629e5bb893d13942a5dfba67368cf3ccf59c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/rm/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/rm/firefox-69.0b14.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "57e47591931d942c59259d10b41a3eacb4e5d8d61540fc294546a0a15dd347b2419b64b66e4a33e651e2f616e158b7bda60bccfaea1a42182197dca694e43e3e"; + sha512 = "370593dfc73e15ec56950c6fe788d579582451151e26896587258bbda65e623bcf28943413d80ba7bb629dc2230e4f42da0c26cd137f8fcbee79d85a8fb4c57a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ro/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ro/firefox-69.0b14.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0c206c38a7833d1c7596f26a0d6b995cbbaedb2b014464dc15c82fb3a8315bb524dec0d2df2ddfe9a28b8737c32c87a85c8b815f284535dc572669089266fee9"; + sha512 = "6a415e17b0a3511da4bc97be2cbff5cb4307c4c63bdd2bf316b3469d6ea1abf365ac84608b169efe3e5ad8629a0430bac0898750b964672f83da0999c1c9b12e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ru/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ru/firefox-69.0b14.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "fa544b95295299c3a9eb8c97be37cab4faf77df818f624562dbfcb553f6b9650b458185e52c2a77ce07e3884ce76bcf925e15aabaa4af4490abb9a6b9ff1ac81"; + sha512 = "b6a7c931874e0b41dbdfa7658b3ce1f7560d20acdc2ad1cb7fd3a51c05e6c7f392eb39c55faae6d723b23cf83ba5134bf9ae12463161fc9df0b04a311bb8f7cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/si/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/si/firefox-69.0b14.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "2f2a407162f4c1fbda3ae3c2f18a97683ff12fcbf863734659d45aae50ea6cc3a8bb447449c1e1922b3b64f84bcc295596287cd24855e10ff8fe25401293f888"; + sha512 = "c2ccb292b6652320593dfb05af30be4a5fca09318981e255f15003bfb8911a6fc3c8bff420bdc13bbd1aea69b44e5809370ec100c4b6eb6ff54c71c85b3f52c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sk/firefox-69.0b14.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "871daa6bdeb59b9ac1c3d73316846d2955bd278a46f17820c7b1f9724a91968f7e1dc19934701afe4d880a22befd3999784e1cda962620400b01bc56662245d8"; + sha512 = "8cecce76d5d8f6ed8d778fe2d2c733f1d81255696e78f7422c464df96275149246704175ae1c28566d223ca38da908d7974f0b055ab953cd3acc08c4e1c246a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sl/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sl/firefox-69.0b14.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "02e477a1c5ffb5cb8df98c8da67dc1556e0bc832b99ab03b4e231ee801baa8bc2964ed81e94ef431ea70b958c3c18fe01dcfec583823d4aebd3c6efb24333772"; + sha512 = "0cfc0a94d8273926407ebc8addb69b76fc734215e6f0199c8b7e9e932ff89315f49f2695826446591a7e223d07b61da8ac2146f5589d58093096f70425ae15c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/son/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/son/firefox-69.0b14.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "b423b037a5395bd230030ce18056703867d74fd595b54c070fb9165f8c8b25108acc9b35fe0422bedc6e5ff57a0657b4bf1ebf5b9840c3b5f0fd3db2b577d416"; + sha512 = "321034ab272f1bfd07bc4938912be05b0a14e81ba537cd232ce38e408d3c9dee6d93010c62c029be27d0322db7883cba6d418b35b0afba534eb32f4bf18e0273"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sq/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sq/firefox-69.0b14.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "7805e5a4b7b84e3ca89bb40d086726b42afb07e6aa78ac2c5231a1e8a3deadf02493b83077841e979b08eee913062c03a6da6b7a835acb54dc2ce34692808a67"; + sha512 = "3eb99ec8007060e049b1be8a70360d8839b90a48599866687b7ccefb46f736ecbcfb166936946feb4e959a941fc0534b6f843d8c62ef4f77b2cead7df32b892d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sr/firefox-69.0b14.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "e3506dcd3a14fefffd3a450e2573498db3fc82ecf9e20b203c5bcb3ba8d9f62e7dc69dfa3ceece91090adafad675451bf70d5badda3e0adcabf340410c9fbce0"; + sha512 = "1645d31f9ae714a85bbc3433bfb97d910147d2b4c8e0b971a75d4bea5b8aeb2c500093e85beef9b28720a6c372db5edf68bd83be874cdf121add61fed3f098d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/sv-SE/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/sv-SE/firefox-69.0b14.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "cacecb4743defedf9f67348adfb201f0092d835049b8a93afe1f1bba6c919441b540c101024f8e55b4d3ad2f4fdc71f8cd91bfc7d35ba5ee2af4ec13efacf10a"; + sha512 = "5a6c3329faf019a10d55a36cf893ce0d961c339c1a80ddec644266c164b774a6fb2bfdd371ceb50de758f12da5172c9bfc37aa6dda254c95b6fe01039c708191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ta/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ta/firefox-69.0b14.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "9184c8ec21fecb20291cefaca07b78fa1d18baa5ae0af2a13639f0b3de176b80615a133a26b575a8c10d722308f50aa0dfb34d9b495a92a137cd1ff738467be7"; + sha512 = "98810df80bd496c8fab57530c56c7aaba0425bcff3debe07dfa4a647f63d6b7cb652fea19c5ec00c61536ea0e94fed6ea583aa411cd72919852f832dd02d6b61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/te/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/te/firefox-69.0b14.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "e903b44ee00bf108bfdb57a31bd954a7a924c039e606bbbe8d804979ea2c9d9268e23df1da36f1188b3e2684bf77a8ccc12590bfd02f73b759cd8f660f038a31"; + sha512 = "ad71ef457a0eb6324a23f7a2e4c6a0dfb6b07063e1ee5f2425a6dd6ab9feeac9f9240b9193d4bc8a70b715cb4f88322f39da577b645cc9359915ccaf91d1d19f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/th/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/th/firefox-69.0b14.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1c5c1a75ebe2cc3a80eb88d3cf80787360e88401ee749ab5b8944caba5caf55d267939376a0c76c72bd733b31d438e141d3f937bf604e8f48e333cc3024851a0"; + sha512 = "2e522f9c164049b6f8510065e2bd69394067b45f361ff127880dcaf1bb4bf893a8d4559222c39dae46b85e6b72abd0204e36296c119ac8c3442bebc8426a5276"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/tr/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/tr/firefox-69.0b14.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a7fc78e4abbaf40ec8982ee14054e2cce5f21e4c5f6fd2dc04d38bb6b3b062c12a97cc7dc113b8893a1f5a842aa892ea1440bad081530918e1108b7034e349e4"; + sha512 = "b6f684716068ad18aa626c05fb2ea331f33e0648c1d710f1037e3c5ad79d9f95748314d1f205fd1c3f3bda57c8512adc0bad55b56f355d9ba5f20469b00e2fb8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uk/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uk/firefox-69.0b14.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "fbfc588e3a366190509948fa846ee0c075e91e4489ca31c496ad73cf3150d93cd1ae657886f370ff36acb211852b0644dd3bc446da973a2dc18f019752a0810e"; + sha512 = "edeeea9cddcbb5505bef77b91a7f85ee909aa1fa803fe0e5a142a2207a0e8717a983bbf5636c3adf0798fd77e509bb90c759615810f19a59a2839e5336264d1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/ur/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/ur/firefox-69.0b14.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ec1cd0bea6a8a78ec6c8bf459d84af87958bf11835ded4c33a46cb721d37a0c56854bc754b5f4c13890b3a436d8c7b9746a6a421683f7845b72052eec9f59bae"; + sha512 = "36193d23c39331bbdae452acd06fa9db963366cb302ecbfc19724ab41fbba4d1ff3daa0f58cfafda95146792dbc1988878080ed104b8f77f1f81a53157728a93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/uz/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/uz/firefox-69.0b14.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "0d8f70aa963afb07cd2a3eed5eead80afa7a8e4664411a781e2ed808fee47381d341b4a0a118b73cf19a3639d61dd36f47a10a5a4e88243ccf0a4930585aa02b"; + sha512 = "06ebb9c3c88d2332fcca2eb51f4a2995c9e181da9e84db1d8f57ce1c2ad4dd35a6b0ed3e7a61395bda7302bd6e7eacfb2114b51fb71e2e3dcefc9d3ef975036d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/vi/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/vi/firefox-69.0b14.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "530c31e84972d53a6983291bdf1a01a4528503f122f94bee9e3fd4fbe284bf7b92f3f53e9b119c9da678a9b453b6f64a054385b96af2bf7855a90babf7cfcf14"; + sha512 = "944b716ccd4ba2ca23f1fe1ab8f5a6e16edee1d8f1ed3d2d785f061ec3317431f941b6aa811ed02f35d9862e44dd7b31a860e292509632258b45b6160a6bbd5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/xh/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/xh/firefox-69.0b14.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "e2c3ac847fce76ee7754e02fe1bd34882e2364ec8773906f9884ce2806b47f5cd966fd5fa39229bf6ce67df43e803542cd6a4925255138d007b571288c8212a3"; + sha512 = "f391a9ef0b66224e91bdc99a0a509211a56af3958f0b2d491d11ab024771bc91986b79b87733c86f8d045564d2546f68a8f2891bb13baacffa55d8f481a87421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-CN/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-CN/firefox-69.0b14.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "04c3306367ed2284b08fcb5c8a8f0c5d3b447117a1195b50457d0e9907d262163129811e95222f307668f4c1178a4575c6d80f3d7ad68587630fb83ca6c1f9f4"; + sha512 = "ec812067a347aa55d3555f156ce9dcce040ac7fa363dd3ff06dae9120e8186f521b08e4b02ce23e41adc5ee443dcf112264043efdadc328b43ba192d977f7d15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b10/linux-i686/zh-TW/firefox-69.0b10.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/69.0b14/linux-i686/zh-TW/firefox-69.0b14.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "cea2e28cec094e9672d849a94b65f925ffb44de9e8182961ba5fe5e1571d665a069c525ff11b9f61632b64017674266b109d5cbd032f552d0d99ec9fc347bba2"; + sha512 = "a42ceb0523b083feda01262678344ae138bc5ff64c4713791a005191b5fe8378813501de11b25bf9c50019f0a07b9180fb34547ae4bebe98eb9964ab9312560b"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 18d14d4120aa1..cd9d3bd88a093 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,935 +1,935 @@ { - version = "68.0.1"; + version = "68.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ach/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ach/firefox-68.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "afebe9f5723ce941fe5f00a4135ae8efaf9659c6d7645f024d0e971c37ec2ca84193848ebfdd4eb3125784986a4093e86884d88a1b68d5180f6deeef18daa9f3"; + sha512 = "f4ef9741a880475331f3cfd6aa9315d64c6cabc68fcea85e9f04f6a4f6cf9df952c05ef810b1eeaa5afbbc4001735840849c2dc180694bc76b5a3812f83ee50b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/af/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/af/firefox-68.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "c06bdcb1e67f29005cedfd8255ebe120ac774766ee21acea659752cbc886c014f88caf21e48c2595f69e518fd54c50cca379f46c8b1ba2271bc3ec42b57c2952"; + sha512 = "891d435d29154ebff8caa7942196c593ae350f490a411d05de1af247ca371f8f531d9a90e52c666f530ae5a4145ff99f686629921f908712c7931bf43d21b9c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/an/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/an/firefox-68.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "990fc0b0982c5793b7b2f8f95730335091c31c322001302fcbf9a0802425a8e218278c5b65cbc66d1a5078e51a32bde10baeb633c564fa5f639bbd985fb6e441"; + sha512 = "d7f587357777b7bf70add4162cd62364d8c2be0bf7219e4c1b25335b66645ae4c1e5581a7d0a03e30d4eab5c5664cf05b1b85ce0dd13827a29c0ce227549c9e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ar/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ar/firefox-68.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "436134d474b5f76eca8edcd16661ffe6af7e169ea617fef6605a513be628fc662eb5f64c491813a8bd31fdb20b574f5937ad1287a32465b8024e21699845069e"; + sha512 = "2b04ba04cdfb1ad488fd5a183a862c2f6d0166d73ee637a25d64a7e9ff962d0fe7ab8970afa83cf28c5976f16257c42f6a26499b49b2d01f4e655499ec85cb0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ast/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ast/firefox-68.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "ebb609e71fa97a43b55f14af6ab96f757d3d4f8feb27ca36a29f1dbae2a8cad7ff2ec186d715000399b300ef4ac222b339c0935acfb36efa39cff7878150fa71"; + sha512 = "2267f7a3a8a27816e550e567d5b9a9639df31b86e24c17216e9843bf5211e520d3303200f5c15b9a342e90754db9a9646ad87615b6b490d6058f26fd21db6ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/az/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/az/firefox-68.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "545f0fdc8e872d22dca7dfff9162634d58250f2575c09ee534aa537db02d641cbed2c70b93b06e35677ae061a25518813e69a771fd10f02149df658bdf20835a"; + sha512 = "69f2e026ddc3c26f7f8a6ee2d239289c1e154a9147a20dcfb07be571bd57ed3492c2b770c768dd0b6ace979410649af5193140757b1d5131391706ce156746d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/be/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/be/firefox-68.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "1a6e1130c20af4c72f21ab5fb9cfbf206a20dbbbb3f2a96ffeb2f5c4e755a545eece645f5d022cda6989890715cdd633be14391344ebbcf20d8ae7e6077f8f28"; + sha512 = "11efb3f3a123d29814be1e4f72e2a0424f05d5c2d5da67fd0ae4f23909d8da910e2b9efde472c85fc3c0b2d51492eae2b41575e6a84954073842d210cbc4de5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bg/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bg/firefox-68.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "bd2001033e785eccb2fd1007231aa290042a4c8be1a39cf9770545dc8c779f3caaae8f4709f62753c0d7442082592864f2c8077ab9decad1bce9b817631a3e21"; + sha512 = "75b57ec04a5a56691e31d4d10acca2e28d1d8975f4cd277c4e1e523e9ab0860789c83f63ce2a7c41f8b3308c7f75539d3c833c2cd62bcecf8677114b053322ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bn/firefox-68.0.2.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "0426330b97dc387ba6e418c1d8410f7acfe6461da9cf8527286d97e8716886e743ff874ae6d4ecf50b2cf40ebafecd0ea0a4282aa4eb1e6e89ad85d84567558d"; + sha512 = "6942ef38de37525233bc24aa993fb9ef3e723fb21a4627f0edd53412b2129c1326b85f3c828383080d7fbff3fecaca63d69e765b61b1d45a2edebc0c037f710f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/br/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/br/firefox-68.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "9373aa27dc0b00588d90f9d08b0c65fde1153a79edd69b886fa01052f84cbd5c041d6b06cdc8c441f8bb33b9abd29dff98b6d0cf6a79de0111cdad0383317338"; + sha512 = "d34947348a7e6ebdfc6d4f91f2b567e6623175dc61a774bc79d137e4bc9679dff381d3e454029d35028ee1019fc806b26e7c85ce4fe36868f01978e4540480e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/bs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/bs/firefox-68.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "5268133d1f1a22d8c4577ec39c772d30430cdfc8a1038ec817a045bce5de08dd09b1cc980ca124e3bf6675cca30d7a2f728397484e6218f859e6c2c7b3f67f9a"; + sha512 = "ee1c6343ea3aef7852ca240608f80dc9279469422e6730f0eb2cc8c532ffb5c6eba01bc3f1f2f759724661c53d329be619593d741771187057fdb903100f1153"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ca/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ca/firefox-68.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "96137fff14c26d3ed2fa6d27ca9a3a16773dbb37cd6f00aeef68cb88797ea9159684594d9b6252b384d878e9439e630b5b1e208bfa32251627ee187bc059742f"; + sha512 = "f22b424240fb8858a9960f96384e81f8609deca0adda0deb29e18328b4f4dd71048c4b450121f53c29d6a4b3d63a4cba8a72a7194da3e93645bbcc00d7d7951a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cak/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cak/firefox-68.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "f3aeb0953e86f6bbb8a7f6bf3be70ed80b653c4473fea54ab49025976d3752ff58c32f24700056ff9d176055ef6708c930ef98f29bec2ee82bfdab6f2fa721e9"; + sha512 = "5b4332b617917f5aaeb315f51262cd444e09bf8c0ba6c147c11ffd23a3eadf4a27bc67067baf17424138b3d26760780a0e8a482701dc9ee8b12a1de229fb8026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cs/firefox-68.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "a233241811e4616cb1bfa2d772c29895b3f4be669fd4e5d7a247b572d840ec4987246b556df23958a6a7953b8e4f04e891071ad5cad21be9017bc70d6e21e0e7"; + sha512 = "a9037bd4feceaa7db14d342ba6bcb07526f847650bafbf40615b1f209a8992739ce82729c3b02230a295638292d219c327fc752fa206945261c3897a888ec4f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/cy/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/cy/firefox-68.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "2c13078a947961c7d91a3646f760ab85121e01d2b3f7b521a14aef4fe8fe0c341a0d605df0966a03ce58a6214cfd9f463504be4bfbedf22253d73c18781c0076"; + sha512 = "0eef12e6d28dd7b0adeea318eb17fed6325c4417d3b05e72fc106118d43d6d152e2b858888164344dfbced5708adb88615490c8e7f784707b6f9e30f52d877c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/da/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/da/firefox-68.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "9e146040a61915fba2531d798b3e4874154cf9750ed55af2018542df6ff294f690929747fb110286fb1176be016034c637d18f97599e54a28e05f639c5ced4aa"; + sha512 = "d3f1ee58db717a3b04d1cdda1790243d776bc8c0670501ad74b1871c61fa788f143ac3c43a9b5c6635f4e5d7f2daf15e293994ba0fd6d5d4dc70b3a39c9f872f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/de/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/de/firefox-68.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "af243d5764a47c3df49661e1011a9cb776ced13483ebdd054ee4be507e56136dcbc734988849e61c87ea9795b364ca002431eeef16c343a4cd8508583e7cc5bb"; + sha512 = "86c38b2a5c8507de6949c153ffc98a2451cc3fb4d35aa534c36ff1b723a0153ccc5c5a92ccdd470826edbd844b02476c58800c2a7c6472a4cfec860e13a7e270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/dsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/dsb/firefox-68.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "5f4335d5bbed003c3692cd3fc6fbc196559d629d9b09ef1e6d94f758658bcd637c300e9c72ee7a53fa5ecfc998b276ddd94f87e961df914e193b762bb2889c94"; + sha512 = "2c8bcafe89dbbf2361af22789a3743ecd2c12fea2b457d75bb24b3ba2b7fbd9638c418158ee70961a25b4a273ab07894ca166dbc783199ab406699c42828fbbf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/el/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/el/firefox-68.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "ff2d55b5658b4c2718b9b0d62d1926bf6735a2342b3c91c49a94cc25af19fe28194588c7c75d24298815d7fa8dd32e30511716db57ff521f14def69b22c7441b"; + sha512 = "4dd8368090c6af5995d63f84bc2a3fb612fa57acb0c38bea48a7371b4c8fbec22017b665b3801f5419ebfceabca5a7b5eb2fc6d21cbf287d6c2427c89457e7ee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-CA/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-CA/firefox-68.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "788c6f0aeb2c5a4565b2d187115c948978c02c4143d20cfeb47421c8afd81c0bb5f0285d15fc0ce2129455347a0dd61bd75b01c8774c9fddf1915c653c874739"; + sha512 = "22badc05493fc477984190c5e839b44e8991f4b43592e84eab093fae3b4720de41965d389ab3dd6425a7ea8a44038222c474be57cddfbd5b30e34b49e3aabdd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-GB/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-GB/firefox-68.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "97ee51e6fdb76d690adc2fdccf5decf18a1a3fb34ec3542c795aef8cf45e3e97bfc7def170535057f3362685f5fa75a3dcc8b7b1383f3b08e5b16c08c5edd9e0"; + sha512 = "7fd1739f7da9aebb19c698b45cae649fd63ae0d573956ce1289c1dc51bd5964d1419f90f4d7c29abf344cf523b8f1ac4063678e70568468db35752ccfd5dfe13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/en-US/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/en-US/firefox-68.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4c489c1cdb76ade26918307af3d8d69ea1e407013382a84d4511ee4fa9e40d0627814ee57ca87faea38e1b879486d57481d74dd0f3344cea90b4101e403fb25a"; + sha512 = "8742f7831dbb888554532583c0dae319c1e30424901bbfeab62011088755067df63f360e5aed8fe3675706c4a64dbfaafbf832e66f559dd3c1f58afe8468bff0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/eo/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eo/firefox-68.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "16392ea6d0aa5c63af1f2b81444ffa091f462a686e911a425b7938a5f34c300f39487fdd4322bb13b5f7631be55dc8bf2c53dcd6a57c347c3862c47cca0c6559"; + sha512 = "93a7d92b10d3927edf5870cc46091933b88372c8ebb55d6a60831671f3501b62557037e38d25e18ee61f4e65c14c057d24a3453083adb9383eb3f21b16550f3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-AR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-AR/firefox-68.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "e4c612f300a210470d166bb1386fd9a8308c3de1d107da53b31356a091d8a1a1aff00f60e8feb0fc1d4a6526acf0510f95bf9d266b72f52f887af52337048172"; + sha512 = "4b775586020624d238d7ab0c09a420a9328fc46f6238f397b569fd60bf56cf424c70e016c2f5814c0e9fe42fecb703f68a366ec7de1c68b11e4b43565b3a3929"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-CL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-CL/firefox-68.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "608decca1ff70bac17bbe0160b00c1fef3b0f0e65f53caa2cc549ac1250c2e5973439123c8e34fd0b5e130269ca5816a7cca78632a15724cf8ebbde3e08fa9a3"; + sha512 = "172daa90a8062c4d7884aa0d2df32d8a9219ef04bedcbb270f785dbf6a9d3d5369f69f9dee589d95593ef464e4dee84384c39462a81eb87ec7c0679cf415bbd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-ES/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-ES/firefox-68.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b8b56148d7d08d560b9b34be4034a6d2abd1b59f1b1da993a92d80bdb83c44bb261860573aab5726af56835bb03c13c65a32b1f8b0b5f5d02df855b576d0a398"; + sha512 = "96ef9f02a019947e9502abc583389b0f06fff8e8bb00149108c0dc15799bb556326c4d79905348d02860efd3a090af93998206c17dda6e88819f531837c97f27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/es-MX/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/es-MX/firefox-68.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "c4040e736647fff866f69a054b1b917d66799c29f54dcbf968942b6447adeed8ce8cd24bb4195be44bd134710053daeba996bafe6e029f5e6c7fba767904d084"; + sha512 = "8f120aef18b76259f84e43c1a2c82fca04c56bed10891381e875758c53334cc2987e7ad78a3f9d9aa34edc79352dcd1bf4a7d2b1bc03099dce59b5423de9687e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/et/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/et/firefox-68.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "ee0d9b469bb717ac317daeecd1fccf10290e72e2359d17ebf58f62fe7d4c266b740ff235438d937f30550cfd4f66387b9d1535156d37e3b689c323cb732b37f0"; + sha512 = "227f0bf21042f11ebf33988803274fe6dddc73f9fb357335e24c1c82cb396bd74fcb913fd9c9c848f34de57f518c924a0c1b8952ad9bb3be18f20ad4328cf629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/eu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/eu/firefox-68.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f94492be3a70be304c3e6c0068c8d50f5e3b94cc8ea0559a5cc521564cfcbb4facaa90a4e237425e63dce093a0c51987b40c6cdda8d1e72792327d6f5562cf8"; + sha512 = "733f75308c4991f73e6c2dd673d380af1d1c6ad25643aa4994424763df1d25df3df3a9a77dcca5e00176d1dae248373aeac914528d5aaff79f73eddb740dacae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fa/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fa/firefox-68.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "7a89b49ca9eadedc2a84a990ba2601740dd3494a27694f6d728f2dfa9b7e7bf41e171b2ff9bb004797da1d30f18f65d70d9a94a398483b1b604633bd3388b7be"; + sha512 = "5b863546dddb8c5fa4c59d53cf2f5b622dc4296378290c85926d49685e06231f0cbcc6030257f356af71ccbc6ff32359f387ef70eed9ae3c72a9acd34eb58350"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ff/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ff/firefox-68.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "a889efda3c2acf0d0d96d857689c8264f1ac79d4103f7188458e1232ebe1646357194aef9e6c448e2636cfabef2c5948d0158c933c04405c6587b1cc745ec741"; + sha512 = "5995cca653238629bc6a1930d40550f957b1e3176ccdfad5e65b16584214858fabbe92ad2a4b1aaa3a3fe920b66aab4e0f74646d42174af82d59c0bcdccf8867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fi/firefox-68.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "363ea795d1dbf428124885f475dc93d962a8c4ddcd253dbfffe1471777616d3c3c348223d5f3a1249a89a636ee99a9d4b48ac644e5009f9ce1a4236200b3f23e"; + sha512 = "32188abe02e4fe36312835a19ab3f76c8e67cfaf0857f98aed4435840acc432a411b8b06727175a8d3d3a1ece6a5baa9ce5249de7019d02d43ef6dd2aaa69e9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fr/firefox-68.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "0b869afa50f2212bdb1312551ba3c552fb9f7008f0bcf4f0c5f9c5f4deee920cf96064120b7442050233bf6367b232a79874321b7b4d98c3326ee12d9151a7a6"; + sha512 = "2035d9a5a078e8fac32604aad679a9f01db60cf872ed3b546fdaeeb7031a8d38db19bd8556fca7377eb10768a53dbc1f70c7e812561cbf0cf926d352a6ccbf8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/fy-NL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/fy-NL/firefox-68.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "40fa18e5e8aa1c987c81832b7ce7ae7ac7314a0bc058b3eb226101457b2f7af65e7a5d33cdcd85d10f87d54336ff348bf2a743505f16b904c5d6d09a3d64221d"; + sha512 = "5539c97e6b8a4f51113434df7a75937dcdeaf3ac8acef1ef8b4bf7b500d387051969d13356dd6663c8c0e7a429748160721fb4f864db29fe77087c4f15a652f3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ga-IE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ga-IE/firefox-68.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "3b2c8b42c6290c41ce08e4857b53ee8838e06f0822c7eabd820071058dc70479bcc1886f6436295cba2ed94ba8d7daf1eff8b6a22e1be3014ec838b3a3d77804"; + sha512 = "4c60bc16af21fc552f62cf6e9057871e220f9ad718844e28f8ea60a5122dbd941dbe1b9e4e0a2bc6b7c62798b178134cba15095e31dee6e25341de5e832a791a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gd/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gd/firefox-68.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8724028836689cf83f4529eb04c747f2990d7b10f17e5f19295bbb2d53b301ae427d4aa836dbe994c3ba5b7a986a3ceeb2e32eec02a09539ec972ee9f180649e"; + sha512 = "1851d0bc3a21828c4d89a8c2338205a7e7a9aad14f60a33061dd229d96d8681008ead1651f7d5a501868b29fb3b50bce0587c142e9bfc4423e398fbf5dc7fb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gl/firefox-68.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "587dabdfce3ba644f10cfc4998ea6492611e8480166f44d97a6733496e55a7a4662b8a296de6361d8f515bdf4122f2bc73f3337763323e3ed0884a6d4300106f"; + sha512 = "a728a158992d2fbcd292c13df36c2b4599d0972dfcdd84d3885d0146e8435808cb92afec7823388906d46d80431b14aebd7e831eb1d80a6995b4c81a933896c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gn/firefox-68.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "8945bf41a214bc79ef0dfaa774afa4bc2a16a1f92da02e6ea1e9813cd96c1a874da93b17086de587d232cd0e78c13873beb647b87afd74d98be7fa1aa6658dc6"; + sha512 = "5ccfa691379cfba11e4f11854ebc3eeea7eb6ccd58b4f73b48a631279a99d0848972cbf924335db7b65ecba47605220df53b847eb361d721e1fddde30b1dac49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/gu-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/gu-IN/firefox-68.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "05dcc39f297723e287476103f149ba80408a015d92442f0aaa791e29a73195605aabcf13a1c11e1030eb74dbab52570600c1848fec0a474b986d580effe8ca60"; + sha512 = "a5d5fc55935a4e9f66d6a549ac4f64649bb3efb335129f04c0e72e2849fb69153e312987233dd81bd58e23aa610b46af35fcd091a566e604c799d83dbdabd703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/he/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/he/firefox-68.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "ec76920d51958ba23d1a63f4c2432cd8054f88ac024cc55be040dd92c5828ab05dfcd654d35552be30ddf3dd49ab3a5870ea90b5f0757a0fffbb269f97ad5b61"; + sha512 = "483850929a93239d40871aae236f698afa4a195d1c42b4f07db1b72c2bf9e7e5ac9a24745c56cdfd2d52e725585be7feed1a3ee9aa4b1516fed85ca33d3874f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hi-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hi-IN/firefox-68.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "a7e368618ace4281eee7b52b2d053c37f43d6077022400d81da5bd3f896d135476a06579d4e60042277f9410ae2b993bfdcea973184a45bd58d5d5b55c7ed306"; + sha512 = "6d4c3269fd2216c7e9f258fdf0c3ccf01a4fcf1af6113bc91e68f65f0e0a060bb13bcc5f5db24a47870906ae5ae7a3cfc0a5c2e2068308eca6dd1926a7a4936e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hr/firefox-68.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "88cfa3193770dbb074ef0e23860e2d6f30214e0f886c1f38c966b3eff3f395b8229f4a2051369c7f7a13dc2af50e442a1b1f08e6c9e582c6634a3037ec37e990"; + sha512 = "cb4dbda71d92af15873e849b7c6291132cc1bca6f108f89d07132b1b34d00cc9d3f887c9af593eff4163accb4e645626fa4ca0725d3b81a19f5a52ab944fcca9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hsb/firefox-68.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "277d1bfc26fe19776d5696ca34f63893ead25a203a7a447365a253bed7ed575da6c5569549d3b4f55d7c9e7e36bc36b732bed1d50a214371724589e02cd7666e"; + sha512 = "156b1c20d452edef51a816dc18c57d0baa84add78ea7e507e037d2a78f433351001d85e4da9ec9e70bb93ee439458d23be93438db98f786fe0efa4f6b031dd78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hu/firefox-68.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "207f279661c57534519a8134f64153b219e5d604d3a1bf0265765658ee9390abcfe051d8f1c11c8dfea975da38c1d9f8bcc50f2090813f091251dfd326216eb6"; + sha512 = "0a5bf1362575ca38a69e790ad34029ae587c8e59b122c86adb3e10762e0633246bd73617a9a7475eca86b30b433c6e958c53206a6c2c9dae37c635ffd8364f00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/hy-AM/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/hy-AM/firefox-68.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "567d75ed252779c89c23dbacfb23138cde921c24c798190d93f4fe20b3b2366caea44ede5b0e66678d5befa0d22e91ccf350aa91733938dda9a6ccc21fda58dd"; + sha512 = "86b8411a12d6d20f85eca026fff9dac6de8c2680708906f551d28bff4adb93a48d6a82db864a609904e9aa73fd3449a38cf1ac74a8c074393f89d9f64aa1e771"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ia/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ia/firefox-68.0.2.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "6e0b22dd63a5e04cd4f61d5ffce9a5ec1569f8e1d4df4abb29e22c8f3c63143233c7b91410d020c00afa6f6aeb3375c2a9a795e20a8efa9ba284f60ed782762f"; + sha512 = "a323485c9780d46087a9e698d958ac9e8348b00b14b4761dcb86d5f2fb1f9b23ab812a9ef9bfd0a7e7612ee40b505e50569afc3c16b2813065495f0b3e12dae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/id/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/id/firefox-68.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3294e5b22144d3d79dd72b00cd71817e55127ac42e2409953f4052751e07cbd40dc195d00133d7bedbaf5cd760a7f72d85a1acf5e7041be5cf91c40ce9f40e4e"; + sha512 = "76767d2e032973adffa08e0b0e49e233373ce95c94aaf61d0911cf0be45cdd0daa092f5b722cf396956f0f3f2abbf7ff063c76524f8b1e3761afeff6ee02ba80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/is/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/is/firefox-68.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "76e409bc8a84fea6a2b257e91171309afcd5a0a95803a741d50012fdb602f98d58e6f2b90d1d81c73b8a4cb961aa619ef7702a467e247657c12f721ab6495351"; + sha512 = "ce9a41ffb2482e0c3049cd3d9984b5094310ed2ee15c60e0bd102f98d9511b3e139ebdd4607c37fcce1c23407fb5c1f969d6ae53816838c32d2ed2b399b710a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/it/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/it/firefox-68.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e40c3231959d8f2e96387a4726852f45c05c5a3b2e191b44dee4d718fa10e15e98c701eaa0d4f61bfcb027a832b21b3080c84a55073f6bbb6e199edbeb8d9ca6"; + sha512 = "babc698b40f4d84a6c8f4cb159b676893724a5b1cea2f1b004d74699f8dfc1a7cd3137bbf9ebcc90f89c59c4e9980be95eae25ed152977fa652d5e8a35418742"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ja/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ja/firefox-68.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "fe74f30aed27e57be51f3840a5035219062149a1fa63dace282ebb257757a8baf0c82c31a506b416b505a640348799a22e7299cb1e6f1b2355a0a649fdba5625"; + sha512 = "1073dea454de8796d7094d99805f05db293a41d871111fb4495745dc6bc9d2199587abd53c7d3bbd09768104d51408dde8e1fc56e85197f5f035e9cbd314e222"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ka/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ka/firefox-68.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a8508d13328f23a967e1083fc0a9faeb9e4cdfc0c412ffb36e8fd962de9e34f5d264e4462cecc716bf40ce45de83e976b114ab1bf541c8fb8be005c574b2fa11"; + sha512 = "77ea45eb051b34f136f8b295ad05cb14d43e526120c30ad028eb94c28531272563a1db80b164a19de28b3304d364558297be9a1305a1407e1aa644a003722202"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kab/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kab/firefox-68.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f825b1786530690f0ecba3c4e486ca42dee067496c58e2e3930fa433dd7f7991df1bd7d6180103d695a565d9a3cd908d84276395a29f854c306f8149ecf94da1"; + sha512 = "8e44bb0dd05028c8a3e689ce273360f24bfbba157a9e5d7562b08d8e4f448b7324a5bcc3c0fc878f8783754ba104206ce82efa84d767fd9cabb0f4c25d75513d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kk/firefox-68.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "7c5939ff37c83f31c1a18932c50bc6dbbdf059b2ce191e892bdabaef64b60530f8e54340d2231fdd3223d087c94f55e0b922df2ad21687384dc05d780631b0bf"; + sha512 = "aa3ce16fb30d08ff1e2d0b27518aa281d559735edf07dbd1471e148bb1fc2d85d9f812870d891e67f96cead4e49be25f66e07e4f52fd1bf08a877da602fa1b27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/km/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/km/firefox-68.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3e304bfaebd97cebec3f5bc517e763ad55af6fd44ba1e9a58fd5835a1bb1f7e688ce04de9f5f4a0c01f670faa2f60a0bdd137dacd7eff735fa5f43bfb162a5e9"; + sha512 = "6e1ad54977f61330d80f310317f1d97d9563e92637c91bdf7a0292e2abceb8f3f1cf3831627ebfa5967061b79ad565d37d2891aa83685ca599d782a4554e586a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/kn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/kn/firefox-68.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "665b75da1af2a98d69999ea578fcb86fc6c770bd638eee98b5096731b63db5803c0c298a922cd6bc77a686fff78d38ed193fe64c17e73e7a8bd9b7faf381e6b2"; + sha512 = "798a1d1b5d3a4f7057d5ad05e5d93f08255ebb302170dc80a8b86238823c8a19a15cfa1368b81187ce389ee3992634ab9be58713e1097bdafdde96bc48dc4036"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ko/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ko/firefox-68.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "52fac04c41e6a5396688f7cd80f9df1c4515cab7b0821a67170ab301d056e00fe37555a1c3d8aba1afb309102b97c518bae215dd777622e55339d0f4a63b8827"; + sha512 = "8ce6490378cc3499155d26db216da44eb51f7b5d0220168882fdd16be63073927eb14fdc4c586c603b049a1be06837290417626f17c17b4620484ebf3e0a0d1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lij/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lij/firefox-68.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9dff958a02e26e378ca64337875ad9890b7f574dcec338f96e9253a1bd9ef6e640959faf0f8a46621822a5d1947589ed9705ac7b7be374b9c6114133b732c72e"; + sha512 = "ead703e84f5b7d2dcebe84c86c49f9aa751fcdfcd30d2c9646288a7ec50d8807160e84333743cb4f97ee6f6e45909ee4678cfccc6ff9729461826d228dd1de0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lt/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lt/firefox-68.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e089fc095ce21ded59dc553a1cb500453541e564296348fa7e0d64c2c649a3da8b838601e03dbd431724e693ad96e91919bb64b598e19a5f64d716c8d41c10de"; + sha512 = "0fac4c345e3d543d0cf1b986c5a81d9fbbeb4617f88c679a2230a6f0605e24eda60a4133f38f496d2df0d027fe029cd9f53f17efb60512263d6fbdd55369d239"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/lv/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/lv/firefox-68.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "038161a7d0cfd81f47146d6cce5ac8b3acbef126c05c28e832b554820ef107cc7d33b01c892c1a4bf59dbe7ba2d6b97c2f5820c02fdafb0e2e32e12a27a3f9e2"; + sha512 = "fd172b285d01771aca741f584e101d66190c29df5dda5e6ef120d41a9488a2e5679339c93478d1e86b869d67d54c226f4e1b7756e5040ab71ba415e5319965bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/mk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mk/firefox-68.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "100f67b45de3ec311eead8fbea6ecd1e9d767c19cb9cce00dc87568c6e123c9bd558b43dea27f6163cd5dfee3e4db84da80f646effef27637f9ce603bb6eb110"; + sha512 = "370dc43f9bc1b33f3e1babadd16d8fb63850b8e68be13a22843bb09db530dfbdb22218507b04c406f3b386ef683572ba262a3a16b62c4273ff3fa2c014b4ef54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/mr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/mr/firefox-68.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "02c4a73dfade16aef4688cbc38aeea0092da846ebe85589dcad472acd2fb06e2ec2a3264b0241e64d7346237238602e5c46f21335f9d0eb965d8c804a73ca561"; + sha512 = "533b32b98deedfa31a62c80663b4aa0805c3b2eeb0da8267918f377183b40058a229f6dd357f9226f0149526c0c37e90c4f13b1041496054d662ab805f8d1d88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ms/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ms/firefox-68.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "2e417277438a82212b82c11da36b826ba64a1c9994b11b6b2e4d5c00e6d62d928e8870fdf97ead915d69ebf5125a9a13d8ee37515b55f2c0da9cbfbc3592608d"; + sha512 = "9092ed4ac8ec60b55c4b5324ebbd9f7b5940ca66dcaa66eaf9bfd808e3755db931568e4f788b3e2bcdd574de0655af16260a86065394536f916254b366188a42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/my/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/my/firefox-68.0.2.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "c7050e05d39e3050987062337569f1cb30bf5505e92c01de313fa5d0c882ece4c1e62e9caa64f5ea7b87d9bb6c63ab2fb7f88c8b52eefeb7e88233427cf381a0"; + sha512 = "64759c70abd171c374cc73485a4ce8e4cec21222a4fbd707d03fdac79b983af9d928b516c926a1558cbee1af374171272c04597d0523839befc8bd7659f24c42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nb-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nb-NO/firefox-68.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "4e90965dd0f2fd44c8a87cea7dda3c3cf5ebd49a2321be18f133f78f93a4b3728ce1a4ba83d52e274b4367652a280143814a88515a07635f27b98ffb28acf59d"; + sha512 = "940c9dcd597dd135fc351c09a6c1c1aaf20ef1305c4c9dafd90915a8ef040bdd02321dae130469985faaf871f24e7ab0b164e2cc1a0e661da886b16687cc4951"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ne-NP/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ne-NP/firefox-68.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "8a367b81d5dd1dd30abc02fcf60b406de2e9735cd4eaf39f9d50ec62817abae18d1255781648981120362beed305f3c126c721536faee7712b1f95209fdad463"; + sha512 = "094b0a3b2a38cf9a21698ece463517efdecd9784711220701815b472ca27b6fcd3358e982aba6fd579cd5b256d52cfdfb6cddbae17d08d1ca2818bcd8eba7f07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nl/firefox-68.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e17960bc934d3e17a04f3ca27133a9c98e6e9b992683eb541bfa47e8b71c077456f03f281d1534560b96bb4ee6bbd5a0613f6f1cc5e99968856eb3b3e9b7611f"; + sha512 = "eff62b73a52a649a4072da79dc0cb5bae23f81360c2727bdad2925514c6f9de861b00f2c7310246da8037f1305da1ad6326023e06fb032ae636169ecfc9a33e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/nn-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/nn-NO/firefox-68.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "675d15cadeb505b4afe801f593dc6d012854b80e9aaa195aededca6b0ea4ae580a0c366cfc99ef5858bc5fa11bc4855cd17cfb66baabe4d0f8ca2c65615234cd"; + sha512 = "b1351dac5e08a6bbf2ba50baedfe5a6ca6b98de40cf89ebbe0672c98b8c900021b9bae2e8391b3cf55b433bd9c655d2a3be2422a7a0ad2067d4a465a9695fbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/oc/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/oc/firefox-68.0.2.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "b46b563b05bf5a1c048f3c2ba0cfe73ab3ff5bccb24c5aff899ce2ef601b55416507d3b35cc0688f9a7602710626479a0824e579ad0a55b22436b1d8b658c6bd"; + sha512 = "8dcb8884541f272cdc97ebb9fbc0ac7cc98c3f3d252ad53cd94aee3c5d9768fd123d87a4b8c111ed92239e90f6d54daf67c5efa3823f8b1b6682eb8ad2c3876a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pa-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pa-IN/firefox-68.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "77c533421b6eee5033d239e67ccd517c2bd484f803969396e2a02c39246e43db710461b61b819fbe2fb8b2f97bbeb0201e31b89c499eb992b565628977467a9a"; + sha512 = "6f8ac6668fc556f051cd735325cfa3b3c16c43298828171b89c17ce22a66a788ec219b7bdad9f9b1d3d0a425778b373962033468f196e999a2ddf8b6ca86233c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pl/firefox-68.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e9349a3416a1e82723cb90db970514a608742ea8589801bb1fcb8c922a302cac83779fbf83c151d13760773d9ca69fc7d57dd91c547d3ba581d731d4d122a195"; + sha512 = "8518a8eff1920aec34cd0ffdb66b4242d55b805e3b489fb0d5c29986b3d7efc62ee6a014ab3fbbe9b40a54aec9c6c76e052d0982f72a4ea4bed82814ae6ba2f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pt-BR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-BR/firefox-68.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "1f2a1417604a73d94712a81638dceb222ffd9594aa319e09d6bd4de3e37dd07a1059af63c27fe26469070d678cb23dcf977e7b8aa86451df1db5d60e698f25f7"; + sha512 = "693d6b6227deb670bd3608cd873eccc3848c76a930c3e8922cf80c18350bdb5429b52e7d7551350a8b565d859adf067ebbd553531e00c6da95c480cf932de03e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/pt-PT/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/pt-PT/firefox-68.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "480770430c8a3a84cd367cdb90c157d0f67e22b4b2d84e3eb3760c6e4463655d74ff6228df31386b8a40221262dbb12549a9c88372e7b2483c099d5a983a4a5f"; + sha512 = "c77e539aa7d2175d793c8ae4dca548332d98efb6cad62ba2ca9f3b94982b7a4d180179ad65b89a460e04462210ee201bc2226105ecff27b5a4b78cf1fb0a5b97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/rm/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/rm/firefox-68.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "291a8627380c933c6df5bb73599ab3c25406710a19b979a893369d30e5117e563fd77b50ac2c1a1b7a37779df7a57a55cfbb42d8f56765cd719fe6ab6c0404eb"; + sha512 = "22ec2647ede04fe74dd7e6c99801c15d4ea131f010a75c0a9e5c8b568179f9230208616147e78179b81a7441f720d9f41dc4d784b9dc6c40e00e886612bd68ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ro/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ro/firefox-68.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "1e2f0c4950a2e67e2cd11e27c6979315f78d4c682962387ddf1e47eda5a1d39136662cc3730a45474ad2978e01f1fb7888e82ad764791ad0d06b5dbbb3088c1b"; + sha512 = "b9e3811280859103e202f0dbaa1c278c8a9cdb451a3cb63a35967bb43625d5f6f6ad2e15871dd727546532edff3f6373013e8bb0eccd83e7f80a31dcbf8e3643"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ru/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ru/firefox-68.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "af5d5167e1f1e39b5b727f269dd57060840ac46c21e593ea9938e6b1d1a97ce75d4ae0430f6a96ec7e403046616fb771aa62e15093c5852e256f49683a704cc1"; + sha512 = "a7383beae7ab2514b0e2f5d86d0317ed0c33b5695eed1526457f14b545a63d036dfcab907fb7090055e6ca29144f5f11c7fc2c00bb389d83074a20eda6173df2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/si/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/si/firefox-68.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "36083df5d4d1b5737453f433fcad2a610445c66888067d6b7351b1ea3b32d3494ec349d825025df77658d8726219faf94e2018e5f8ba47fb03b456657f16fbd8"; + sha512 = "5d9bee0a705d1250dd07636a0e8bb3dc3e0150607d58f7eee28c5050270e8786fee2f843e4b801e7de6de56f284025bb13f5dbaa131676796f69973ca45a209e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sk/firefox-68.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "393576a17577b9642afbceff032328a571189938a89d34eb1f9d0dd9d0fb2ab0bf37c83548eecea75894464887d3e7875e6c25b4382db8bd57ad54f534836439"; + sha512 = "de0eb221142cce4cf6272be9323b2a851385d539a739b0b2ccbd7b98926673cea695fd7debf11aded37a57b551309a7c93cba244b64128e074c93e23b68942c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sl/firefox-68.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2c2cd423e0b8e01ecb12574b3d461e79864989d179c785de745b458e03844201b9a5baf9ccdf40cc06d591e96fcc9152d231382bd3862082662ef015f61c4ca5"; + sha512 = "09d4936cd5e3f0592751699bda3b4164004e7e2651cd0b28f5eb191677352a61901725357bcdf5f2744b6090d47b6754b910a7c34e611f813b12fc7566bbaa92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/son/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/son/firefox-68.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "5b714236fd01e0f7cdf57c441c44b772433cf890a1aa32f2ea6ea6207140845125c8770e2fb92c228838e7af012eb535418ceb2fcb9f2eff2ec3bb6d769b01e2"; + sha512 = "564306bc98a0a0a9e54d2f315cbb1414107f49deb4bf25cb729e10ede60620df0a1abdadcc675e531e364d1338c746cd9cb6d4afdf6e46a420b12920db1e304d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sq/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sq/firefox-68.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "f8e1a366bc6a423dcd45c2c89195dabc46d62d5333d8df075e86a07b122c32d00893fac6dddbe9a8c2a5f14d961dfed7b1faa1eb8324caa91d8bfc335ccc4386"; + sha512 = "28c300db3616e510733133f0868cd42e7b05a15fb066575dd7386ac4e53b4526e86ae7d24907e3f7e98b3a9c189ccf2004c958d122b47e476eb3e411f17c29ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sr/firefox-68.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "df817b50e802fde8653e24c590fca64099a29b1eb8391527ea2aef19c995c10a51a6674914f933b1d90838ae8a0ea66b5ab309b7cf5f2ad601d0367696499ce5"; + sha512 = "0ca1a926600075e7e8348ee2ad55c435b3775c8aa6d1f27717ce1c35fd1e108c7600547302f072213e7c54903e6c0faa6ad299a9af991c8234ecff454d336427"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/sv-SE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/sv-SE/firefox-68.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f50094058ee1ae5abf089cd11aa7cabd3435dee79147fec091c18f61c8e6248a79d195fe374e8b5e2a4dd13594bb936c6a7393463fe4c245e2933b26790c94a0"; + sha512 = "ef4fe5ba87db3dfba62490022f1b91ddca96fff6035328b07608e56a3247b4021f6fdc007d65e5adbd52cd0adaea9f0b59dbb5f01d71535655d0bc5e0800202f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ta/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ta/firefox-68.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "31fc4b39d78615d83a2082edc82bce70242b2106d14afc2ee631499a3b3b7c8828ed89252f86c37fb2ef4d8e1fb9a778314b759e3570059771c9a4c1506b27ec"; + sha512 = "6fb48f0c09d74228317eed041b4f8d2670dca7ed043c133e8bd6a01a0d7bb310144434960be9b9916bfdfc3139de2cdcd3b8282d1568e67d29cec425420b1e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/te/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/te/firefox-68.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "81ac4e7fa49dc61a476d993709093d05c6853ac74502310c01ba97061cd04590f11c205a4df9ce2ec5c5537feda7b52e42506eda820e4e0fec173d0fa1629da6"; + sha512 = "bea99c4f34bfb5860bb5885d4697f18bd45de423943c5d15952bb99c7e4cccf125f041f1378b693b805ef4d623fed52ba8b13a76b87bb383da95d06a4032f8db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/th/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/th/firefox-68.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "477001631c285096f6630541c511a15501ca4c5cfe1a25bf273e4fb505d7376ce0662d392683f33ff0a976f3362c0aa850dad999835679419b98b61cb0d94465"; + sha512 = "4a03397a288a7414ee5ad9f42a7333d30b7a6448321e4507cdff71a2e3b0933292e6ae937ca96c1f6a5ba906e54013b6d6d8501c4a9be4741fd3505dd24b0424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/tr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/tr/firefox-68.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "7d90a8a3aa1f3d06610997ade0ecf9da1b4ea5ecb93252ef254ee9e23280ef9462333a2b041fbc7aa450ca567d8a053c3b415f9f135a2b278b4ac6f466ab6525"; + sha512 = "85378409bb2ae8953c1f90736cfc3e00551d77e3aaa6a7fb76a157291e99be18d55f5d07b1171a7137d982442f55ed70ccb3f6f6dfd73869e9cb37019e976590"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/uk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uk/firefox-68.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "22ef62d00b6ebb7f0f01e442bcd6ef767ccdc5630b7c732d09d42df3089842a8c9db4a6094b20209de722f7cf903993f19e2e1173682fa71d883a0ecdbba2706"; + sha512 = "5ba9df05480e7852d894925248c7550a36db59c8a4c37792de325aca02b8e5feac0c20719077d718292eb262794668bcfe810dde7229faad6f2370a97c05e973"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/ur/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/ur/firefox-68.0.2.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e21fe585a204a00e1b6b038141f4e8c188076e57c601822005d64b56ad3b4b6285d3de6e6a2dda46833a0e8ffb2c3e34af67bbf0f54c2f11000a9edd4fbe30d2"; + sha512 = "bef12893d73b1c9583302562781907d0fb121003dd1714ccc4c3b2a27160384795ac8d85cec4858849004b020e0ff5e73f512925b9d5561948ef16bb26e0ceb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/uz/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/uz/firefox-68.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "c8238c9cb18a9ffb861eec6eec4bcc1335d19e24e1684c592985e380c231f5eb0eb1c311ffb0750efcea9f784f6d9dfa5d4231e1765f53a8d0467479328c0bc1"; + sha512 = "5961e478d0cfee99edb3a7ec20a0368f8b6604b4449dad835decff54c8a9f3add6bed22a131024682779922686dac0ea6d489ff111dfcdd476f7641e293b40fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/vi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/vi/firefox-68.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f51f299082f0accb6cf2cb055d361067907a020e60e5e1acebf45313e0065a1ae52e8b60ead16d3a45626492e50d809af36d24fa588395a60a7bd3774671ebcf"; + sha512 = "31efeb8ee3ec4614f0e116e615db97f9836026c0c94f5452cd3c5ce338fb9b35f19c0a15fb6bf17ed945a37832a628e7fc16381d5e6393475d8b9053596a5c4e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/xh/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/xh/firefox-68.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "5ce836611f3fc95034cd950e727ae7c1080f79ed584a3e4ddb87494e8be790061c0761e34dcfdd381e074e6db5f846a52d9f5821bbe079681e17d91205eecf02"; + sha512 = "bf23c18c5a8c13c115e8ceea382eee8e5c7af24552c3feb92a5ffac0d2aa34effb7dffb0b41890d1af23f75b9581ee05451785c5ab2538af9082b13ceba04ed6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/zh-CN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-CN/firefox-68.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "e48fa39d1c183ed9dfdab93da265d10fa5782e8a9744661ae1b6283344c689c4a63f20f386dbccc7f822fd434865692c1c7f0cdbb44f7f1eeda860ea105aac12"; + sha512 = "ff490ea8b3b847343b3b7262154ec8815fe3c38d91c2fa0e92625db793f7d24bfcf3985ba07a5f5724b2463d00934925641bbade9f65f5c55627c15f1eefdb5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-x86_64/zh-TW/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-x86_64/zh-TW/firefox-68.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "116c39b237985ab27f007fff740e1a7c5adf638f8a05b7e8bd9124671f83c523e4e80294521542986add8399a4754f7551d823b2d689051aa533fee551092416"; + sha512 = "f3de7f3d53a47532dfded82ce25db7d7d0f89b2026bf3052c42f9b51087ff5905ff487f9dbc7e19b76a5816b9c2d8c1d350d5e9742244adf1c9d0818c6b048e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ach/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ach/firefox-68.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "992f2ce9b0fe7fcb73bc999da0f76269efa6b7deb232a7c20c62706400822ceb6aec932c1b86ff475ae9a2cd173fdb37f481399a8b03b9893e697c217b333845"; + sha512 = "515921cf97afec94b5853a7b6a7ed426cb1ba6b875ed1ceb8f6611cf052dddce40e519c4927ea50a02d23c7ed40d6ee882fbddff4293971b1c832e5a38b6573c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/af/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/af/firefox-68.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "0f692c38ebf187b51c177d90d76181911e07ed1956bcd4ebe3dd9df8ac70a4fb38b07eea6c021c4b7efe5441113a4e7cc1df738e1ad773bc48e99ad50edc414d"; + sha512 = "1a9b041ddeab4a06257d9313761f288acfb4ca75e0a50edeaeeb7670f4b3fc7719b480a5d673d90ee9478cb1dc9e14ed07c47e2160527874c134db8a85908408"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/an/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/an/firefox-68.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b9966ad9cd07a9ec998865b78d7d6c6a5995806d49d438354ba5ddff1c982858d1144ce960a1b3c2cf735c7c13c74217741600561f0f03db86a61a07e1dafae9"; + sha512 = "8d56691644124b6038c2a61cb74332f38c4648163745d37d37ae07bbf868b0ab6dacafb6c2f1f6d0991a6bf7cb8ffac498f36afad067756b1b8fabcc634c2624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ar/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ar/firefox-68.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "c2fe29032df66698a11c7608979125d888d0ff79a5ffc4544fdddd3cd0401272544ece1b8136edec036f6ec388a6474645bd68873b7d8a3a1ae60e37002913e4"; + sha512 = "f443355a1778e087e14a214524cea2c66a58166c1832a5bff89a783c4ef1e3fcd614fedc00ca7b78a0595d29370da82de6f53c8b58c0fda15c79227ebe317f0a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ast/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ast/firefox-68.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4a78956be92a98a291767cb29c8029c07aab2c88eb71f1527188010950c8c34cd94923fcc6bd4e4969e286dae32d3c8673ef61a754e027e2e45e04bf21ef71ca"; + sha512 = "50c4ab65a5c85822355fc6c1dfb57aea54f68c9e578784101d233c8d1f2ae678f32646bf36be5c21e0e32bf1ce0c7635be4482aff422100e55e6fd813d0c6343"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/az/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/az/firefox-68.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "e9b88f53294781662f4fcd96f85de5a73de6ad2d9f2c4c10ab9202530a3774cade8a421c32794406dbed0a276bb40a6598db2b8254bb814345eae1eb79fb82e9"; + sha512 = "070840441591f942491f64cf793f2e12d4a5038fef2804d0143c726f33874a06ecae36bc4f2bb3cc04aa6e46791a7f5148900f9aeb1954eb0e0717a5f8a7577f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/be/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/be/firefox-68.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "cfb0f17fdde9dc400785ecb1b4951312fc16685d7bd1a3fcd4743b729b831f8b25e92d64bf7366aebc5e3325e12e00a6a7a28cb1b2775755c0ccbbbc02a25b28"; + sha512 = "4338a55b80c9e9a21570fb49dbf9595d6c0d51390d370cb8dbf541bd4c14605b1daf118193d2ba3f20d2b2f79e2f40f276e079046d8db65ea524f3bcea88d826"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bg/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bg/firefox-68.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a2efc640303e0244430c4c9feff0862e5f554cbc62fc63656419dce0099ade9ff6d459aa5d1f8fb243c0e4b129870feb54ee5b18d25603524992edb3c27f3b04"; + sha512 = "0a473653d6ff4b6c604e269243f781704c8fbf9f99b18e3fce83680793622b58de5aa655e5301dca2765d6526fb5aa88ee2caf7d35557047c4329994610d9502"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bn/firefox-68.0.2.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "91f116045b7658ad6119105c469e6a9791cb5ac37b6f47fdf8f8fb2955836b1d1c474eccf3e51852d69a98a31244b778264b2eb8133afe75db9514407ea2aa32"; + sha512 = "fbaa81947143836f54f84e4e376ce31a21cf59a46debdb61c8a9db2f92703da3ac06218c560a639b5d6076e81d74dffd291f9d773b6b7ae5d65dcd0e77b5d1de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/br/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/br/firefox-68.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "207e2da1d5fb769799fb3f6e47b3aa28aa4e79a1d9c8a2d63985c22c5628738e12692cac5ce130715796880d3025975ff7a224179374401c6402eebb0385183e"; + sha512 = "a5c69e995213a6f3066e685077b911093db15859e6dafdc2a385d012d0815520fa2e64c7b89deb279e307fa702c9bb57961a3147ff450f91ee8b3b31a2efee90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/bs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/bs/firefox-68.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "90437aaec77e3f2b63e0e0db35109fbd8b81f76c349e1f1b19a3eb1866beabf63c608cf77b2e720ffebd1f28c092de64932822684aa009cafbe7e88b213570c7"; + sha512 = "82d585cdd034016265c43f0e70f09ba8cba1429a551491f6e8ef4c8f333a40179c4817ace39cbb4a2376b03c88c54849eb45904e148dbbb4f47f8fa32048d3fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ca/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ca/firefox-68.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "9d42c1854e344a776223cab5d7ba06950ee9713398916b90a575106426e5991a5bdcba29f60c695b2f46f9d0a2dab7cc5a19149b0025d46a324e75e876e186b1"; + sha512 = "9c884ea535c3192fec754dd891ddb2743afa400453d9299f26bac710ad5bd7c7d8cd0ebdce3f1ce88995c13e381701312fd9247b029c73f12ce7940297034e8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cak/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cak/firefox-68.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "dedcaeaf2165229b281af26555b0f219cdf4bde907f5dab190f5ec4fb7bf3360a9b9d45dc4f9bcec27bc5216210b8b79a9b6c1ed0d0569712ceb965b9d094905"; + sha512 = "367755d495f3b583a8f09d200f5828c10d8723017d691d6380515d3a4be65e6edcbd1318909c1652dfcc1cacecbe80d6b4e399e2192b335701e17764fe5598eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cs/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cs/firefox-68.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "b551cc15580de7e0f58dbeadad25b74ac50dd15942d3132d14983c239342829f5dee2e7feb9b0e4aa950fd18f3c8be6b80e28ff71c7175c0b905565e59555574"; + sha512 = "427ff1470de34928ec660d539fb6977145540608b36ac36fa0f7b98af0f814373105d9912681bd70fed069e94f58aa48f441818a3f4cd67dd7a65342133f2d62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/cy/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/cy/firefox-68.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "02ec0b98aa8ab3fe1173a193dd7a77519f73fbe406846cc39ebd54633e19b415bf3667e1996aef6aa84f4551d154ef24e8126221def2d4b6df98d34408df59f4"; + sha512 = "8ec2ee32b5dcbe1d9dc80ff8d518c640e9bf8b21b2a8ed2ef215193216b22e17de4d8c102c59eec4c773f0e3dd0eaad6b1502c91367f1bc1b1860e13a2b70151"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/da/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/da/firefox-68.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "969e14d63859039d1bad21ed6d0d083536a9becc476ca9ea1a87ff8159aac9711b981d9d34898dadbc161344aeedf529c64b0979bb4a371c778818441c97bf70"; + sha512 = "72bb5e0719382aa518b9a427f06946a85e7f8c8c0176a66720d47cd7fed6a85aad370888899553a029db1d841bdecdf55316fc8b4f67fccfd227bb48ac655126"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/de/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/de/firefox-68.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "710ca362783ae98bea8f3f3a0fdf8be05abb051c456118091d27e2854be718a0d28ae8496be8f8ac71fbffd270dee46ce161dedc2dcfc27a411c1e4dae0622e9"; + sha512 = "39add77c78c64d77e052565fe058256fe9ec44886844b664bd9055b940fa0af89a60d4cae5f32523f62eb7909b18dfe2f521dc43b4a24a5d0fb67e0d543de28d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/dsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/dsb/firefox-68.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "c5eadd98981da8e91138267832680e0d3e0e2d38525d91ba68647ed89c15c21d4a245069ad7352669f411433b72fdf262436224df408cad1ae1e9b8d7510326c"; + sha512 = "1a0fdd365df8b034a4e05741d450209f685c22e6ef6b2d030f1981c711f46a9d561963c57a4da49c01dc2b92f6867b6296a013560501939788bf2b62ff622d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/el/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/el/firefox-68.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "ad5b36d527c5ae3c5b5b1c44ead91d0cd31d0517657b391c68f446cef1df1dbbfd7eda9661acfee8fb132f2947a929bd54223139a15e4b8b4fb44c0375858c9e"; + sha512 = "3bff3c718c77af76bc10b13b7a816eeb37e6c2756249fdf441894350834e69ffe8868ba119f473d1cf07e8569fed6c604bbb1cbf1a1a51d5dccfe3f5018df2b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-CA/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-CA/firefox-68.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "72f0aeb46b2d5fc59bea781faad79b41d5ceec9f0100d5d82f961057252c74f94903cf5eac679f5711b2984ebb376ca92f5f58a8d46542beb6ed3d482e298df3"; + sha512 = "8400867a50bb1f677b41d2b030a66857697a95d155c50e0c57711a96ac13f6d236df86ae889d442df805eb56cee80050370df2210503d61c5a3d3a5f0f3a3c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-GB/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-GB/firefox-68.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "51ad08d603a664f34ca4a5aa4d24959f587a140ee2ca1d351032441d2ccd28cc478b0bd14138f020e02f1e5c4d2e5e69664dfca095586d30cbedca9034b3f37f"; + sha512 = "b03559560ab0afa718a15bb0ca1e4d9b97eaedfd4b4ca42e3910425bf6bb6a0bf251208b7fc4848eba0285becb5509569bfb7ea609df3f60972e625addd20396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/en-US/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/en-US/firefox-68.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ba1d3a34b13c543544f364934dc936d6d1e63e8c62d2d6cf0a503c4a439db5d0d4d5fe88da77932c42a52832016ef197804014930fffc0361c16ff34b7883a7c"; + sha512 = "d6acd7725858a512805676f6fa215b949e631f4493bdb060921bc51c2f2526bd0e69641b41168ce756556510e354cd98fe1d1bced42a1e0a7100ee797c2eec00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/eo/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eo/firefox-68.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "55a65074af541dfc4f25639ba1604336f3f77f9a3243f5b11e80387e00f7c9df9cdc6401f1d297341064450678514d3c663bebdc1090b33259151215025e2f7c"; + sha512 = "25ba775be4e0329fce2a927174923c69e3dc38b61af4f29ec6e1d0dc74706b8becc6f6d139ca3007f7893f9bfb66cc71d9426cf420695f2494696902d5247d8e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-AR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-AR/firefox-68.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "c7d82986325f467aa8ef762850fef81cd12e6a5ff2ed8ba2f7d23badd17fe0ed0777572b9a2b18d8addfcefc30b603c7350504b943e005de690da5c48d72db8b"; + sha512 = "a3616f6c7d9d7005ca8f76560bebf63b3a49f86d58d6c8c145400bb12e1574c1a3986347660c6da2700402c26441754991335bb199eee5a43292644fe935083b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-CL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-CL/firefox-68.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "88cb20885971219fd11b44becfd72b0622e7b9bc04cb1f9bca03b634399566e3c02222cf3aa10ea039c43a6f2415059b814b6e510c1c4a0f80ce83a3cabff32c"; + sha512 = "9dd4f16594d3d53a9c6ab2c24a373dafa1c3d02cf1d2aff5725bdfaf7bdec7c0df254b133f1e1e63f235a69fae687fa261f36b08fa0d09d6bd141d01e4f10c74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-ES/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-ES/firefox-68.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5105a3c0d613dcf9c5e6bbef8d73428efba49e470d0af5f8a63077e0ecde4e83731efaa71da503e3315eaff05a3cb98e47d7d3ed6ca1fba72678f9e4b2cc1069"; + sha512 = "a560d1c5b2142590d086bb645b76c91c664bb6b849d5a1e90a32feb87691615b7d943612048fc4c248e0c65a7532861a751f9b3a1537eaece9e6604df8388778"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/es-MX/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/es-MX/firefox-68.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "0f793eca6858c63dd38e867c844c0c5ca11928904e67aa50e6613d895ceb49803079e360302851fd37bbbfd6c6ea2566d50c9421e6a4358aae6400f8872a4f6d"; + sha512 = "481db1dfc9cdd02963235d5ae74a3fd9bfea1d4d4e2dfff8a15e621e2ed2027ebc4dc14095e1ce0013f1350ee73717393e8db4126e3ac707218eee3f4f7a247e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/et/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/et/firefox-68.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "16dceecc270ccdbe998d2bf523f3c8efe7b70b466d754b93b10e782add602a003b6c00ff91d0eb06cdfbe7a5ec752714d5a65837235ba16c62651d9e3fd1b818"; + sha512 = "7286f28029838e9b0ce5070afb9001fe01dcbac24dc85c5c2f93c5b9e5f6635daec7d42f0788c1ea2c03cfa8c03b190200be21bdf44acc2ea2bf9ba9aed62231"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/eu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/eu/firefox-68.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c8785c8af23149595e31e6ffb8305cccbc40e89a60944c3e3db126a6348d43ba3b2db13e3bf9da12d44d515ac8b6ed97c66c73b06592af7f454427afdee0dff5"; + sha512 = "472a773ebb672bbe0e523dd08cdd45d310f0ba599dbd2ef720ec9a2b199c77596c746cd1378d2853ab82c289b5b3a2001ef407aa3e250b082dd82072e858a5fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fa/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fa/firefox-68.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "467793f8c9129477053fb1f90b19eb905310b2e3d7e0463b404bd4e2d50f9041fdfde4358d6b86d04d02caddf48ed0f3294ec93bad5edc8a1e5b9e69ee2292b8"; + sha512 = "037df8470545afc445f30f269efa4cf981a20593ee3ab180a92dfa7f33affd03a6dcefba47d252275ceae2c9291a743f5cc1060253854d0ff94c5ebfcd81f464"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ff/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ff/firefox-68.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "68f76f18b0796d67f8d2d901d3bc4168fab14005b9ede5d01b80a8f151ba5d18700babb6c76d0e36768b32c488fddb48ff85900161804166106ea05ec2700ddf"; + sha512 = "e1293b2b8501bd30344ad54a8fe1ad0fb27292baca43ad791917d06441837004c8591bf54858852a8ca9de52048fd126937c81b2faa822f2140f73bdd8a4838b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fi/firefox-68.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "4a72d9c8989d66eab070a0713deb49b419b0756bb50c889af9895e56bad25da129974f860c4ca7c97a178546bcaff9f7b1c1073d3886cf93b7f55d8627fd7969"; + sha512 = "f9acc483d78fa9e3a97d0d70dedd152f433106fe718198fdaf020bd4184595e0661d8086b2c680bb345165a57ea573a00e7484aaba99ad416c0fe4c08ce7ded7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fr/firefox-68.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "5375cdad39dd217da9a145a9d3d8c1370371f324321a793393d47c67938cb55796f4c99c1f3ce1ae7fc536263df4ffbcba0be0ab3af7b908b1632b7f3ee9a501"; + sha512 = "bb28397f39be4e61dcb8cf783bdccb2fc0126e006d4fe8a8da7e15985335d5740cb3d41384f0592f0b7b4daa898066bc634397a680555dc720aec08ae0b8c989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/fy-NL/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/fy-NL/firefox-68.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "367657456e186a052f5351d4e7f0a94373ed400c94dfd0ca64851a16cbb16e5d8dbb62cd5153a8e7178d7fe83dc22a601838942f9cb658af4624327a6309c0e8"; + sha512 = "edbb404ebdb71a2c6b1b66a2fff776ec467b0fd42a0710d1b796388674e62e70679b9490d70b92797bcdb5e32ace3691da88c50acd7e681d89bb9d166ca771cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ga-IE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ga-IE/firefox-68.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "11fe334d97565e47080c969fce1b979b33c3bcba4aa87992433982483cedb49badb6c456c3e47d57cdca37f7da48100bae120ab7defb78fefd4151da5d2b348a"; + sha512 = "7f16cd4796525f77fb2faf3ebdc08c61d14c35780107049a4ac2c00c208cdd1c36543933e64ae51c1cc65bf3896ccb2fb546735762762e25dd22c5bed71251ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gd/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gd/firefox-68.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b11806066cdad015aa9f71e501b108af023ebefb04ee73fcdf6186c29fb0779b6e83d185fb501e5768262bd4850d9cf70ad3ca9db38a3c6c26ec7b4bc67e9552"; + sha512 = "5c875835f2c1a2cbcc97cf623f4a2d57a252d2741707847cdaf4a2fa21cf4a2ad0bbe9c0a075f29306580499a9d9420d77bc8db2da88551e36af006f946e21da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gl/firefox-68.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c4f057d049d58164119c9cebc8c12404afb090a87fa8c70c5c948ab3150e997672a6831fff1437f50319a65f66a40e4b4b174f40b3768184c6e6c060c38f9c6d"; + sha512 = "6a0e069836ee596e9e7c6b08a39ce15b073bff8ceb676f957285d26978d8768d7b60fec011d941b05644474add0ea00e37ced01eb43512037839c010ecd5b637"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gn/firefox-68.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "376205bfc04eb9d293b7ac618dc30218661c107ead680121163fdb26c7ea43c34b2eb2d5c081b3c1a015fb19c55fbae1792475c7c0c2021efe695fa1f9bbd794"; + sha512 = "6811327bd3d952ec59ec04cd21567ce347fd53fb401a5017558dee0f89ef0cc5437f9edb8a8e21626a7c379dcdb118fa8a27d5ee7d1bbb14eaf7daad5b08391b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/gu-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/gu-IN/firefox-68.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "35104699fe4b8680ae04ca6371f39227e99fa10d75c78e9615e4a63abae622ec1fccdcfba48cfc6da33bb717bafd55e8a4bc08a7712758f1eef677753f75d93f"; + sha512 = "5d8e5d339d350f151c8834d16fd26979b42d3ca32e5c7f72e280923252cea294eb4857725035eb40c282848b38efaaa79b974e795211d3d59598c6a53a6babc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/he/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/he/firefox-68.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "5e2471b33a132833eb4c128e5d93f14f9ed03822362461ebfcbb0791eb7e468e5ad49e34266c6a9bc219e5285011307587f2e9098b7864b1a24fba853911fd36"; + sha512 = "e9e9bdd9698d7288dc89fa03a5461668dd67ba305a2d822a50b1325e797ad233dc727cbecece58da43e104fccf319ae2d884c39bdf4abdb3b5bfc88f989d1f52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hi-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hi-IN/firefox-68.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b691bd4adc2589a09f780d2a301921d4aadad231e0c9df810085fcbe57d52acdfb801d18ac21bbe7070292d40f009f6d3bf43f7a107b0e58f4bdf98818bcab10"; + sha512 = "5b650fbefccd3768918a8203687e39fac96f3530236a40f1d73ef24ab2a25a58f901ba5cea0dddc9b9623ec84015eb6392182b1f02a14c46d382eb07a2078ced"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hr/firefox-68.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "199977cdae135d15c6e57194f93425c9058ba0a43f1071c8124c03d154e3b6be9bb1755b77b2313da102a973f82efd427ec195759811e3ce4a780a17d4c66ca1"; + sha512 = "6cd3ab0dfe19ee2bc3725af08dbe54f12f214bf4b41047435f6fa8ff986bfcf45772626c7392858987e01e1fefcd5ba1b28872cf7774ca90413993343367705d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hsb/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hsb/firefox-68.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "411f411c6967fb4126637dc86edcaa8dc2d30da1b4898a1b762916f3b42429fe9ced5f4511f8482dcc5d6a3e0864ae1c002d995b559fc29847c4a447e3c35c2d"; + sha512 = "ce300da3c7e1787fc205d904694ac84bf4fe4f271d95cadd9539b18c2b0fe8f35d12ba331ac098f56a56786f36e1cc2b2fbb62ae7fac25cd6368d8a66ea8efdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hu/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hu/firefox-68.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b63bb10f875f313af70177212c2fa89c7e7bd0750f2f3a756690ba0e4b447a046b1ed5550527d840b9a6792f9e2e8d9d0dad2d168db2375c1bcaaee7e20b3709"; + sha512 = "64d30bf6122ff4598603bca84d4d1ac30c2e84f106e4c68f6a0dc24dceabe67e34e514dcf58acdd8b6d3c4412a5e1a912e184ec13e8ddb5867943b2965a3f1be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/hy-AM/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/hy-AM/firefox-68.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "aaf4184373fe79fee98e5029c6d869d6799665e561441cc47c25b800d502c5e25fd254945cae950b662093b407761100662928631e285940693ad209043ac2a8"; + sha512 = "799faf34055822487b442da86ceecc7dbe36574a76a8e04e4fd76852182bd75d773b69c0ed19fb33c5dc23bc4ac6c0c21a6694256398629a984a1d2ebd63a63d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ia/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ia/firefox-68.0.2.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "df93e81ce41af39dd54a01485dde96803c1d9fd6be1a514999f6983e71805e25e1abca7469df1c322fdb5b933370a3f1be7040783ee496bb6525bb457eeea8fb"; + sha512 = "ebf9d05baf6b4963b0b5ff25b2747b3a90e4b664bca1c865638190dae85891499e3b1c5b3b656f83896117b430556efee039bd58a5728573e3be47e1da4b77bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/id/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/id/firefox-68.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b195ed2de8f83f4dbb5b5f8703407666d29e5d7430bdc92e6373f0c7617ad85d1405acfa7b2634eaedc9c114d9793a5202cdc4051a0636947c99147fcfc76444"; + sha512 = "0268c27fac89400ac179778f9e17b8b1e5d1f1e6bb9817576e03f4985f0aa7a57444eecdde69c1f7800e5128cdcb5829f62a4ebdce6124e3f4832a9fd44022cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/is/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/is/firefox-68.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "4bc445b3d4666f695c48524ebfb5378a2c3914a2f884f6e4a3a83076906f8d8f5c7d87866f04bd5df96092cbcc6f5d204be40fe9a0417b2d9383f2fe6bb2c314"; + sha512 = "818f4173ff8e9bc01576c0d416b39519bcaf33d83760e91d1b4f8ba8e28389b81816c15f5d19f3fcaf6a8140b2bd8fb92e29a844e2da05f9d6344542c7b5f615"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/it/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/it/firefox-68.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "b07507137aa522f57df53f005ac3c201a6e369bf6a9ec9ebe2c26a91c2d72cd9e065abbecb591e68ccbc151513da7c62aaa0fc49cf99cf2a134331e4a2fe56b5"; + sha512 = "6710ac5a6c98dd9010712acc29239f9f102bda2458d16fa3394ff0ef6128486b759c3e68d568614f793eb0959fae908f3fc519dd52fb27a7495956d1e66c6f53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ja/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ja/firefox-68.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f2134162dcae6be75cdc4fd9f94bfe03f89ed6ac80c6b9894cc322f7cbd96bf478d13fea6b17ff082b1c90f8699cbddeeaeaed77e41e0996a1df28cb23cde70b"; + sha512 = "481206f6a36704b06d207f6b4eda96c307f61a2700a3da6fcf659c6b12c7880ca5ed69f1c3ae9da42d774e84e2e9c621095cfe3fd4c8e175304945272d51bbdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ka/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ka/firefox-68.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6128c485ad9bc47c3afcb404b07f3afc344957328ab63cb90874179c913e479cc2b910975442a7af01585ce85ec6604fe4cb190e853527d19f29c80d98043c3c"; + sha512 = "ea1bbb5f759060a45a62b605d82db9b560a05ce9f0f92b907bc92da1a30229e312bdaca3e78560ed698100099f1bf261b71abccb353930a77b9908d0b0862ee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kab/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kab/firefox-68.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9ee4940d57ea364c8f01510d480c0175220a8b5946921bcba87fcc0d21a2cec673ce3e823e17c1637e332bed6c4d8829a404185e583056375009ffb34e963988"; + sha512 = "4855f086d6d4028d18a6dfcb3da366c667e16a84e3b81d6e58408a2dcbeba77fc01668b90290e4ed49334d2afa5454b866dbc2ea3f4b446d5eef861bbb5b03cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kk/firefox-68.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "92255a43141ca91fad054e597acbde26e9468019a5e1b3250ed25372e27ce1a5f3843898060a11a727c3ce38c4e233cf5b10fe0cd658d2d64b17638f207e5224"; + sha512 = "e48bb95cdb2361cd274e064e879ffef3d4cf25c15712c716c278a16b31636b3ffe3585999f7477e58b26ec5fa4ba0a3d5c5e80f7af97b305aec3e899867e66ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/km/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/km/firefox-68.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "cf9f5eeed7fbb332c18374d070eee9a143643e4e34b6a924cd0c18a6589f68781330d0066f20f495be92cd96889b2770d5b737e8c96be4f0c45fc2b8949ff025"; + sha512 = "3a987d55f2b113fe7ca2f47457d786b5d851605edc94e3a6467a2ce127075be4a2aa924892e053da6b9f854de60555941a875e0b94c8a8d736d84c791d5d7803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/kn/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/kn/firefox-68.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "3091d42eb7820b9b258c0f735ff8d9b00d2c850651916cb209dd28830e2d664b85f56673feece131f7a3531b0f2a808b7f8ddfb1f23fa35c52b98f29cf0ba18c"; + sha512 = "36331d0774b85403d294b1240e1348a1aea9ea52df8ff8013a69f0b82cb5e8c799c87e3fbc9fdf0fc20f3537d0124d7dc291cd8fbc34063e4bd3b17c6810ea7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ko/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ko/firefox-68.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "847e70bb62ba1d12a424fd0e33aa2605c090bea64bf3c4b653661a863f9988c2860eeda9dbea021b1cf67f0808554872d7b74bd73abef39dc104f436fdc1b57c"; + sha512 = "7534ba3a9df96088180efd8a9c1df50e674f1749edb9103c6efc6db8c72d8e82aee09081ad3a956b07e0ab6c57e8c8194317d39a933da977dc0afdd1142d1c2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lij/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lij/firefox-68.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "f084db30d883189604087432ae8e8bb4958ef44f50e26bf1df5a72b7a2b6b2107bdee3a28f305b619f6fed9f0d800b259e92b8b9554c96e0e9d68426c6dbb97b"; + sha512 = "affa07c2eb1590fddf0c30c670b6c7b6f9f6969dd43858e277a750ac524063f5da5166d7d8326e1823e0258ec5f214d241a08dbe338a3cb979de8b19a9799009"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lt/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lt/firefox-68.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "45aa058345f691fec5efdc309842dd13271e717b87fad43b74f1c7d15e64b991eec667536a333965f5eaa8a3842722dc2b27b1ac29ff59b7da5ba278be2afd3b"; + sha512 = "416a8a66b087dea18c577d839c151f958c084e8ee95fb0fd7f17a45015baed961de0ca138fcc12f58154f480df15d294d822dcf1f218f4c8082c9193ad57710d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/lv/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/lv/firefox-68.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "07ac2c7c0829d952c9327bc2f9ec354920a5a2b738df6ad639d51c454567498b4ce6daf320046a62a03da082d8880ba455d3de8222003b00142c2f4cfb0ee1f6"; + sha512 = "1c5359efb53b0d4f0d9f33a321cac45ed112ede997c06b2279546183dd005c186f107701c895ced27a76086ca71374a49a067f5599a0d2ff166432b7eb7629df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/mk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mk/firefox-68.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "685369c075265a35f7338f50a87c7e00059fdd5c1ab3dbfdf23753fd30c5bcd3a0eafd546876a5c06aa15731673cf6e8b03d629148ba3894595da7a2215aaac6"; + sha512 = "db44f22e19d505a590749ac98d7b84354106d421e4a45eff70986af2c9d2ac581a0bd84cfa103196ae4cdc17dd1fe5d9f0cf0c710ee0fb5a0ff7701f6de5253f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/mr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/mr/firefox-68.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "3e169297be6530b3a1f0733a22680df25688eacea37377dd763779cfe6ecf9695e904e471821ea3cd6558bddb33a2ca9f6c769a0d7c59467144979a431316b1f"; + sha512 = "db73d7706ec4b87e76f5d174f22f9b032d75d9aebe6001ecdaa7c2c8fe5db897efd57f0f2ec482a5ef22e629a6233f5ef7c5df19566a3df0f0ce58ce008a22fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ms/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ms/firefox-68.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "5c32f67a5d9e88c4025d51e80cec6d21be37f4120bab2b2adf69fb82dd44fb0368e2b4ec8e66f8fa13570d35d133b74710f9aa37104459f2a15446261f026149"; + sha512 = "23dad70a4757bf8e9c67328bf43b9be2a9d6e7f88ecc9c2980314e68eff269f996535f43f9fb93419d81a2e7c922327e5642c191e15582cdfcd3e420433e4270"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/my/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/my/firefox-68.0.2.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "9829f5e90f7ced1b83052a2741a6776da2f6ad7613ff174b1b92e123962df6ddad76abc1ca51feb9b9324c68baa6100e8306858d515558f2f27a144cddd64647"; + sha512 = "ba595429b7c637d06f703ae6bb1cb5ec6095a7f6fed7ea64a0b39825921f49f5f827c33a5cf3cd0bccc4b6398acbf4119a147014f1d2db1d8bd4b3e72b7733d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nb-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nb-NO/firefox-68.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5431508873ac32627d8ba28fb5d5863f0b6eaadee0e02c07397c1effc388ea82a568f1d1f91f78230ebdcaa88cfce0a62f890e922c1b2f56889d6cbff95dc983"; + sha512 = "8af331ca56c43c43b42061de4a7686bd2f944de845f9d94d088a4c1c913e1d7376abfd175dcebbb3ee78fac7fbea407cbdb2b81382919d12fca021dfccf59feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ne-NP/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ne-NP/firefox-68.0.2.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "a5a65a0ee02a83833ad4b8759aa7221ae9af6e12c246a9dde975c19346b5182aa8445f304a0507b89bba6891cdafdd3dfef0b80adb859de95427846c42921d9d"; + sha512 = "497001fbf28df53edf13aec04de313a1353ce0eae894905d6a33b0c182ef589160eca2f0a8fc18d8e1644f573cd74de3e96dbf43141b05b6884be04fde28be76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nl/firefox-68.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "d5ba84a3d0a8423e0568060cc6c11bd1490d4701a53f25c8635ec59824208595584f7c61451e0c16ab669c324f2be9c80005cf80c05a394c85b90fa636ae90be"; + sha512 = "6c0836da50f14accbf536570bfea5fe4e587e87fe2e4203b2c94052476994949058ee2418f862312a95627730d648832f6a0ca39690513c6d96070108630e43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/nn-NO/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/nn-NO/firefox-68.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "36a7f33a78edd79979c0033ba3c63ab3f680bad2aed051968e9f790776c02c5c2f050402e7ad292cf31fbbb2c73ac81f2c646244ce829cd3e655a6c2ca772bd4"; + sha512 = "89be8b53fdc39bb39431584ea25cd6e5d660f75756d6c45f0157c1eb387cc625e927931c1cf0d1587c0819fef9635cb3ac2319af6a6f35825a6170518070cbd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/oc/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/oc/firefox-68.0.2.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "8f27e10e5424cceb71ed9e5388289b8bd37ea9003b2003d1d98c140335f80e156f4fceb812565092b98e47071ca4dcabd7afc21f03c7797ef59ea107e66b5e88"; + sha512 = "6b34edad11c141398d329d07e126eddf03bfd395bacd6856e947771ea65e274e78f96784f695542280f4530c395ebd0011946f1bdc95c1bf5c0f96ae8d7ea707"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pa-IN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pa-IN/firefox-68.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "b01ad4efe6ba519435d11fab4696264d9a92ee8dbc86e2019573e475823cc0fed276fc26de77611deab9197e31d278187c49457a63d122e8e5f8b3a82aa2c128"; + sha512 = "025cdbfa14ae385fd87e71296b67f9b0313c60ac56cb3d0f2734bd803e990b846383d64f65ca9a3d643fe0f2fd678d54a2b2000c7dca1cff73e5ec47acf1e53d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pl/firefox-68.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "c6dd411c9bd1e8ce0db99e619955e3b036aedc084f9065d71c35daefb66f5745905eadf09bf291975b96ea1ab23aac77f56e26ddc73ff4b608dd3a56f345834b"; + sha512 = "569b0dabacb30f8ed02cb1118a062c1e212c4b688a104d9afce8d846572a92723ca1ebbc495dd0e97c3365ab3e5010b9d812e88b111f40a6e87b14c646794dfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pt-BR/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-BR/firefox-68.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "81c9a23041e71610efbdd05a37f4a4112715e002b146366640cee437b2da77c776ec98f030c81c58a7fc87b386f1aff9dbae2890fb99d0663bd61375c6aa7e08"; + sha512 = "36e7914fee752f7cbddce0ec5e48ffc0f45a20dc4b62a825488ddb0b49c36f91d2df257ffe2b551bba2261d7786291a2a7fb3f518cef5c6f9b449205eaa733be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/pt-PT/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/pt-PT/firefox-68.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "2d4d770531e166a597fa27c8e95a4586e580a2c872b31aa9a1d7a0ac98fb2571ce368711258d552abdd3205f4beaedfdc0404b8261a047a737f4991abe01ecab"; + sha512 = "fc6dcdec3e6d53111929a70f3cd22948006d9a5bc2c6e4cb305a07c4bc8ee0469297be01d85b68017a026e011c35252c25032156ff383cc708c470fabcbc7198"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/rm/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/rm/firefox-68.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2bccb963953f99a92e266a5996819db8cf439244fb3e328ca19d7282a3b9839fb44f3da6c6ac78dbd75c91766b7c7bcd1af8dd61b0562a9ab3a390d0789c930f"; + sha512 = "d5b2631fc3076cc251cb82e6c0930f7890750a73902480033ad0b5ec91aecc6f15c01e1e79b88ee4b2e74588a76cd0017fa520175559e1e68a6edd4149cd556d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ro/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ro/firefox-68.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "8f4f79bbdc55ab8490df7158540ddf79bd75099eea285815f267f72426e8ecc5d8818b9a5617995fb44e3da88d79889f0b2fbd2065a38ab2e04c4d462a5818f8"; + sha512 = "d88ea2b05b262e010b0e447f4480149ddc79874dcce3925d3768211d7016cff99a9a0aef594c7185eb81988edfa46497dc442a4d825358c821461cc0f689c593"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ru/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ru/firefox-68.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "8b4d2f096c0833e91e9392a874de9cc1adcf90651c49f95792a4b63219b380fb419a8ff5a2a90bfab4da8ccfb212622f295646d0abcf1a3317780fd4b5fd97b9"; + sha512 = "cc28f64e1ba7aa4771667a09e3ef9a2dfbe1af3c3ba552f14d16bf338eaa178c32eaafa39b6c0592e690fc10325b88966f555283669d241fe05bef113e533c02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/si/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/si/firefox-68.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "ff91edbe087b3302692f2cdc22f1f6961560dd752980c6a2d1859a99489e6a6a8bcd872776a795974d4ef7afb5b21acb4d77c9461b34cb949809ff64d3a3744f"; + sha512 = "9119703b2edc30023b0bf81fdf6083a46544273a5b0dbe0f1d76c00020f1a093ea1df2592375bff9e81af1190f7fbd269f0387e311211a8d806e7519164b24af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sk/firefox-68.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "94334d2ed2819339b725573284b8ffb5b8a8b7cc210e8ff341d0b54172a72053ea7b501189a2d928c79b62f185a00ac02e8bac4e8f90d44f4088b81cd64999e1"; + sha512 = "fababc6cd6644be1404ee1b6ab6f0c01c161b13539702a932e67062bc6d7ca350d0b7c88957d0617b404d892b93fff1b736d93a4061ca0b154e2cf3fbd0972ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sl/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sl/firefox-68.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "bffdbadea3d80d51ef2f35cebc245d7649970cdded7a98ba6ad8c6d293cd076445c802c376ee5ca76235416e8dac3793888e3e93f83e88598fe7752dbddb9a46"; + sha512 = "5e16fd5446f742f259fcaaab1bf15e7d56cfd412065c268d625d87fb812312e6caffbdf0502d8d20bd9478bb4b2b3444604d8a1aea7a006c0dfe3d8120b2c1fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/son/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/son/firefox-68.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "c38f4605af7ae181514d060cf72060c461d5e78c6f63f0e7c2dfc4a42b8fa929b239e189a33d632ffb1517bd6c73e19bca0fdd96c06456969fd9cff2ee22a23b"; + sha512 = "0a36b7350d7cff22bd583bf7d811fac358046ddb0b85da52750e1687d7b82487ccac8575472683302c9a814abd07f81b227db3f2ecc8562f5d069d95045ba7d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sq/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sq/firefox-68.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6aa2a1a2d2cfcbf2c603e825a5331c831aa49a5a1149dfa4112747d0003ef8025ccc5c0ff35c3893f810749edee45cfd9831e0a11020b1d96e4585e4c014625e"; + sha512 = "b18398395e0ea078117987704c962399a385e0ea2e4568291d8449d9fcf5f1784e4074b990e0e5e8a5b6b9dbd789772eeed689e722f4179e3f451064fb08ac92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sr/firefox-68.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c9dcdd960e035e937fda42ea96bfb854d293969dd0a0c46ea1585436c4fd5762e3f8a4154027b4919dc582a6eff4412d69d5ef8b27201ad54c6fd07fd502106e"; + sha512 = "469ea3344ef2893333b7c967a72a08a86c24ce511f8d45f95ad159def204e2d5a2665829ddcf6783cb0602f0013f3924045410609b9e2a921f43c79750435648"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/sv-SE/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/sv-SE/firefox-68.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "97ba9fdad986567f6bf4ca3866bd474390a09114413515bc4df848ca832d9e620e7a0e47210fed1503b7e4103b77ec5ed25e0a605557df74515dca0b511956f5"; + sha512 = "4d9080b2bb8d3dbabd2ba6a14d0db8e5a983f5ab077d80dc7ddf892a82c1508b1b9bfe9b346d009b95a1ae89f300e72e37479c905b70ad924fc9d1c34f1317d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ta/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ta/firefox-68.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "aec52cc2af72f3b34639435fedde839dfe5da8dfee521e7e987b10587bfd257cc44b848e79df8fda26d35848d47cd56c4732edbd02be8a3be0fda28e9da92237"; + sha512 = "347edc360548f3a254c1eeaec47f1ece912fc79a0c19d3d9a1e455ec847749d8d531aef8bb44e2875afc4618a1eabfb77aaf581788138bb0a8607a443699da91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/te/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/te/firefox-68.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bce11fc72ea11b2f5a95f2edb273dfb0829ad49063274427c6b3f1380c6a8cd1c26fbaab0caec241dceaaac96c421cb353a6bb15c28e4943b238ff793ceee39b"; + sha512 = "806a97bdf4030dd8de57f3e2af8e06d71ea17891f4cd08df3cb3e71bfef372f1029b78ec6a16bb6ec96dc5113a0e96616e2fb907e11c98b6f33c9b83f67d9c37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/th/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/th/firefox-68.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "8d97c763b0689e315d866fc27642589cd10bc94dc2281a7eacf60b2509a01e9b0312178f4b387dd1dceccaff9235e41308c10f536efb189039c3374829c2894e"; + sha512 = "a453c97807c46eae98a1fef4184dfe06c3101240e5d20c389b9cfdaf4dfb4c2c3c38758d0451789d326c2d76249651c2d1a7aa4134e514b9de3ef966e4bed60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/tr/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/tr/firefox-68.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "3443bdd68555d8cb36a827ae9cc2a94e26f6718561286ce1ecf8cce9c15822c1daebdcafb90d02c241d9bdb41641397c1e4ee6175f36e764025003a10d420456"; + sha512 = "79fc0d00870d27ea7485c5807c5e4753b036364f68f71b3a66e11b23e8a6f5498af35411d5baf1dcebbc8959b3ec1870faed90b136aec6a71ee2ccc59832cd3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/uk/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uk/firefox-68.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "25af455760eb79dfbbab7d27dc6b738d9b1800f9043f429b978bd087b19f3c0a690634e7ebe07bb1bd03d9e64d2628ffdf4356c74cd0fb042569660f28fe52e3"; + sha512 = "87176598ed9df72c6b05a2469ff404520f8e4171ee42cfdecd4dd461c761bddaaf8735ec9a9d9e651299951a656dc9189c2bf91f2ad896ff387706aaf31614b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/ur/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/ur/firefox-68.0.2.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "cde44d69bc67bde135be5f7a9a364aded951ae9f1c69a8209bd09e54aff576400effe538d87473ce5cea633494b035d4d98f4dc63fd9dc6b2e33d66eee66d426"; + sha512 = "761089a4b9a9df1e8aeb61567db383cc7f1068a56a857f9ddd9f306ae0eadd0f1fd0d911243b86dbd7cf755a1d0d9e2728f710d5e4855286c897fbf1bae3621c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/uz/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/uz/firefox-68.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2c4cfa944e937ec1eb87678eb5a022912b3c8c97a51fccdf673248fc0c06bd0bf175c95ccd26c90c9e9fa02730b0b84f07df5ec5a8be4061c15b494b967ee4cf"; + sha512 = "16838912099255e703f45537810f9a125f162da46654356da5d7284cf5976af0ba47e77b5658f7a95ff63287379411356521fca2250daef3f8ec299231c561c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/vi/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/vi/firefox-68.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e4039206f13126be5b4ab1fcde6f25ed60054274cba96c2c0cbd3ee37af16275f1e9db9f617b87bcdb5dd81f90b171a444eac194f170b15cad9a9c5d28310cfe"; + sha512 = "26c8651de12544aff98d6657bcd3dfce453d394dd0f4e6045d8a29d8ffeded020335bfc958984e1b79dcc4b8bf4c3b3a29c1b20fb62c0df7a6dc76478f72dc65"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/xh/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/xh/firefox-68.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "7162e25df7626472d4f1878d7f8ff9e8bfdf50fe386f53faf5341449915ad62c4c48bc52e1cc34de664bae4e8fe4546610bb0c98e1678dc1f20ea21a583a5f09"; + sha512 = "222a0a22c6e41a6f755ba881097c2c354924bfb809f3a04b588853da667444f8c922fda9bea0f3c7bc82f46938f86810d2cbd5900960180a2a25f9cffaac9088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/zh-CN/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-CN/firefox-68.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "c2d4c2bf53bed935c38b23e1f31b7b462e676c172682aa7d0c896146b11a050c880af2358dac23b08a3d2faf00750fff928d6174620ac3fda2e77d7e04af71bb"; + sha512 = "3a3eea1dbb9c42c1740ee67b68e71ce84ef1f3f14a52c069a17956911464570429b3576e29ec7370a857dbcaec143bc4ae65e3f01e319b7ca065899e8f864eee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.1/linux-i686/zh-TW/firefox-68.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/68.0.2/linux-i686/zh-TW/firefox-68.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c1d916c1e728596046bd9344798d582ce05592e9ea20ba11094181f89084b029b6c237c93d5d65048be624a3bc7f4913005af74663b75a72817c9d7224b52be9"; + sha512 = "a8d53ff606b7bc82dfbec77b299b8f69985472486706f79c960da988063a0e86d232eefb4734b8a624e97e9849fad3e36a483190b8cbc6c3210b2c2d79bd2b25"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index f56154c276432..20509439d2fbc 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -17,10 +17,10 @@ rec { firefox = common rec { pname = "firefox"; - ffversion = "68.0.1"; + ffversion = "68.0.2"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "20rqfa5sdaagryk00iywnbap0bmhq1c74pfbxi3pq1cs52qs5nhjqn3xm6910zwcn5nw08i9qd5jkg5blvqrjzw780nh8qbrwsm3d4n"; + sha512 = "2xzakpb6mp9hjqkim353afv059i4zfpmhflhv3l3qzajgjz36cacbmp4bkn4cghinm8krhp8z02264ww0bcraryjjwn5q0dzljrha2w"; }; patches = [ @@ -99,10 +99,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.0.1esr"; + ffversion = "68.0.2esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "27ncapq18rdlrf0kp5r09spcqazi0g8nbzbfxijs9pi3cvlkayagi3fbbzzq5jkn0n3j580vadc6v1v3zibvdwb5s3c6bz559a7nra2"; + sha512 = "0dyjayrbcq6dg8vmzbf7303aixnhpd6r777chxpdvqq892rgvw5q4f8yfb6pr8j978hahn4dz968vzmi6sp40y3hf62hnzdqpzd2bx1"; }; patches = [ diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index fb36d3729c05b..b5276818f79fa 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cni-plugins"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "07d8knnabfjipzvcqbq7h8gd940lln934xp57nf5x31d3hpmvzws"; + sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia"; }; buildInputs = [ removeReferencesTo go ]; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index ef4009b0e96c8..94d5be030da64 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,7 +2,7 @@ let stableVersion = "2.1.21"; - previewVersion = "2.2.0b4"; + previewVersion = "2.2.0rc3"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "03jlg4ncs69gv1dn1zsdm0ipvlg6r0lwf8myxric6vv4ks7qqd3w"; + sha256Hash = "0lj2av2kbh1drr8jzd71j85xaiwp53q1g348lk2qqzr35yh16n99"; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0mzn62649hmmqq8z2vphqvi0w38jwq8ps4zzbl1dqygbf4gadnqa"; + sha256Hash = "0a4gx0qhy50v7nivqn8c2kz07crgzg2105hzmwag8xw6bpqmgm1d"; }; } diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2338f2478f899..189092a6d5e09 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.91"; + version = "0.0.93"; src = fetchurl { - url = "https://dl-canary.discordapp.net/apps/linux/0.0.91/discord-canary-0.0.91.tar.gz"; - sha256 = "0sw5m4z5k29rzqrsxbvjqd8fxjwd9jn7nbq65nyg7f0d790rhpy8"; + url = "https://dl-canary.discordapp.net/apps/linux/0.0.93/discord-canary-0.0.93.tar.gz"; + sha256 = "1jzm5fm7a1p68ims7bv5am0bpbvrhbynzblpj9qrzzrwakdaywbi"; }; }; }.${branch} diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7dbd06d1ddab4..0b4c3aade87dc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { name = "signal-desktop-${version}"; - version = "1.26.1"; + version = "1.26.2"; src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1s48mgya1gvidk0fmm7pifhqj2k0dc9xdq3h5ifz9kivjp7h0z09"; + sha256 = "08qx7k82x6ybqi3lln6ixzmdz4sr8yz8vfx0y408b85wjfc7ncjk"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index fbf6047af6059..b3b21174bc3ac 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -2,9 +2,9 @@ rec { major = "6"; - minor = "2"; - patch = "4"; - tweak = "2"; + minor = "3"; + patch = "0"; + tweak = "4"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1drq59lc6p4s8mil2syz93l97phsbk9dcrd5gikqi2dwlzkli0gz"; + sha256 = "1mxflzrcm04djkj8ifyy4rwgl8bxirrvzrn864w6rgvzn43h30w7"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a82999366627e..fe33d72a2167f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -48,14 +48,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0ahyrkg1sa4a0igvvd98spjlm5k34cddpwpxl7qhir8ldgighk2c"; + sha256 = "0730fw2kr00b2d56jkdzjdz49c4k4mxiz879c7ikw59c5zvrh009"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0zrfm8kw6m60wz6mn4y5jhlng90ya045nxyh46sib9nl4nd4d98s"; + sha256 = "1w9bqwzz75vvxxy9dgln0v6p6isf8mkqnkg1nzlaykvdgsn5sp4z"; }; }; @@ -144,6 +144,8 @@ in stdenv.mkDerivation rec { sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME sed -e 's@OString sSysPath("~/tmp");@& return ; @' -i sal/qa/osl/file/osl_File.cxx + # fails on systems using ZFS, see https://github.com/NixOS/nixpkgs/issues/19071 + sed -e '/CPPUNIT_TEST(getSystemPathFromFileURL_005);/d' -i './sal/qa/osl/file/osl_File.cxx' # rendering-dependent: on my computer the test table actually doesn't fit… # interesting fact: test disabled on macOS by upstream sed -re '/DECLARE_WW8EXPORT_TEST[(]testTableKeep, "tdf91083.odt"[)]/,+5d' -i ./sw/qa/extras/ww8export/ww8export.cxx @@ -306,6 +308,9 @@ in stdenv.mkDerivation rec { # Without these, configure does not finish "--without-junit" + # Schema files for validation are not included in the source tarball + "--without-export-validation" + "--disable-libnumbertext" # system-libnumbertext" # We do tarball prefetching ourselves diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index bfb74d1bb5078..4df8ce1059b42 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -28,11 +28,11 @@ md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_66_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2"; - sha256 = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9"; + name = "boost_1_69_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_69_0.tar.bz2"; + sha256 = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406"; md5 = ""; - md5name = "5721818253e6a0989583192f96782c4a98eb6204965316df9f5ad75819225ca9-boost_1_66_0.tar.bz2"; + md5name = "8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406-boost_1_69_0.tar.bz2"; } { name = "breakpad.zip"; @@ -105,11 +105,11 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.64.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz"; - sha256 = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5"; + name = "curl-7.65.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/curl-7.65.0.tar.xz"; + sha256 = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd"; md5 = ""; - md5name = "cb90d2eb74d4e358c1ed1489f8e3af96b50ea4374ad71f143fa4595e998d81b5-curl-7.64.0.tar.gz"; + md5name = "7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd-curl-7.65.0.tar.xz"; } { name = "libe-book-0.1.3.tar.xz"; @@ -231,11 +231,11 @@ md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; } { - name = "source-serif-font-2.007R.tar.gz"; - url = "http://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz"; - sha256 = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb"; + name = "source-serif-pro-3.000R.tar.gz"; + url = "http://dev-www.libreoffice.org/src/source-serif-pro-3.000R.tar.gz"; + sha256 = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3"; md5 = ""; - md5name = "10b2bbb357d52bf0f516d3e0ac0a09b5f7901470fbf649b69dad9ccc2d29f7cb-source-serif-font-2.007R.tar.gz"; + md5name = "826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3-source-serif-pro-3.000R.tar.gz"; } { name = "EmojiOneColor-SVGinOT-1.3.tar.gz"; @@ -308,11 +308,11 @@ md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; } { - name = "freetype-2.8.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; - sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + name = "freetype-2.9.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.9.1.tar.bz2"; + sha256 = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d"; md5 = ""; - md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; + md5name = "db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d-freetype-2.9.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -329,18 +329,18 @@ md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { - name = "graphite2-minimal-1.3.10.tgz"; - url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; - sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; + name = "graphite2-minimal-1.3.13.tgz"; + url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.13.tgz"; + sha256 = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36"; md5 = ""; - md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; + md5name = "d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36-graphite2-minimal-1.3.13.tgz"; } { - name = "harfbuzz-1.8.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2"; - sha256 = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd"; + name = "harfbuzz-2.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-2.3.1.tar.bz2"; + sha256 = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468"; md5 = ""; - md5name = "3c592f86fa0da69e2e0e98cae9f5d5b61def3bb7948aa00ca45748f27fa545fd-harfbuzz-1.8.4.tar.bz2"; + md5name = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468-harfbuzz-2.3.1.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -539,11 +539,11 @@ md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.27.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz"; - sha256 = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6"; + name = "xmlsec1-1.2.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.28.tar.gz"; + sha256 = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4"; md5 = ""; - md5name = "97d756bad8e92588e6997d2227797eaa900d05e34a426829b149f65d87118eb6-xmlsec1-1.2.27.tar.gz"; + md5name = "13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4-xmlsec1-1.2.28.tar.gz"; } { name = "libxml2-2.9.9.tar.gz"; @@ -602,11 +602,11 @@ md5name = "ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba-libmspub-0.1.4.tar.xz"; } { - name = "libmwaw-0.3.14.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz"; - sha256 = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9"; + name = "libmwaw-0.3.15.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.15.tar.xz"; + sha256 = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1"; md5 = ""; - md5name = "aca8bf1ce55ed83adbea82c70d4c8bebe8139f334b3481bf5a6e407f91f33ce9-libmwaw-0.3.14.tar.xz"; + md5name = "0440bb09f05e3419423d8dfa36ee847056ebfd837f9cbc091fdb5b057daab0b1-libmwaw-0.3.15.tar.xz"; } { name = "mythes-1.2.4.tar.gz"; @@ -623,11 +623,11 @@ md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.38-with-nspr-4.19.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz"; - sha256 = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9"; + name = "nss-3.45-with-nspr-4.21.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.45-with-nspr-4.21.tar.gz"; + sha256 = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1"; md5 = ""; - md5name = "f271ec73291fa3e4bd4b59109f8035cc3a192fc33886f40ed4f9ee4b31c746e9-nss-3.38-with-nspr-4.19.tar.gz"; + md5name = "fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1-nss-3.45-with-nspr-4.21.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; @@ -686,11 +686,11 @@ md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3550.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2"; - sha256 = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679"; + name = "pdfium-3794.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3794.tar.bz2"; + sha256 = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4"; md5 = ""; - md5name = "572460f7f9e2f86d022a9c6a82f1e2ded6c3c29ba352d4b9fac60b87e2159679-pdfium-3550.tar.bz2"; + md5name = "e3faddcf741336c64ca2e6f72b23e9e60979969b2cf67c878c9a5bc38328cfc4-pdfium-3794.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index 8ba77159693e5..064ad204aff8d 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, yosys, bash, python3 }: stdenv.mkDerivation rec { - name = "symbiyosys-${version}"; - version = "2019.04.18"; + pname = "symbiyosys"; + version = "2019.08.13"; src = fetchFromGitHub { owner = "yosyshq"; repo = "symbiyosys"; - rev = "b1de59032ef3de35e56fa420a914c2f14d2495e4"; - sha256 = "0zci1n062csswl5xxjh9fwq09p9clv95ckag3yywxq06hnqzx0r7"; + rev = "9cb542ac7a310b3dfa626349db53bed6236b670c"; + sha256 = "0c7nz740738ybk33zzlfl00cq86n31wvra8pqqkpl4ygxnwca1d6"; }; buildInputs = [ python3 yosys ]; @@ -26,9 +26,6 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/sby \ --replace "##yosys-sys-path##" \ "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]" - substituteInPlace $out/share/yosys/python3/sby_core.py \ - --replace "/bin/bash" \ - "${bash}/bin/bash" ''; meta = { description = "Tooling for Yosys-based verification flows"; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index f1116a27c0bea..7d39aae6e3ced 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -1,9 +1,9 @@ { lib, fetchzip, makeWrapper, makeDesktopItem, stdenv -, jre, swt, gtk, libXtst, glib +, gtk, libXtst, glib, zlib }: let - version = "1.5.7"; + version = "1.6.0"; arch = "x86_64"; desktopItem = makeDesktopItem rec { @@ -24,7 +24,7 @@ in stdenv.mkDerivation { name = "tla-toolbox-${version}"; src = fetchzip { url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.${arch}.zip"; - sha256 = "0lg9sizpw5mkcnwwvmgqigkizjyz2lf1wrg48h7mg7wcv3macy4q"; + sha256 = "1mgx4p5qykf9q0p4cp6kcpc7fx8g5f2w1g40kdgas24hqwrgs3cm"; }; buildInputs = [ makeWrapper ]; @@ -34,17 +34,20 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p "$out/bin" cp -r "$src" "$out/toolbox" - chmod +w "$out/toolbox" "$out/toolbox/toolbox" + chmod -R +w "$out/toolbox" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/toolbox/toolbox" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + "$(find "$out/toolbox" -name java)" + makeWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \ --run "set -x; cd $out/toolbox" \ --add-flags "-data ~/.tla-toolbox" \ - --prefix PATH : "${jre}/bin" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ swt gtk libXtst glib ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk libXtst glib zlib ]}" echo -e "\nCreating TLA Toolbox icons..." pushd "$src" diff --git a/pkgs/applications/science/math/sage/dist-tests.nix b/pkgs/applications/science/math/sage/dist-tests.nix new file mode 100644 index 0000000000000..24a86a8f37a4b --- /dev/null +++ b/pkgs/applications/science/math/sage/dist-tests.nix @@ -0,0 +1,17 @@ +# Lists past failures and files associated with it. The intention is to build +# up a subset of a testsuite that catches 95% of failures that are relevant for +# distributions while only taking ~5m to run. This in turn makes it more +# reasonable to re-test sage on dependency changes and makes it easier for +# users to override the sage derivation. +# This is an experiment for now. If it turns out that there really is a small +# subset of files responsible for the vast majority of packaging tests, we can +# think about moving this upstream. +[ + "src/sage/env.py" # [1] + "src/sage/misc/persist.pyx" # [1] + "src/sage/misc/inline_fortran.py" # [1] + "src/sage/repl/ipython_extension.py" # [1] +] + +# Numbered list of past failures to annotate files with +# [1] PYTHONPATH related issue https://github.com/NixOS/nixpkgs/commit/ec7f569211091282410050e89e68832d4fe60528 diff --git a/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch b/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch new file mode 100644 index 0000000000000..e687281ad1a7c --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/configurationpy-error-verbose.patch @@ -0,0 +1,19 @@ +diff --git a/src/sage/repl/configuration.py b/src/sage/repl/configuration.py +index 67d7d2accf..18279581e2 100644 +--- a/src/sage/repl/configuration.py ++++ b/src/sage/repl/configuration.py +@@ -9,10 +9,11 @@ the IPython simple prompt is being used:: + sage: cmd = 'print([sys.stdin.isatty(), sys.stdout.isatty()])' + sage: import pexpect + sage: output = pexpect.run( +- ....: 'bash -c \'echo "{0}" | sage\''.format(cmd), ++ ....: 'bash -c \'export SAGE_BANNER=no; echo "{0}" | sage\''.format(cmd), + ....: ).decode('utf-8', 'surrogateescape') +- sage: 'sage: [False, True]' in output +- True ++ sage: print(output) ++ sage...[False, True] ++ sage...Exiting Sage ... + """ + + #***************************************************************************** diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 04a2cde9ba992..57d6c852be8da 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -61,7 +61,11 @@ stdenv.mkDerivation rec { # Since sage unfortunately does not release bugfix releases, packagers must # fix those bugs themselves. This is for critical bugfixes, where "critical" # == "causes (transient) doctest failures / somebody complained". - bugfixPatches = [ ]; + bugfixPatches = [ + # To help debug the transient error in + # https://trac.sagemath.org/ticket/23087 when it next occurs. + ./patches/configurationpy-error-verbose.patch + ]; # Patches needed because of package updates. We could just pin the versions of # dependencies, but that would lead to rebuilds, confusion and the burdons of diff --git a/pkgs/applications/science/math/sage/sage-tests.nix b/pkgs/applications/science/math/sage/sage-tests.nix index 591fa192d563c..0cd5b5d976a16 100644 --- a/pkgs/applications/science/math/sage/sage-tests.nix +++ b/pkgs/applications/science/math/sage/sage-tests.nix @@ -51,6 +51,10 @@ stdenv.mkDerivation rec { export HOME="$TMPDIR/sage-home" mkdir -p "$HOME" + # avoid running out of memory with many threads in subprocesses, see + # https://github.com/NixOS/nixpkgs/pull/65802 + export GLIBC_TUNABLES=glibc.malloc.arena_max=4 + echo "Running sage tests with arguments ${timeSpecifier} ${patienceSpecifier} ${testArgs}" "sage" -t --nthreads "$NIX_BUILD_CORES" --optional=sage ${timeSpecifier} ${patienceSpecifier} ${testArgs} ''; diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 5068647e8798c..c7d77bf349813 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -145,7 +145,7 @@ let lab = callPackage ./lab { }; - pre-commit = callPackage ./pre-commit { }; + pre-commit = pkgs.python3Packages.toPythonApplication pkgs.python3Packages.pre-commit; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 18fb672226f2c..1a6eda6a04e92 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -9,7 +9,8 @@ buildPythonApplication rec { # Mercurial should be added as a build input but because it's a Python # application, it would mess up the Python environment. Thus, don't add it # here, instead add it to PATH when running unit tests - buildInputs = [ pytest pytest-flake8 pytest-cram git pytestrunner ]; + checkInputs = [ pytest pytest-flake8 pytest-cram git ]; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ ipython nbformat ]; # PyPI source is currently missing tests. Thus, use GitHub instead. diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 5c9b5a83c1865..343d88554d632 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "smartgithg"; - version = "18.2.9"; + version = "19.1.1"; src = fetchurl { url = "https://www.syntevo.com/downloads/smartgit/smartgit-linux-${builtins.replaceStrings [ "." ] [ "_" ] version}.tar.gz"; - sha256 = "0d08awb2s3w1w8n8048abw2x4wnqhfx96sls9kdsnxj0xrszgz67"; + sha256 = "0i0dvyy9d63f4hk8czlyk83ai0ywhqp7wbdkq3s87l7irwgs42jy"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 8e87a0589c591..4cbd506c177dd 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { name = "avidemux-${version}"; - version = "2.7.3"; + version = "2.7.4"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "17x2mnnr5h8pp764p55l1xcn2ljnzhbj8cykajlllvk4rc4qwxld"; + sha256 = "1acdb3m37vdzzbm8mwyibcn8msi7birb5v30qfi7jli5r00src3x"; }; patches = [ diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 8fd85aaeb862c..b81f662543774 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "bspwm-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "baskerville"; repo = "bspwm"; rev = version; - sha256 = "1vc4pdm4fwb5gz7hyzwvjqkx5087f0vrw11898nq1s7kxzl2lhbx"; + sha256 = "1i7crmljk1vra1r6alxvj6lqqailjjcv0llyg7a0gm23rbv4a42g"; }; buildInputs = [ libxcb libXinerama xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 49adcb4d301dd..09802d56d34c5 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -80,14 +80,6 @@ stdenv.mkDerivation (args // { substitute $config .cargo/config \ --subst-var-by vendor "$(pwd)/$cargoDepsCopy" - unset cargoDepsCopy - - export RUST_LOG=${logLevel} - '' + (args.postUnpack or ""); - - configurePhase = args.configurePhase or '' - runHook preConfigure - mkdir -p .cargo cat >> .cargo/config <<'EOF' [target."${stdenv.buildPlatform.config}"] "linker" = "${ccForBuild}" @@ -96,7 +88,13 @@ stdenv.mkDerivation (args // { "linker" = "${ccForHost}" ''} EOF - cat .cargo/config + + unset cargoDepsCopy + export RUST_LOG=${logLevel} + '' + (args.postUnpack or ""); + + configurePhase = args.configurePhase or '' + runHook preConfigure runHook postConfigure ''; diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 163f230e077a5..3124b57ac2b28 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "20190504"; + version = "20190731"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "1h61qnb3ybyfivyq8qjnisj4arbnhn8hcwad1bp4iqidjk6rjfv3"; + sha256 = "0vqr4zm53zn7z75ynmf59xfrlhpyk8f41xd6i4v8j0f7k6hfdvpi"; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 1b53a142d12a0..52323b3de7654 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python, fetchFromGitHub, emscriptenRev ? null }: let - defaultVersion = "88"; + defaultVersion = "89"; # Map from git revs to SHA256 hashes sha256s = { - "version_88" = "14vm2hksn696klk97yz562mm5sqd67qbbzmlw4kvy22ldyc6sgmi"; + "version_89" = "0rh1dq33ilq54szfgi1ajaiaj7rbylai02rhp9zm9vpwp0rw8mij"; "1.38.28" = "172s7y5f38736ic8ri3mnbdqcrkadd40a26cxcfwbscc53phl11v"; }; in diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index d1c0db25351c3..d32d3fa67f1d3 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -26,14 +26,14 @@ let }); in stdenv.mkDerivation rec { - name = "nextpnr-${version}"; - version = "2019.04.19"; + pname = "nextpnr"; + version = "2019.08.10"; src = fetchFromGitHub { owner = "yosyshq"; repo = "nextpnr"; - rev = "5344bc3b65f4e06f983db781e9a82d30b3f1512b"; - sha256 = "1y14jpa948cwk0i19bsfqh7yxsxkgskm4xym4z179sjcvcdvrn3a"; + rev = "3f26cf50767143e48d29ae691b2a0052c359eb15"; + sha256 = "1gv84svw56ass9idbzh17h3yxkk9ydr40ijf9w72gf72rbixszdr"; }; nativeBuildInputs @@ -49,6 +49,10 @@ stdenv.mkDerivation rec { "-DICEBOX_ROOT=${icestorm}/share/icebox" "-DTRELLIS_ROOT=${trellisRoot}/trellis" "-DUSE_OPENMP=ON" + # warning: high RAM usage + "-DSERIALIZE_CHIPDB=OFF" + # use PyPy for icestorm if enabled + "-DPYTHON_EXECUTABLE=${icestorm.pythonInterp}" ] ++ (stdenv.lib.optional (!enableGui) "-DBUILD_GUI=OFF"); # Fix the version number. This is a bit stupid (and fragile) in practice diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 9f576042787a4..e000edad49b67 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -26,13 +26,6 @@ rustPlatform.buildRustPackage rec { # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel RUSTC_BOOTSTRAP = 1; - # FIXME: Use impure version of CoreFoundation because of missing symbols. - # CFURLSetResourcePropertyForKey is defined in the headers but there's no - # corresponding implementation in the sources from opensource.apple.com. - preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_CFLAGS_COMPILE="-F${CoreFoundation}/Library/Frameworks $NIX_CFLAGS_COMPILE" - ''; - postInstall = '' # NOTE: We override the `http.cainfo` option usually specified in # `.cargo/config`. This is an issue when users want to specify diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 66da4d33251a3..d777695839022 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -45,12 +45,6 @@ in stdenv.mkDerivation rec { ++ optional (stdenv.isDarwin && !withBundledLLVM) "-lc++" ++ optional stdenv.isDarwin "-rpath ${llvmSharedForHost}/lib"; - # Enable nightly features in stable compiles (used for - # bootstrapping, see https://github.com/rust-lang/rust/pull/37265). - # This loosens the hard restrictions on bootstrapping-compiler - # versions. - RUSTC_BOOTSTRAP = "1"; - # Increase codegen units to introduce parallelism within the compiler. RUSTFLAGS = "-Ccodegen-units=10"; @@ -92,6 +86,8 @@ in stdenv.mkDerivation rec { "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" + ] ++ optional stdenv.isLinux [ + "--enable-profiler" # build libprofiler_builtins ]; # The bootstrap.py will generated a Makefile that then executes the build. diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 7f4c895d85a08..75717b5ba0964 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -48,10 +48,6 @@ in stdenv.mkDerivation rec { moveToOutput "lib/*.a" $static ''; - preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_BINDIR=$bin/bin"''; - - enableParallelBuilding = true; - cmakeFlags = [ "-DSHADERC_SKIP_TESTS=ON" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index afb1bcd5a0b06..aaa8628efbe93 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub , pkgconfig, bison, flex , tcl, readline, libffi, python3 -, protobuf +, protobuf, zlib }: with builtins; stdenv.mkDerivation rec { - name = "yosys-${version}"; - version = "2019.04.23"; + pname = "yosys"; + version = "2019.08.13"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "d9daf09cf3aab202b6da058c5e959f6375a4541e"; - sha256 = "0l27r9l3fvkqhmbqqpjz1f3ny4wdh5mdc7jlnbgy6nxx6vqcmkh0"; + rev = "19d6b8846f55b4c7be705619f753bec86deadac8"; + sha256 = "185sbkxajx3k9j03n0cxq2qvzwfwdbcxp19h8vnk7ghd5y9gp602"; name = "yosys"; }) @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { (fetchFromGitHub { owner = "berkeley-abc"; repo = "abc"; - rev = "3709744c60696c5e3f4cc123939921ce8107fe04"; - sha256 = "18a9cjng3qfalq8m9az5ck1y5h4l2pf9ycrvkzs9hn82b1j7vrax"; + rev = "5776ad07e7247993976bffed4802a5737c456782"; + sha256 = "1la4idmssg44rp6hd63sd5vybvs3vr14yzvwcg03ls37p39cslnl"; name = "yosys-abc"; }) ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ tcl readline libffi python3 bison flex protobuf ]; + buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ]; makeFlags = [ "ENABLE_PROTOBUF=1" ]; diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index b3b506783cd23..c8856ea2aa302 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -115,25 +115,25 @@ in { self = pypy27; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "1m6ja79sbkl38p1hs7c0n4kq5xzn01wp7wl5456hsw9q6cwg6894"; + sha256 = "0yq6ln1ic476sasp8zs4mg5i9524l1p96qwanp486rr1yza1grlg"; pythonVersion = "2.7"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; }; - pypy35 = callPackage ./pypy { - self = pypy35; + pypy36 = callPackage ./pypy { + self = pypy36; sourceVersion = { major = "7"; - minor = "0"; - patch = "0"; + minor = "1"; + patch = "1"; }; - sha256 = "0hbv9ziv8n9lqnr6cndrw70p6g40c00w1ds7lmzgrr153myxkp7w"; - pythonVersion = "3.5"; + sha256 = "1hqvnran7d2dzj5555n7q680dyzhmbklz04pvkxgb5j604v7kkx1"; + pythonVersion = "3.6"; db = db.override { dbmSupport = true; }; python = python27; inherit passthruFun; @@ -143,26 +143,26 @@ in { # Not included at top-level self = pythonInterpreters.pypy27_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0rxgnp3fm18b87ln8bbjr13g2fsf4ka4abkaim6m03y9lwmr9gvc"; # linux64 + sha256 = "0rlx4x9xy9h989w6sy4h7lknm00956r30c5gjxwsvf8fhvq9xc3k"; # linux64 pythonVersion = "2.7"; inherit passthruFun; ncurses = ncurses5; }; - pypy35_prebuilt = callPackage ./pypy/prebuilt.nix { - # Not included at top-level - self = pythonInterpreters.pypy35_prebuilt; + pypy36_prebuilt = callPackage ./pypy/prebuilt.nix { + # Not included at top-level + self = pythonInterpreters.pypy36_prebuilt; sourceVersion = { - major = "6"; - minor = "0"; - patch = "0"; + major = "7"; + minor = "1"; + patch = "1"; }; - sha256 = "0j3h08s7wpglghasmym3baycpif5jshvmk9rpav4pwwy5clzmzsc"; # linux64 - pythonVersion = "3.5"; + sha256 = "1c1xx6dm1n4xvh1vd3rcvyyixm5jm9rvzisji1a5bc9l38xzc540"; # linux64 + pythonVersion = "3.6"; inherit passthruFun; ncurses = ncurses5; }; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index db7e51a51f32a..7ec476b1ea492 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -88,7 +88,9 @@ in with passthru; stdenv.mkDerivation rec { setupHook = python-setup-hook sitePackages; - doCheck = true; + # TODO: A bunch of tests are failing as of 7.1.1, please feel free to + # fix and re-enable if you have the patience and tenacity. + doCheck = false; checkPhase = let disabledTests = [ # disable shutils because it assumes gid 0 exists @@ -139,7 +141,7 @@ in with passthru; stdenv.mkDerivation rec { echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py # Include a sitecustomize.py file - cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py + cp ${../sitecustomize.py} $out/lib/${libPrefix}/${sitePackages}/sitecustomize.py ''; inherit passthru; @@ -149,8 +151,7 @@ in with passthru; stdenv.mkDerivation rec { homepage = http://pypy.org/; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ andersk ]; - broken = true; # TODO: Tests are failing! }; } diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 1ac779ed25e38..af933f0a4bd05 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -56,7 +56,7 @@ in with passthru; stdenv.mkDerivation { inherit pname version; src = fetchurl { - url= "https://bitbucket.org/pypy/pypy/downloads/pypy${majorVersion}-v${version}-linux64.tar.bz2"; + url = "https://bitbucket.org/pypy/pypy/downloads/pypy${pythonVersion}-v${version}-linux64.tar.bz2"; inherit sha256; }; @@ -123,4 +123,4 @@ in with passthru; stdenv.mkDerivation { platforms = [ "x86_64-linux" ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index d48cf841b0487..2c45ba5897676 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, nspr +{ stdenv, fetchurl, pkgconfig, gnused_422, perl, python2, zip, libffi, readline, icu, zlib, buildPackages , libobjc }: +with stdenv.lib; + stdenv.mkDerivation rec { version = "38.8.0"; name = "spidermonkey-${version}"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "10lrync6cxnjlnadc0j3vg8r2dq9b3wwanw8qj1h6ncxwb7asxcl"; }; - buildInputs = [ libffi readline icu zlib nspr ] + buildInputs = [ libffi readline icu zlib ] ++ stdenv.lib.optional stdenv.isDarwin libobjc; nativeBuildInputs = [ pkgconfig perl python2 zip gnused_422 ]; @@ -19,13 +21,13 @@ stdenv.mkDerivation rec { preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" ''; configureFlags = [ "--enable-threadsafe" "--with-system-ffi" - "--with-system-nspr" + "--enable-posix-nspr-emulation" "--with-system-zlib" "--with-system-icu" "--enable-readline" @@ -34,8 +36,17 @@ stdenv.mkDerivation rec { # not be good defaults for other uses. "--enable-gcgenerational" "--enable-shared-js" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" ]; + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + # This addresses some build system bug. It's quite likely to be safe # to re-enable parallel builds if the source revision changes. enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index 1dfaf9a22860c..518fc5f77b727 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, zip, buildPackages , which, readline, zlib, icu }: +with stdenv.lib; + let version = "60.4.0"; in stdenv.mkDerivation rec { @@ -24,7 +26,7 @@ in stdenv.mkDerivation rec { preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out - export PYTHON="${python2.interpreter}" + export PYTHON="${buildPackages.python2.interpreter}" # We can't build in js/src/, so create a build dir mkdir obj @@ -45,8 +47,17 @@ in stdenv.mkDerivation rec { # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e "--enable-optimize" "--enable-release" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" ]; + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + # Remove unnecessary static lib preFixup = '' rm $out/lib/libjs_static.ajs diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index e0c46acb63039..75c942d4d4871 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ace-${version}"; - version = "6.5.5"; + version = "6.5.6"; src = fetchurl { url = "http://download.dre.vanderbilt.edu/previous_versions/ACE-${version}.tar.bz2"; - sha256 = "1r1bvy65n50l6lbxm1k1bscqcv29mpkgp0pgr5cvvv7ldisrjl39"; + sha256 = "15lfjc8r854hvjfvimhnqc3987b3cdngilhkii9rwpzginbyipi4"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 0e1445ca9ee1f..3552e335fedad 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -1,32 +1,38 @@ { stdenv, unzip, fetchurl }: -let - version = "24"; +# Upstream changes files in-place, to update: +# 1. Check latest version at http://www.un4seen.com/ +# 2. Update `version`s and `sha256` sums. +# See also http://www.un4seen.com/forum/?topic=18614.0 +let allBass = { bass = { h = "bass.h"; + version = "2.4.14"; so = { i686_linux = "libbass.so"; x86_64-linux = "x64/libbass.so"; }; - urlpath = "bass${version}-linux.zip"; - sha256 = "1hjxp1akj8367qlglv5rqpwq2dimfz3bkllwq39abavz4sp8smjz"; + urlpath = "bass24-linux.zip"; + sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; }; bass_fx = { h = "C/bass_fx.h"; + version = "2.4.12.1"; so = { i686_linux = "libbass_fx.so"; x86_64-linux = "x64/libbass_fx.so"; }; - urlpath = "z/0/bass_fx${version}-linux.zip"; + urlpath = "z/0/bass_fx24-linux.zip"; sha256 = "1q0g74z7iyhxqps5b3gnnbic8v2jji1r0mkvais57lsx8y21sbin"; }; }; dropBass = name: bass: stdenv.mkDerivation { - name = "lib${name}-${version}"; + pname = "lib${name}"; + inherit (bass) version; src = fetchurl { url = "https://www.un4seen.com/files/${bass.urlpath}"; diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index bab0a84ca79a3..3e6e62e5a967c 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "cimg-${version}"; - version = "2.6.7"; + version = "2.7.0"; src = fetchurl { url = "http://cimg.eu/files/CImg_${version}.zip"; - sha256 = "1jjsyq6ljpprak8l76aym1p28j9y7djxl73pdh1kpkw85ac23h6m"; + sha256 = "1la6332cppyciyn3pflbchxa3av72a70p0n1c9sm1hgfbjlydqnv"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index 74619cbaaaede..d8130d0b8f918 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "cre2-${version}"; - version = "0.3.0"; - + version = "0.3.6"; + src = fetchFromGitHub { owner = "marcomaggi"; repo = "cre2"; - rev = version; - sha256 = "12yrdad87jjqrhbqm02hzsayan2402vf61a9x1b2iabv6d1c1bnj"; + rev = "v${version}"; + sha256 = "1h9jwn6z8kjf4agla85b5xf7gfkdwncp0mfd8zwk98jkm8y2qx9q"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch index 79257fd6be50a..407811736f83b 100644 --- a/pkgs/development/libraries/flatpak/bubblewrap-paths.patch +++ b/pkgs/development/libraries/flatpak/bubblewrap-paths.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..8c621ec4 100644 +index 9e885070..d02eeb8c 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -149,8 +149,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -156,8 +156,8 @@ rerun_in_sandbox (const char *arg_width, "--unshare-ipc", "--unshare-net", "--unshare-pid", diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 4c4949b37be89..d29be4cb93047 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit -, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme +, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, hicolor-icon-theme, fuse , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas, librsvg }: stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.2.4"; + version = "1.4.2"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "1qf3ys84fzv11z6f6li59rxjdjbyrv7cyi9539k73r9i9pckjr8v"; + sha256 = "08nmpp26mgv0vp3mlwk97rnp0j7i108h4hr9nllja19sjxnrlygj"; }; patches = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { buildInputs = [ bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp - libsoup lzma ostree polkit python3 systemd xorg.libXau + libsoup lzma ostree polkit python3 systemd xorg.libXau fuse gsettings-desktop-schemas glib-networking librsvg # for flatpak-validate-icon ]; diff --git a/pkgs/development/libraries/flatpak/fix-paths.patch b/pkgs/development/libraries/flatpak/fix-paths.patch index 49fcaa2b3f9b8..746b4382864be 100644 --- a/pkgs/development/libraries/flatpak/fix-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-paths.patch @@ -1,6 +1,8 @@ +diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c +index 5dd7629e..ddc71a4c 100644 --- a/session-helper/flatpak-session-helper.c +++ b/session-helper/flatpak-session-helper.c -@@ -624,7 +624,7 @@ +@@ -693,7 +693,7 @@ start_p11_kit_server (const char *flatpak_dir) g_auto(GStrv) stdout_lines = NULL; int i; char *p11_argv[] = { @@ -9,7 +11,7 @@ /* We explicitly request --sh here, because we then fail on earlier versions that doesn't support * this flag. This is good, because those earlier versions did not properly daemonize and caused * the spawn_sync to hang forever, waiting for the pipe to close. -@@ -770,7 +770,7 @@ +@@ -836,7 +836,7 @@ main (int argc, exit (1); } diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch index f987899e3bcb8..85b222152d0a1 100644 --- a/pkgs/development/libraries/flatpak/fix-test-paths.patch +++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch @@ -1,6 +1,8 @@ +diff --git a/tests/libtest.sh b/tests/libtest.sh +index 46bcefb3..0134425e 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh -@@ -328,7 +328,7 @@ +@@ -352,7 +352,7 @@ if [ -z "${FLATPAK_BWRAP:-}" ]; then # running installed-tests: assume we know what we're doing _flatpak_bwrap_works=true elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \ @@ -9,7 +11,7 @@ _flatpak_bwrap_works=false else _flatpak_bwrap_works=true -@@ -309,12 +309,12 @@ +@@ -426,12 +426,12 @@ dbus-daemon --fork --config-file=session.conf --print-address=3 --print-pid=4 \ export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)" DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)" @@ -24,9 +26,11 @@ gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true fusermount -u $XDG_RUNTIME_DIR/doc || : if test -n "${TEST_SKIP_CLEANUP:-}"; then +diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh +index 0a0a28f1..16fd51fe 100755 --- a/tests/make-test-app.sh +++ b/tests/make-test-app.sh -@@ -114,13 +114,13 @@ msgid "Hello world" +@@ -129,13 +129,13 @@ msgid "Hello world" msgstr "Hallo Welt" EOF mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES @@ -42,9 +46,11 @@ flatpak build-finish ${DIR} mkdir -p repos +diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh +index 57899b75..9236996f 100755 --- a/tests/make-test-runtime.sh +++ b/tests/make-test-runtime.sh -@@ -26,6 +26,7 @@ +@@ -28,6 +28,7 @@ EOF PATH="$PATH:/usr/sbin:/sbin" # Add bash and dependencies @@ -52,7 +58,7 @@ mkdir -p ${DIR}/usr/bin mkdir -p ${DIR}/usr/lib ln -s ../lib ${DIR}/usr/lib64 -@@ -35,48 +36,27 @@ +@@ -37,48 +38,23 @@ if test -f /sbin/ldconfig.real; then else cp `which ldconfig` ${DIR}/usr/bin fi @@ -105,21 +111,20 @@ -# We copy the C.UTF8 locale and call it en_US. Its a bit of a lie, but -# the real en_US locale is often not available, because its in the -# local archive. +-mkdir -p ${DIR}/usr/lib/locale/ +-cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US +mv ${DIR}/nix/store ${DIR}/usr/store # files outside /usr are not permitted, we will have to replace /nix/store with /usr/store +chmod -R u+w ${DIR} # nix store has read-only directories which would cause problems during clean-up, files need to be writable for sed +find ${DIR} -type f -print0 | xargs -0 sed -i 's~/nix/store/~/usr/store/~g' # replace hardcoded paths +find ${DIR} -type l | xargs -I '{}' sh -c 'tg="$(readlink "$1")"; newtg="${tg#/nix/store/}"; if [ "$tg" != "$newtg" ]; then ln -fs "/usr/store/$newtg" "$1"; fi' -- '{}' # replace symlink targets -+ -+# We copy the whole locale archive because we do not have C.UTF8 locale - mkdir -p ${DIR}/usr/lib/locale/ --cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US -+cp @glibcLocales@/lib/locale/locale-archive ${DIR}/usr/lib/locale/locale-archive if [ x$COLLECTION_ID != x ]; then collection_args=--collection-id=${COLLECTION_ID} +diff --git a/tests/testlibrary.c b/tests/testlibrary.c +index f2773dc8..3af9026f 100644 --- a/tests/testlibrary.c +++ b/tests/testlibrary.c -@@ -584,7 +584,7 @@ +@@ -1053,7 +1053,7 @@ check_bwrap_support (void) { gint exit_code = 0; char *argv[] = { (char *) bwrap, "--unshare-ipc", "--unshare-net", @@ -128,6 +133,8 @@ g_autofree char *argv_str = g_strjoinv (" ", argv); g_test_message ("Spawning %s", argv_str); g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL, &exit_code, &error); +diff --git a/triggers/gtk-icon-cache.trigger b/triggers/gtk-icon-cache.trigger +index 711cfab2..10c220ec 100755 --- a/triggers/gtk-icon-cache.trigger +++ b/triggers/gtk-icon-cache.trigger @@ -1,7 +1,7 @@ diff --git a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch index 0e259aebd8a5e..4cee60be2d07d 100644 --- a/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch +++ b/pkgs/development/libraries/flatpak/respect-xml-catalog-files-var.patch @@ -1,6 +1,8 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index 92ec3985..b3fccf1d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 -@@ -40,8 +40,8 @@ +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], [ AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) diff --git a/pkgs/development/libraries/flatpak/unset-env-vars.patch b/pkgs/development/libraries/flatpak/unset-env-vars.patch index 798e388b23c27..63ce0d12fe075 100644 --- a/pkgs/development/libraries/flatpak/unset-env-vars.patch +++ b/pkgs/development/libraries/flatpak/unset-env-vars.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-run.c b/common/flatpak-run.c +index 8d52d3a5..81700183 100644 --- a/common/flatpak-run.c +++ b/common/flatpak-run.c -@@ -1192,6 +1192,7 @@ static const ExportData default_exports[] = { +@@ -1232,6 +1232,7 @@ static const ExportData default_exports[] = { {"PERLLIB", NULL}, {"PERL5LIB", NULL}, {"XCURSOR_PATH", NULL}, diff --git a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch index 408198bda5cbe..01363ffb7b349 100644 --- a/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch +++ b/pkgs/development/libraries/flatpak/use-flatpak-from-path.patch @@ -1,6 +1,8 @@ +diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c +index 8f9dc66c..d3ab6e5f 100644 --- a/common/flatpak-dir.c +++ b/common/flatpak-dir.c -@@ -5758,7 +5758,7 @@ export_desktop_file (const char *app, +@@ -6701,7 +6701,7 @@ export_desktop_file (const char *app, new_exec = g_string_new (""); g_string_append_printf (new_exec, @@ -9,7 +11,7 @@ escaped_branch, escaped_arch); -@@ -6935,8 +6935,8 @@ flatpak_dir_deploy (FlatpakDir *self, +@@ -7891,8 +7891,8 @@ flatpak_dir_deploy (FlatpakDir *self, error)) return FALSE; @@ -21,28 +23,28 @@ G_FILE_CREATE_REPLACE_DESTINATION, NULL, cancellable, error)) return FALSE; diff --git a/tests/test-bundle.sh b/tests/test-bundle.sh -index 6937b041..01f8add7 100755 +index dff17f33..a9857adc 100755 --- a/tests/test-bundle.sh +++ b/tests/test-bundle.sh @@ -59,7 +59,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/tests/test-run.sh b/tests/test-run.sh -index 9d83d82e..234e4ec6 100755 +index 233df9ad..76e0b23b 100644 --- a/tests/test-run.sh +++ b/tests/test-run.sh -@@ -42,7 +42,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/files - assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/master/active/export +@@ -45,7 +45,7 @@ assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/files + assert_has_dir $FL_DIR/app/org.test.Hello/$ARCH/stable/active/export assert_has_file $FL_DIR/exports/share/applications/org.test.Hello.desktop # Ensure Exec key is rewritten --assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" -+assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=master --arch=$ARCH --command=hello.sh org.test.Hello$" +-assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=.*/flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" ++assert_file_has_content $FL_DIR/exports/share/applications/org.test.Hello.desktop "^Exec=flatpak run --branch=stable --arch=$ARCH --command=hello\.sh org\.test\.Hello$" assert_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/org.test.Hello.png assert_not_has_file $FL_DIR/exports/share/icons/hicolor/64x64/apps/dont-export.png assert_has_file $FL_DIR/exports/share/icons/HighContrast/64x64/apps/org.test.Hello.png diff --git a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch index 5b8cc2d0383f2..086114e11c30d 100644 --- a/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch +++ b/pkgs/development/libraries/flatpak/validate-icon-pixbuf.patch @@ -1,8 +1,8 @@ diff --git a/icon-validator/validate-icon.c b/icon-validator/validate-icon.c -index 6e23d9f2..f0659a78 100644 +index 9e885070..44fea035 100644 --- a/icon-validator/validate-icon.c +++ b/icon-validator/validate-icon.c -@@ -193,6 +193,8 @@ rerun_in_sandbox (const char *arg_width, +@@ -200,6 +200,8 @@ rerun_in_sandbox (const char *arg_width, add_args (args, "--setenv", "G_MESSAGES_DEBUG", g_getenv ("G_MESSAGES_DEBUG"), NULL); if (g_getenv ("G_MESSAGES_PREFIXED")) add_args (args, "--setenv", "G_MESSAGES_PREFIXED", g_getenv ("G_MESSAGES_PREFIXED"), NULL); diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 1486b5bfc55a3..909c504870f0e 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse }: +{ lib, stdenv, fetchFromGitHub, cmake, eigen, suitesparse, libGLU, qt5 +, libsForQt5, makeWrapper }: stdenv.mkDerivation rec { pname = "g2o"; @@ -11,8 +12,33 @@ stdenv.mkDerivation rec { sha256 = "1rgrz6zxiinrik3lgwgvsmlww1m2fnpjmvcx1mf62xi1s2ma5w2i"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen suitesparse ]; + # Removes a reference to gcc that is only used in a debug message + patches = [ ./remove-compiler-reference.patch ]; + + separateDebugInfo = true; + + nativeBuildInputs = [ cmake makeWrapper ]; + buildInputs = [ eigen suitesparse libGLU qt5.qtbase libsForQt5.libqglviewer ]; + + cmakeFlags = [ + # Detection script is broken + "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer" + "-DG2O_BUILD_EXAMPLES=OFF" + ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { + "default" = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; + "westmere" = [ "-DDISABLE_SSE4_A=ON" ]; + "sandybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "ivybridge" = [ "-DDISABLE_SSE4_A=ON" ]; + "haswell" = [ "-DDISABLE_SSE4_A=ON" ]; + "broadwell" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake" = [ "-DDISABLE_SSE4_A=ON" ]; + "skylake-avx512" = [ "-DDISABLE_SSE4_A=ON" ]; + }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); + + postInstall = '' + wrapProgram $out/bin/g2o_viewer \ + --prefix QT_PLUGIN_PATH : "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}" + ''; meta = { description = "A General Framework for Graph Optimization"; diff --git a/pkgs/development/libraries/g2o/remove-compiler-reference.patch b/pkgs/development/libraries/g2o/remove-compiler-reference.patch new file mode 100644 index 0000000000000..347c578024032 --- /dev/null +++ b/pkgs/development/libraries/g2o/remove-compiler-reference.patch @@ -0,0 +1,25 @@ +From b9bfed09e4e3c481b7eb36bee1ff4202ccf69dee Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Fri, 17 May 2019 19:05:36 -0400 +Subject: [PATCH] Remove reference to compiler. + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3f66dd..bb05bd0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -371,7 +371,7 @@ set(G2O_HAVE_CHOLMOD ${CHOLMOD_FOUND}) + set(G2O_HAVE_CSPARSE ${CSPARSE_FOUND}) + set(G2O_SHARED_LIBS ${BUILD_SHARED_LIBS}) + set(G2O_LGPL_SHARED_LIBS ${BUILD_LGPL_SHARED_LIBS}) +-set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER}") ++set(G2O_CXX_COMPILER "${CMAKE_CXX_COMPILER_ID} unknown") + + configure_file(config.h.in "${PROJECT_BINARY_DIR}/g2o/config.h") + install(FILES ${PROJECT_BINARY_DIR}/g2o/config.h DESTINATION ${INCLUDES_DESTINATION}/g2o) +-- +2.21.0 + diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index e0a54052c23e8..1b17f4c800f5b 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.8"; + version = "3.6.9"; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "10ry71sy8zbksa905bjryphafcg25gkmfa3pf48ripimar7990da"; + sha256 = "1jqz5s3lv8sa53348cfi9nr5pw5l55n8m40b8msdvv0pb2jzqca3"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index 371d7b838d40d..191c375f3be81 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake nasm ]; - cmakeFlags = [ "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" "-DENABLE_STATIC=0" ]; + cmakeFlags = [ + "-DENABLE_STATIC=0" + ]; doInstallCheck = true; installCheckTarget = "test"; diff --git a/pkgs/development/libraries/libmodulemd/1.nix b/pkgs/development/libraries/libmodulemd/1.nix new file mode 100644 index 0000000000000..174296375e08c --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/1.nix @@ -0,0 +1,21 @@ +{ libmodulemd, fetchurl }: + +libmodulemd.overrideAttrs(old: rec { + name = "libmodulemd-${version}"; + version = "1.8.15"; + + # Removes py output since there's no overrides here + outputs = [ "out" "devdoc" ]; + + patches = [ + # Checks for glib docs in glib's prefix + # but they're installed to another + ./dont-check-docs.patch + ]; + + src = fetchurl { + url = "https://github.com/fedora-modularity/libmodulemd/releases/download/${name}/modulemd-${version}.tar.xz"; + sha256 = "0gz8p3qzji3cx0r57sy3gn4dhigg4k7pcxj3lmjcjn13vxh5rm7z"; + }; + +}) diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix new file mode 100644 index 0000000000000..ba77c7806b53b --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -0,0 +1,59 @@ +{ stdenv +, fetchFromGitHub +, pkgconfig +, meson +, ninja +, gobject-introspection +, python3 +, libyaml +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +}: + +stdenv.mkDerivation rec { + pname = "libmodulemd"; + version = "2.6.0"; + + outputs = [ "out" "devdoc" "py" ]; + + src = fetchFromGitHub { + owner = "fedora-modularity"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i"; + }; + + patches = [ + ./pygobject-dir.patch + ]; + + nativeBuildInputs = [ + pkgconfig + meson + ninja + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + gobject-introspection + ]; + + buildInputs = [ + libyaml + glib + ]; + + mesonFlags = [ + "-Ddeveloper_build=false" + "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + ]; + + meta = with stdenv.lib; { + description = "C Library for manipulating module metadata files"; + homepage = "https://github.com/fedora-modularity/libmodulemd"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/libmodulemd/dont-check-docs.patch b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch new file mode 100644 index 0000000000000..38ad5683692b1 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/dont-check-docs.patch @@ -0,0 +1,29 @@ +diff --git a/meson.build b/meson.build +index 155c9e7..9125372 100644 +--- a/meson.build ++++ b/meson.build +@@ -60,15 +60,15 @@ sh = find_program('sh') + sed = find_program('sed') + test = find_program('test') + +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GLib.') +-endif +- +-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) +-if ret.returncode() != 0 +- error('Missing documentation for GObject.') +-endif ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GLib.') ++# endif ++ ++# ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')]) ++# if ret.returncode() != 0 ++# error('Missing documentation for GObject.') ++# endif + + python_name = get_option('python_name') + diff --git a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch new file mode 100644 index 0000000000000..a367872eec650 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch @@ -0,0 +1,45 @@ +diff --git a/bindings/python/meson.build b/bindings/python/meson.build +index 4358b79..61fd5a5 100644 +--- a/bindings/python/meson.build ++++ b/bindings/python/meson.build +@@ -1,3 +1,5 @@ ++pygobject_override_dir = get_option('pygobject_override_dir') ++ + get_overridedir = ''' + import os + import sysconfig +@@ -21,7 +23,7 @@ print(overridedir) + ''' + + # Python 3 +-if (get_option('with_py3_overrides')) ++if (get_option('with_py3_overrides')) and pygobject_override_dir == '' + ret = run_command([python3, '-c', get_overridedir]) + + if ret.returncode() != 0 +@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides')) + endif + + # Python 2 +-if (get_option('with_py2_overrides')) ++if (get_option('with_py2_overrides')) and pygobject_override_dir == '' + ret2 = run_command([python2, '-c', get_overridedir]) + + if ret2.returncode() != 0 +@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides')) + + install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir) + endif ++ ++if pygobject_override_dir != '' ++ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir) ++endif +diff --git a/meson_options.txt b/meson_options.txt +index 147419f..9071a04 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false) + option('python_name', type : 'string') + option('with_py2_overrides', type : 'boolean', value : false) + option('with_py3_overrides', type : 'boolean', value : true) ++option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix index e68c5052beb8b..34b396a710267 100644 --- a/pkgs/development/libraries/libqglviewer/default.nix +++ b/pkgs/development/libraries/libqglviewer/default.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, AGL }: +{ stdenv, fetchurl, qmake, qtbase, libGLU, AGL }: stdenv.mkDerivation rec { - name = "libqglviewer-2.6.3"; - version = "2.6.3"; + pname = "libqglviewer"; + version = "2.7.1"; src = fetchurl { url = "http://www.libqglviewer.com/src/libQGLViewer-${version}.tar.gz"; - sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy"; + sha256 = "08f10yk22kjdsvrqhd063gqa8nxnl749c20mwhaxij4f7rzdkixz"; }; - buildInputs = [ qt4 qmake4Hook ] + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase libGLU ] ++ stdenv.lib.optional stdenv.isDarwin AGL; - postPatch = - '' - cd QGLViewer - ''; + postPatch = '' + cd QGLViewer + ''; meta = with stdenv.lib; { description = "C++ library based on Qt that eases the creation of OpenGL 3D viewers"; - homepage = http://libqglviewer.com/; + homepage = "http://libqglviewer.com"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 5aa26a749e4ff..6bfb694a41b70 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -15,9 +15,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" # for tests - # TODO: move the following to CMake setup hook - "-DCMAKE_INSTALL_BINDIR=${placeholder "bin"}/bin" - "-DCMAKE_INSTALL_MANDIR=${placeholder "man"}/share/man" ]; doCheck = true; diff --git a/pkgs/development/libraries/qt-5/5.11/default.nix b/pkgs/development/libraries/qt-5/5.11/default.nix index 67c5047e50787..7f0937db30f01 100644 --- a/pkgs/development/libraries/qt-5/5.11/default.nix +++ b/pkgs/development/libraries/qt-5/5.11/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -32,7 +31,7 @@ with stdenv.lib; let - qtCompatVersion = "5.11"; + qtCompatVersion = srcs.qtbase.version; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 1fbf7b57289f7..1bc63d0e2b9d5 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -32,7 +31,7 @@ with stdenv.lib; let - qtCompatVersion = "5.12"; + qtCompatVersion = srcs.qtbase.version; stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 4f739b57ffecc..d45b014b765e2 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -18,9 +18,8 @@ existing packages here and modify it as necessary. 1. Update the URL in `./fetch.sh`. 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/` from the top of the Nixpkgs tree. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -40,7 +39,7 @@ with stdenv.lib; let - qtCompatVersion = "5.6"; + qtCompatVersion = srcs.qtbase.version; mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index f36f86e26ffe9..52c763263b53d 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -9,9 +9,8 @@ top-level attribute to `top-level/all-packages.nix`. 1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`. 2. From the top of the Nixpkgs tree, run `./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`. -3. Update `qtCompatVersion` below if the minor version number changes. -4. Check that the new packages build correctly. -5. Commit the changes and open a pull request. +3. Check that the new packages build correctly. +4. Commit the changes and open a pull request. */ @@ -31,7 +30,7 @@ with stdenv.lib; let - qtCompatVersion = "5.9"; + qtCompatVersion = srcs.qtbase.version; mirror = "http://download.qt.io"; srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; }; diff --git a/pkgs/development/libraries/readline/readline-8.0-patches.nix b/pkgs/development/libraries/readline/readline-8.0-patches.nix index b8019fb335024..433da83dab954 100644 --- a/pkgs/development/libraries/readline/readline-8.0-patches.nix +++ b/pkgs/development/libraries/readline/readline-8.0-patches.nix @@ -1,4 +1,5 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ +(patch "001" "0sfh7wn0pr743xspnb1zndxndlv9rc0hcg14cbw5cmyg6f4ykrfq") ] diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index b8cf86999e0b7..9b0316023710f 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,18 +1,39 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gsettings-desktop-schemas }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, libxml2 +, xdg-desktop-portal +, gtk3 +, glib +, wrapGAppsHook +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1vgnsahljzrjcdjzv1dxhp2rf709pnf8595an82llnylwa8rdp1j"; + sha256 = "1zryfg6232vz1pmv0zqcxvl4clnbb15kjf55b24cimkcnidklbap"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; - buildInputs = [ glib gtk3 gsettings-desktop-schemas ]; + nativeBuildInputs = [ + autoreconfHook + libxml2 + pkgconfig + wrapGAppsHook + xdg-desktop-portal + ]; + + buildInputs = [ + glib + gsettings-desktop-schemas + gtk3 + ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 3f02946c77040..4be7bd1474cf0 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, substituteAll, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, gsettings-desktop-schemas, acl, dbus, fuse, geoclue2, json-glib, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal"; - version = "1.2.0"; + version = "1.4.2"; outputs = [ "out" "installedTests" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "flatpak"; repo = pname; rev = version; - sha256 = "1gjyif4gly0mkdx6ir6wc4vhfh1raah9jq03q28i88hr7phjdy71"; + sha256 = "1rs3kmpczkr6nm08kb9njnl7n3rmhh0ral0xav6f0y70pyh8whx6"; }; patches = [ @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ]; - buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas ]; + buildInputs = [ glib pipewire fontconfig flatpak acl dbus geoclue2 fuse gsettings-desktop-schemas json-glib ]; doCheck = true; # XXX: investigate! diff --git a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch index f884899ecd19f..d970f5636ae44 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch +++ b/pkgs/development/libraries/xdg-desktop-portal/respect-path-env-var.patch @@ -1,10 +1,12 @@ ---- a/src/xdg-desktop-portal.c -+++ b/src/xdg-desktop-portal.c -@@ -177,38 +177,50 @@ - static void - load_installed_portals (void) +diff --git a/src/portal-impl.c b/src/portal-impl.c +index 4fd48ff..346da7c 100644 +--- a/src/portal-impl.c ++++ b/src/portal-impl.c +@@ -116,38 +116,50 @@ sort_impl_by_name (gconstpointer a, + void + load_installed_portals (gboolean opt_verbose) { -- const char *portal_dir = PKGDATADIR "/portals"; +- const char *portal_dir = DATADIR "/xdg-desktop-portal/portals"; - g_autoptr(GFile) dir = g_file_new_for_path (portal_dir); - g_autoptr(GFileEnumerator) enumerator = NULL; @@ -14,7 +16,7 @@ + const char *portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_PATH"); + + if (portal_dir == NULL) -+ portal_dir = PKGDATADIR "/portals"; ++ portal_dir = DATADIR "/portals"; - if (enumerator == NULL) - return; @@ -56,7 +58,7 @@ - path = g_file_get_path (child); + name = g_file_info_get_name (info); -- if (!register_portal (path, &error)) +- if (!register_portal (path, opt_verbose, &error)) - { - g_warning ("Error loading %s: %s", path, error->message); - continue; @@ -66,7 +68,7 @@ + child = g_file_enumerator_get_child (enumerator, info); + path = g_file_get_path (child); + -+ if (!register_portal (path, &error)) ++ if (!register_portal (path, opt_verbose, &error)) + { + g_warning ("Error loading %s: %s", path, error->message); + continue; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 9f5af47c72680..592abea4ea04e 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -1,24 +1,19 @@ { stdenv , fetchurl -# Regarding static/shared libaries, the current behaviour is: -# -# - static=true, shared=true: builds both and moves .a to the .static output; -# in this case `pkg-config` auto detection will -# not work if the .static output is given as -# buildInputs to another package (#66461) -# - static=true, shared=false: builds .a only and leaves it in the main output -# - static=false, shared=true: builds shared only -# -# To get both `.a` and shared libraries in one output, -# you currently have to use -# static=false, shared=true -# and use -# .overrideAttrs (old: { dontDisableStatic = true; }) -# This is because by default, upstream zlib ./configure builds both. -, static ? true +# Note: If `{ static = false; shared = false; }`, upstream's default is used +# (which is building both static and shared as of zlib 1.2.11). , shared ? true +, static ? true +# If true, a separate .static ouput is created and the .a is moved there. +# In this case `pkg-config` will auto detection will currently not work if the +# .static output is given as `buildInputs` to another package (#66461), because +# the `.pc` file lists only the main output's lib dir. +# If false, and if `{ static = true; }`, the .a stays in the main output. +, splitStaticOutput ? static }: +assert splitStaticOutput -> static; + stdenv.mkDerivation (rec { name = "zlib-${version}"; version = "1.2.11"; @@ -41,14 +36,35 @@ stdenv.mkDerivation (rec { ''; outputs = [ "out" "dev" ] - ++ stdenv.lib.optional (shared && static) "static"; + ++ stdenv.lib.optional splitStaticOutput "static"; setOutputFlags = false; outputDoc = "dev"; # single tiny man3 page - configureFlags = stdenv.lib.optional shared "--shared" - ++ stdenv.lib.optional (static && !shared) "--static"; + # For zlib's ./configure (as of verion 1.2.11), the order + # of --static/--shared flags matters! + # `--shared --static` builds only static libs, while + # `--static --shared` builds both. + # So we use the latter order to be able to build both. + # Also, giving just `--shared` builds both, + # giving just `--static` builds only static, + # and giving nothing builds both. + # So we have 3 possible ways to build both: + # `--static --shared`, `--shared` and giving nothing. + # Of these, we choose `--shared`, only because that's + # what we did in the past and we can avoid mass rebuilds this way. + # As a result, we pass `--static` only when we want just static. + configureFlags = stdenv.lib.optional (static && !shared) "--static" + ++ stdenv.lib.optional shared "--shared"; + + # Note we don't need to set `dontDisableStatic`, because static-disabling + # works by grepping for `enable-static` in the `./configure` script + # (see `pkgs/stdenv/generic/setup.sh`), and zlib's handwritten one does + # not have such. + # It wouldn't hurt setting `dontDisableStatic = static && !splitStaticOutput` + # here (in case zlib ever switches to autoconf in the future), + # but we don't do it simply to avoid mass rebuilds. - postInstall = stdenv.lib.optionalString (shared && static) '' + postInstall = stdenv.lib.optionalString splitStaticOutput '' moveToOutput lib/libz.a "$static" '' # jww (2015-01-06): Sometimes this library install as a .so, even on @@ -69,6 +85,8 @@ stdenv.mkDerivation (rec { # to the bootstrap-tools libgcc (as uses to happen on arm/mips) NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) "-static-libgcc"; + # We don't strip on static cross-compilation because of reports that native + # stripping corrupted the target library; see commit 12e960f5 for the report. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform && static; configurePlatforms = []; diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 2e42e8bd23c25..2ddffbf16b7c4 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -7,12 +7,15 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + algoliasearch (1.26.1) + httpclient (~> 2.8, >= 2.8.3) + json (>= 1.5.1) atomos (0.1.3) - claide (1.0.2) - cocoapods (1.7.5) + claide (1.0.3) + cocoapods (1.8.0.beta.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.5) + cocoapods-core (= 1.8.0.beta.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -27,9 +30,10 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.10.0, < 2.0) - cocoapods-core (1.7.5) + xcodeproj (>= 1.11.1, < 2.0) + cocoapods-core (1.8.0.beta.1) activesupport (>= 4.0.2, < 6) + algoliasearch (~> 1.0) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -48,8 +52,10 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) + httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) + json (2.2.0) minitest (5.11.3) molinillo (0.6.6) nanaimo (0.2.6) @@ -59,7 +65,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.11.0) + xcodeproj (1.12.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index 7ae6e50de99fe..baa4748fb9461 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -10,6 +10,17 @@ }; version = "4.2.11.1"; }; + algoliasearch = { + dependencies = ["httpclient" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vlasxdgz49y75p8vjkbdpb4kmc73xv71d7vpn9x9xjgvsar03kp"; + type = "gem"; + }; + version = "1.26.1"; + }; atomos = { groups = ["default"]; platforms = []; @@ -35,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + sha256 = "0kasxsms24fgcdsq680nz99d5lazl9rmz1qkil2y5gbbssx89g0z"; type = "gem"; }; - version = "1.0.2"; + version = "1.0.3"; }; cocoapods = { dependencies = ["activesupport" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-stats" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; @@ -46,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02gnm6l7f3pxmy7bqns0dhxmanlqp01hkpvng5cxryww17zrq2qz"; + sha256 = "1gs9ybf1zbajhsn591dwh2papj0bs1dzbnw8shbsm4mfqz976y54"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.0.beta.1"; }; cocoapods-core = { - dependencies = ["activesupport" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "fuzzy_match" "nap"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i53x5lhlvyirls2ch45x9wsrfqk7s3zp85lbnwps9abimxj4nh4"; + sha256 = "02c0415b7iridf0gypajm4i3vqpq8zs6vx8bw49rm70l554jp14j"; type = "gem"; }; - version = "1.7.5"; + version = "1.8.0.beta.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -194,6 +205,16 @@ }; version = "1.1.3"; }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; i18n = { dependencies = ["concurrent-ruby"]; groups = ["default"]; @@ -205,6 +226,16 @@ }; version = "0.9.5"; }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx"; + type = "gem"; + }; + version = "2.2.0"; + }; minitest = { groups = ["default"]; platforms = []; @@ -292,9 +323,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h73ilwyjwyyhj761an3pmicllw50514gxb6b1r4z4klc9rzxw4j"; + sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.0"; }; } \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 4bc9b7f8629e6..1287c9b80b578 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchFromGitHub, buildOcaml, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server +{ stdenv, fetchFromGitHub, ocaml, findlib, ocsigen-toolkit, eliom, ocaml_pcre, pgocaml, macaque, safepass, yojson, ocsigen_deriving, ocsigen_server , js_of_ocaml-camlp4 , resource-pooling }: -buildOcaml rec -{ - name = "ocsigen-start"; - version = "1.5.0"; +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-ocsigen-start-${version}"; + version = "1.8.0"; - buildInputs = [ eliom js_of_ocaml-camlp4 ]; + buildInputs = [ ocaml findlib eliom js_of_ocaml-camlp4 ]; propagatedBuildInputs = [ pgocaml macaque safepass ocaml_pcre ocsigen-toolkit yojson ocsigen_deriving ocsigen_server resource-pooling ]; patches = [ ./templates-dir.patch ]; @@ -16,12 +15,14 @@ buildOcaml rec postPatch = '' substituteInPlace "src/os_db.ml" --replace "citext" "text" ''; + + createFindlibDestdir = true; src = fetchFromGitHub { owner = "ocsigen"; - repo = name; + repo = "ocsigen-start"; rev = version; - sha256 = "07478hz5jhxb242hfr808516k81vdbzj4j6cycvls3b9lzbyszha"; + sha256 = "0h5gp06vxy6jpppz1x840gyf9viiy7lic7spx7fxldpy2jpv058s"; }; meta = { @@ -31,6 +32,7 @@ buildOcaml rec An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. ''; license = stdenv.lib.licenses.lgpl21; + inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; }; diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 4e46c1534d803..6c9e72f95d750 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "ocsigen-toolkit"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "2.0.0"; + version = "2.2.0"; propagatedBuildInputs = [ calendar eliom js_of_ocaml-ppx_deriving_json ]; buildInputs = [ ocaml findlib opaline ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "ocsigen"; repo = pname; rev = version; - sha256 = "0gkiqw3xi31l9q9h89fnr5gfmxi9w9lg9rlv16h4ssjgrgq3y5cw"; + sha256 = "0qy6501jf81qcmkbicgrb1x4pxsjkhr40plwdn09w37d8vx9va3s"; }; createFindlibDestdir = true; diff --git a/pkgs/development/python-modules/capstone/default.nix b/pkgs/development/python-modules/capstone/default.nix index 91e00ed7e43cf..2bd22ebf0d9b2 100644 --- a/pkgs/development/python-modules/capstone/default.nix +++ b/pkgs/development/python-modules/capstone/default.nix @@ -6,11 +6,15 @@ buildPythonPackage rec { pname = "capstone"; - version = "3.0.4"; + version = "3.0.5.post1"; + + setupPyBuildFlags = [ + "--plat-name x86_64-linux" + ]; src = fetchPypi { inherit pname version; - sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225"; + sha256 = "3c0f73db9f8392f7048c8a244809f154d7c39f354e2167f6c477630aa517ed04"; }; patches = [ diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix new file mode 100644 index 0000000000000..ee7c89d8167d3 --- /dev/null +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchPypi, buildPythonPackage, + wrapt, pytest, tox }: + +buildPythonPackage rec { + pname = "Deprecated"; + version = "1.2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1hcw9y7dvhwg5flk6wy8aa4kkgpvcqq3q4jd53h54586fp7w85d5"; + }; + + postPatch = '' + # odd broken tests, don't appear in GitHub repo + rm tests/demo_classic_usage*.py + ''; + + propagatedBuildInputs = [ wrapt ]; + checkInputs = [ pytest ]; + meta = with stdenv.lib; { + homepage = "https://github.com/tantale/deprecated"; + description = "Python @deprecated decorator to deprecate old python classes, functions or methods"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ tilpner ]; + }; +} diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index a2597b2e6e77f..2a20d61048537 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, requests }: buildPythonPackage rec { @@ -12,10 +13,15 @@ buildPythonPackage rec { sha256 = "f7ce6c06250f694976c3cd4944e3b607b0810b93383839e5b67c7199ce2f0d3d"; }; + propagatedBuildInputs = [ requests ]; + meta = with stdenv.lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; }; + # No tests included + doCheck = false; + } diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix new file mode 100644 index 0000000000000..d5492b3b6414f --- /dev/null +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -0,0 +1,31 @@ +{ buildPythonPackage +, fetchFromGitHub +, lxml +, pillow +, reportlab +, stdenv +}: +buildPythonPackage rec { + pname = "hocr-tools"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "tmbdev"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "14f9hkp7pr677085w8iidwd0la9cjzy3pyj3rdg9b03nz9pc0w6p"; + }; + + # hocr-tools uses a test framework that requires internet access + doCheck = false; + + propagatedBuildInputs = [ pillow lxml reportlab ]; + + meta = with stdenv.lib; { + description = " +Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; + homepage = https://github.com/tmbdev/hocr-tools; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix new file mode 100644 index 0000000000000..7d83d2c4338f2 --- /dev/null +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "kconfiglib"; + version = "10.36.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1qhy4vv1rpgx4r1la14symxv3cpz7klqakn1rqdagwyaqp667g9b"; + }; + + # doesnt work out of the box but might be possible + doCheck = false; + + meta = with lib; { + description = "A flexible Python 2/3 Kconfig implementation and library"; + homepage = https://github.com/ulfalizer/Kconfiglib; + license = licenses.isc; + maintainers = with maintainers; [ teto ]; + }; +} diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix new file mode 100644 index 0000000000000..c2662915b12d3 --- /dev/null +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -0,0 +1,73 @@ +{ attrs +, buildPythonPackage +, defusedxml +, fetchPypi +, hypothesis +, isPy3k +, lxml +, pillow +, pybind11 +, pytest +, pytest-helpers-namespace +, pytest-timeout +, pytest_xdist +, pytestrunner +, python-xmp-toolkit +, python3 +, qpdf +, setuptools-scm-git-archive +, setuptools_scm +, stdenv +}: + +buildPythonPackage rec { + pname = "pikepdf"; + version = "1.1.0"; + disabled = ! isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "14b36r6h3088z2sxp2pqvm171js53hz53mwm1g52iadignjnp0my"; + }; + + buildInputs = [ + pybind11 + qpdf + ]; + + nativeBuildInputs = [ + setuptools-scm-git-archive + setuptools_scm + ]; + + checkInputs = [ + attrs + hypothesis + pillow + pytest + pytest-helpers-namespace + pytest-timeout + pytest_xdist + pytestrunner + python-xmp-toolkit + ]; + + propagatedBuildInputs = [ defusedxml lxml ]; + + postPatch = '' + substituteInPlace requirements/test.txt \ + --replace "pytest >= 3.6.0, < 4.1.0" "pytest >= 4.2.1, < 5" + ''; + + preBuild = '' + HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pikepdf/pikepdf"; + description = "Read and write PDFs with Python, powered by qpdf"; + license = licenses.mpl20; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 98608b20b575f..6b65af073f428 100644 --- a/pkgs/applications/version-management/git-and-tools/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -1,5 +1,18 @@ -{ stdenv, python3Packages }: -with python3Packages; buildPythonApplication rec { +{ lib, fetchPypi, buildPythonApplication, pythonOlder +, aspy-yaml +, cached-property +, cfgv +, futures +, identify +, importlib-metadata +, importlib-resources +, nodeenv +, six +, toml +, virtualenv +}: + +buildPythonApplication rec { pname = "pre-commit"; version = "1.18.1"; @@ -19,13 +32,13 @@ with python3Packages; buildPythonApplication rec { toml virtualenv importlib-metadata - ] ++ stdenv.lib.optional (pythonOlder "3.7") importlib-resources - ++ stdenv.lib.optional (pythonOlder "3.2") futures; + ] ++ lib.optional (pythonOlder "3.7") importlib-resources + ++ lib.optional (pythonOlder "3.2") futures; - # Tests fail due to a missing windll dependency + # slow and impure doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; homepage = https://pre-commit.com/; license = licenses.mit; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index be409e348ea3b..a4e3cada1fc14 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,23 +1,20 @@ { stdenv, fetchFromGitHub -, buildPythonPackage, python-jose, pyjwt }: +, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }: buildPythonPackage rec { pname = "PyGithub"; - version = "1.36"; - name = pname + "-" + version; + version = "1.43.8"; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "0yb74f9hg2vdsy766m850hfb1ss17lbgcdvvklm4qf72w12nxc5w"; + sha256 = "1625v558xga5mwhl9jqmibywy5qafmg1vqrirqz6zfq1la1d22mw"; }; - postPatch = '' - # requires network - echo "" > github/tests/Issue142.py - ''; - propagatedBuildInputs = [ python-jose pyjwt ]; + propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; + doCheck = false; + meta = with stdenv.lib; { homepage = https://github.com/PyGithub/PyGithub; description = "A Python (2 and 3) library to access the GitHub API v3"; diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index ce0df266332e0..559b75eec4122 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -1,31 +1,33 @@ -{ buildPythonPackage, lib, fetchPypi -, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub +, pythonOlder , requests , pytest +, pre-commit }: buildPythonPackage rec { pname = "pylibgen"; - version = "2.0.1"; + version = "2.0.2"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "3c2a82b47cb7225dcf4ecea27081b0185ae4d195499140cdbb9597d914e1ae9e"; + src = fetchFromGitHub { + owner = "joshuarli"; + repo = pname; + rev = "v${version}"; + sha256 = "1a9vhkgnkiwkicr2s287254mrkpnw9jq5r63q820dp3h74ba4kl1"; }; - disabled = !isPy3k; - propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest pre-commit ]; - # no tests in PyPI tarball + # literally every tests does a network call doCheck = false; - meta = { + meta = with lib; { description = "Python interface to Library Genesis"; homepage = https://pypi.org/project/pylibgen/; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.nico202 ]; + license = licenses.mit; + maintainers = [ maintainers.nico202 ]; }; } diff --git a/pkgs/development/tools/profiling/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index a2d98bcf23870..198445177c410 100644 --- a/pkgs/development/tools/profiling/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, fetchFromGitHub }: +{ lib, buildPythonPackage, fetchFromGitHub }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "pyprof2calltree"; version = "1.4.4"; diff --git a/pkgs/development/python-modules/pytest-helpers-namespace/default.nix b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix new file mode 100644 index 0000000000000..a4e0cb809aec2 --- /dev/null +++ b/pkgs/development/python-modules/pytest-helpers-namespace/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, fetchFromGitHub +, pytest +, stdenv +}: + +buildPythonPackage rec { + pname = "pytest-helpers-namespace"; + version = "2019.1.8"; + + src = fetchFromGitHub { + owner = "saltstack"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "0z9f25d2wpf3lnqzmmnrlvl5b1f7kqwjjf4nzs9x2bpf91s5zny1"; + }; + + buildInputs = [ pytest ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + + # The tests fail with newest pytest. They passed with pytest_3, which no longer exists + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/saltstack/pytest-helpers-namespace"; + description = "PyTest Helpers Namespace"; + license = licenses.asl20; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix new file mode 100644 index 0000000000000..93fa36fa2fcfc --- /dev/null +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -0,0 +1,44 @@ +{ buildPythonPackage +, exempi +, fetchFromGitHub +, mock +, pythonOlder +, pytz +, stdenv +}: + +buildPythonPackage rec { + pname = "python-xmp-toolkit"; + version = "2.0.2"; + + # PyPi has version 2.0.1; the tests fail + # There are commits for a 2.0.2 release that was never published + # Not to github, not to PyPi + # This is the latest commit from Jun 29, 2017 (as of Mar 13, 2019) + # It includes the commits for the unreleased version 2.0.2 and more + # Tests pass with this version + src = fetchFromGitHub { + owner = "python-xmp-toolkit"; + repo = "python-xmp-toolkit"; + rev = "5692bdf8dac3581a0d5fb3c5aeb29be0ab6a54fc"; + sha256 = "16bylcm183ilzp7mrpdzw0pzp6csv9v5v247914qsv2abg0hgl5y"; + }; + + buildInputs = [ exempi ]; + + checkInputs = stdenv.lib.optionals (pythonOlder "3.3") [ mock ]; + + propagatedBuildInputs = [ pytz ]; + + postPatch = '' + substituteInPlace libxmp/exempi.py \ + --replace "ctypes.util.find_library('exempi')" "'${exempi}/lib/libexempi${stdenv.hostPlatform.extensions.sharedLibrary}'" + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/python-xmp-toolkit/python-xmp-toolkit; + description = "Python XMP Toolkit for working with metadata"; + license = licenses.bsd3; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix new file mode 100644 index 0000000000000..1b3b271fb61f6 --- /dev/null +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -0,0 +1,53 @@ +{ gevent +, buildPythonPackage +, fetchFromGitHub +, hostname +, pytest +, python +, stdenv +}: + +buildPythonPackage rec { + pname = "ruffus"; + version = "2.8.1"; + + src = fetchFromGitHub { + owner = "cgat-developers"; + repo = "${pname}"; + rev = "v${version}"; + sha256 = "1gyabqafq4s2sy0prh3k1m8859shzjmfxr7fimx10liflvki96a9"; + }; + + propagatedBuildInputs = [ gevent ]; + + postPatch = '' + sed -i -e 's|/bin/bash|${stdenv.shell}|' ruffus/test/Makefile + sed -i -e 's|\tpytest|\t${pytest}/bin/pytest|' ruffus/test/Makefile + sed -i -e 's|\tpython|\t${python.interpreter}|' ruffus/test/Makefile + sed -i -e 's|/usr/bin/env bash|${stdenv.shell}|' ruffus/test/run_all_unit_tests.cmd + sed -i -e 's|python3|${python.interpreter}|' ruffus/test/run_all_unit_tests3.cmd + sed -i -e 's|python %s|${python.interpreter} %s|' ruffus/test/test_drmaa_wrapper_run_job_locally.py + ''; + + makefile = "ruffus/test/Makefile"; + + checkInputs = [ + gevent + hostname + pytest + ]; + + checkPhase = '' + export HOME=$TMPDIR + cd ruffus/test + make all PYTEST_OPTIONS="-q --disable-warnings" + ''; + + meta = with stdenv.lib; { + description = "Light-weight Python Computational Pipeline Management"; + homepage = http://www.ruffus.org.uk; + license = licenses.mit; + maintainers = [ maintainers.kiwi ]; + }; +} + diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 9e80830f43802..abd4854c73fd8 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -1,18 +1,20 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , stdenv , pytest }: buildPythonPackage rec { pname = "simplejson"; - version = "3.16.0"; + version = "3.16.1"; doCheck = !stdenv.isDarwin; - src = fetchPypi { - inherit pname version; - sha256 = "b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1v80dbk3ajhgz7q5cc8k0dd22zj9rrlz838c90l5g3w1i280r1iq"; }; # Package does not need pytest, but its a bit easier debugging. diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix new file mode 100644 index 0000000000000..ec34a451156dc --- /dev/null +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage +, lib +, fetchPypi +}: + +buildPythonPackage rec { + version = "1.0.1"; + pname = "unittest-data-provider"; + + src = fetchPypi { + inherit pname version; + sha256 = "1gn2ka4vqpayx4cpbp8712agqjh3wdpk9smdxnp709ccc2v7zg46"; + }; + + meta = with lib; { + description = "PHPUnit-like @dataprovider decorator for unittest"; + homepage = https://github.com/yourlabs/unittest-data-provider; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index ce15de8678d6b..08644def517dc 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -8,7 +8,7 @@ in { sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; }; scons_latest = mkScons { - version = "3.0.5"; - sha256 = "0gn7fgxvx94bjm4cim29cdz91ar1rmfxk2f39wwgljvdvhinyryz"; + version = "3.1.0"; + sha256 = "0bqkrpk5j6wvlljpdsimazav44y43qkl9mzc4f8ig8nl73blixgk"; }; } diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index c287e40d823a9..851acd17b7ea2 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -1,23 +1,26 @@ { stdenv, fetchFromGitHub , pkgconfig, libftdi , python3, pypy3 -}: -let - pypyCompatible = stdenv.isx86_64; /* pypy3 seems broken on i686 */ - pythonPkg = if pypyCompatible then pypy3 else python3; - pythonInterp = pythonPkg.interpreter; -in +# PyPy yields large improvements in build time and runtime performance, +# and IceStorm isn't intended to be used as a library other than by the +# nextpnr build process (which is also sped up by using PyPy), so we +# use it by default. See 18839e1 for more details. +, usePyPy ? stdenv.isx86_64 /* pypy3 seems broken on i686 */ +}: stdenv.mkDerivation rec { - name = "icestorm-${version}"; - version = "2019.04.16"; + pname = "icestorm"; + version = "2019.08.08"; + + pythonPkg = if usePyPy then pypy3 else python3; + pythonInterp = pythonPkg.interpreter; src = fetchFromGitHub { owner = "cliffordwolf"; repo = "icestorm"; - rev = "d9ea2e15fccebbbce59409b0ae7a1481d78aab86"; - sha256 = "1qa37p7hm7c2ga26xcvsd8xkqrp4hm0w6yh7cvz2q988yjzal5ky"; + rev = "2ccae0d3864fd7268118287a85963c0116745cff"; + sha256 = "1vlk5k7x6c1bjp19niyl0shljj8il94q2brjmda1rwhqxz81g9s7"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index 31e720b13f290..6de69a34b290e 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "cgdb-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://cgdb.me/files/${name}.tar.gz"; - sha256 = "08slzg3702v5nivjhdx2bciqxc5vqcn8pc4i4lsgkcwdcrj94ymz"; + sha256 = "1671gpz5gx5j0zga8xy2x7h33vqh3nij93lbb6dbb366ivjknwmv"; }; buildInputs = [ ncurses readline flex texinfo ]; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 0fb3dfed74455..0424b9012519e 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -2,10 +2,11 @@ }: stdenv.mkDerivation rec { - name = "libtool-2.4.6"; + pname = "libtool"; + version = "2.4.6"; src = fetchurl { - url = "mirror://gnu/libtool/${name}.tar.gz"; + url = "mirror://gnu/libtool/${pname}-${version}.tar.gz"; sha256 = "1qq61k6lp1fp75xs398yzi6wvbx232l7xbyn3p13cnh27mflvgg3"; }; @@ -23,13 +24,14 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = false; + enableParallelBuilding = true; + # Don't run the native `strip' when cross-compiling. This breaks at least # with `.a' files for MinGW. dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; - meta = { + meta = with stdenv.lib; { description = "GNU Libtool, a generic library support script"; - longDescription = '' GNU libtool is a generic library support script. Libtool hides the complexity of using shared libraries behind a consistent, @@ -39,12 +41,9 @@ stdenv.mkDerivation rec { your Makefile, Makefile.in, or Makefile.am. See the documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; - - license = stdenv.lib.licenses.gpl2Plus; - + license = licenses.gpl2Plus; maintainers = [ ]; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index a348e295933ef..0888130c2d454 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -7,22 +7,22 @@ let boostWithPython3 = boost.override { python = python3; enablePython = true; }; in stdenv.mkDerivation rec { - name = "trellis-${version}"; - version = "2019.04.22"; + pname = "trellis"; + version = "2019.08.09"; srcs = [ (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis"; - rev = "5eb0ad870f30422b95d090ac9a476343809c62b9"; - sha256 = "10jkjfhqdr2bff41mh3w8a7kszf2whqqgk5s1z5z07mlh6zfdjlg"; + rev = "a67379179985bb12a611c75d975548cdf6e7d12e"; + sha256 = "0vqwfsblf7ylz0jnnf532kap5s1d1zcvbavxmb6a4v32b9xfdv35"; name = "trellis"; }) (fetchFromGitHub { owner = "symbiflow"; repo = "prjtrellis-db"; - rev = "d0b219af41ae3da6150645fbc5cc5613b530603f"; - sha256 = "1mnzvrqrcbfypvbagwyf6arv3kmj6q7n27gcmyk6ap2xnavkx4bq"; + rev = "b4d626b6402c131e9a035470ffe4cf33ccbe7986"; + sha256 = "0k26lq6c049ja8hhqcljwjb1y5k4gcici23l2n86gyp83jr03ilx"; name = "database"; }) ]; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 4bdfc87d8da71..435329bdc4ab4 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, autoreconfHook, ncurses5 }: stdenv.mkDerivation rec { - version = "4.1.3"; + version = "4.2.0"; name = "angband-${version}"; src = fetchFromGitHub { owner = "angband"; repo = "angband"; rev = version; - sha256 = "0g9m7pq8a1hzhr83v552hfk37qc868lms2mlsq29pbi8vxdjybk7"; + sha256 = "0fr59986swx9a2xkxkbfgadzpwy2lq55fgcib05k393kibyz49kg"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index fd7b208fc9621..b8e9dd2d9609a 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-08-02"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "dd1e1025b8a9b13cb7966bf2baa3e6b42a862857"; - sha256 = "0rgfsnx4dbigbc17r3ksvikmdkyfz3fl4g78nd31lxhsn3x5akcj"; + rev = "28c93ab1854ef41a46855401cc4addbaf7dfb9d4"; + sha256 = "12kfvnycdf4sshajhzj3b5l92zbdgvnj1sdzfj7mc77d0k4mzskq"; }; }; @@ -391,12 +391,12 @@ let coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2019-08-01"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "999865c6bd3745689d1eb4009b9b706cb5a68617"; - sha256 = "0sq9im0bbbpsjcf22frn24rb5apxf3sravqhlvwkh34wh9qjvzgy"; + rev = "2c502ceec9816259350969970e76402c984ac4f9"; + sha256 = "1ic62ba9w4diajd1d65xpqxkb3kjpp3d09p1n7pv8341w015zcf9"; }; }; @@ -799,12 +799,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-08-04"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "fb56c2ca2ff655c4d82e000e13e233629894caac"; - sha256 = "1bwcm7smvfpllbkxb512ys9gjc5gin7v75jkys7q0xq0xb73d1hn"; + rev = "c263e50e03e62dc15fc912fd9eaca75752d33fd0"; + sha256 = "19avsx03wv3piq6c1x105na08f90c0p24rz8x59c2yv0p1gdm74n"; }; }; @@ -912,12 +912,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-08-11"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "153e242b07cfe5d67cd217eda3163730046de88b"; - sha256 = "08slqd2kcy94xs669y8rbyz8xz72zn4rasa0yyk3i7yp8w4awgp8"; + rev = "bb2b16309b94695a3344c713282368b3329a2412"; + sha256 = "0dbph7p921ibh2nyfansj5pzqw98vh1w4m9kv04n3wwyygzym5q9"; }; }; @@ -1024,12 +1024,12 @@ let falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2019-08-01"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "370f7efa1ce15d4d8fa62b2b00ea60bebd11ef73"; - sha256 = "0i5vjxwrmj0amf8dbr6slq91gg2rkvdw8gwam7qaf7n6d874qxbn"; + rev = "d642592f062c5e4d195e627ac4104d4e0355a125"; + sha256 = "053kgsgsqnazzzignfvmgca46gm8z75alq7hsix4lvj3hrmx9lac"; }; }; @@ -1057,12 +1057,12 @@ let ferret = buildVimPluginFrom2Nix { pname = "ferret"; - version = "2019-06-12"; + version = "2019-08-13"; src = fetchFromGitHub { owner = "wincent"; repo = "ferret"; - rev = "f6d7d01de8a92baee83218001c0bdbade8458a72"; - sha256 = "1zsh7yc2mv1hv6gj7bhzbx4qqmasc32sxsdlh4sz95nxsfnk28dr"; + rev = "aeb47b01b36021aaf84ff4f7f1a4cf64bc68fe53"; + sha256 = "1cssvdpkmrlby50p2lyqfz1jhp5igyv1bqd34588p3ivsd3hrhyy"; }; }; @@ -1366,12 +1366,12 @@ let jedi-vim = buildVimPluginFrom2Nix { pname = "jedi-vim"; - version = "2019-07-13"; + version = "2019-08-11"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "b9f83175951654256cff41737841b4abc0c9266d"; - sha256 = "0w24zqs1026khdzr7v283yx9yc3sp5rw4kzsjwalclg5xnyy55c0"; + rev = "b3d715c5fccddbae95c0f8b5485e98c7b8143827"; + sha256 = "0hf6k5nabhfaqgf76962hdihpvja93fahz6psf98q2xrz09c7i86"; fetchSubmodules = true; }; }; @@ -1488,12 +1488,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-08-06"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "f5039419d87b76accee7000319b394ce25a0dbfb"; - sha256 = "0cfjw1jpddw92jz62ly8m6waxknj19cazff01x8drk1lr9xj6wdy"; + rev = "09c61dc3f650eccd2c165c36db8330496321aa50"; + sha256 = "14g79s9pn8bb50kwd50sw8knss5mgq8iihxa2bwkjr55jj5ghkwb"; }; }; @@ -1708,12 +1708,12 @@ let neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-08-10"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "neomake"; repo = "neomake"; - rev = "ebfb1f5a24f39561b0299ffe4d346582a6e2432d"; - sha256 = "0yjd3h36zd5g4m0ldijx0p75hlf2dq69y38ilwpm2zp8rqhqgmaw"; + rev = "cad94240c8284ab3502c62acc18e420ca22107de"; + sha256 = "12i0qwckg7fl5gim7k20kvd1xcqspws994nq5b8nn08ljw01dcfq"; }; }; @@ -1906,12 +1906,12 @@ let onehalf = buildVimPluginFrom2Nix { pname = "onehalf"; - version = "2019-06-26"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "sonph"; repo = "onehalf"; - rev = "408104a30ae4f220096e591350a72e60cc15f9b3"; - sha256 = "0jyf8cri6d1s4pragarz02ma8kvxphlblp4i70f12z1yiazykzh2"; + rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e"; + sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql"; }; }; @@ -2148,12 +2148,12 @@ let rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2019-08-01"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "772eaa6a991d2a0f53844f241a6af3bc1ab1fc50"; - sha256 = "1794yvladda6wz574qn0cv3giainqssl864vhh16aigjjaqy76nf"; + rev = "a49b1473eca309e5f5cf2486100d9efe23a6e4ff"; + sha256 = "0m6rryyg3mka2h9j9v8sm1zm8cqwmvix38aa1p114w2vrpfxbs0x"; }; }; @@ -2225,12 +2225,12 @@ let SpaceCamp = buildVimPluginFrom2Nix { pname = "SpaceCamp"; - version = "2019-06-26"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "jaredgorski"; repo = "SpaceCamp"; - rev = "f0c31ff9e0b5359c43cfd33820f2b4790d94b1d8"; - sha256 = "08kbcmqjr383sh8h7p1fwav72lvncx78c0zq0b72prbvfw8pfq5c"; + rev = "9f7bee325f32db1ee509b82e5144df522fa2aca2"; + sha256 = "1i9kyipnd7fkv7vdlwpsb44h0yzvf0rjrwrj09w8bj2lqmcv8yjp"; }; }; @@ -2874,12 +2874,12 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2019-01-30"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "9a555405baaccc3fa4cad2fc6c627eb43f3be939"; - sha256 = "15kzi9b30l6xhz71r376w3vgml7g4vpi046ff9fvl1i6vi4ny78f"; + rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; + sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; }; }; @@ -2962,12 +2962,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2019-06-16"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "0de948ca411c65ee1d07be84ee406e38f7a725d8"; - sha256 = "1cyvj1q94frnii1mcx1f1dhl5z38ppmly6wjgz71hs1w5qdy12qh"; + rev = "18f47c3ac563b60f71103b1e1d29b349ff9d8549"; + sha256 = "0z36jjj1bxb4xz9lyjrbv769797g3x475ncamflfj6yj72vvhfy4"; }; }; @@ -3204,12 +3204,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-07-22"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "46a68476fc7b4f454c829d83d21997b82ac66f76"; - sha256 = "1fyi39s211cw2db7zb5a5jy2r18h5azpkiij52ba6asxk7n5dghs"; + rev = "1b7f422a1e6b0693032e54a14277a2aa2ec437f5"; + sha256 = "0v7gmqk5i6l49lz5r6v783qrc2fw5afchgllqc25jmlbr0bhd8fm"; }; }; @@ -3248,12 +3248,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-08-09"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "c4f084bc36bbb7b2ab4216d87f1cce644d278dc7"; - sha256 = "1c3vfpq7d3fibjz748sracfbxg6xp28c2y5780cc1jkph5z7wvvj"; + rev = "8712a165da4d1de9fb6ae918322ece843ac742e0"; + sha256 = "0yjljc01dk75q6rhr3kwa8lhr9ymya0i4bwvsvr09kz7dgsqf5s7"; }; }; @@ -3314,12 +3314,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-08-11"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "4daa0c558ceb14223c6c6861063ef0ae9a35233b"; - sha256 = "13m30hl6syha9pkr58w23sch89m2nd9cgxbdnkkcqvbzlq202nfh"; + rev = "442d56e23cd75a336b28cf5e46bf0def8c65dff5"; + sha256 = "0viijvsds2a6l34bjca3yrsizmips1l8g2hcqd1v7v2bqhf4jsqh"; }; }; @@ -3358,12 +3358,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-08-10"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "9bf988bd1d2d8001f84126d8bf74036bab33bb9b"; - sha256 = "0ksz7k29nzs00apnimp2r3hqjamdhcpr9h241hcagil3dqraqi5d"; + rev = "46f15ed42ad987b003ef5e81ec114c748c73ea89"; + sha256 = "0lr3i22b949d64d2l1gvlgb3hzmhhvkdjjz7nqr5bda0pj3rxhzw"; }; }; @@ -3391,12 +3391,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-08-09"; + version = "2019-08-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "ed63c87496c030d436507c4eb211a923aa5dc90b"; - sha256 = "0vxqx343wgc9dr9s7jx33hai7ib8cqlfqfpwbmv7zq83x5ff0sh6"; + rev = "007b69c27b63fbcbe2e0766073b09281274b0231"; + sha256 = "14klcx69p5ngl3qvanc0l23ind2hsgzj917a80a6lvs78h4mwp7w"; }; }; @@ -3644,12 +3644,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-07-08"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "7cc6baebaf0065fd8c31cc9216c87bfa543eb71a"; - sha256 = "0d905n5v4c8vifp229lijrylq6ajlsmxkl1w603nzkappw8kky1s"; + rev = "b6c8c8419240bdd29b5eb51a47d488fd390deed5"; + sha256 = "0p56av0zmig4rpsq4w4armnccyd713xdm5lwrck3cip55c39382f"; }; }; @@ -3843,23 +3843,23 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-08-10"; + version = "2019-08-13"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "329d894f941945287e9797c42e6125838c8a2ac0"; - sha256 = "1cv1mgdc4i68kvbh1z090vj29yl2axqfnnlizikbf1z68s2ghnvr"; + rev = "6583613e4cf1842e6e273893bb0275d2e90ea27a"; + sha256 = "1wmzr31y9c0sj2bfq1l2a5dny6l7s74q0dfp6b0ajw9i6q5nbv25"; }; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2019-01-24"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "ec7a094e602babc2e0d43dc5fa5411e46e3bd70c"; - sha256 = "1377wqzrsvwvmzb91a6fm5ma2hnnlas0wgia5bk62a8f1rsgyfgc"; + rev = "ed4357d2caf1d04bd229a24191098759f94b2e25"; + sha256 = "0zz048nbp2dc361g7zr3qdn1n506ym82d6igaz0qv37ani85fq6v"; }; }; @@ -4107,12 +4107,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2019-07-16"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "226d6abeb2f02bcd8f5b11288543259fa2e02962"; - sha256 = "1iy0qj7wjbhp7byann4qyww5cyqrb9hsb1wm1j4ihzgrv1yw1qx3"; + rev = "307b0f244d99408decda3a98f58e864d49626818"; + sha256 = "1fbiasm3w4ww4qdyaphk1xl9phqjxl12fsapza084ix48lhfh5pw"; }; }; @@ -4327,12 +4327,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-08-09"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "2673d732dd329b012b1f319de8ba289dbf5a281e"; - sha256 = "0qmf32yi6kk8y020qgi2g7xw3c7kxh0i58r5y3mfwya9f4lqm43r"; + rev = "ffab0c9d71bf33529b3dd52783b45652e8b500ad"; + sha256 = "1d8z1nnnsyxh0sm248nzjc169vfx8650b7bg9g60k8v9knkgajyc"; }; }; @@ -4448,12 +4448,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-08-07"; + version = "2019-08-15"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "2486ab67bc5a84414ec8792f5ce7aaf04a91138c"; - sha256 = "1wpk9xflhj2cklfk9ac6dpp436gizl6la8877d8ra19774zgw0k1"; + rev = "d7849587e5cf36ea4858fe2aab4f7b5faff76d33"; + sha256 = "11nsz9g3m95av5andi1ry0aqq6s9k7jn1sk7m1djnqqqs46vzpmr"; }; }; @@ -4547,12 +4547,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-07-12"; + version = "2019-08-16"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "6781cc1dbfec16efc7a67bf8f8c118898664da11"; - sha256 = "0iqbb5ycl33q0542gj7kr3dyalvha59y0dyyzymzs5lqa1q0y7in"; + rev = "4729346c46c34ce03d6e12b39727d85cdfcec44b"; + sha256 = "1aazaydi9136i4b5pq9jd4ccrgcx72gyra7ja05igmszkhcznlq9"; }; }; @@ -4855,12 +4855,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-08-09"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "d01f136c068451ef99795ceb15d285d362bec61b"; - sha256 = "06hqzw63mijiqadczaf2x3sy117hlzil16la1w6ynf6d37hr1zq1"; + rev = "866699bdae3696130159e7115954c64de8e7bdcd"; + sha256 = "0302k0ss9drp37dzs123w6y1p16vxgmwn06z86x837n02xzpwwzq"; }; }; @@ -4899,12 +4899,12 @@ let vundle = buildVimPluginFrom2Nix { pname = "vundle"; - version = "2018-02-03"; + version = "2019-08-17"; src = fetchFromGitHub { owner = "gmarik"; repo = "vundle"; - rev = "9a38216a1c0c597f978d73547d37681fc689c90d"; - sha256 = "1695glma8zf2lnp0w713sdvwqagf1s127p4i60114nk6gx5g5x2c"; + rev = "b255382d6242d7ea3877bf059d2934125e0c4d95"; + sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6"; }; }; @@ -5055,12 +5055,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-08-03"; + version = "2019-08-14"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "5ef469df4f663a81e983f5ee4dce9b50b8a612af"; - sha256 = "0bmcc051n9jhzggsi1mwcmlsg5qhhzycvsrziladl7xg22nv8w5m"; + rev = "defc660d235152e82271a48bd89bfcc9fa58b432"; + sha256 = "0x6yaiwc3nnyxcrjfdllhx3s7kfspy5ggm3crhd2s81gq9lrxc3q"; }; }; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index cb240ba16953b..1f24f4182de23 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2019.2"; + ver = "2019.3"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "https://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "1whbi39sx3gz91yvynr7vmnc2l9lcvyynjbd3d9wg6bsm7lz0mmn"; + sha256 = "0rj7vyir4m63b69fgrz06mqlw7nivjfc8mdv19l02xs9vqh7khx4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix index dc704dc167e01..01e70fbb0407d 100644 --- a/pkgs/os-specific/linux/checksec/default.nix +++ b/pkgs/os-specific/linux/checksec/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "checksec"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec.sh"; rev = version; - sha256 = "04lzwm24d576h425rgvgjj2wim29i3961jrj35r43wrswmrsc3r2"; + sha256 = "00s4qg4h9s9vi46jyw7lz36lb5i8h3s9cmicnngp17764xgkr916"; }; patches = [ ./0001-attempt-to-modprobe-config-before-checking-kernel.patch ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 1af37c2168d11..298f5e30d0188 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -68,13 +68,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "conky-${version}"; - version = "1.11.3"; + version = "1.11.5"; src = fetchFromGitHub { owner = "brndnmtthws"; repo = "conky"; rev = "v${version}"; - sha256 = "0pdl31xvmy8niagzqx9sd2b6hc6lzwfiaz66m4djf1gz9bksc8qv"; + sha256 = "1a75ss48mn9pknrxy33dh5rdgm67a5kpddsyqfhlcn1761kfzzyp"; }; postPatch = '' diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 4e0202cebf31d..5aa9e9b43da6d 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, groff, system-sendmail }: +{ stdenv, utillinux, coreutils, fetchurl, groff, system-sendmail }: stdenv.mkDerivation rec { name = "mdadm-4.1"; @@ -8,26 +8,37 @@ stdenv.mkDerivation rec { sha256 = "0jjgjgqijpdp7ijh8slzzjjw690kydb1jjadf0x5ilq85628hxmb"; }; - # This is to avoid self-references, which causes the initrd to explode - # in size and in turn prevents mdraid systems from booting. - allowedReferences = [ stdenv.cc.libc.out system-sendmail ]; - patches = [ ./no-self-references.patch ]; makeFlags = [ - "NIXOS=1" "INSTALL=install" "INSTALL_BINDIR=$(out)/sbin" + "NIXOS=1" "INSTALL=install" "BINDIR=$(out)/sbin" + "SYSTEMD_DIR=$(out)/lib/systemd/system" "MANDIR=$(out)/share/man" "RUN_DIR=/dev/.mdadm" "STRIP=" ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CROSS_COMPILE=${stdenv.cc.targetPrefix}" ]; + installFlags = [ "install-systemd" ]; + + enableParallelBuilding = true; + nativeBuildInputs = [ groff ]; - preConfigure = '' + postPatch = '' sed -e 's@/lib/udev@''${out}/lib/udev@' \ -e 's@ -Werror @ @' \ -e 's@/usr/sbin/sendmail@${system-sendmail}@' -i Makefile + sed -i \ + -e 's@/usr/bin/basename@${coreutils}/bin/basename@g' \ + -e 's@BINDIR/blkid@${utillinux}/bin/blkid@g' \ + *.rules + ''; + + # This is to avoid self-references, which causes the initrd to explode + # in size and in turn prevents mdraid systems from booting. + postFixup = '' + grep -r $out $out/bin && false || true ''; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 4bf1e41bd57bd..76257f94fe76a 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,18 +1,22 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "nvme-cli-${version}"; - version = "1.8.1"; + pname = "nvme-cli"; + version = "1.9"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0agnxfcwgnnimmxrdpg4lmiqc5ai9b4amk8krriw01lflxi3xzn0"; + sha256 = "08x0x7nq8v7gr8a4lrrhclkz6n8fxlhhizxl2nz56w1xmfghcnfv"; }; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + # To omit the hostnqn and hostid files that are impure and should be unique + # for each target host: + installTargets = "install-spec"; + meta = with lib; { inherit (src.meta) homepage; description = "NVM-Express user space tooling for Linux"; diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 39aa855e3cc50..b7f1af618feb8 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "aa4c4d39d75ce52664cb28d569b1ceafda7b4c06"; - sha256 = "1ax94gzbdwdcf3wgj7f9cabdkvn2zynnnli7gkbz4isidlpis86g"; + rev = "5fb35fbc783516e2014115c3488134a2afb8494c"; + sha256 = "0pyjvzzh8nnxv4z58n82lz1mjnzv44sylcjgkvw8sp35vx1ryxfh"; }; outputs = [ "out" "lib" "man" "dev" ]; diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index ac44dbbf04d16..d94f34ebd21fc 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -1,17 +1,35 @@ { lib, python3Packages }: -python3Packages.buildPythonApplication rec { +with python3Packages; +buildPythonApplication rec { pname = "doh-proxy"; - version = "0.0.8"; + version = "0.0.9"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0mfl84mcklby6cnsw29kpcxj7mh1cx5yw6mjs4sidr1psyni7x6c"; + sha256 = "1fxzxipzdvk75yrcr78mpdz8lwpisba67lk4jcwxdnkv6997dwfp"; }; - propagatedBuildInputs = with python3Packages; - [ aioh2 dnspython aiohttp-remotes pytestrunner flake8 ]; - doCheck = false; # Trouble packaging unittest-data-provider + nativeBuildInputs = [ pytestrunner flake8]; + + propagatedBuildInputs = [ + aioh2 + dnspython + aiohttp-remotes + ]; + + checkInputs = [ + asynctest + unittest-data-provider + pytest + pytestcov + pytest-aiohttp + ]; + + # attempts to resolve address + checkPhase = '' + pytest -k 'not servers' + ''; meta = with lib; { homepage = https://facebookexperimental.github.io/doh-proxy/; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 75d12a5f66fe1..33b7674cf9e52 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit -, sqlite, expat, mp4v2, flac, spidermonkey_1_8_5, taglib, libexif, curl, ffmpeg, file +, sqlite, expat, mp4v2, flac, spidermonkey, taglib, libexif, curl, ffmpeg, file , pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1mimslr4q6mky865y6561rr64cbn4gf0qc2dhgb31hxp4rc1kmzd"; }; - buildInputs = [ sqlite expat spidermonkey_1_8_5 taglib libexif curl ffmpeg file mp4v2 flac + buildInputs = [ sqlite expat spidermonkey taglib libexif curl ffmpeg file mp4v2 flac pkgconfig autoreconfHook ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index d0ce73f5410f7..a7fb0b3b3a779 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "airsonic-${version}"; - version = "10.3.1"; + version = "10.4.0"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "15y56h7zy94408605cchvf2fqg3aicylpzgd1g8fxyl42h216816"; + sha256 = "1m4l10hp5m010ljsvn2ba4bbh8i26d04xffw81gfgjw08gya2hh8"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 2062dc6659f84..48b72dc0590d1 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -63,7 +63,10 @@ in mkdir -p $out/share/zabbix/database/ '' + optionalString sqliteSupport '' mkdir -p $out/share/zabbix/database/sqlite3 - cp -prvd database/sqlite3/*.sql $out/share/zabbix/database/sqlite3/ + cp -prvd database/sqlite3/schema.sql $out/share/zabbix/database/sqlite3/ + '' + optionalString mysqlSupport '' + mkdir -p $out/share/zabbix/database/mysql + cp -prvd database/mysql/schema.sql $out/share/zabbix/database/mysql/ '' + optionalString postgresqlSupport '' mkdir -p $out/share/zabbix/database/postgresql cp -prvd database/postgresql/schema.sql $out/share/zabbix/database/postgresql/ diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index 04daa2f4a8554..06cef9cefab7b 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "mosquitto-${version}"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "1xvfcqi6pa5pdnqd88gz9qx6kl2q47xp7l3q5wwgj0l9y9mlxp99"; + sha256 = "1kr1dgc4nzhyg3rzymbv4rka3rpb30rwsy6binb7apnw3n3ff58l"; }; postPatch = '' diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 84d4d04cac75f..94e8519fcc93c 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,14 +8,14 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.16.3.1402-22929c8a2"; + version = "1.16.4.1469-6d5612c2f"; pname = "plexmediaserver"; name = "${pname}-${version}"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0mb5y777mcyn8lv1afyi0xx0afyzjm67ccbbkyhk2j817k9diyg5"; + sha256 = "16ifgqsxgpqyd1m0xmwrrv4cic1yccklv1jlv7fhq8wc6vz9l6lx"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 4ee23e68265f0..c9f0f2b84bbe7 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, pcre, libxslt, groff, ncurses, pkgconfig, readline, libedit -, python3, makeWrapper }: +, python2, python3, makeWrapper }: let - common = { version, sha256, extraBuildInputs ? [] }: + common = { version, sha256, python, extraNativeBuildInputs ? [] }: stdenv.mkDerivation rec { name = "varnish-${version}"; @@ -11,11 +11,12 @@ let inherit sha256; }; - nativeBuildInputs = [ pkgconfig ]; + passthru.python = python; + + nativeBuildInputs = with python.pkgs; [ pkgconfig docutils ] ++ extraNativeBuildInputs; buildInputs = [ - pcre libxslt groff ncurses readline python3 libedit - python3.pkgs.docutils makeWrapper - ] ++ extraBuildInputs; + pcre libxslt groff ncurses readline libedit makeWrapper python + ]; buildFlags = "localstatedir=/var/spool"; @@ -41,14 +42,17 @@ in varnish4 = common { version = "4.1.10"; sha256 = "08kwx0il6cqxsx3897042plh1yxjaanbaqjbspfl0xgvyvxk6j1n"; + python = python2; }; varnish5 = common { version = "5.2.1"; sha256 = "1cqlj12m426c1lak1hr1fx5zcfsjjvka3hfirz47hvy1g2fjqidq"; + python = python2; }; varnish6 = common { version = "6.2.0"; sha256 = "0lwfk2gq99c653h5f51fs3j37r0gh2pf0p4w5z986nm2mi9z6yn3"; - extraBuildInputs = [ python3.pkgs.sphinx ]; + python = python3; + extraNativeBuildInputs = [ python3.pkgs.sphinx ]; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 711bc1cf78f55..b3e86387ee325 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "0.3"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "12a42lbv0vf6fn3qnvngw893kmbd006f8pgab4ir7irc8855xjgf"; }; - nativeBuildInputs = [ pkgconfig docutils autoreconfHook ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils autoreconfHook varnish.python ]; + buildInputs = [ varnish ]; postPatch = '' substituteInPlace Makefile.am --replace "''${LIBVARNISHAPI_DATAROOTDIR}/aclocal" "${varnish.dev}/share/aclocal" ''; diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 7775221d1638b..16c74956db7e7 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, python, docutils, removeReferencesTo }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, varnish, docutils, removeReferencesTo }: stdenv.mkDerivation rec { version = "0.14.0"; @@ -11,8 +11,15 @@ stdenv.mkDerivation rec { sha256 = "17fkbr4i70qgdqsrx1x28ag20xkfyz1v3q3d3ywmv409aczqhm40"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook docutils removeReferencesTo ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ + autoreconfHook + docutils + pkgconfig + removeReferencesTo + varnish.python # use same python version as varnish server + ]; + + buildInputs = [ varnish ]; postPatch = '' substituteInPlace bootstrap --replace "''${dataroot}/aclocal" "${varnish.dev}/share/aclocal" diff --git a/pkgs/servers/varnish/rtstatus.nix b/pkgs/servers/varnish/rtstatus.nix index 99c0bb1765974..c27633a2d333a 100644 --- a/pkgs/servers/varnish/rtstatus.nix +++ b/pkgs/servers/varnish/rtstatus.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, varnish, python, docutils }: +{ stdenv, fetchurl, pkgconfig, varnish, docutils }: stdenv.mkDerivation rec { version = "1.2.0"; @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0hll1aspgpv1daw5sdbn5w1d6birchxgapzb6zi1nhahjlimy4ly"; }; - nativeBuildInputs = [ pkgconfig docutils ]; - buildInputs = [ varnish python ]; + nativeBuildInputs = [ pkgconfig docutils varnish.python ]; + buildInputs = [ varnish ]; configureFlags = [ "VMOD_DIR=$(out)/lib/varnish/vmods" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 1b6c540b3d888..173963135f873 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { name = "ckbcomp-${version}"; - version = "1.192"; + version = "1.193"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "1s570y8qwwy71ag9wgpznrhakps6rmw6j7p05hibns1spn2mxd5x"; + sha256 = "107nl6vpy4036km3gr9z5f3mq1i6x169v0z0a0ywavj3zjqy23rp"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index d0731c1f5996e..68046be2eeea9 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "analog"; - version = "6.0.15"; + version = "6.0.16"; src = fetchFromGitHub { owner = "c-amie"; repo = "analog-ce"; rev = version; - sha256 = "1clrx2xr3n5zh6gaavvdxkc127hayssxrplrd2qvw70givywza0m"; + sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk"; }; configurePhase = '' diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 572c66a01d6af..4bb9dd8857431 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2019.08.02"; + version = "2019.08.11"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "1iz4m86lc4nyf312qk749kgvq60g6x1zn2y70859g16ki16mk8m3"; + sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index dfa28203dbf2b..91809af415a35 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages -, utillinux, asciidoc, makeWrapper }: +, utillinux, asciidoc, asciidoctor, makeWrapper }: stdenv.mkDerivation rec { name = "btrbk-${version}"; - version = "0.28.0"; + version = "0.28.3"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${name}.tar.xz"; - sha256 = "1bqgcbkdd5s3l3ba1ifa9l523r8cr5y3arjdy9f6rmm840kn7xzf"; + sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz"; }; - nativeBuildInputs = [ asciidoc makeWrapper ]; + nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; buildInputs = with perlPackages; [ perl DateCalc ]; diff --git a/pkgs/tools/filesystems/apfs-fuse/default.nix b/pkgs/tools/filesystems/apfs-fuse/default.nix new file mode 100644 index 0000000000000..9ee0b8133260e --- /dev/null +++ b/pkgs/tools/filesystems/apfs-fuse/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, fuse3, bzip2, zlib, attr, cmake }: + +stdenv.mkDerivation rec { + pname = "apfs-fuse-unstable"; + version = "2019-07-23"; + + src = fetchFromGitHub { + owner = "sgan81"; + repo = "apfs-fuse"; + rev = "309ecb030f38edac4c10fa741a004c5eb7a23e15"; + sha256 = "0wq6rlqi00m5dp5gbzy65i1plm40j6nsm7938zvfgx5laal4wzr2"; + fetchSubmodules = true; + }; + + buildInputs = [ fuse3 bzip2 zlib attr ]; + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sgan81/apfs-fuse"; + description = "FUSE driver for APFS (Apple File System)"; + license = licenses.gpl2; + maintainers = with maintainers; [ ealasu ]; + platforms = platforms.linux; + }; + +} diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 5fc614de4a7f2..35e26828176d6 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "19rk2c0xd3mi66kr88ykrcn81fv09c09md0gf6mnm9z1bd7p7wx7"; + sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 168542f57df80..2ef70ca78479d 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; - version = "5.1.1"; + version = "5.2.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "06xybs7rglxjqkbzl2409acb3rgmnc5zc0xhyaxsc2p1x5yipfcw"; + sha256 = "0crjv3i20nyj2dagfw6q7byshscpn6j7wlqch3apkzzzk00lmb1n"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index 00ab4cd75d0c3..5055ce67d3064 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.0.1"; + version = "1.2.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "1i1cnzmb12pxldc7y4q1xdmybv9xkhzrjyhdvmk3qsn02p859q04"; + sha256 = "19dck47v4hd07q9742mgb928h7y1y9638qlh2rzsvqsfqvqmxh85"; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index f15dfc2adba7f..4eb6f302f1b0f 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "chezmoi-${version}"; - version = "1.3.0"; + version = "1.5.5"; goPackagePath = "github.com/twpayne/chezmoi"; @@ -10,13 +10,13 @@ buildGoPackage rec { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0dvdjx5khpw62lprn06k271xfc9fdrw4c1q74vd1vffaz60yfd8d"; + sha256 = "18kc3b2ncjzxivycx3mhqw9kbqp0sxmlgc2ddvhgj2vpvlkayzkh"; }; goDeps = ./deps.nix; buildFlagsArray = [ - "-ldflags=-s -w -X ${goPackagePath}/cmd.version=${version}" + "-ldflags=-s -w -X ${goPackagePath}/cmd.VersionStr=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/chezmoi/deps.nix b/pkgs/tools/misc/chezmoi/deps.nix index 4fb1bd5355289..6641a58931dd1 100644 --- a/pkgs/tools/misc/chezmoi/deps.nix +++ b/pkgs/tools/misc/chezmoi/deps.nix @@ -46,15 +46,6 @@ }; } { - goPackagePath = "github.com/blang/semver"; - fetch = { - type = "git"; - url = "https://github.com/blang/semver"; - rev = "v3.5.1"; - sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; - }; - } - { goPackagePath = "github.com/coreos/etcd"; fetch = { type = "git"; @@ -82,15 +73,6 @@ }; } { - goPackagePath = "github.com/d4l3k/messagediff"; - fetch = { - type = "git"; - url = "https://github.com/d4l3k/messagediff"; - rev = "v1.2.1"; - sha256 = "104hl8x57ciaz7mzafg1vp9qggxcyfm8hsv9bmlihbz9ml3nyr8v"; - }; - } - { goPackagePath = "github.com/danieljoos/wincred"; fetch = { type = "git"; @@ -127,6 +109,33 @@ }; } { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "v25.0.1"; + sha256 = "1wggj64dm73zmav64qfgw8v3pkzxxmlaqrccvs5rf66j0wij9g20"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "v1.0.0"; + sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; + }; + } + { goPackagePath = "github.com/google/renameio"; fetch = { type = "git"; @@ -181,6 +190,24 @@ }; } { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { goPackagePath = "github.com/magiconair/properties"; fetch = { type = "git"; @@ -190,12 +217,12 @@ }; } { - goPackagePath = "github.com/mitchellh/go-homedir"; + goPackagePath = "github.com/mattn/go-isatty"; fetch = { type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.0.0"; - sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -226,12 +253,30 @@ }; } { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { goPackagePath = "github.com/spf13/afero"; fetch = { type = "git"; url = "https://github.com/spf13/afero"; - rev = "v1.1.2"; - sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + rev = "v1.2.2"; + sha256 = "0j9r65qgd58324m85lkl49vk9dgwd62g7dwvkfcm3k6i9dc555a9"; }; } { @@ -284,8 +329,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + rev = "v0.2.0"; + sha256 = "0pcdvakxgddaiwcdj73ra4da05a3q4cgwbpm2w75ycq4kzv8ij8k"; }; } { @@ -293,8 +338,17 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/twpayne/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-difflib"; + rev = "v1.3.0"; + sha256 = "01lidr7brrdv4xqx87n6c2ppyaj8rdf9lqj85qhbbalwy6z34fj8"; }; } { @@ -311,8 +365,17 @@ fetch = { type = "git"; url = "https://github.com/twpayne/go-vfs"; - rev = "v1.0.3"; - sha256 = "138ykzmb4994qwbv3m99536p75804ap15c2drvz6d3k0v95rbw38"; + rev = "v1.0.6"; + sha256 = "0sqjng5qm4s7crq9s1f5y5niq4wss6dizip62zx37iyvws1yngjd"; + }; + } + { + goPackagePath = "github.com/twpayne/go-vfsafero"; + fetch = { + type = "git"; + url = "https://github.com/twpayne/go-vfsafero"; + rev = "v1.0.0"; + sha256 = "18jwxhlrjd06z8xzg9ij0irl4f79jfy5jpwiz6xqlhzb1fja19pw"; }; } { @@ -320,8 +383,8 @@ fetch = { type = "git"; url = "https://github.com/twpayne/go-xdg"; - rev = "v1.0.0"; - sha256 = "06np468cl8bbpal6x0mf8q6jzlkz65rzma5y65n7wfmrg2k7yn72"; + rev = "v3.1.0"; + sha256 = "0j8q7yzixs6jlaad0lpa8hs6b240gm2cmy0yxgnprrbpa0y2r7ln"; }; } { @@ -352,12 +415,48 @@ }; } { + goPackagePath = "go.etcd.io/bbolt"; + fetch = { + type = "git"; + url = "https://github.com/etcd-io/bbolt"; + rev = "4af6cfab7010"; + sha256 = "1zgirl82lph606vw39wj4mvk8bkq2bakvnx49dpq7l5dsdhiydpv"; + }; + } + { goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "505ab145d0a9"; - sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "d8887717615a"; + sha256 = "1wfm6ngxjyj7v5a2dqib6lw8bb2rdnf1kl48diykxjrsddn0s163"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "d2e6202438be"; + sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "e225da77a7e6"; + sha256 = "0bh3583smcfw6jw3w6lp0za93rz7hpxfdz8vhxng75b7a6vdlw4p"; }; } { @@ -365,8 +464,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "a5c9d58dba9a"; - sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; + rev = "10058d7d4faa"; + sha256 = "0y83433yjgsr7057h99g5ayljzlivx2bnkcp01xnzqz8lppv8fql"; }; } { @@ -379,6 +478,15 @@ }; } { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.1.0"; + sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; + }; + } + { goPackagePath = "gopkg.in/check.v1"; fetch = { type = "git"; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index bdb919006fd0d..59ac70a8162fa 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "3.0.2"; + version = "3.1.0"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1xw9fxdb3n9h595sw1imns6g5a5339ppn2plx8qw4ngnkzd9pvhj"; + sha256 = "0zv64cnd5nrn2hgbjmcwjam8dx5y2a7gz5x7xb9kr134132dm0yd"; }; dontBuild = true; diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 5080203d515c8..6b0d5d3387c21 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -26,7 +26,7 @@ GEM mercenary (0.3.6) mini_portile2 (2.4.0) minitest (5.11.3) - nokogiri (1.10.3) + nokogiri (1.10.4) mini_portile2 (~> 2.4.0) parallel (1.17.0) public_suffix (3.1.1) @@ -45,4 +45,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.14.6 + 1.17.2 diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 4777d5d53e6cb..256243f3d5d18 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -1,6 +1,8 @@ { activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "110vp4frgkw3mpzlmshg2f2ig09cknls2w68ym1r1s39d01v0mi8"; @@ -10,6 +12,8 @@ }; addressable = { dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l"; @@ -18,6 +22,8 @@ version = "2.6.0"; }; concurrent-ruby = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; @@ -27,6 +33,8 @@ }; ethon = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; @@ -35,6 +43,8 @@ version = "0.12.0"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; @@ -44,6 +54,8 @@ }; html-proofer = { dependencies = ["activesupport" "addressable" "mercenary" "nokogiri" "parallel" "rainbow" "typhoeus" "yell"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0kpcz7p0yjr1y9fs8gila2bkgb8y6qkyqv5a8yymw0hkvddnqig4"; @@ -53,6 +65,8 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; @@ -61,6 +75,8 @@ version = "1.6.0"; }; mercenary = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "10la0xw82dh5mqab8bl0dk21zld63cqxb1g16fk8cb39ylc4n21a"; @@ -69,6 +85,8 @@ version = "0.3.6"; }; mini_portile2 = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; @@ -77,6 +95,8 @@ version = "2.4.0"; }; minitest = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0icglrhghgwdlnzzp4jf76b0mbc71s80njn5afyfjn4wqji8mqbq"; @@ -86,14 +106,18 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bjydih0j515szfv9mls195cvpyidh6ixm7dwbl3s2sbaxxk5s4"; + sha256 = "0nmdrqqz1gs0fwkgzxjl4wr554gr8dc1fkrqjc2jpsvwgm41rygv"; type = "gem"; }; - version = "1.10.3"; + version = "1.10.4"; }; parallel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1x1gzgjrdlkm1aw0hfpyphsxcx90qgs3y4gmp9km3dvf4hc4qm8r"; @@ -102,6 +126,8 @@ version = "1.17.0"; }; public_suffix = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0g9ds2ffzljl6jjmkjffwxc1z6lh5nkqqmhhkxjk71q5ggv0rkpm"; @@ -110,6 +136,8 @@ version = "3.1.1"; }; rainbow = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -118,6 +146,8 @@ version = "3.0.0"; }; thread_safe = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -127,6 +157,8 @@ }; typhoeus = { dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; @@ -136,6 +168,8 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; @@ -144,6 +178,8 @@ version = "1.2.5"; }; yell = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1394pf8wsv4wx2lf1d9iqqx6lcww9bgmgh9sms3dbga804cns0n8"; diff --git a/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch new file mode 100644 index 0000000000000..9c334436162b5 --- /dev/null +++ b/pkgs/tools/misc/ostree/01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch @@ -0,0 +1,271 @@ +From a9a62d7c7adf6fc0237c7d04937b538a4cea87ad Mon Sep 17 00:00:00 2001 +From: Colin Walters <walters@verbum.org> +Date: Tue, 19 Jun 2018 09:34:18 -0400 +Subject: [PATCH] Drop "ostree trivial-httpd" CLI, move to tests directory + +See https://github.com/ostreedev/ostree/issues/1593 + +Basically this makes it easier for people packaging, as the trivial-httpd +is only for tests, and this way the binary will live with the tests. + +Also at this point nothing should depend on `ostree trivial-httpd`. +--- + Makefile-man.am | 6 -- + Makefile-ostree.am | 7 --- + Makefile-tests.am | 7 +++ + configure.ac | 10 --- + man/ostree-trivial-httpd.xml | 118 ----------------------------------- + src/ostree/main.c | 5 -- + tests/libtest.sh | 13 ++-- + 7 files changed, 12 insertions(+), 154 deletions(-) + delete mode 100644 man/ostree-trivial-httpd.xml + +diff --git a/Makefile-man.am b/Makefile-man.am +index 8ccbba8c..d204aa3e 100644 +--- a/Makefile-man.am ++++ b/Makefile-man.am +@@ -34,12 +34,6 @@ ostree-init.1 ostree-log.1 ostree-ls.1 ostree-prune.1 ostree-pull-local.1 \ + ostree-pull.1 ostree-refs.1 ostree-remote.1 ostree-reset.1 \ + ostree-rev-parse.1 ostree-show.1 ostree-summary.1 \ + ostree-static-delta.1 +-if BUILDOPT_TRIVIAL_HTTPD +-man1_files += ostree-trivial-httpd.1 +-else +-# We still want to distribute the source, even if we are not building it +-EXTRA_DIST += man/ostree-trivial-httpd.xml +-endif + + if BUILDOPT_FUSE + man1_files += rofiles-fuse.1 +diff --git a/Makefile-ostree.am b/Makefile-ostree.am +index 8d352e38..1471b3e5 100644 +--- a/Makefile-ostree.am ++++ b/Makefile-ostree.am +@@ -133,13 +133,6 @@ ostree_SOURCES += src/ostree/ot-builtin-pull.c + endif + + if USE_LIBSOUP +-# Eventually once we stop things from using this, we should support disabling this +-ostree_SOURCES += src/ostree/ot-builtin-trivial-httpd.c +-pkglibexec_PROGRAMS += ostree-trivial-httpd +-ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c +-ostree_trivial_httpd_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_SOUP_CFLAGS) +-ostree_trivial_httpd_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_SOUP_LIBS) +- + if !USE_CURL + # This is necessary for the cookie jar bits + ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS) +diff --git a/Makefile-tests.am b/Makefile-tests.am +index 2c0916f6..b11fde89 100644 +--- a/Makefile-tests.am ++++ b/Makefile-tests.am +@@ -248,6 +248,13 @@ _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-u + tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ + tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h + ++if USE_LIBSOUP ++test_extra_programs += ostree-trivial-httpd ++ostree_trivial_httpd_SOURCES = src/ostree/ostree-trivial-httpd.c ++ostree_trivial_httpd_CFLAGS = $(common_tests_cflags) $(OT_INTERNAL_SOUP_CFLAGS) ++ostree_trivial_httpd_LDADD = $(common_tests_ldadd) $(OT_INTERNAL_SOUP_LIBS) ++endif ++ + if USE_AVAHI + test_programs += tests/test-repo-finder-avahi + endif +diff --git a/configure.ac b/configure.ac +index e6e145db..1e36e6a0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -187,15 +187,6 @@ if test x$with_soup != xno; then OSTREE_FEATURES="$OSTREE_FEATURES libsoup"; fi + AM_CONDITIONAL(USE_LIBSOUP, test x$with_soup != xno) + AM_CONDITIONAL(HAVE_LIBSOUP_CLIENT_CERTS, test x$have_libsoup_client_certs = xyes) + +-AC_ARG_ENABLE(trivial-httpd-cmdline, +- [AS_HELP_STRING([--enable-trivial-httpd-cmdline], +- [Continue to support "ostree trivial-httpd" [default=no]])],, +- enable_trivial_httpd_cmdline=no) +-AM_CONDITIONAL(BUILDOPT_TRIVIAL_HTTPD, test x$enable_trivial_httpd_cmdline = xyes) +-AM_COND_IF(BUILDOPT_TRIVIAL_HTTPD, +- [AC_DEFINE([BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE], 1, [Define if we are enabling ostree trivial-httpd entrypoint])] +-) +- + AS_IF([test x$with_curl = xyes && test x$with_soup = xno], [ + AC_MSG_WARN([Curl enabled, but libsoup is not; libsoup is needed for tests (make check, etc.)]) + ]) +@@ -602,7 +593,6 @@ echo " + Rust (internal oxidation): $rust_debug_release + rofiles-fuse: $enable_rofiles_fuse + HTTP backend: $fetcher_backend +- \"ostree trivial-httpd\": $enable_trivial_httpd_cmdline + SELinux: $with_selinux + cryptographic checksums: $with_crypto + systemd: $have_libsystemd +diff --git a/man/ostree-trivial-httpd.xml b/man/ostree-trivial-httpd.xml +deleted file mode 100644 +index d03c12be..00000000 +--- a/man/ostree-trivial-httpd.xml ++++ /dev/null +@@ -1,118 +0,0 @@ +-<?xml version='1.0'?> <!--*-nxml-*--> +-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" +- "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +- +-<!-- +-Copyright 2011,2013 Colin Walters <walters@verbum.org> +- +-SPDX-License-Identifier: LGPL-2.0+ +- +-This library is free software; you can redistribute it and/or +-modify it under the terms of the GNU Lesser General Public +-License as published by the Free Software Foundation; either +-version 2 of the License, or (at your option) any later version. +- +-This library is distributed in the hope that it will be useful, +-but WITHOUT ANY WARRANTY; without even the implied warranty of +-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-Lesser General Public License for more details. +- +-You should have received a copy of the GNU Lesser General Public +-License along with this library; if not, write to the +-Free Software Foundation, Inc., 59 Temple Place - Suite 330, +-Boston, MA 02111-1307, USA. +---> +- +-<refentry id="ostree"> +- +- <refentryinfo> +- <title>ostree trivial-httpd</title> +- <productname>OSTree</productname> +- +- <authorgroup> +- <author> +- <contrib>Developer</contrib> +- <firstname>Colin</firstname> +- <surname>Walters</surname> +- <email>walters@verbum.org</email> +- </author> +- </authorgroup> +- </refentryinfo> +- +- <refmeta> +- <refentrytitle>ostree trivial-httpd</refentrytitle> +- <manvolnum>1</manvolnum> +- </refmeta> +- +- <refnamediv> +- <refname>ostree-trivial-httpd</refname> +- <refpurpose>Simple webserver</refpurpose> +- </refnamediv> +- +- <refsynopsisdiv> +- <cmdsynopsis> +- <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg> +- </cmdsynopsis> +- </refsynopsisdiv> +- +-<!-- Don't entirely understand this command. Needs details, better content--> +- <refsect1> +- <title>Description</title> +- +- <para> +- This runs a simple webserver and keeps it running until killed. If DIR is not specified, it defaults to the current directory. +- </para> +- </refsect1> +- +- <refsect1> +- <title>Options</title> +- +- <variablelist> +- <varlistentry> +- <term><option>--daemonize</option>,<option>-d</option></term> +- +- <listitem><para> +- Fork into background when ready. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--autoexit</option></term> +- +- <listitem><para> +- Automatically exit when directory is deleted. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--port-file</option>,<option>-p</option>="PATH"</term> +- +- <listitem><para> +- Write port number to PATH (- for standard output). +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--port</option>,<option>-P</option></term> +- +- <listitem><para> +- Use the specified TCP port to listen on. +- </para></listitem> +- </varlistentry> +- +- <varlistentry> +- <term><option>--force-range-requests</option></term> +- +- <listitem><para> +- Force range requests by only serving half of files. +- </para></listitem> +- </varlistentry> +- </variablelist> +- </refsect1> +- +-<!-- NEED EXAMPLE OUTPUT HERE!--> +- <refsect1> +- <title>Example</title> +- <para><command>$ ostree trivial-httpd</command></para> +- </refsect1> +-</refentry> +diff --git a/src/ostree/main.c b/src/ostree/main.c +index c5b45012..6478a62b 100644 +--- a/src/ostree/main.c ++++ b/src/ostree/main.c +@@ -116,11 +116,6 @@ static OstreeCommand commands[] = { + { "summary", OSTREE_BUILTIN_FLAG_NONE, + ostree_builtin_summary, + "Manage summary metadata" }, +-#if defined(HAVE_LIBSOUP) && defined(BUILDOPT_ENABLE_TRIVIAL_HTTPD_CMDLINE) +- { "trivial-httpd", OSTREE_BUILTIN_FLAG_NONE, +- ostree_builtin_trivial_httpd, +- NULL }, +-#endif + { NULL } + }; + +diff --git a/tests/libtest.sh b/tests/libtest.sh +index e0022512..b07dc962 100755 +--- a/tests/libtest.sh ++++ b/tests/libtest.sh +@@ -149,15 +149,12 @@ fi + if test -n "${OSTREE_UNINSTALLED:-}"; then + OSTREE_HTTPD=${OSTREE_UNINSTALLED}/ostree-trivial-httpd + else +- # trivial-httpd is now in $libexecdir by default, which we don't +- # know at this point. Fortunately, libtest.sh is also in +- # $libexecdir, so make an educated guess. If it's not found, assume +- # it's still runnable as "ostree trivial-httpd". +- if [ -x "${test_srcdir}/../../libostree/ostree-trivial-httpd" ]; then +- OSTREE_HTTPD="${CMD_PREFIX} ${test_srcdir}/../../libostree/ostree-trivial-httpd" +- else +- OSTREE_HTTPD="${CMD_PREFIX} ostree trivial-httpd" ++ # trivial-httpd is now the test directory. ++ OSTREE_HTTPD="${G_TEST_BUILDDIR}/ostree-trivial-httpd" ++ if ! [ -x "${OSTREE_HTTPD}" ]; then ++ fatal "Failed to find ${OSTREE_HTTPD}" + fi ++ OSTREE_HTTPD="${CMD_PREFIX} ${OSTREE_HTTPD}" + fi + + files_are_hardlinked() { +-- +2.22.0 + diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 0054e38ed2da6..9f423cf6a4da0 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ostree"; - version = "2019.1"; + version = "2019.2"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "08y7nsxl305dnlfak4kyj88lld848y4kg6bvjqngcxaqqvkk9xqm"; + sha256 = "0nbbrz3p4ms6vpl272q6fimqvizryw2a8mnfqcn69xf03sz5204y"; }; patches = [ @@ -22,10 +22,7 @@ stdenv.mkDerivation rec { ./disable-test-gpg-verify-result.patch # Tests access the helper using relative path # https://github.com/ostreedev/ostree/issues/1593 - (fetchpatch { - url = https://github.com/ostreedev/ostree/pull/1633.patch; - sha256 = "07xiw1dr7j4yw3w92qhw37f9crlglibflcqj2kf0v5gfrl9i6g4j"; - }) + ./01-Drop-ostree-trivial-httpd-CLI-move-to-tests-director.patch ]; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch index d3ef7e08357ab..8da2fb82dd0ee 100644 --- a/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch +++ b/pkgs/tools/misc/ostree/disable-test-gpg-verify-result.patch @@ -1,12 +1,12 @@ -diff -aur --no-dereference a/Makefile-tests.am b/Makefile-tests.am ---- a/Makefile-tests.am 1970-01-01 01:00:01.000000000 +0100 -+++ b/Makefile-tests.am 2018-09-17 00:24:11.977841113 +0200 -@@ -243,7 +243,7 @@ +diff --git a/Makefile-tests.am b/Makefile-tests.am +index b11fde89..82937a67 100644 +--- a/Makefile-tests.am ++++ b/Makefile-tests.am +@@ -245,7 +245,6 @@ endif _installed_or_uninstalled_test_programs = tests/test-varint tests/test-ot-unix-utils tests/test-bsdiff tests/test-mutable-tree \ tests/test-keyfile-utils tests/test-ot-opt-utils tests/test-ot-tool-util \ - tests/test-gpg-verify-result tests/test-checksum tests/test-lzma tests/test-rollsum \ -+ tests/test-checksum tests/test-lzma tests/test-rollsum \ tests/test-basic-c tests/test-sysroot-c tests/test-pull-c tests/test-repo tests/test-include-ostree-h - if USE_AVAHI + if USE_LIBSOUP diff --git a/pkgs/tools/misc/ostree/fix-1592.patch b/pkgs/tools/misc/ostree/fix-1592.patch index f26a924c0d833..1eccd74bfa7de 100644 --- a/pkgs/tools/misc/ostree/fix-1592.patch +++ b/pkgs/tools/misc/ostree/fix-1592.patch @@ -1,6 +1,7 @@ -diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh ---- a/tests/pull-test.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/pull-test.sh 2018-09-16 23:55:44.214593856 +0200 +diff --git a/tests/pull-test.sh b/tests/pull-test.sh +index a8bc49a9..4a08ebb5 100644 +--- a/tests/pull-test.sh ++++ b/tests/pull-test.sh @@ -275,7 +275,7 @@ if ${CMD_PREFIX} ostree --repo=mirrorrepo-local pull-local otherrepo 2>err.txt; then fatal "pull with mixed refs succeeded?" @@ -19,23 +20,62 @@ diff -aur --no-dereference a/tests/pull-test.sh b/tests/pull-test.sh echo "ok pull-local nonexistent branch" cd ${test_tmpdir} -@@ -587,5 +587,5 @@ +@@ -593,5 +593,5 @@ if ${CMD_PREFIX} ostree --repo=repo pull origin main 2>err.txt; then fatal "pull of invalid ref succeeded" fi -assert_file_has_content_literal err.txt 'error: Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' +assert_file_has_content_literal err.txt 'Fetching checksum for ref ((empty), main): Invalid rev lots of html here lots of html here lots of html here lots of' echo "ok pull got HTML for a ref" -diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh ---- a/tests/test-fsck-collections.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/test-fsck-collections.sh 2018-09-17 02:22:48.922502037 +0200 +diff --git a/tests/test-config.sh b/tests/test-config.sh +index 7e913d32..69d1675d 100755 +--- a/tests/test-config.sh ++++ b/tests/test-config.sh +@@ -46,7 +46,7 @@ + if ${CMD_PREFIX} ostree config --repo=repo get --group=core lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config get should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config get" + + ${CMD_PREFIX} ostree config --repo=repo set core.mode bare-user-only +@@ -63,7 +63,7 @@ + if ${CMD_PREFIX} ostree config --repo=repo set --group=core lock-timeout-secs 120 extra 2>err.txt; then + assert_not_reached "ostree config set should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config set" + + # Check that "ostree config unset" works +@@ -78,7 +78,7 @@ + fi + # Check for any character where quotation marks would be as they appear differently in the Fedora and Debian + # test suites (“” and '' respectively). See: https://github.com/ostreedev/ostree/pull/1839 +-assert_file_has_content err.txt "error: Key file does not have key .lock-timeout-secs. in group .core." ++assert_file_has_content err.txt "Key file does not have key .lock-timeout-secs. in group .core." + + # Check that it's idempotent + ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs +@@ -95,5 +95,5 @@ + if ${CMD_PREFIX} ostree config --repo=repo unset core.lock-timeout-secs extra 2>err.txt; then + assert_not_reached "ostree config unset should error out if too many arguments are given" + fi +-assert_file_has_content err.txt "error: Too many arguments given" ++assert_file_has_content err.txt "Too many arguments given" + echo "ok config unset" +diff --git a/tests/test-fsck-collections.sh b/tests/test-fsck-collections.sh +index dc6bcfeb..4a5eef55 100755 +--- a/tests/test-fsck-collections.sh ++++ b/tests/test-fsck-collections.sh @@ -100,7 +100,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 3 fsck detects missing ref bindings" @@ -113,7 +113,7 @@ @@ -44,26 +84,26 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref1’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref1.)" - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -127,7 +127,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi --assert_file_has_content fsck-error "Commit has collection ID ‘org.example.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org.example.Collection2’" -+assert_file_has_content fsck-error "Commit has collection ID .org.example.Collection. in collection binding metadata, while the remote it came from has collection ID .org.example.Collection2." - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" +-assert_file_has_content fsck-error "Commit has collection ID ‘org\.example\.Collection’ in collection binding metadata, while the remote it came from has collection ID ‘org\.example\.Collection2’" ++assert_file_has_content fsck-error "Commit has collection ID .org\.example\.Collection. in collection binding metadata, while the remote it came from has collection ID .org\.example\.Collection2." + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -147,7 +147,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-back-refs > fsck 2> fsck-error; then assert_not_reached "fsck unexpectedly succeeded after adding unbound ref!" fi --assert_file_has_content fsck-error "Collection–ref (org.example.Collection, ref1) in bindings for commit .* does not exist" -+assert_file_has_content fsck-error 'Collection.ref (org.example.Collection, ref1) in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs...$" - assert_file_has_content fsck "^Validating refs in collections...$" +-assert_file_has_content fsck-error "Collection–ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist" ++assert_file_has_content fsck-error 'Collection.ref (org\.example\.Collection, ref1) in bindings for commit .* does not exist' + assert_file_has_content fsck "^Validating refs\.\.\.$" + assert_file_has_content fsck "^Validating refs in collections\.\.\.$" @@ -186,7 +186,7 @@ if ${CMD_PREFIX} ostree fsck --repo=repo --verify-bindings > fsck 2> fsck-error; then @@ -71,7 +111,7 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Commit has no requested ref ‘new-ref’ in ref binding metadata (‘ref3’, ‘ref4’)" +assert_file_has_content fsck-error "Commit has no requested ref .new-ref. in ref binding metadata (.ref3., .ref4.)" - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 9 fsck detects missing ref bindings" @@ -205,7 +205,7 @@ @@ -80,12 +120,13 @@ diff -aur --no-dereference a/tests/test-fsck-collections.sh b/tests/test-fsck-co fi -assert_file_has_content fsck-error "Ref ‘ref3’ in bindings for commit .* does not exist" +assert_file_has_content fsck-error 'Ref .ref3. in bindings for commit .* does not exist' - assert_file_has_content fsck "^Validating refs...$" + assert_file_has_content fsck "^Validating refs\.\.\.$" echo "ok 11 fsck ignores unreferenced ref bindings" -diff -aur --no-dereference a/tests/test-remote-add.sh b/tests/test-remote-add.sh ---- a/tests/test-remote-add.sh 1970-01-01 01:00:01.000000000 +0100 -+++ b/tests/test-remote-add.sh 2018-09-17 00:14:16.486788225 +0200 +diff --git a/tests/test-remote-add.sh b/tests/test-remote-add.sh +index bb7eae89..62a3bcd7 100755 +--- a/tests/test-remote-add.sh ++++ b/tests/test-remote-add.sh @@ -83,7 +83,7 @@ if $OSTREE remote delete nosuchremote 2>err.txt; then assert_not_reached "Deleting remote unexpectedly succeeded" diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 0680f360209c9..409e65dff7739 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, cargo, rustc, gobject-introspection, gtk-doc, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_43, gperf, cmake, libcap, glib, systemd, json-glib, libarchive, libsolv, librepo, polkit, - bubblewrap, pcre, check, python }: + bubblewrap, pcre, check, python, json_c, libmodulemd_1, utillinux, sqlite, cppunit }: stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2019.2"; + version = "2019.5"; src = fetchurl { url = "https://github.com/projectatomic/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0sxjlcq15avb0fv6v89z2xrqv095dck4k5s9f0pk6y7sm063n2pk"; + sha256 = "0innbrjj086mslbf55bcvs9a3rv9hg1y2nhzxdjy3nhpqxqlzdnn"; }; patches = [ @@ -28,6 +28,8 @@ stdenv.mkDerivation rec { libcap ostree rpm glib systemd polkit bubblewrap json-glib libarchive libsolv librepo pcre check python + # libdnf + json_c libmodulemd_1 utillinux sqlite cppunit ]; configureFlags = [ diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index ce372f6b75244..e593bccbd1d53 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "babeld-1.8.5"; + name = "babeld-1.9.0"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz"; - sha256 = "1i2v7npl9aykq8d6zhkinqnbdpqx5x910dqkrv30fib0fp19jb90"; + sha256 = "0g7nhvd0hhb3jxdzpbqdxnb68375vm6apj2wslkxb70ip6rkk2hj"; }; preBuild = '' diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix new file mode 100644 index 0000000000000..2073c0b8497e5 --- /dev/null +++ b/pkgs/tools/networking/curlie/default.nix @@ -0,0 +1,22 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "curlie"; + version = "1.2.0"; + + src= fetchFromGitHub { + owner = "rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0jgwd1amwjpmfgg08j9m9i15rpxijhmld9najzqb2gf8c1n5d8cf"; + }; + + modSha256 = "18nwq99vv3nbdwfilfn8v64mn58jviwybi93li0lcg7779nxab3d"; + + meta = with lib; { + description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; + homepage = https://curlie.io/; + maintainers = with maintainers; [ ma27 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 78dc52905d834..cfd4658f63f8d 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -30,6 +30,6 @@ pythonPackages.buildPythonApplication rec { homepage = https://github.com/eliangcs/http-prompt; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; - platforms = platforms.linux; # can only test on linux + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch index d1640ebc43dfd..aa161460904b0 100644 --- a/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,9 +1,11 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..ff2d50d +index 0000000..09a545a --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1205 @@ +@@ -0,0 +1,1174 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. +[[package]] +name = "adler32" +version = "1.0.3" @@ -11,10 +13,10 @@ index 0000000..ff2d50d + +[[package]] +name = "aho-corasick" -+version = "0.7.3" ++version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -32,17 +34,16 @@ index 0000000..ff2d50d + +[[package]] +name = "atty" -+version = "0.2.11" ++version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "autocfg" -+version = "0.1.2" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -50,8 +51,8 @@ index 0000000..ff2d50d +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -59,17 +60,12 @@ index 0000000..ff2d50d +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "bitflags" -+version = "0.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "bitflags" -+version = "1.0.4" ++version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -77,8 +73,8 @@ index 0000000..ff2d50d +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -87,17 +83,12 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "build_const" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "byteorder" -+version = "1.3.1" ++version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -106,7 +97,7 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -114,18 +105,27 @@ index 0000000..ff2d50d +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] ++name = "c2-chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "cc" -+version = "1.0.35" ++version = "1.0.40" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "cfg-if" -+version = "0.1.7" ++version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -134,8 +134,8 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -147,59 +147,48 @@ index 0000000..ff2d50d +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-foundation" -+version = "0.2.3" ++version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.2.3" ++version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "crc" -+version = "1.8.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "crc32fast" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "ctrlc" -+version = "3.1.2" ++version = "3.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "dtoa" -+version = "0.4.3" ++version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "embed-resource" -+version = "1.2.0" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -208,13 +197,13 @@ index 0000000..ff2d50d + +[[package]] +name = "flate2" -+version = "1.0.7" ++version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -241,37 +230,47 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "getrandom" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "httparse" -+version = "1.3.3" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "https" -+version = "1.5.0" ++version = "1.5.1" +dependencies = [ + "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", + "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "embed-resource 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -281,11 +280,11 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -295,12 +294,12 @@ index 0000000..ff2d50d + +[[package]] +name = "hyper-native-tls" -+version = "0.2.4" ++version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -315,15 +314,15 @@ index 0000000..ff2d50d + +[[package]] +name = "iron" -+version = "0.6.0" ++version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", + "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -341,11 +340,6 @@ index 0000000..ff2d50d + +[[package]] +name = "lazy_static" -+version = "0.2.11" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "lazy_static" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + @@ -356,7 +350,7 @@ index 0000000..ff2d50d + +[[package]] +name = "libc" -+version = "0.2.53" ++version = "0.2.62" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -364,15 +358,15 @@ index 0000000..ff2d50d +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "log" -+version = "0.4.6" ++version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -386,12 +380,12 @@ index 0000000..ff2d50d +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "memchr" -+version = "2.2.0" ++version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -404,7 +398,7 @@ index 0000000..ff2d50d + +[[package]] +name = "mime_guess" -+version = "1.8.6" ++version = "1.8.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -415,60 +409,52 @@ index 0000000..ff2d50d + +[[package]] +name = "miniz-sys" -+version = "0.1.11" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "miniz_oxide" -+version = "0.2.1" ++version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "miniz_oxide_c_api" -+version = "0.2.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "native-tls" -+version = "0.1.5" ++version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", + "schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "nix" -+version = "0.13.0" ++version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -477,49 +463,53 @@ index 0000000..ff2d50d +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-traits" -+version = "0.2.6" ++version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++] + +[[package]] +name = "num_cpus" -+version = "1.10.0" ++version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "numtoa" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "openssl" -+version = "0.9.24" ++version = "0.10.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "openssl-probe" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "openssl-sys" -+version = "0.9.43" ++version = "0.9.49" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -564,7 +554,7 @@ index 0000000..ff2d50d + +[[package]] +name = "pkg-config" -+version = "0.3.14" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -576,34 +566,27 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "quote" -+version = "0.3.15" ++name = "ppv-lite86" ++version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] -+name = "rand" -+version = "0.4.6" ++name = "quote" ++version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -611,28 +594,57 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "rand" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "rand_chacha" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "rand_core" -+version = "0.4.0" ++version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] ++name = "rand_core" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -641,6 +653,14 @@ index 0000000..ff2d50d +] + +[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++dependencies = [ ++ "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", ++] ++ ++[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -650,11 +670,11 @@ index 0000000..ff2d50d + +[[package]] +name = "rand_jitter" -+version = "0.1.3" ++version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -665,8 +685,8 @@ index 0000000..ff2d50d +dependencies = [ + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] @@ -676,8 +696,8 @@ index 0000000..ff2d50d +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -698,40 +718,28 @@ index 0000000..ff2d50d + +[[package]] +name = "redox_syscall" -+version = "0.1.54" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] -+name = "redox_termios" -+version = "0.1.1" ++version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "regex" -+version = "1.1.6" ++version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.6" ++version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+] + +[[package]] +name = "remove_dir_all" -+version = "0.5.1" ++version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", @@ -750,16 +758,8 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "rustc_version" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] +name = "safemem" -+version = "0.3.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -773,38 +773,24 @@ index 0000000..ff2d50d + +[[package]] +name = "security-framework" -+version = "0.1.16" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "security-framework-sys" -+version = "0.1.16" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "semver" -+version = "0.9.0" ++version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] -+name = "semver-parser" -+version = "0.7.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -832,7 +818,7 @@ index 0000000..ff2d50d +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -845,7 +831,7 @@ index 0000000..ff2d50d + +[[package]] +name = "smallvec" -+version = "0.6.9" ++version = "0.6.10" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -872,23 +858,16 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "tempdir" -+version = "0.3.7" ++name = "tempfile" ++version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "termion" -+version = "1.5.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", ++ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -912,8 +891,8 @@ index 0000000..ff2d50d +version = "0.1.42" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", ++ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -941,11 +920,6 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "ucd-util" -+version = "0.1.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -955,7 +929,7 @@ index 0000000..ff2d50d + +[[package]] +name = "unicase" -+version = "2.3.0" ++version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -974,7 +948,7 @@ index 0000000..ff2d50d +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] @@ -1006,13 +980,8 @@ index 0000000..ff2d50d +] + +[[package]] -+name = "utf8-ranges" -+version = "1.0.2" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[[package]] +name = "vcpkg" -+version = "0.2.6" ++version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] @@ -1035,7 +1004,7 @@ index 0000000..ff2d50d +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", + "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + @@ -1044,11 +1013,16 @@ index 0000000..ff2d50d +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ -+ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] ++name = "wasi" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++ ++[[package]] +name = "winapi" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1077,111 +1051,107 @@ index 0000000..ff2d50d + +[metadata] +"checksum adler32 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e522997b529f05601e05166c07ed17789691f562762c7f3b987263d2dedee5c" -+"checksum aho-corasick 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e6f484ae0c99fec2e858eb6134949117399f222608d84cadb3f58c1f97c2364c" ++"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" +"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+"checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" -+"checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" ++"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" ++"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" +"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -+"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12" ++"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+"checksum build_const 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "39092a32794787acd8525ee150305ff051b0aa6cc2abaf193924f5ab05425f39" -+"checksum byteorder 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a019b10a2a7cdeb292db131fc8113e57ea2a908f6e7894b0c3c671893b65dbeb" ++"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -+"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83" -+"checksum cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "11d43355396e872eefb45ce6342e4374ed7bc2b3a502d1b28e36d6e23c05d1f4" ++"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" ++"checksum cc 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "b548a4ee81fccb95919d4e22cfea83c7693ebfd78f0495493178db20b3139da7" ++"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" +"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67" -+"checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d" -+"checksum crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" ++"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" ++"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" +"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+"checksum ctrlc 3.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5531b7f0698d9220b4729f8811931dbe0e91a05be2f7b3245fdc50dd856bae26" -+"checksum dtoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6d301140eb411af13d3115f9a562c85cc6b541ade9dfa314132244aaee7489dd" -+"checksum embed-resource 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee11dd277e159f3a7845341f8c800899cf918a366956e31dd52f35eff638a403" -+"checksum flate2 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f87e68aa82b2de08a6e037f1385455759df6e445a8df5e005b4297191dbf18aa" ++"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" ++"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" ++"checksum embed-resource 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9e691c6cebf9fc63d525a8308df4094f07dc8b391dad7fafd09b3c96081f834d" ++"checksum flate2 1.0.11 (registry+https://github.com/rust-lang/crates.io-index)" = "2adaffba6388640136149e18ed080b77a78611c1e1d6de75aedcdf78df5d4682" +"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" +"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum httparse 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e8734b0cfd3bc3e101ec59100e101c2eecd19282202e87808b3037b442777a83" ++"checksum getrandom 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "2512b3191f22e2763a5db387f1c9409379772e2050841722eb4a8c4f497bf096" ++"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -+"checksum hyper-native-tls 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "72332e4a35d3059583623b50e98e491b78f8b96c5521fcb3f428167955aa56e8" ++"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum iron 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d8e17268922834707e1c29e8badbf9c712c9c43378e1b6a3388946baff10be2" ++"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" +"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" +"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+"checksum libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)" = "ec350a9417dfd244dc9a6c4a71e13895a4db6b92f0b106f07ebbc3f3bc580cee" ++"checksum libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)" = "34fcd2c08d2f832f376f4173a231990fa5aef4e99fb569867318a227ef4c06ba" +"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6" ++"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d" -+"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39" ++"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2d4c0961143b8efdcfa29c3ae63281601b446a4a668165454b6c90f8024954c5" -+"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649" -+"checksum miniz_oxide 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c468f2369f07d651a5d0bb2c9079f8488a66d5466efe42d0c5c6466edcb7f71e" -+"checksum miniz_oxide_c_api 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7fe927a42e3807ef71defb191dc87d4e24479b221e67015fe38ae2b7b447bab" ++"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" ++"checksum miniz-sys 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9e3ae51cea1576ceba0dde3d484d30e6e5b86dee0b2d412fe3a16a15c98202" ++"checksum miniz_oxide 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7108aff85b876d06f22503dcce091e29f76733b2bfdd91eebce81f5e68203a10" +"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+"checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0" -+"checksum nix 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46f0f3210768d796e8fa79ec70ee6af172dacbe7147f5e69be5240a47778302b" ++"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" ++"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" +"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "0b3a5d7cc97d6d30d8b9bc8fa19bf45349ffe46241e8816f50f62f6d6aaabee1" -+"checksum num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a23f0ed30a54abaa0c7e83b1d2d87ada7c3c23078d1d87815af3e3b6385fbba" -+"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" -+"checksum openssl 0.9.24 (registry+https://github.com/rust-lang/crates.io-index)" = "a3605c298474a3aa69de92d21139fb5e2a81688d308262359d85cdd0d12a7985" -+"checksum openssl-sys 0.9.43 (registry+https://github.com/rust-lang/crates.io-index)" = "33c86834957dd5b915623e94f2f4ab2c70dd8f6b70679824155d5ae21dbd495d" ++"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" ++"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" ++"checksum openssl 0.10.24 (registry+https://github.com/rust-lang/crates.io-index)" = "8152bb5a9b5b721538462336e3bef9a539f892715e5037fda0f984577311af15" ++"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" ++"checksum openssl-sys 0.9.49 (registry+https://github.com/rust-lang/crates.io-index)" = "f4fad9e54bd23bd4cbbe48fdc08a1b8091707ac869ef8508edea2fec77dcc884" +"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)" = "676e8eb2b1b4c9043511a9b7bea0915320d7e502b0a079fb03f9635a5252b18c" ++"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" +"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" ++"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" +"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" +"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" ++"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" +"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" ++"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" ++"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" ++"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" +"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" ++"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+"checksum rand_jitter 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b9ea758282efe12823e0d952ddb269d2e1897227e464919a554f2a03ef1b832" ++"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252" -+"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76" -+"checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" -+"checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" -+"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" ++"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" ++"checksum regex 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88c3d9193984285d544df4a30c23a4e62ead42edf70a4452ceb76dac1ce05c26" ++"checksum regex-syntax 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b143cceb2ca5e56d5671988ef8b15615733e7ee16cd348e064333b251b89343f" ++"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -+"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" ++"checksum safemem 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e133ccc4f4d1cd4f89cc8a7ff618287d56dc7f638b8e38fc32c5fdcadc339dd5" +"checksum schannel 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "f2f6abf258d99c3c1c5c2131d99d064e94b7b3dd5f416483057f308fea253339" -+"checksum security-framework 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "dfa44ee9c54ce5eecc9de7d5acbad112ee58755239381f687e564004ba4a2332" -+"checksum security-framework-sys 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "5421621e836278a0b139268f36eee0dc7e389b784dc3f79d8f11aabadf41bead" -+"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -+"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++"checksum security-framework 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "eee63d0f4a9ec776eeb30e220f0bc1e092c3ad744b2a379e3993070364d3adc2" ++"checksum security-framework-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9636f8989cbf61385ae4824b98c1aaa54c994d7d8b41f11c601ed799f0549a56" +"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" +"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" +"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" +"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c4488ae950c49d403731982257768f48fada354a5203fe81f9bb6f43ca9002be" ++"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" +"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -+"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea" ++"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b" +"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" @@ -1189,22 +1159,21 @@ index 0000000..ff2d50d +"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" +"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" +"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum ucd-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535c204ee4d8434478593480b8f86ab45ec9aae0e83c568ca81abf0fd0e88f86" +"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicase 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41d17211f887da8e4a70a45b9536f26fc5de166b81e2d5d80de4a17fd22553bd" ++"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" +"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" +"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" +"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" +"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737" -+"checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d" ++"checksum vcpkg 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "33dd455d0f96e90a75803cfeb7f948768c08d70a6de9a8d2362461935698bf95" +"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" +"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" ++"checksum wasi 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd5442abcac6525a045cc8c795aedb60da7a2e5e89c7bf18a0d5357849bb23c7" +"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 21fc08a39a9eb..f8ea5f2dae628 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgs }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgs, darwin }: rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0mb2wifz8pba03bdpiqadih33jimhg9crs4b72rcyfmj9l8fd1ba"; + sha256 = "00w8sy0m92by6lby1zb8hh36dnsrvwyyl56p6p7a1mf3iiq84r1y"; }; - buildInputs = with pkgs; [ openssl pkgconfig ]; + buildInputs = with pkgs; [ openssl pkgconfig ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "0cy23smal6y5qj6a202zf7l76vwkpzvcjmlbq0ffyph3gq07ps7b"; + cargoSha256 = "1axf15ma7fkbphjc6hjrbcj9rbd1x5i4kyz7fjrlqjgdsmvaqc93"; meta = with stdenv.lib; { description = "A basic http server for hosting a folder fast and simply"; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index f2c83c661ae34..c0e29c6538bef 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -11,11 +11,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "1.18.1"; + version = "1.18.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07vg2ryyjaxs5h8kmkwqhk4ki750c4di98g0i7h7zglfs16psiqd"; + sha256 = "1hx5dx5dgdqh3p8fq7q1pxy2bx2iymc74lj60ycrf7ydfjlprnad"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -28,6 +28,7 @@ in stdenv.mkDerivation rec { "-Ddnsmasq=${dnsmasq}/bin/dnsmasq" # Upstream prefers dhclient, so don't add dhcpcd to the closure "-Ddhcpcd=no" + "-Ddhcpcanon=no" "-Dpppd=${ppp}/bin/pppd" "-Diptables=${iptables}/bin/iptables" # to enable link-local connections @@ -49,6 +50,7 @@ in stdenv.mkDerivation rec { "-Dqt=false" # Allow using iwd when configured to do so "-Diwd=true" + "-Dlibaudit=yes-disabled-by-default" ]; patches = [ diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 6fbcffdae2901..654d2dd6a7ac1 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pcsclite, pkgconfig, libusb1, perl }: stdenv.mkDerivation rec { - version = "1.4.30"; + version = "1.4.31"; name = "ccid-${version}"; src = fetchurl { url = "https://ccid.apdu.fr/files/${name}.tar.bz2"; - sha256 = "0z7zafdg75fr1adlv2x0zz34s07gljcjg2lsz76s1048w1xhh5xc"; + sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; }; postPatch = '' diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix new file mode 100644 index 0000000000000..514f3f675399b --- /dev/null +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -0,0 +1,103 @@ +{ fetchFromGitHub +, ghostscript +, img2pdf +, jbig2enc +, leptonica +, pngquant +, python3 +, python3Packages +, qpdf +, stdenv +, tesseract4 +, unpaper +}: + +let + inherit (python3Packages) buildPythonApplication; + + runtimeDeps = with python3Packages; [ + ghostscript + jbig2enc + leptonica + pngquant + qpdf + tesseract4 + unpaper + pillow + ]; + +in buildPythonApplication rec { + pname = "ocrmypdf"; + version = "8.2.3"; + disabled = ! python3Packages.isPy3k; + + src = fetchFromGitHub { + owner = "jbarlow83"; + repo = "OCRmyPDF"; + rev = "v${version}"; + sha256 = "1ldlyhxkav34y9d7g2kx3d4p26c2b82vnwi0ywnfynb16sav36d5"; + }; + + nativeBuildInputs = with python3Packages; [ + pytestrunner + setuptools + setuptools-scm-git-archive + setuptools_scm + ]; + + propagatedBuildInputs = with python3Packages; [ + cffi + chardet + img2pdf + pdfminer + pikepdf + reportlab + ruffus + ]; + + checkInputs = with python3Packages; [ + hocr-tools + pypdf2 + pytest + pytest-helpers-namespace + pytest_xdist + pytestcov + pytestrunner + python-xmp-toolkit + setuptools + ] ++ runtimeDeps; + + + postPatch = '' + substituteInPlace src/ocrmypdf/leptonica.py \ + --replace "ffi.dlopen(find_library('lept'))" \ + 'ffi.dlopen("${stdenv.lib.makeLibraryPath [leptonica]}/liblept${stdenv.hostPlatform.extensions.sharedLibrary}")' + ''; + + # The tests take potentially 20+ minutes, depending on machine + doCheck = false; + + # These tests fail and it might be upstream problem... or packaging. :) + # development is happening on macos and the pinned test versions are + # significantly newer than nixpkgs has. Program still works... + # (to the extent I've used it) -- Kiwi + checkPhase = '' + export HOME=$TMPDIR + pytest -k 'not test_force_ocr_on_pdf_with_no_images \ + and not test_tesseract_crash \ + and not test_tesseract_crash_autorotate \ + and not test_ghostscript_pdfa_failure \ + and not test_gs_render_failure \ + and not test_gs_raster_failure \ + and not test_bad_utf8 \ + and not test_old_unpaper' + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jbarlow83/OCRmyPDF"; + description = "Adds an OCR text layer to scanned PDF files, allowing them to be searched"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.kiwi ]; + }; +} diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 23aca98ec81c0..a3b58e7274ded 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -170,7 +170,7 @@ in platforms = lib.platforms.all; hydraPlatforms = lib.optionals (lib.elem pname ["scheme-small" "scheme-basic"]) platforms; - maintainers = with lib.maintainers; [ vcunat veprbl ]; + maintainers = with lib.maintainers; [ veprbl ]; } (combine { ${pname} = attrs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae24b113fa16a..75ba59e8079ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -564,6 +564,8 @@ in antora = callPackage ../development/tools/documentation/antora {}; + apfs-fuse = callPackage ../tools/filesystems/apfs-fuse { }; + apktool = callPackage ../development/tools/apktool { inherit (androidenv.androidPkgs_9_0) build-tools; }; @@ -1594,6 +1596,8 @@ in firecracker = callPackage ../applications/virtualization/firecracker { }; + firestarter = callPackage ../applications/misc/firestarter { }; + fsmon = callPackage ../tools/misc/fsmon { }; fsql = callPackage ../tools/misc/fsql { }; @@ -1684,6 +1688,8 @@ in gscan2pdf = callPackage ../applications/graphics/gscan2pdf { }; + gsctl = callPackage ../applications/misc/gsctl { }; + gti = callPackage ../tools/misc/gti { }; hdate = callPackage ../applications/misc/hdate { }; @@ -1698,6 +1704,8 @@ in hid-listen = callPackage ../tools/misc/hid-listen { }; + hocr-tools = with python3Packages; toPythonApplication hocr-tools; + home-manager = callPackage ../tools/package-management/home-manager {}; hostsblock = callPackage ../tools/misc/hostsblock { }; @@ -1822,6 +1830,8 @@ in nyx = callPackage ../tools/networking/nyx { }; + ocrmypdf = callPackage ../tools/text/ocrmypdf { }; + onboard = callPackage ../applications/misc/onboard { }; xkbd = callPackage ../applications/misc/xkbd { }; @@ -2467,6 +2477,8 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; + curlie = callPackage ../tools/networking/curlie { }; + cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -5515,6 +5527,8 @@ in pptpd = callPackage ../tools/networking/pptpd {}; + pre-commit = gitAndTools.pre-commit; + prettyping = callPackage ../tools/networking/prettyping { }; prey-bash-client = callPackage ../tools/security/prey { }; @@ -8721,7 +8735,7 @@ in python3 = python37; pypy = pypy2; pypy2 = pypy27; - pypy3 = pypy35; + pypy3 = pypy36; # Python interpreter that is build with all modules, including tkinter. # These are for compatibility and should not be used inside Nixpkgs. @@ -8740,7 +8754,7 @@ in python3Packages = python3.pkgs; pythonInterpreters = callPackage ./../development/interpreters/python {}; - inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy35; + inherit (pythonInterpreters) python27 python35 python36 python37 python38 pypy27 pypy36; # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); @@ -9784,7 +9798,7 @@ in pprof = callPackage ../development/tools/profiling/pprof { }; - pyprof2calltree = pythonPackages.callPackage ../development/tools/profiling/pyprof2calltree { }; + pyprof2calltree = with python3Packages; toPythonApplication pyprof2calltree; prelink = callPackage ../development/tools/misc/prelink { }; @@ -11914,10 +11928,6 @@ in libplist = callPackage ../development/libraries/libplist { }; - libqglviewer = callPackage ../development/libraries/libqglviewer { - inherit (darwin.apple_sdk.frameworks) AGL; - }; - libre = callPackage ../development/libraries/libre {}; librem = callPackage ../development/libraries/librem {}; @@ -12338,6 +12348,9 @@ in libvdpau = callPackage ../development/libraries/libvdpau { }; + libmodulemd = callPackage ../development/libraries/libmodulemd { }; + libmodulemd_1 = callPackage ../development/libraries/libmodulemd/1.nix { }; + libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { }; libversion = callPackage ../development/libraries/libversion { }; @@ -13137,6 +13150,10 @@ in libopenshot-audio = callPackage ../applications/video/openshot-qt/libopenshot-audio.nix { }; + libqglviewer = callPackage ../development/libraries/libqglviewer { + inherit (darwin.apple_sdk.frameworks) AGL; + }; + libqtav = callPackage ../development/libraries/libqtav { }; kpmcore = callPackage ../development/libraries/kpmcore { }; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 338e4b61ff481..9ff9045600be1 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -88,10 +88,10 @@ let ack = buildPerlPackage { pname = "ack"; - version = "2.28"; + version = "3.0.2"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-2.28.tar.gz; - sha256 = "16zgn96v1qkibpj5lic571zjl07y8x55v5xql3x7bvlsmgqcnvla"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.0.2.tar.gz; + sha256 = "0a4mriclnmwvm8rn9crkfr00qjy6ffgf0b0bg0qz46drpnyv7d33"; }; outputs = ["out" "man"]; # use gnused so that the preCheck command passes @@ -152,10 +152,10 @@ let AlienBuild = buildPerlPackage { pname = "Alien-Build"; - version = "1.65"; + version = "1.79"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.65.tar.gz; - sha256 = "1xvwh6r2aawilpxl8zdqb8yy3skj56nkps3h5xz6spkv4ggzzm4a"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.79.tar.gz; + sha256 = "18qlizxa67ldnxw91ks6qffhn5iia83ygcfv3c0db331f8nr68ki"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; buildInputs = [ DevelHide Test2Suite ]; @@ -192,10 +192,10 @@ let asa = buildPerlPackage { pname = "asa"; - version = "1.03"; + version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/asa-1.03.tar.gz; - sha256 = "1w97m0gf3n9av61d0qcw7d1i1rac4gm0fd2ba5wyh53df9d7p0i2"; + url = mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz; + sha256 = "0pk783s1h2f45zbmm6a62yfgy71w4sqh8ppgs4cyxfikwxs3p0z5"; }; meta = { description = "Lets your class/object say it works like something else"; @@ -229,10 +229,10 @@ let AnyEvent = buildPerlPackage { pname = "AnyEvent"; - version = "7.15"; + version = "7.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.15.tar.gz; - sha256 = "111db2335c71f789edaec271126b3810356691eb1214dd3f67b527a88ec9e354"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.16.tar.gz; + sha256 = "149fe8c3082dfb015fd15ad2b8fea5fb75e012238c790aa0398dcfaabfa0546c"; }; buildInputs = [ CanaryStability ]; meta = { @@ -305,6 +305,19 @@ let propagatedBuildInputs = [ Moose Mouse ]; }; + AnyURIEscape = buildPerlPackage { + pname = "Any-URI-Escape"; + version = "0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PH/PHRED/Any-URI-Escape-0.01.tar.gz; + sha256 = "0k4c20bmw32yxksgkc2i44j4vfmzhqcqrq36pv0ab3qhkzn3r0g3"; + }; + propagatedBuildInputs = [ URI ]; + meta = { + description = "Load URI::Escape::XS preferentially over URI::Escape"; + }; + }; + ApacheAuthCookie = buildPerlPackage { pname = "Apache-AuthCookie"; version = "3.27"; @@ -360,10 +373,10 @@ let ApacheTest = buildPerlPackage { pname = "Apache-Test"; - version = "1.40"; + version = "1.41"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz; - sha256 = "0h5fsi0is6nhclsd3wwkkqx2hfgl3bpdazxycafm9sqxr3qkgx9w"; + url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.41.tar.gz; + sha256 = "065hka389fq8kq4623li519a6bqk84dmpiwg7c2ahmiisswn1krq"; }; doCheck = false; meta = { @@ -383,6 +396,32 @@ let buildInputs = [ TestKwalitee TestPod ]; }; + AppClusterSSH = buildPerlModule { + pname = "App-ClusterSSH"; + version = "4.13.2"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-v4.13.2.tar.gz; + sha256 = "0rmk2p3f2wz1h092anidjclh212rv3gxyk0c641qk3frlrjnw6mp"; + }; + propagatedBuildInputs = [ ExceptionClass Tk TryTiny X11ProtocolOther ]; + buildInputs = [ CPANChanges FileSlurp FileWhich PerlTidy Readonly TestDifferences TestDistManifest TestPerlTidy TestPod TestPodCoverage TestTrap ]; + preCheck = "rm t/perltidy.t t/manifest.t t/30cluster.t"; # do not run failing tests + postInstall = '' + mkdir -p $out/etc/bash_completion.d + mv $out/bin/clusterssh_bash_completion.dist \ + $out/etc/bash_completion.d/clusterssh_bash_completion + substituteInPlace $out/etc/bash_completion.d/clusterssh_bash_completion \ + --replace '/bin/true' '${pkgs.coreutils}/bin/true' \ + --replace 'grep' '${pkgs.gnugrep}/bin/grep' \ + --replace 'sed' '${pkgs.gnused}/bin/sed' + ''; + meta = { + description = "A container for functions of the ClusterSSH programs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "http://github.com/duncs/clusterssh/wiki"; + }; + }; + AppCmd = buildPerlPackage { pname = "App-Cmd"; version = "0.331"; @@ -473,14 +512,14 @@ let }; AppSqitch = buildPerlModule { - version = "0.9999"; + version = "1.0.0"; pname = "App-Sqitch"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-0.9999.tar.gz; - sha256 = "f5bfa80206738ab8a70358a3b0557661c7459e11ec07dece23ecafa1f34372b3"; + url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz; + sha256 = "f46466c1e9ad8bbabf6844fed4f6e534ea475731de61b775ad7c331db1ca9c5c"; }; - buildInputs = [ CaptureTiny IOPager TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; - propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale FileHomeDir HashMerge IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; + buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; + propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { homepage = https://sqitch.org/; @@ -538,10 +577,10 @@ let ArrayDiff = buildPerlPackage { pname = "Array-Diff"; - version = "0.07"; + version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TY/TYPESTER/Array-Diff-0.07.tar.gz; - sha256 = "0il3izx45wkh71fli2hvaq32jyin95k8x3qrnwby2x2c6yix7rvq"; + url = mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz; + sha256 = "0xsh8k312spzl90xds075qprcaz4r0b93g1bgi9l3rv1k0p3j1l0"; }; propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; meta = { @@ -711,10 +750,10 @@ let AuthenRadius = buildPerlPackage { pname = "Authen-Radius"; - version = "0.29"; + version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.29.tar.gz; - sha256 = "7fb3425546b2f518e4a07edb3bcb55672454fe8e13bece58de2dc43885afb079"; + url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz; + sha256 = "bb5191484188ac7d6e281eb199d16c4e09fb0090af7c2187aa275c454c1fc012"; }; buildInputs = [ TestNoWarnings ]; propagatedBuildInputs = [ DataHexDump NetIP ]; @@ -826,10 +865,10 @@ let BC = buildPerlPackage { pname = "B-C"; - version = "1.55"; + version = "1.57"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.55.tar.gz; - sha256 = "001bc3mxv1zkg1ynqpv3fbn1v3h3bqihg0pp19z4gfvrsrkns8q9"; + url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.57.tar.gz; + sha256 = "1zs9a4gl63icja055kncgyny6xk1nsk6payfbzczkba3sc8sclh4"; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; meta = { @@ -840,6 +879,19 @@ let doCheck = false; /* test fails */ }; + BCOW = buildPerlPackage { + pname = "B-COW"; + version = "0.001"; + src = fetchurl { + url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.001.tar.gz; + sha256 = "1n5hfhm72q96cpplc8hjfwkv7haq0xnq2db6ql611jdv17z3sp4d"; + }; + meta = { + description = "B::COW additional B helpers to check COW status"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + BFlags = buildPerlPackage { pname = "B-Flags"; version = "0.17"; @@ -1167,10 +1219,10 @@ let CanaryStability = buildPerlPackage { pname = "Canary-Stability"; - version = "2012"; + version = "2013"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2012.tar.gz; - sha256 = "fd240b111d834dbae9630c59b42fae2145ca35addc1965ea311edf0d07817107"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz; + sha256 = "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea"; }; meta = { license = stdenv.lib.licenses.gpl1Plus; @@ -1227,10 +1279,10 @@ let CarpAssertMore = buildPerlPackage { pname = "Carp-Assert-More"; - version = "1.16"; + version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.16.tar.gz; - sha256 = "1x9jd6s3lq97na6gz7g0zaq62l8z297xsfpdj2v42p3ijpfirl4f"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.18.tar.gz; + sha256 = "0k7lpyb7mwck9w7vlqd4w3vw5r0qxlhzw8x6himy6p9aijwrdh4g"; }; propagatedBuildInputs = [ CarpAssert ]; meta = { @@ -1259,7 +1311,7 @@ let url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz; sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45"; }; - propagatedBuildInputs = [ ClassTiny MenloLegacy ModuleCPANfile PathTiny TryTiny ]; + propagatedBuildInputs = [ MenloLegacy PathTiny TryTiny ]; meta = { homepage = https://github.com/perl-carton/carton; description = "Perl module dependency manager (aka Bundler for Perl)"; @@ -1415,10 +1467,10 @@ let CatalystManual = buildPerlPackage { pname = "Catalyst-Manual"; - version = "5.9009"; + version = "5.9010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9000.tar.gz; - sha256 = "1z6l0vdjxzisqgb5w447m3m73sfvkhwm7qw2l1dpcdng3zaypllh"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9010.tar.gz; + sha256 = "1xg2m6d76xl0a76vq0v4yv25458d6df00k5xq1ab2z8mzvwbm4ah"; }; meta = { description = "The Catalyst developer's manual"; @@ -1669,6 +1721,21 @@ let }; }; + CatalystPluginSmartURI = buildPerlPackage { + pname = "Catalyst-Plugin-SmartURI"; + version = "0.041"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-SmartURI-0.041.tar.gz; + sha256 = "0msz3w2vfdb5w4ixi5llq66xlhm0181gjz9xj8yj0lalk232326b"; + }; + propagatedBuildInputs = [ CatalystRuntime ClassC3Componentised ]; + buildInputs = [ CatalystActionREST TestWarnings TimeOut URISmartURI ]; + meta = { + description = "Configurable URIs for Catalyst"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CatalystPluginStackTrace = buildPerlPackage { pname = "Catalyst-Plugin-StackTrace"; version = "0.12"; @@ -1742,12 +1809,11 @@ let CatalystViewJSON = buildPerlPackage { pname = "Catalyst-View-JSON"; - version = "0.36"; + version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-View-JSON-0.36.tar.gz; - sha256 = "0x943j1n2r0zqanyzdrs1xsnn8ayn2wqskn7h144xcqa6v6gcisl"; + url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-JSON-0.37.tar.gz; + sha256 = "1v4xkzazs743sc7cd1kxkbi99cf00a4dadyyancckcbpi9p3znn5"; }; - buildInputs = [ YAML ]; propagatedBuildInputs = [ CatalystRuntime ]; meta = { description = "JSON view for your data"; @@ -1823,6 +1889,22 @@ let }; }; + Catmandu = buildPerlModule { + pname = "Catmandu"; + version = "1.2002"; + src = fetchurl { + url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2002.tar.gz; + sha256 = "0gq08q5s95p58fvdl30n1k94w01pplinw2c9b4s36946fhydqifq"; + }; + propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUUID DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate YAMLLibYAML namespaceclean ]; + buildInputs = [ LogAnyAdapterLog4perl LogLog4perl TestDeep TestException TestLWPUserAgent TestPod ]; + meta = { + description = "a data toolkit"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/LibreCat/Catmandu"; + }; + }; + CDDB_get = buildPerlPackage { pname = "CDDB_get"; version = "2.28"; @@ -1839,10 +1921,10 @@ let CGI = buildPerlPackage { pname = "CGI"; - version = "4.42"; + version = "4.44"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.42.tar.gz; - sha256 = "11d308e7dad2312d65747a7fdec5d0c22024c28df5e882e829ca1553482024e7"; + url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.44.tar.gz; + sha256 = "12435fb7ebd3585c47b6d60ee4f5c7d6a7c114a2827d2b5acf3d62aa9fcf1208"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; propagatedBuildInputs = [ HTMLParser ]; @@ -2189,10 +2271,10 @@ let ClassEHierarchy = buildPerlPackage { pname = "Class-EHierarchy"; - version = "2.00"; + version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.00.tar.gz; - sha256 = "8498baaf7539eaa3422c6fe1055a0fc9a0c02e94dad0c63405373528e622bacb"; + url = mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.01.tar.gz; + sha256 = "637ab76beb3832a9b071b999a1b15bf05d297df6a662ccb1a8004f2987308382"; }; meta = { description = "Base class for hierarchally ordered objects"; @@ -2225,10 +2307,10 @@ let ClassInspector = buildPerlPackage { pname = "Class-Inspector"; - version = "1.34"; + version = "1.36"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.34.tar.gz; - sha256 = "1n7h3jzwdz5a8gmz515xfr7ic82dl5sbdrk5d2fskiycngf8d6py"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.36.tar.gz; + sha256 = "0kk900bp8iq7bw5jyllfb31gvf93mmp24n4x90j7qs3jlhimsafc"; }; meta = { description = "Get information about a class and its structure"; @@ -2489,15 +2571,16 @@ let Clone = buildPerlPackage { pname = "Clone"; - version = "0.41"; + version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GARU/Clone-0.41.tar.gz; - sha256 = "060mlm31lacirpnp5fl9jqk4m9cl07vjlh89k83qk25wykf5dh78"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz; + sha256 = "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr"; }; meta = { description = "Recursively copy Perl datatypes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ BCOW ]; }; CloneChoose = buildPerlPackage { @@ -2528,10 +2611,10 @@ let CodeTidyAll = buildPerlPackage { pname = "Code-TidyAll"; - version = "0.73"; + version = "0.74"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.73.tar.gz; - sha256 = "1fvw73q5vj5b12y9jj9mmwl0dipdjlvpsw5rzvldr4csicrpiz6q"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.74.tar.gz; + sha256 = "1nbbmn136b09kzpfz5ld2mx6syfx16hdrlf7vcj3j0kjvkjifapq"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; buildInputs = [ TestClass TestClassMost TestDeep TestDifferences TestException TestFatal TestMost TestWarn TestWarnings librelative ]; @@ -2741,6 +2824,21 @@ let }; }; + ConfigOnion = buildPerlPackage { + pname = "Config-Onion"; + version = "1.007"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DS/DSHEROH/Config-Onion-1.007.tar.gz; + sha256 = "1bx81nakvgj9m7x1q7pnra2cm1rzfdyf7fm2wmlj92qkivvdszrj"; + }; + propagatedBuildInputs = [ ConfigAny HashMergeSimple Moo ]; + buildInputs = [ TestException YAML ]; + meta = { + description = "Layered configuration, because configs are like ogres"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConfigMVP = buildPerlPackage { pname = "Config-MVP"; version = "2.200011"; @@ -2787,11 +2885,12 @@ let ConfigTiny = buildPerlPackage { pname = "Config-Tiny"; - version = "2.23"; + version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.23.tgz; - sha256 = "037524cpx962cjdgcp1m8sd30s43g3zvwfn4hmjvq322xpind2ls"; + url = mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz; + sha256 = "0cjj2f0pj9y3cx1lgk2qp6arsnyaacf7kj6v33iqczn59f798r0h"; }; + buildInputs = [ TestPod ]; }; ConfigVersioned = buildPerlPackage { @@ -2811,10 +2910,10 @@ let Connector = buildPerlPackage { pname = "Connector"; - version = "1.26"; + version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.26.tar.gz; - sha256 = "9852c2b43a8201996530deb1d3aa7fda18abe1ce24c80fbdebd7981cd2f05c45"; + url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.27.tar.gz; + sha256 = "98ff4700fde2b7872d89566a3308d03c2899c88cb6317af901869513bdbfb603"; }; buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; propagatedBuildInputs = [ LogLog4perl Moose ]; @@ -2912,10 +3011,10 @@ let CookieBaker = buildPerlModule { pname = "Cookie-Baker"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.10.tar.gz; - sha256 = "b42bad15b12da4cdc5c90c902faf3ad484281a42203fa4e7652866434f6fa4dd"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.11.tar.gz; + sha256 = "59275f474e07c0aa3611e3e684b894e7db913333d8214420be63f12ec18cd7ab"; }; buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; @@ -2938,10 +3037,10 @@ let Coro = buildPerlPackage { pname = "Coro"; - version = "6.54"; + version = "6.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.54.tar.gz; - sha256 = "0a00b351m7fxm39vfk726wpva2xx8qxlx5nv4yjgkbqap502ld2m"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz; + sha256 = "0c4ams0lqxlh9nwp2l3gd0if35dw0m3774pfl16dmz3hf419rms3"; }; propagatedBuildInputs = [ AnyEvent Guard commonsense ]; buildInputs = [ CanaryStability ]; @@ -2966,10 +3065,10 @@ let CPAN = buildPerlPackage { pname = "CPAN"; - version = "2.26"; + version = "2.27"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.26.tar.gz; - sha256 = "0db80ce17c374affa71534033bcac94a213912d6b35f5379e263ae3d7c98ae5c"; + url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz; + sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f"; }; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; meta = { @@ -2980,10 +3079,10 @@ let CpanelJSONXS = buildPerlPackage { pname = "Cpanel-JSON-XS"; - version = "4.11"; + version = "4.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.11.tar.gz; - sha256 = "08d17df7d373868a154bfa687f54fa06e0691836af8470fb29d538215d82bc78"; + url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.12.tar.gz; + sha256 = "49417b118fb111607cc7d021443e5b32fd104c0bf59d1852c95923a4916ac658"; }; meta = { description = "CPanel fork of JSON::XS, fast and correct serializing"; @@ -3062,10 +3161,10 @@ let CPANPerlReleases = buildPerlPackage { pname = "CPAN-Perl-Releases"; - version = "3.94"; + version = "4.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-3.94.tar.gz; - sha256 = "12g3mdl8lziz218a5rlflhbd295paqfqq5f9ylkdr00pnss5jfnp"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-4.10.tar.gz; + sha256 = "1dgijw8rpvhy79ff8jbly5bwh7gdb7d6mn6vx5mm6krjfybdprrk"; }; meta = { homepage = https://github.com/bingos/cpan-perl-releases; @@ -3076,10 +3175,10 @@ let CPANPLUS = buildPerlPackage { pname = "CPANPLUS"; - version = "0.9176"; + version = "0.9178"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9176.tar.gz; - sha256 = "09fypxwd13fraarq6qznmw04n1zh2f2ykdz037jmzm4m2ic8n8xc"; + url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9178.tar.gz; + sha256 = "1x2r5pnxw3f637z1b1c1pphkbvbm7y6v63nycrqni2zlx1xjpxnm"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { @@ -3267,10 +3366,10 @@ let CryptRijndael = buildPerlPackage { pname = "Crypt-Rijndael"; - version = "1.13"; + version = "1.14"; src = fetchurl { url = mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz; - sha256 = "0ki16vkgzvzyjdx6mmvjfpngyvhf7cis46pymy6dr8z0vyk0jwnd"; + sha256 = "03l5nwq97a8q9na4dpd4m3r7vrwpranx225vw8xm40w7zvgw6lb4"; }; }; @@ -3455,10 +3554,10 @@ let CryptX = buildPerlPackage { pname = "CryptX"; - version = "0.063"; + version = "0.064"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.063.tar.gz; - sha256 = "6cfc672e0e56d56cf849caf0b929ed94f87cb4e6be5c20757ca3d3dbe5569595"; + url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.064.tar.gz; + sha256 = "176ef4d2eac80731b360db04289431f0b96acc2568a1fec856abed4a51779a47"; }; meta = { description = "Crypto toolkit"; @@ -3683,10 +3782,10 @@ let DataPage = buildPerlPackage { pname = "Data-Page"; - version = "2.02"; + version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz; - sha256 = "1hvi92c4h2angryc6pngw7gbm3ysc2jfmyxk2wh9ia4vdwpbs554"; + url = mirror://cpan/authors/id/E/ET/ETHER/Data-Page-2.03.tar.gz; + sha256 = "12rxrr2b11qjk0c437cisw2kfqkafw1awcng09cv6yhzglb55yif"; }; propagatedBuildInputs = [ ClassAccessorChained ]; buildInputs = [ TestException ]; @@ -3835,6 +3934,21 @@ let }; }; + DataUtil = buildPerlModule { + pname = "Data-Util"; + version = "0.66"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz; + sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3"; + }; + buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; + meta = { + description = "A selection of utilities for data and data types"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/gfx/Perl-Data-Util"; + }; + }; + DataURIEncode = buildPerlPackage { pname = "Data-URIEncode"; version = "0.11"; @@ -3950,10 +4064,10 @@ let DateManip = buildPerlPackage { pname = "Date-Manip"; - version = "6.76"; + version = "6.77"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.76.tar.gz; - sha256 = "1a33mpkx7qqb9nqxyh2kkb596d8xq6jw0ljrd4xrwiz30f6cg1qw"; + url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.77.tar.gz; + sha256 = "0sw36dc224km06jnzkyxgpi6l4cavdn8gfxd3zb11mnf0y12phsi"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work patchPhase = '' @@ -3963,7 +4077,7 @@ let meta = { description = "Date manipulation routines"; }; - buildInputs = [ TestInter ]; + buildInputs = [ FileFindRule TestInter TestPod TestPodCoverage ]; }; DateSimple = buildPerlPackage { @@ -3980,10 +4094,10 @@ let DateTime = buildPerlPackage { pname = "DateTime"; - version = "1.50"; + version = "1.51"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.50.tar.gz; - sha256 = "165iqk1xvhs5j0kzsipa7aqycx3h37wqsl2r4jl104yqvmqhqszd"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz; + sha256 = "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ DateTimeLocale DateTimeTimeZone ]; @@ -4248,10 +4362,10 @@ let DateTimeTimeZone = buildPerlPackage { pname = "DateTime-TimeZone"; - version = "2.34"; + version = "2.36"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.34.tar.gz; - sha256 = "dee1111c06f2aa705f803bc4f3d93b50df566d864a1a8bf31b55dfaf2b3de809"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.36.tar.gz; + sha256 = "7e033a3cae17a62a0a4011b9e3dd900acf8b7614e05dc6595d1f55406ec6f6a7"; }; buildInputs = [ TestFatal TestRequires ]; propagatedBuildInputs = [ ClassSingleton ParamsValidationCompiler Specio namespaceautoclean ]; @@ -4356,10 +4470,10 @@ let DevelPatchPerl = buildPerlPackage { pname = "Devel-PatchPerl"; - version = "1.56"; + version = "1.64"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.56.tar.gz; - sha256 = "1b97a6b82qh1dsv13rgxyiv4lffp360crgc9wiq3pyj0zr13nfc2"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.64.tar.gz; + sha256 = "16fl04m0b9jccq30h7myaj6hsv4ivx53i3q5klq0d0q6w0k5sb4v"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { @@ -4385,10 +4499,10 @@ let DevelPPPort = buildPerlPackage { pname = "Devel-PPPort"; - version = "3.45"; + version = "3.52"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.45.tar.gz; - sha256 = "171dcfb3abd964081986634b79c53108f0825c47f95f915eb7cdb3309f7d04f0"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.52.tar.gz; + sha256 = "cf4963786ea6821fcb7fe8979229f1c1c69a624b1ef968a498460792e35ec390"; }; meta = { description = "Perl/Pollution/Portability"; @@ -4409,6 +4523,17 @@ let }; }; + DeviceSerialPort = buildPerlPackage { + pname = "Device-SerialPort"; + version = "1.04"; + src = fetchurl { + url = mirror://cpan/authors/id/C/CO/COOK/Device-SerialPort-1.04.tar.gz; + sha256 = "1mz9a2qzkz6fbz76wcwmp48h6ckjxpcazb70q03acklvndy5d4nk"; + }; + meta = { + }; + }; + DBDMock = buildPerlModule { pname = "DBD-Mock"; version = "1.45"; @@ -4783,10 +4908,10 @@ let DevelStackTrace = buildPerlPackage { pname = "Devel-StackTrace"; - version = "2.03"; + version = "2.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.03.tar.gz; - sha256 = "7618cd4ebe24e254c17085f4b418784ab503cb4cb3baf8f48a7be894e59ba848"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.04.tar.gz; + sha256 = "cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855"; }; meta = { description = "An object representing a stack trace"; @@ -4908,6 +5033,34 @@ let }; }; + DirManifest = buildPerlModule { + pname = "Dir-Manifest"; + version = "0.2.0"; + src = fetchurl { + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Dir-Manifest-0.2.0.tar.gz; + sha256 = "0yfi23czr1l50666bb9akm3sqjpqr3j8sxwn86lwzgd5qg51n2zh"; + }; + propagatedBuildInputs = [ Moo PathTiny ]; + meta = { + description = "treat a directory and a manifest file as a hash/dictionary of keys to texts or blobs"; + license = with stdenv.lib.licenses; [ mit ]; + }; + }; + + DispatchClass = buildPerlPackage { + pname = "Dispatch-Class"; + version = "0.02"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MAUKE/Dispatch-Class-0.02.tar.gz; + sha256 = "10k5l4n2mp0hfn9jwn785k211n75y56zwny1zx3bvs7r38xv8kfp"; + }; + propagatedBuildInputs = [ ExporterTiny ]; + meta = { + description = "dispatch on the type (class) of an argument"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DistCheckConflicts = buildPerlPackage { pname = "Dist-CheckConflicts"; version = "0.11"; @@ -5126,14 +5279,14 @@ let }; }; - DistZillaPluginTestMinimumVersion = buildPerlPackage { + DistZillaPluginTestMinimumVersion = buildPerlModule { pname = "Dist-Zilla-Plugin-Test-MinimumVersion"; - version = "2.000008"; + version = "2.000010"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-MinimumVersion-2.000008.tar.gz; - sha256 = "d924ce79aaaa1885510ca6ecfcb4d8bc250fb6995bc96627f1536cb589e3b660"; + url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-MinimumVersion-2.000010.tar.gz; + sha256 = "b8b71f4b64b689f4b647a3a87d6aaaae45a68892d35e36baa976f605736370fb"; }; - buildInputs = [ TestDeep TestMinimumVersion TestOutput ]; + buildInputs = [ ModuleBuildTiny TestDeep TestMinimumVersion TestOutput ]; propagatedBuildInputs = [ DistZilla ]; meta = { description = "Release tests for minimum required versions"; @@ -5670,10 +5823,10 @@ let EV = buildPerlPackage { pname = "EV"; - version = "4.25"; + version = "4.27"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.25.tar.gz; - sha256 = "2e65c8e8f2358599f9a48f766cc1b3ad0eaf2e6cef416adc8ad9cddc3f329c6a"; + url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.27.tar.gz; + sha256 = "55750e5422d8cac7a2d0c89feeaca7d840ab2268f4c537655cdda0085e0d0cbc"; }; buildInputs = [ CanaryStability ]; propagatedBuildInputs = [ commonsense ]; @@ -5927,10 +6080,10 @@ let ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.34"; + version = "7.36"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.34.tar.gz; - sha256 = "95f1eb44de480d00b28d031b574ec868f7aeeee199eb5abe5666f6bcbbf68480"; + url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.36.tar.gz; + sha256 = "06cef6429315cdc6afa9b2dc6fbdfa33538b6f68c827f441294621858e28c558"; }; meta = { description = "Create a module Makefile"; @@ -6074,10 +6227,10 @@ let FFICheckLib = buildPerlPackage { pname = "FFI-CheckLib"; - version = "0.23"; + version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.23.tar.gz; - sha256 = "0rjivas0rsp7d5599cjcxss80zfj7a5b8did771dlw7h2p5apisf"; + url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.25.tar.gz; + sha256 = "193b6vx11cfj2w6nv61zi9apq8165klh2zmpn5jllxpirykvjdpb"; }; buildInputs = [ Test2Suite ]; meta = { @@ -6169,10 +6322,10 @@ let FileCopyRecursive = buildPerlPackage { pname = "File-Copy-Recursive"; - version = "0.44"; + version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.44.tar.gz; - sha256 = "1r3frbl61kr7ig9bzd60fka772cd504v3kx9kgnwvcy1inss06df"; + url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz; + sha256 = "0mqivx4nbzagl3s2kxka72050sfb75xvn25j8a0f6ic3ibvir5yk"; }; buildInputs = [ PathTiny TestDeep TestFatal TestFile TestWarnings ]; }; @@ -6574,10 +6727,10 @@ let FilesysDiskUsage = buildPerlPackage { pname = "Filesys-DiskUsage"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.12.tar.gz; - sha256 = "e8afee07014df5868f9a2784e041c82c3c8c38550f4cd48bec56d0d6c4997273"; + url = mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.13.tar.gz; + sha256 = "fd3e52c6f6241271a281348d1d43c44154c2f61a32543db46aa9e15692d1b713"; }; buildInputs = [ TestWarn ]; meta = { @@ -6739,17 +6892,18 @@ let FinanceQuote = buildPerlPackage { pname = "Finance-Quote"; - version = "1.47"; + version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.47.tar.gz; - sha256 = "0gzbq85738f299jaw4nj3ljnka380j2y6yspmyl71rgfypqjvbr7"; + url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.49.tar.gz; + sha256 = "0lxz9fsm4ld3l900zxh2w91wjygk0ifn4miw6q5k4mm67d2c9nwm"; }; - propagatedBuildInputs = [ CGI DateTime HTMLTableExtract JSON LWPProtocolHttps ]; + propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; meta = with stdenv.lib; { homepage = http://finance-quote.sourceforge.net/; description = "Get stock and mutual fund quotes from various exchanges"; license = licenses.gpl2; }; + buildInputs = [ TestPod ]; }; FontAFM = buildPerlPackage { @@ -6817,13 +6971,13 @@ let GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; - version = "0.2000"; + version = "0.2202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2000.tar.gz; - sha256 = "dc87a348a2cacfadfb8205ff3fdbc138f475126bef175bc806ec9454285c2165"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz; + sha256 = "14fe240613b41c9d3e7cc560eaabd78bd13ded66d2838b738b74f7d1811d9263"; }; - buildInputs = [ PathTiny TestDifferences ]; - propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils ]; + buildInputs = [ DirManifest TestDifferences ]; + propagatedBuildInputs = [ ClassXSAccessor ExceptionClass ListMoreUtils PathTiny ]; meta = { description = "Verify solutions for solitaire games"; license = stdenv.lib.licenses.mit; @@ -6901,10 +7055,10 @@ let GeoIP2 = buildPerlPackage { pname = "GeoIP2"; - version = "2.006001"; + version = "2.006002"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006001.tar.gz; - sha256 = "05pb8bj2dkfcn8z56f8dcs76x65xcn05fywm7vifmfh39qgkmm62"; + url = mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006002.tar.gz; + sha256 = "0d4qq0k0pd0xd83iykr0jkyizl499ii6ajwwwl93rgg9xsl44189"; }; propagatedBuildInputs = [ JSONMaybeXS LWPProtocolHttps MaxMindDBReader ParamsValidate Throwable ]; buildInputs = [ PathClass TestFatal TestNumberDelta ]; @@ -7363,10 +7517,10 @@ let Gtk3 = buildPerlPackage { pname = "Gtk3"; - version = "0.034"; + version = "0.035"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.034.tar.gz; - sha256 = "0baxyhlzdf7avka40h1niiir8vz4nilqkiwh876i0hv0f8xj3nqa"; + url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.035.tar.gz; + sha256 = "1zhr4ixjb93rjnxsbrjc3fg86qkx1fj4w21yg5q4swjvm6fxdfcg"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; meta = { @@ -8725,10 +8879,10 @@ let Inline = buildPerlPackage { pname = "Inline"; - version = "0.82"; + version = "0.83"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.82.tar.gz; - sha256 = "1af94a8e95e4ba4545592341c47d8d1dc45b01822b877f7d3095a438566e874b"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.83.tar.gz; + sha256 = "171a8e5f66faf88fe5ef4de7126267cd8fb2503483432eabc3b88ac7d5be4239"; }; buildInputs = [ TestWarn ]; meta = { @@ -8746,10 +8900,10 @@ let InlineC = buildPerlPackage { pname = "Inline-C"; - version = "0.80"; + version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.80.tar.gz; - sha256 = "35f5ff188f56b9c8a5ec342e2ff3a2d248ddbc91eead80d9361697914d5adbe3"; + url = mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz; + sha256 = "f185258d9050d7f79b4f00f12625cc469c2f700ff62d3e831cb18d80d2c87aac"; }; buildInputs = [ FileCopyRecursive FileShareDirInstall TestWarn YAMLLibYAML ]; propagatedBuildInputs = [ Inline ParseRecDescent Pegex ]; @@ -8879,10 +9033,10 @@ let JSONPP = buildPerlPackage { pname = "JSON-PP"; - version = "4.02"; + version = "4.04"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.02.tar.gz; - sha256 = "11wlh4clq0cddiamh1ipps3fh9ly01j4pcdh8f4nw7912bw7pimc"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.04.tar.gz; + sha256 = "0smna2b8h9jlzlbfb64i31vabyqyjs3iwhng0f0byjxrsxb1qcc1"; }; meta = { description = "JSON::XS compatible pure-Perl module"; @@ -8903,6 +9057,19 @@ let }; }; + JSONParse = buildPerlPackage { + pname = "JSON-Parse"; + version = "0.55"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz; + sha256 = "0mnjypkiga8zdxr5kbd7sf49pcbn55ivndn01p5ln4amqgdmd66w"; + }; + meta = { + description = "Read JSON into a Perl variable"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + JSONWebToken = buildPerlModule { pname = "JSON-WebToken"; version = "0.10"; @@ -9065,10 +9232,10 @@ let LinguaENInflect = buildPerlPackage { pname = "Lingua-EN-Inflect"; - version = "1.903"; + version = "1.904"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.903.tar.gz; - sha256 = "fcef4b67b04cc39e427b2d70e7c5b24195edd0ed88dd705a08ecd5cd830b0d49"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.904.tar.gz; + sha256 = "54d344884ba9b585680975bbd4049ddbf27bf654446fb00c7e1fc538e08c3173"; }; meta = { description = "Convert singular to plural. Select 'a' or 'an'"; @@ -9123,10 +9290,10 @@ let LinguaENTagger = buildPerlPackage { pname = "Lingua-EN-Tagger"; - version = "0.30"; + version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.30.tar.gz; - sha256 = "0nrnkvsf9f0a7lp82sanmy89ms2nqq1lvjqicvsagsvzp513bl5b"; + url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.31.tar.gz; + sha256 = "14z9fbl3mf6lxhp0v2apdlxy1fw1y07j4ydrjsh7p3w0wj3qr7ll"; }; propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; meta = { @@ -9395,15 +9562,16 @@ let LocaleCodes = buildPerlPackage { pname = "Locale-Codes"; - version = "3.60"; + version = "3.61"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.60.tar.gz; - sha256 = "32829bc49d927335de6994f3cfd55c5e693881602564c2aa966fe86740371194"; + url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.61.tar.gz; + sha256 = "9432c02674dd789da45fe5b778599b4c648f0a3433bf71cda203fc8a0cec501d"; }; meta = { description = "A distribution of modules to handle locale codes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; + buildInputs = [ FileFindRule TestInter TestPod TestPodCoverage ]; }; LocaleGettext = buildPerlPackage { @@ -9598,6 +9766,21 @@ let }; }; + LogAnyAdapterLog4perl = buildPerlPackage { + pname = "Log-Any-Adapter-Log4perl"; + version = "0.09"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-0.09.tar.gz; + sha256 = "19f1drqnzr6g4xwjm6jk4iaa3zmiax8bzxqch04f4jr12bjd75qi"; + }; + propagatedBuildInputs = [ LogAny LogLog4perl ]; + meta = { + description = "Log::Any adapter for Log::Log4perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/preaction/Log-Any-Adapter-Log4perl"; + }; + }; + LogContextual = buildPerlPackage { pname = "Log-Contextual"; version = "0.008001"; @@ -9681,10 +9864,10 @@ let MCE = buildPerlPackage { pname = "MCE"; - version = "1.838"; + version = "1.843"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.838.tar.gz; - sha256 = "1xg63kd2la5zh7cvapv1l1wsxjallj4xv5l15bdp8jl3vvffwdhi"; + url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.843.tar.gz; + sha256 = "0x1s4xxxc9jj46h6i8mr8sczz0qavhal5639img1n8b96nsj6cf7"; }; meta = { description = "Many-Core Engine for Perl providing parallel processing capabilities"; @@ -9725,10 +9908,10 @@ let LogDispatchouli = buildPerlPackage { pname = "Log-Dispatchouli"; - version = "2.017"; + version = "2.019"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.017.tar.gz; - sha256 = "99f8341c8d4f8f46a673b1ff1a6edc96165d75af96ddcb6d99fa227f9af4dfbf"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.019.tar.gz; + sha256 = "fe8890c553c8f72b8b55633067270862c34db2ab8ff1cf8db0855f0427c23442"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; @@ -9755,10 +9938,10 @@ let LWP = buildPerlPackage { pname = "libwww-perl"; - version = "6.38"; + version = "6.39"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.38.tar.gz; - sha256 = "a8e0849b8d2798fc45a2a5f2fe45c96cbbad5baf3bcbe64a3bf85f210e78708c"; + url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.39.tar.gz; + sha256 = "9a8d7747938aa75d7d524c71574ae7f99ca66a5dac8255a7f7759f373e7774d5"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; # support cross-compilation by avoiding using `has_module` which does not work in miniperl (it requires B native module) @@ -9927,11 +10110,11 @@ let }; MailBox = buildPerlPackage { - version = "3.006"; + version = "3.007"; pname = "Mail-Box"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.006.tar.gz; - sha256 = "1fm17z13jq7ff2f4ynnajdzzdqa4sb0kx5nfy9fvb0nzw49qd502"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.007.tar.gz; + sha256 = "1rqn9d6sjinbnl8a9ia4rqfmp899ad89y9h9hpzvmr8jxni7i19s"; }; doCheck = false; @@ -10073,10 +10256,10 @@ let MailTools = buildPerlPackage { pname = "MailTools"; - version = "2.20"; + version = "2.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.20.tar.gz; - sha256 = "15iizg2x1w7ca0r8rn3wwhp7w160ljvf55prspljwd6cm7vhcmpm"; + url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz; + sha256 = "1js43bp2dnd8n2rv8clsv749166jnyqnc91k4wkkmw5n4rlbvnaa"; }; propagatedBuildInputs = [ TimeDate ]; meta = { @@ -10087,10 +10270,10 @@ let MailTransport = buildPerlPackage { pname = "Mail-Transport"; - version = "3.003"; + version = "3.004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.003.tar.gz; - sha256 = "0lb1awpk2wcnn5wg663982jl45x9fdn8ikxscayscxa16rim116p"; + url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.004.tar.gz; + sha256 = "049xsjxfn00v5znmrg7vgyafy5wzxxa901hq2g083s0pyq4mlcfg"; }; propagatedBuildInputs = [ MailMessage ]; meta = { @@ -10176,10 +10359,10 @@ let MathClipper = buildPerlModule { pname = "Math-Clipper"; - version = "1.27"; + version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.27.tar.gz; - sha256 = "0di8frcxa8laa5s0x4vkr2mp9abv2a099c3x4gsdpnbijj10j6dn"; + url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.29.tar.gz; + sha256 = "14vmz1x8hwnlk239dcsh0n39kd7cd7v5g1iikgbyjvc66gqw89sk"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; buildInputs = [ ExtUtilsCppGuess ExtUtilsTypemapsDefault ExtUtilsXSpp ModuleBuildWithXSpp TestDeep ]; @@ -10335,10 +10518,10 @@ let MaxMindDBReader = buildPerlPackage { pname = "MaxMind-DB-Reader"; - version = "1.000013"; + version = "1.000014"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000013.tar.gz; - sha256 = "0w7dmfhpibazrh75bdr7vmpji83fzldsy0zjvhg3cwadr4f35kmq"; + url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000014.tar.gz; + sha256 = "1a9rrvarw3q6378w3sqv632w36a9bsh0r90yfa49lzwnkj7hf81q"; }; propagatedBuildInputs = [ DataIEEE754 DataPrinter DataValidateIP MaxMindDBCommon ]; buildInputs = [ PathClass TestBits TestFatal TestNumberDelta TestRequires ]; @@ -10350,10 +10533,10 @@ let MaxMindDBReaderXS = buildPerlModule { pname = "MaxMind-DB-Reader-XS"; - version = "1.000007"; + version = "1.000008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000007.tar.gz; - sha256 = "1wg1x1pqamapfhn6rbffqipncgs15k99q34agdamv76i6782ny8r"; + url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz; + sha256 = "11y71m77y38mi68gw5dqx54z9syvax42x3m9v7mgx35c5z4gpal4"; }; propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; buildInputs = [ NetWorks PathClass TestFatal TestNumberDelta TestRequires ]; @@ -10409,7 +10592,7 @@ let url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-1.9019.tar.gz; sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565"; }; - propagatedBuildInputs = [ CPANCommonIndex CPANDistnameInfo CPANMetaCheck CaptureTiny ClassTiny ExtUtilsConfig ExtUtilsHelpers ExtUtilsInstallPaths FileWhich Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote URI Win32ShellQuote locallib ]; + propagatedBuildInputs = [ CPANCommonIndex CPANMetaCheck CaptureTiny ExtUtilsHelpers ExtUtilsInstallPaths Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote Win32ShellQuote locallib ]; meta = { homepage = https://github.com/miyagawa/cpanminus; description = "A CPAN client"; @@ -10605,11 +10788,11 @@ let ModernPerl = buildPerlPackage { pname = "Modern-Perl"; - version = "1.20181021"; + version = "1.20190727"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20181021.tar.gz; - sha256 = "1d482b528f7c6c60f868d7d0bf0fcc9c3668250dc44fcb39a95b7c63e092c9c5"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz; + sha256 = "2e69d7ab7e4a53153e686c25547ad914e7464d4e5604b8851931a6e63fc51b21"; }; meta = { homepage = https://github.com/chromatic/Modern-Perl; @@ -11030,10 +11213,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.14"; + version = "8.22"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.14.tar.gz; - sha256 = "0dammdx51cyqn2b35yihk85gz1blgw85w6jv6h04cv4cdahph59q"; + url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.22.tar.gz; + sha256 = "0m28yb1pbnbgdq0z7ykb44j93c1vwjzv7msm6vs7msysyx84mqw6"; }; meta = { homepage = https://mojolicious.org; @@ -11324,6 +11507,21 @@ let }; }; + MooXAliases = buildPerlPackage { + pname = "MooX-Aliases"; + version = "0.001006"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/MooX-Aliases-0.001006.tar.gz; + sha256 = "0rrqqsm8i6rckzxgzcj2p2s4cfszzddzwbcm04yjcqdcihkk2q01"; + }; + propagatedBuildInputs = [ Moo strictures ]; + buildInputs = [ TestFatal ]; + meta = { + description = "easy aliasing of methods and attributes in Moo"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + MooXCmd = buildPerlPackage { pname = "MooX-Cmd"; version = "0.017"; @@ -11677,12 +11875,12 @@ let MooseXRoleParameterized = buildPerlModule { pname = "MooseX-Role-Parameterized"; - version = "1.10"; + version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.10.tar.gz; - sha256 = "0plx25n80mv9qwhix52z79md0qil616nbcryk2f4216kghpw2ij8"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.11.tar.gz; + sha256 = "17pc5dly7ba0p50p2xcmp7bar8m262jcqgbkgyswl3kzbmn7dzhw"; }; - buildInputs = [ CPANMetaCheck ModuleBuildTiny MooseXRoleWithOverloading TestFatal TestRequires ]; + buildInputs = [ CPANMetaCheck ModuleBuildTiny TestFatal TestNeeds ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { homepage = https://github.com/sartak/MooseX-Role-Parameterized/tree; @@ -12329,10 +12527,10 @@ let NetHTTP = buildPerlPackage { pname = "Net-HTTP"; - version = "6.18"; + version = "6.19"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.18.tar.gz; - sha256 = "7e42df2db7adce3e0eb4f78b88c450f453f5380f120fd5411232e03374ba951c"; + url = mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz; + sha256 = "52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4"; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; @@ -12582,10 +12780,10 @@ let NetSSLeay = buildPerlPackage { pname = "Net-SSLeay"; - version = "1.85"; + version = "1.88"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEM/Net-SSLeay-1.85.tar.gz; - sha256 = "1j5h4ycm8538397l204d2d5fkm9595aj174pj7bkpbhwzfwqi0cx"; + url = mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz; + sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; }; buildInputs = [ pkgs.openssl ]; doCheck = false; # Test performs network access. @@ -12652,14 +12850,13 @@ let url = mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz; sha256 = "08kj2h9qiyfvv3jfz619xl796j93cslg7d96919mnrnjy6hdz6zh"; }; - - propagatedBuildInputs = [ RegexpIPv6 LWPProtocolhttps ]; doCheck = false; # https://rt.cpan.org/Public/Bug/Display.html?id=99377 postPatch = '' substituteInPlace IP.pm --replace " AutoLoader" "" ''; + buildInputs = [ RegexpIPv6 ]; }; NetWorks = buildPerlPackage { @@ -13200,6 +13397,20 @@ let }; }; + ParserMGC = buildPerlModule { + pname = "Parser-MGC"; + version = "0.16"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz; + sha256 = "14bv2fwg59q4s3kv0vf11hh222anlm181ig87cph2f68y32n2i3l"; + }; + propagatedBuildInputs = [ FileSlurpTiny ]; + meta = { + description = "build simple recursive-descent parsers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + PathClass = buildPerlModule { pname = "Path-Class"; version = "0.37"; @@ -13213,6 +13424,22 @@ let }; }; + PathIteratorRule = buildPerlPackage { + pname = "Path-Iterator-Rule"; + version = "1.014"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz; + sha256 = "19mik0r5v1cmxfxm0h4lwqyj0nmq6jgnvvq96hqcjgylpvc02x1z"; + }; + propagatedBuildInputs = [ NumberCompare TextGlob TryTiny ]; + buildInputs = [ Filepushd PathTiny TestDeep TestFilename ]; + meta = { + description = "Iterative, recursive file finder"; + license = with stdenv.lib.licenses; [ asl20 ]; + homepage = "https://github.com/dagolden/Path-Iterator-Rule"; + }; + }; + PathTiny = buildPerlPackage { pname = "Path-Tiny"; version = "0.108"; @@ -13268,10 +13495,10 @@ let PDFAPI2 = buildPerlPackage { pname = "PDF-API2"; - version = "2.033"; + version = "2.034"; src = fetchurl { - url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.033.tar.gz; - sha256 = "9c0866ec1a3053f73afaca5f5cdbe6925903b4ce606f4bf4ac317731a69d27a0"; + url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.034.tar.gz; + sha256 = "8aa98818fb6e4bebd6f9096e222989dcdd5fd4c5fa2ad1c7f0149053fc68f1cc"; }; buildInputs = [ TestException TestMemoryCycle ]; propagatedBuildInputs = [ FontTTF ]; @@ -13339,13 +13566,13 @@ let PerlCritic = buildPerlModule { pname = "Perl-Critic"; - version = "1.132"; + version = "1.134"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.132.tar.gz; - sha256 = "bcf36e32830373cf1ee35abbe2e20336fbbcad5041c14aad6822ac947be092b1"; + url = mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.134.tar.gz; + sha256 = "90ec87ed8d49dd5fd686a0e4c8ef77268962faf14b18b43f2385db79e34085eb"; }; buildInputs = [ TestDeep ]; - propagatedBuildInputs = [ BKeywords ConfigTiny FileHomeDir ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; + propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { homepage = http://perlcritic.com; description = "Critique Perl source code for best-practices"; @@ -13450,10 +13677,10 @@ let PerlTidy = buildPerlPackage { pname = "Perl-Tidy"; - version = "20181120"; + version = "20190601"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20181120.tar.gz; - sha256 = "7db0eeb76535a62cbb4e69b6558e0705162d476a654a7a5ec472aa846b8c4569"; + url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20190601.tar.gz; + sha256 = "8f3d704b4eff457bf5bb70f9adf570690b2252dec31f75e8cb743392f1be338f"; }; meta = { description = "Indent and reformat perl scripts"; @@ -13626,10 +13853,10 @@ let PlackMiddlewareRemoveRedundantBody = buildPerlPackage { pname = "Plack-Middleware-RemoveRedundantBody"; - version = "0.07"; + version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.07.tar.gz; - sha256 = "64b841d5d74b4c4a595b85749d69297f4f5f5c0829a6e99e0099f05dd69be3c3"; + url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.09.tar.gz; + sha256 = "80d45f93d6b7290b0bd8b3cedd84a37fc501456cc3dec02ec7aad81c0018087e"; }; propagatedBuildInputs = [ Plack ]; meta = { @@ -13773,13 +14000,13 @@ let PPI = buildPerlPackage { pname = "PPI"; - version = "1.236"; + version = "1.270"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.236.tar.gz; - sha256 = "c6674b349c0b7d9a6d668e789a5e5215477d88ed4c8203aa69a2a50085308aec"; + url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz; + sha256 = "622a698c781bb85d2bdf7bbfe040fe70d33b79774c9ae01fce2375dc73faf457"; }; - buildInputs = [ ClassInspector FileRemove TestDeep TestObject TestSubCalls ]; - propagatedBuildInputs = [ Clone IOString ListMoreUtils ParamsUtil TaskWeaken ]; + buildInputs = [ ClassInspector TestDeep TestNoWarnings TestObject TestSubCalls ]; + propagatedBuildInputs = [ Clone IOString ParamsUtil TaskWeaken ]; # Remove test that fails due to unexpected shebang after # patchShebang. @@ -13794,10 +14021,10 @@ let PPIxQuoteLike = buildPerlModule { pname = "PPIx-QuoteLike"; - version = "0.006"; + version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.006.tar.gz; - sha256 = "1gyp3ywnhpv7k3cqdgywpinz7wgqzg38iailcnyiwgl62wib0bsq"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.007.tar.gz; + sha256 = "040ma7763isxn9axsf9s8g00hm3ld6dajwp3nhq0nn4mz8cfaa3w"; }; propagatedBuildInputs = [ PPI ]; meta = { @@ -13808,12 +14035,12 @@ let PPIxRegexp = buildPerlModule { pname = "PPIx-Regexp"; - version = "0.064"; + version = "0.065"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.064.tar.gz; - sha256 = "8769c634294c941f83b5a7e74a14eda3671c1fa131b8d6416e7fc77f7cd57408"; + url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.065.tar.gz; + sha256 = "eb4a56858c077d9e6a859c4f29d7659ed40ea588d21cfe7193dd91143a8e843e"; }; - propagatedBuildInputs = [ PPI ]; + propagatedBuildInputs = [ ListMoreUtils PPI ]; meta = { description = "Parse regular expressions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -13848,10 +14075,10 @@ let ProcProcessTable = buildPerlPackage { pname = "Proc-ProcessTable"; - version = "0.56"; + version = "0.59"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.56.tar.gz; - sha256 = "99fb8fd11e4e438399dd362d95b5b2073f1f340e9b3a7f04e76b6c7428170660"; + url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz; + sha256 = "f8cc5054d78c35a0ce39fb75430b4ef402e2a99013d2ec37e7997f316594606c"; }; meta = { description = "Perl extension to access the unix process table"; @@ -13989,7 +14216,7 @@ let url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz; sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; - propagatedBuildInputs = [ GetoptLongDescriptive ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Perl-PrereqScanner; description = "A tool to scan your Perl code for its prerequisites"; @@ -13999,10 +14226,10 @@ let PerlPrereqScannerNotQuiteLite = buildPerlPackage { pname = "Perl-PrereqScanner-NotQuiteLite"; - version = "0.9904"; + version = "0.9906"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9904.tar.gz; - sha256 = "1qf6x49sjswazh7bicpm7wnwpdnx245ws02s53dvbxcbw2c66hsn"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9906.tar.gz; + sha256 = "19b59zf69ayabkacifz36b5z3kfh4kbv5kn1a1habk46f6v7g9pj"; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; buildInputs = [ ExtUtilsMakeMakerCPANfile TestFailWarnings TestUseAllModules ]; @@ -14262,10 +14489,10 @@ let PodSimple = buildPerlPackage { pname = "Pod-Simple"; - version = "3.35"; + version = "3.39"; src = fetchurl { - url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.35.tar.gz; - sha256 = "0gg11ibbc02l2aw0bsv4jx0jax8z0apgfy3p5csqnvhlsb6218cr"; + url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.39.tar.gz; + sha256 = "0qh43griaz3i21ca745irrnjbksv5q07h4wdjv28nqpcc55pva8m"; }; }; @@ -14363,10 +14590,10 @@ let Razor2ClientAgent = buildPerlPackage { pname = "Razor2-Client-Agent"; - version = "2.84"; + version = "2.86"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.84.tar.gz; - sha256 = "d7c2ed7f347a673b1425e4da7656073d6c52847bc7403bf57e3a404b52f7e501"; + url = mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.86.tar.gz; + sha256 = "5e062e02ebb65e24b708e7eefa5300c43d6f657bf20d08fec4ca8a0a3b94845f"; }; propagatedBuildInputs = [ DigestSHA1 URI ]; meta = { @@ -14404,12 +14631,12 @@ let Redis = buildPerlModule { pname = "Redis"; - version = "1.991"; + version = "1.995"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.991.tar.gz; - sha256 = "f7d1a934fa9360a26e480f896f97be0fd62807f9d9baca65a9aa8d007ff2acaa"; + url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz; + sha256 = "a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906"; }; - buildInputs = [ IOString ModuleBuildTiny PodCoverageTrustPod TestCPANMeta TestDeep TestFatal TestSharedFork TestTCP ]; + buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; meta = { homepage = https://github.com/PerlRedis/perl-redis; @@ -14468,10 +14695,10 @@ let RegexpGrammars = buildPerlModule { pname = "Regexp-Grammars"; - version = "1.049"; + version = "1.052"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.049.tar.gz; - sha256 = "2e642a7051b9ea5dccd05d53e49684ca28e99c43b811bbec37d160d3f81edf68"; + url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz; + sha256 = "d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62"; }; meta = { description = "Add grammatical parsing features to Perl 5.10 regexes"; @@ -14605,10 +14832,10 @@ let RoleTiny = buildPerlPackage { pname = "Role-Tiny"; - version = "2.000006"; + version = "2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.000006.tar.gz; - sha256 = "cc73418c904a0286ecd8915eac11f5be2a8d1e17ea9cb54c9116b0340cd3e382"; + url = mirror://cpan/authors/id/E/ET/ETHER/Role-Tiny-2.000007.tar.gz; + sha256 = "33af02d79d5e9ae76172fd1b2a80230bd8cfde146e1b9327a094a6dfdec6fb56"; }; meta = { description = "Roles. Like a nouvelle cuisine portion size slice of Moose"; @@ -14702,10 +14929,10 @@ let ScopeUpper = buildPerlPackage { pname = "Scope-Upper"; - version = "0.31"; + version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.31.tar.gz; - sha256 = "cc4d2ce0f185b4867d73b4083991117052a523fd409debf15bdd7e374cc16d8c"; + url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz; + sha256 = "ccaff3251c092f2af8b5ad840b76655c4bc4ccf504ff7bde233811822a40abcf"; }; meta = { description = "Act on upper scopes"; @@ -15078,12 +15305,12 @@ let SQLTranslator = buildPerlPackage { pname = "SQL-Translator"; - version = "0.11024"; + version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-0.11024.tar.gz; - sha256 = "5bde9d6f67850089ef35a9296d6f53e5ee8e991438366b71477f3f27c1581bb1"; + url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz; + sha256 = "6bb0cb32ca25da69df65e5de71f679f3ca90044064526fa336cabd342f220e87"; }; - buildInputs = [ JSON TestDifferences TestException XMLWriter YAML ]; + buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; propagatedBuildInputs = [ CarpClan DBI FileShareDir Moo PackageVariant ParseRecDescent TryTiny ]; meta = { description = "SQL DDL transformations and more"; @@ -15132,10 +15359,10 @@ let Starman = buildPerlModule { pname = "Starman"; - version = "0.4014"; + version = "0.4015"; src = fetchurl { - url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4014.tar.gz"; - sha256 = "1sbb5rb3vs82rlh1fjkgkcmj5pj62b4y9si4ihh45sl9m8c2qxx5"; + url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz; + sha256 = "1y1kn4929k299fbf6sw9lxcsdlq9fvq777p6yrzk591rr9xhkx8h"; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ]; @@ -15208,10 +15435,10 @@ let Storable = buildPerlPackage { pname = "Storable"; - version = "3.11"; + version = "3.15"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.11.tar.gz; - sha256 = "b2dac116d2f5adaf289e9a8a9bbac35cc2c24a9d2221fea9b6578a33b8ec7d28"; + url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.15.tar.gz; + sha256 = "fc3dad06cb2e6fc86a2f2abc5b5491d9da328ca3e6b6306559c224521db174da"; }; meta = { license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; @@ -15854,7 +16081,7 @@ let sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; - propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX PathTiny StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; + propagatedBuildInputs = [ EnvPath FileWhich GamesSolitaireVerify InlineC MooX StringShellQuote TaskTestRunAllPlugins TemplateToolkit YAMLLibYAML ]; meta = { description = "Install the CPAN dependencies of the Freecell Solver test suite"; license = stdenv.lib.licenses.mit; @@ -15989,10 +16216,10 @@ let TemplateToolkit = buildPerlPackage { pname = "Template-Toolkit"; - version = "2.28"; + version = "2.29"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-2.28.tar.gz; - sha256 = "1msxg3j1hx5wsc7vr81x5gs9gdbn4y0x6cvyj3pq4dgi1603dbvi"; + url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-2.29.tar.gz; + sha256 = "0ya7c49q2rd2gdjf28y60iq8wsr2afphsy1labyhbf0zyhfdgp9b"; }; propagatedBuildInputs = [ AppConfig ]; doCheck = !stdenv.isDarwin; @@ -16146,10 +16373,10 @@ let TermShell = buildPerlModule { pname = "Term-Shell"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.10.tar.gz; - sha256 = "7d1f824c2db22769b60000b5b9ca2ad469c154939f9ec1cd3f0e06e9c967dda3"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz; + sha256 = "7a142361f22f2e5fae9d6e39353663e8bdfa6118d1aee82204bd9083ddb04154"; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = with stdenv.lib; { @@ -16260,12 +16487,12 @@ let Test2PluginNoWarnings = buildPerlPackage { pname = "Test2-Plugin-NoWarnings"; - version = "0.06"; + version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.06.tar.gz; - sha256 = "002qk6qsm0l6r2kaxywvc38w0yf0mlavgywq8li076pn6kcw3242"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.07.tar.gz; + sha256 = "1sxqcbklmpxpkysq3wbivs77n3c8mvasvfa38dzmyqz04ifaf7gz"; }; - buildInputs = [ IPCRun3 Test2Suite ]; + buildInputs = [ CaptureTiny IPCRun3 Test2Suite ]; meta = { description = "Fail if tests warn"; license = with stdenv.lib.licenses; [ artistic2 ]; @@ -16274,10 +16501,10 @@ let Test2Suite = buildPerlPackage { pname = "Test2-Suite"; - version = "0.000119"; + version = "0.000122"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000119.tar.gz; - sha256 = "fd48764118acf1c30057f58f0af90696b194fbc5b637c77e08672e949c101e74"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000122.tar.gz; + sha256 = "83828cf440ce2a7bfc2fe48f535931e44328e39810370b04c9e947db888a7442"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; meta = { @@ -16455,10 +16682,10 @@ let TestCompile = buildPerlModule { pname = "Test-Compile"; - version = "1.3.0"; + version = "2.2.2"; src = fetchurl { - url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v1.3.0.tar.gz; - sha256 = "77527e9477ac5260443c756367a7f7bc3d8f6c6ebbc561b0b2fb3f79303bad33"; + url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.2.2.tar.gz; + sha256 = "7853b44a9819eb3e6003260eedf904a1ad80035ea5254296ce014f96084b65d4"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; meta = { @@ -16658,6 +16885,20 @@ let }; }; + TestFilename = buildPerlPackage { + pname = "Test-Filename"; + version = "0.03"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Filename-0.03.tar.gz; + sha256 = "1gpw4mjw68gnby8s4cifvbz6g2923xsc189jkw9d27i8qv20qiba"; + }; + propagatedBuildInputs = [ PathTiny ]; + meta = { + description = "Portable filename comparison"; + license = with stdenv.lib.licenses; [ asl20 ]; + }; + }; + TestFork = buildPerlModule { pname = "Test-Fork"; version = "0.02"; @@ -16750,6 +16991,22 @@ let }; }; + TestLWPUserAgent = buildPerlPackage { + pname = "Test-LWP-UserAgent"; + version = "0.033"; + src = fetchurl { + url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz; + sha256 = "03fjjj65fpjr4pv1532kwci1llfbsv4g9an0h7k723yqfx1wgdsb"; + }; + propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; + buildInputs = [ PathTiny Plack TestDeep TestFatal TestNeeds TestRequiresInternet TestWarnings ]; + meta = { + description = "A LWP::UserAgent suitable for simulating and testing network calls"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = "https://github.com/karenetheridge/Test-LWP-UserAgent"; + }; + }; + TestLeakTrace = buildPerlPackage { pname = "Test-LeakTrace"; version = "0.16"; @@ -16855,10 +17112,10 @@ let SUPER = buildPerlModule { pname = "SUPER"; - version = "1.20141117"; + version = "1.20190531"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20141117.tar.gz; - sha256 = "1a620e7d60aee9b13b1b26a44694c43fdb2bba1755cfff435dae83c7d42cc0b2"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20190531.tar.gz; + sha256 = "685d1ee76e7f0e9006942923bf7df8b11c107132992917593dcf7397d417d39a"; }; propagatedBuildInputs = [ SubIdentify ]; meta = { @@ -17298,10 +17555,10 @@ let TestRunValgrind = buildPerlModule { pname = "Test-RunValgrind"; - version = "0.2.0"; + version = "0.2.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.0.tar.gz; - sha256 = "70947565ad0be3e5d0cd9aca9e1fd0cb07c873e574310e92e8eca629ec6cd631"; + url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.1.tar.gz; + sha256 = "25a4a8bfcefaed7c40d8b8492e8828e798e6c85ca5f34ce4b9993f9899a7b09c"; }; buildInputs = [ TestTrap ]; propagatedBuildInputs = [ PathTiny ]; @@ -17341,10 +17598,10 @@ let TestSimple13 = buildPerlPackage { pname = "Test-Simple"; - version = "1.302162"; + version = "1.302164"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302162.tar.gz; - sha256 = "73a0197c3d735e060881da509f4c5fa76c4cbf7dbabd4297d3cf5f5feed31fc4"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302164.tar.gz; + sha256 = "50277b613f09cd52eb87b02c69ce0517b80080be8a8d80e1eda609479b0d6615"; }; meta = { description = "Basic utilities for writing tests"; @@ -17379,10 +17636,10 @@ let TestSynopsis = buildPerlPackage { pname = "Test-Synopsis"; - version = "0.15"; + version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.15.tar.gz; - sha256 = "1cxxidhwf8j8n41d423ankvls2wdi7aw755csi3hcv3mj9k67mfi"; + url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz; + sha256 = "09891vnkw9i8v074rswaxbrp6x2d8j8r90gqc306497ppiryq4qv"; }; meta = { description = "Test your SYNOPSIS code"; @@ -17660,11 +17917,11 @@ let TextBibTeX = buildPerlModule { pname = "Text-BibTeX"; - version = "0.87"; + version = "0.88"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.87.tar.gz; - sha256 = "1qhm0fin3j6nqpzlk0xy1lx6bzcrhb7fr82rjgkcq0wgmw91mqax"; + url = mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz; + sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"; }; perlPreHook = "export LD=$CC"; perlPostHook = stdenv.lib.optionalString stdenv.isDarwin '' @@ -17703,10 +17960,10 @@ let TextCSV = buildPerlPackage { pname = "Text-CSV"; - version = "1.99"; + version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-1.99.tar.gz; - sha256 = "e74ec039b12cc51d346bf1d814af7db8a05cb0a98340e7547a21646da8668cd2"; + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz; + sha256 = "8ccbd9195805222d995844114d0e595bb24ce188f85284dbf256080311cbb2c2"; }; meta = { description = "Comma-separated values manipulator (using XS or PurePerl)"; @@ -17790,6 +18047,21 @@ let }; }; + TextHogan = buildPerlPackage { + pname = "Text-Hogan"; + version = "2.02"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KA/KAORU/Text-Hogan-2.02.tar.gz; + sha256 = "0b3hzl4fz1bypmdh225wwx9lcmjx4bxz8l2p800x5vy8r2w7ngd3"; + }; + propagatedBuildInputs = [ Clone TextTrim ]; + buildInputs = [ DataVisitor PathTiny TryTiny YAML ]; + meta = { + description = "Text::Hogan - A mustache templating engine statement-for-statement cloned from hogan.js"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + TextIconv = buildPerlPackage { pname = "Text-Iconv"; version = "1.7"; @@ -18018,10 +18290,10 @@ let TextTemplate = buildPerlPackage { pname = "Text-Template"; - version = "1.55"; + version = "1.56"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.55.tar.gz; - sha256 = "a4948be945250c17f9f0aaee56cc79b3195dcebcb75215b55d6ed1ca2b02f18b"; + url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.56.tar.gz; + sha256 = "09aaa095c562d22824daf849378a58632446093f397d8c7acb37c25a7f37e646"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; }; @@ -18380,10 +18652,10 @@ let TimeDuration = buildPerlPackage { pname = "Time-Duration"; - version = "1.20"; + version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.20.tar.gz; - sha256 = "1f5vkid4pl5iq3hal01hk1zjbbzrqpx4m1djawbp93l152shb0j5"; + url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.21.tar.gz; + sha256 = "1f59z2svfydxgd1gzrb5k3hl6d432kzmskk7jhv2dyb5hyx0wd7y"; }; meta = { description = "Rounded or exact English expression of durations"; @@ -18393,10 +18665,10 @@ let TimeDurationParse = buildPerlPackage { pname = "Time-Duration-Parse"; - version = "0.14"; + version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.14.tar.gz; - sha256 = "17nh73r50mqqpgxdf3zpgdiqrizmjy0vdk0zd6xi9zcsdijrdhnc"; + url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz; + sha256 = "10g39bbrxkabbsfq4rv7f5b5x7h3jba08j4pg8gwr0b9iqx19n31"; }; buildInputs = [ TimeDuration ]; propagatedBuildInputs = [ ExporterLite ]; @@ -18419,6 +18691,17 @@ let }; }; + TimeOut = buildPerlPackage { + pname = "Time-Out"; + version = "0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz; + sha256 = "1lhmx1x8j6z1k9vn32bcsw7g44cg22icshnnc37djlnlixlxm5lk"; + }; + meta = { + }; + }; + TimeParseDate = buildPerlPackage { pname = "Time-ParseDate"; version = "2015.103"; @@ -18514,6 +18797,19 @@ let }; }; + TryTinyByClass = buildPerlPackage { + pname = "Try-Tiny-ByClass"; + version = "0.01"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MAUKE/Try-Tiny-ByClass-0.01.tar.gz; + sha256 = "0ipif12ix6vnmlyar4gh89libfadbsd9kvqg52f2cpr957slx3h3"; + }; + propagatedBuildInputs = [ DispatchClass TryTiny ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Twiggy = buildPerlPackage { pname = "Twiggy"; version = "0.1025"; @@ -18756,6 +19052,35 @@ let }; }; + URISmartURI = buildPerlPackage { + pname = "URI-SmartURI"; + version = "0.032"; + src = fetchurl { + url = mirror://cpan/authors/id/R/RK/RKITOVER/URI-SmartURI-0.032.tar.gz; + sha256 = "0b2grkmkbnp37q85wj7jpj5zr93vdbisgxlls2vl5q928rwln5zb"; + }; + propagatedBuildInputs = [ ClassC3Componentised FileFindRule ListMoreUtils Moose URI namespaceclean ]; + buildInputs = [ TestFatal TestNoWarnings ]; + meta = { + description = "Subclassable and hostless URIs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + URITemplate = buildPerlPackage { + pname = "URI-Template"; + version = "0.24"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-0.24.tar.gz; + sha256 = "1phibcmam2hklrddzj79l43va1gcqpyszbw21ynxq53ynmhjvbk8"; + }; + propagatedBuildInputs = [ URI ]; + meta = { + description = "Object for handling URI templates (RFC 6570)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + URIws = buildPerlPackage { pname = "URI-ws"; version = "0.03"; @@ -18812,15 +19137,11 @@ let vidir = buildPerlPackage { pname = "App-vidir"; - version = "0.040"; + version = "0.042"; src = fetchurl { - url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vivid-0.040-woldrich.tar.gz"; - sha256 = "0c97yx33pyhskbmwpqbwlkxr85awd6kg1baibvqkarhhvc8v7l0h"; + url = "mirror://cpan/authors/id/W/WO/WOLDRICH/App-vidir-0.042.tar.gz"; + sha256 = "18xkln3xajysxk0jwfyhavnifrsz38zv81s1gfb1w0xkwky3cla3"; }; - # NB: This preInstall a workaround for a problem that is fixed in HEAD. - preInstall = '' - sed -i -e '/^use encoding/d' bin/vidir - ''; outputs = [ "out" ]; meta = { maintainers = [ maintainers.chreekat ]; @@ -18893,10 +19214,10 @@ let WWWFormUrlEncoded = buildPerlModule { pname = "WWW-Form-UrlEncoded"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.25.tar.gz; - sha256 = "0kh7qrskhbk4j253pr2q4vpn73q5k6fj517m3lnj8n755z9adxz1"; + url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz; + sha256 = "1x4h5m5fkwaa0gbn6zp9mjrhr3r989w8wyrjxiii3dqm3xghnj60"; }; meta = { description = "parser and builder for application/x-www-form-urlencoded"; @@ -19000,10 +19321,10 @@ let Workflow = buildPerlModule { pname = "Workflow"; - version = "1.45"; + version = "1.46"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.45.tar.gz; - sha256 = "0w814z4j85gghzqnbxzsr60m8dbqc02yi7137sq58lhbsfshmvhx"; + url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.46.tar.gz; + sha256 = "10zxp39yp11ry5j1c1krhx7s57rb2r8m48jf66k8f4jzm6f0w7pf"; }; buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; @@ -19066,6 +19387,22 @@ let doCheck = false; # requires an X server }; + X11ProtocolOther = buildPerlPackage { + pname = "X11-Protocol-Other"; + version = "31"; + src = fetchurl { + url = mirror://cpan/authors/id/K/KR/KRYDE/X11-Protocol-Other-31.tar.gz; + sha256 = "1x3kvic52jgp2mvd5wzrqrprqi82cdk8l4075v8b33ksvj9mjqiw"; + }; + propagatedBuildInputs = [ X11Protocol ]; + buildInputs = [ EncodeHanExtra ModuleUtil ]; + meta = { + description = "Miscellaneous helpers for X11::Protocol connections."; + license = with stdenv.lib.licenses; [ gpl1Plus gpl3Plus ]; + homepage = "http://user42.tuxfamily.org/x11-protocol-other/index.html"; + }; + }; + X11GUITest = buildPerlPackage { pname = "X11-GUITest"; version = "0.28"; @@ -19331,10 +19668,10 @@ let XMLSAX = buildPerlPackage { pname = "XML-SAX"; - version = "1.00"; + version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.00.tar.gz; - sha256 = "1qra9k3wszjxvsgbragl55z3qba4nri0ipmjaxfib4l6xxj6bsj5"; + url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.02.tar.gz; + sha256 = "0am13vnv8qsjafr5ljakwnkhlwpk15sga02z8mxsg9is0j3w61j5"; }; propagatedBuildInputs = [ XMLNamespaceSupport XMLSAXBase ]; postInstall = '' @@ -19482,10 +19819,10 @@ let YAML = buildPerlPackage { pname = "YAML"; - version = "1.27"; + version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.27.tar.gz; - sha256 = "1yc2yqjyrcdlhp209f3a63f9xx6v5klisli25fv221yy43la34n9"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.29.tar.gz; + sha256 = "0gl5ssvrdajlbc85cy6z873n9cwlssk5q8z97a31vyiikhw5fp4w"; }; buildInputs = [ TestBase TestDeep TestYAML ]; @@ -19521,10 +19858,10 @@ let YAMLLibYAML = buildPerlPackage { pname = "YAML-LibYAML"; - version = "0.77"; + version = "0.79"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.77.tar.gz; - sha256 = "04wfa78i3r6gznl47gj3qvsa1ixdas7l7c5c3n5mwm81wi4d9vsi"; + url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.79.tar.gz; + sha256 = "0wwmk3f2q0qv229sjjl3vbypppa9wmaiqh2b0qlai33m476vl1c4"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 454e497ad1dc0..e0a2d049ca5ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -643,6 +643,8 @@ in { hdmedians = callPackage ../development/python-modules/hdmedians { }; + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + holoviews = callPackage ../development/python-modules/holoviews { }; hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { @@ -673,6 +675,8 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; @@ -1909,6 +1913,8 @@ in { pkginfo = callPackage ../development/python-modules/pkginfo { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; + pretend = callPackage ../development/python-modules/pretend { }; detox = callPackage ../development/python-modules/detox { }; @@ -1950,6 +1956,8 @@ in { hypothesis = self.hypothesis.override { doCheck = false; }; }; + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; @@ -2137,6 +2145,8 @@ in { demjson = callPackage ../development/python-modules/demjson { }; + deprecated = callPackage ../development/python-modules/deprecated { }; + deprecation = callPackage ../development/python-modules/deprecation { }; derpconf = callPackage ../development/python-modules/derpconf { }; @@ -4139,6 +4149,8 @@ in { pika-pool = callPackage ../development/python-modules/pika-pool { }; + pikepdf = callPackage ../development/python-modules/pikepdf { }; + kmapper = callPackage ../development/python-modules/kmapper { }; kmsxx = (callPackage ../development/libraries/kmsxx { @@ -5079,6 +5091,8 @@ in { ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; + ruffus = callPackage ../development/python-modules/ruffus { }; + runsnakerun = callPackage ../development/python-modules/runsnakerun { }; pysendfile = callPackage ../development/python-modules/pysendfile { }; @@ -5326,6 +5340,8 @@ in { units = callPackage ../development/python-modules/units { }; + unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; @@ -5663,6 +5679,8 @@ in { python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + pluggy = callPackage ../development/python-modules/pluggy {}; xcffib = callPackage ../development/python-modules/xcffib {}; @@ -6162,6 +6180,8 @@ in { wget = callPackage ../development/python-modules/wget { }; runway-python = callPackage ../development/python-modules/runway-python { }; + + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; }); in fix' (extends overrides packages) |