From cb4b9b1cc196fec213c98541752f9df0cc6ee320 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 31 Oct 2017 17:53:49 +0100 Subject: [PATCH 01/98] owncloud: fix some but not all errors * Don't set timezone when it's null * Don't create the postgres role because the postgresqsl service already does that. * Fix documentation * Add a test suite --- .../web-servers/apache-httpd/owncloud.nix | 46 ++++++++++++++----- nixos/release.nix | 1 + nixos/tests/owncloud.nix | 39 ++++++++++++++++ 3 files changed, 74 insertions(+), 12 deletions(-) create mode 100644 nixos/tests/owncloud.nix diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 94e85f1f4289..d689e9dd8e4c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -188,8 +188,7 @@ let /* date format to be used while writing to the owncloud logfile */ 'logdateformat' => 'F d, Y H:i:s', - /* timezone used while writing to the owncloud logfile (default: UTC) */ - 'logtimezone' => '${serverInfo.fullConfig.time.timeZone}', + ${tzSetting} /* Append all database queries and parameters to the log file. (watch out, this option can increase the size of your log file)*/ @@ -339,6 +338,31 @@ let ''; + tzSetting = let tz = serverInfo.fullConfig.time.timeZone; in optionalString (!isNull tz) '' + /* timezone used while writing to the owncloud logfile (default: UTC) */ + 'logtimezone' => '${tz}', + ''; + + postgresql = serverInfo.fullConfig.services.postgresql.package; + + setupDb = pkgs.writeScript "setup-owncloud-db" '' + #!${pkgs.stdenv.shell} + PATH="${postgresql}/bin" + createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true + createdb "${config.dbName}" -O "${config.dbUser}" || true + psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true + + QUERY="CREATE TABLE appconfig + ( appid VARCHAR( 255 ) NOT NULL + , configkey VARCHAR( 255 ) NOT NULL + , configvalue VARCHAR( 255 ) NOT NULL + ); + GRANT ALL ON appconfig TO ${config.dbUser}; + ALTER TABLE appconfig OWNER TO ${config.dbUser};" + + psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true + ''; + in rec { @@ -373,7 +397,7 @@ rec { defaultText = "pkgs.owncloud70"; example = literalExample "pkgs.owncloud70"; description = '' - PostgreSQL package to use. + ownCloud package to use. ''; }; @@ -574,13 +598,7 @@ rec { chmod -R o-rwx ${config.dataDir} chown -R wwwrun:wwwrun ${config.dataDir} - ${pkgs.postgresql}/bin/createuser -s -r postgres - ${pkgs.postgresql}/bin/createuser --no-superuser --no-createdb --no-createrole "${config.dbUser}" || true - ${pkgs.postgresql}/bin/createdb "${config.dbName}" -O "${config.dbUser}" || true - ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -U postgres -d postgres -c "alter user ${config.dbUser} with password '${config.dbPassword}';" || true - - QUERY="CREATE TABLE appconfig (appid VARCHAR( 255 ) NOT NULL ,configkey VARCHAR( 255 ) NOT NULL ,configvalue VARCHAR( 255 ) NOT NULL); GRANT ALL ON appconfig TO ${config.dbUser}; ALTER TABLE appconfig OWNER TO ${config.dbUser};" - ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true + ${pkgs.sudo}/bin/sudo -u postgres ${setupDb} fi if [ -e ${config.package}/config/ca-bundle.crt ]; then @@ -591,7 +609,11 @@ rec { chown wwwrun:wwwrun ${config.dataDir}/owncloud.log || true - QUERY="INSERT INTO groups (gid) values('admin'); INSERT INTO users (uid,password) values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}'); INSERT INTO group_user (gid,uid) values('admin','${config.adminUser}');" - ${pkgs.sudo}/bin/sudo -u postgres ${pkgs.postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true + QUERY="INSERT INTO groups (gid) values('admin'); + INSERT INTO users (uid,password) + values('${config.adminUser}','${builtins.hashString "sha1" config.adminPassword}'); + INSERT INTO group_user (gid,uid) + values('admin','${config.adminUser}');" + ${pkgs.sudo}/bin/sudo -u postgres ${postgresql}/bin/psql -h "/tmp" -U postgres -d ${config.dbName} -Atw -c "$QUERY" || true ''; } diff --git a/nixos/release.nix b/nixos/release.nix index d5f59a524e04..053ce925c9a1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -302,6 +302,7 @@ in rec { tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; + tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; diff --git a/nixos/tests/owncloud.nix b/nixos/tests/owncloud.nix new file mode 100644 index 000000000000..0dcdea40b064 --- /dev/null +++ b/nixos/tests/owncloud.nix @@ -0,0 +1,39 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "owncloud"; + nodes = + { web = + { config, pkgs, ... }: + { + services.postgresql.enable = true; + services.httpd = { + enable = true; + logPerVirtualHost = true; + adminAddr = "example@example.com"; + virtualHosts = [ + { + hostName = "owncloud"; + extraSubservices = + [ + { + serviceType = "owncloud"; + adminPassword = "secret"; + dbPassword = "secret"; + } + ]; + } + ]; + }; + }; + }; + + testScript = '' + startAll; + + $web->waitForUnit("postgresql"); + $web->waitForUnit("httpd"); + + $web->succeed("curl -L 127.0.0.1:80"); + ''; +}) From 3fb57fe0f88f2ce17bcf323fda6b0d1f5e0c8573 Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Wed, 1 Nov 2017 14:46:01 +0800 Subject: [PATCH 02/98] jazzy: init at 0.9.0 --- pkgs/development/tools/jazzy/Gemfile | 2 + pkgs/development/tools/jazzy/Gemfile.lock | 100 +++++++ pkgs/development/tools/jazzy/default.nix | 17 ++ pkgs/development/tools/jazzy/gemset.nix | 343 ++++++++++++++++++++++ pkgs/development/tools/jazzy/update | 10 + pkgs/top-level/all-packages.nix | 2 + 6 files changed, 474 insertions(+) create mode 100644 pkgs/development/tools/jazzy/Gemfile create mode 100644 pkgs/development/tools/jazzy/Gemfile.lock create mode 100644 pkgs/development/tools/jazzy/default.nix create mode 100644 pkgs/development/tools/jazzy/gemset.nix create mode 100755 pkgs/development/tools/jazzy/update diff --git a/pkgs/development/tools/jazzy/Gemfile b/pkgs/development/tools/jazzy/Gemfile new file mode 100644 index 000000000000..27c230a9829a --- /dev/null +++ b/pkgs/development/tools/jazzy/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'jazzy' diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock new file mode 100644 index 000000000000..b8fc28a740e8 --- /dev/null +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -0,0 +1,100 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (2.3.5) + activesupport (4.2.10) + i18n (~> 0.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + claide (1.0.2) + cocoapods (1.3.1) + activesupport (>= 4.0.2, < 5) + claide (>= 1.0.2, < 2.0) + cocoapods-core (= 1.3.1) + cocoapods-deintegrate (>= 1.0.1, < 2.0) + cocoapods-downloader (>= 1.1.3, < 2.0) + cocoapods-plugins (>= 1.0.0, < 2.0) + cocoapods-search (>= 1.0.0, < 2.0) + cocoapods-stats (>= 1.0.0, < 2.0) + cocoapods-trunk (>= 1.2.0, < 2.0) + cocoapods-try (>= 1.1.0, < 2.0) + colored2 (~> 3.1) + escape (~> 0.0.4) + fourflusher (~> 2.0.1) + gh_inspector (~> 1.0) + molinillo (~> 0.5.7) + nap (~> 1.0) + ruby-macho (~> 1.1) + xcodeproj (>= 1.5.1, < 2.0) + cocoapods-core (1.3.1) + activesupport (>= 4.0.2, < 6) + fuzzy_match (~> 2.0.4) + nap (~> 1.0) + cocoapods-deintegrate (1.0.1) + cocoapods-downloader (1.1.3) + cocoapods-plugins (1.0.0) + nap + cocoapods-search (1.0.0) + cocoapods-stats (1.0.0) + cocoapods-trunk (1.3.0) + nap (>= 0.8, < 2.0) + netrc (~> 0.11) + cocoapods-try (1.1.0) + colored2 (3.1.2) + concurrent-ruby (1.0.5) + escape (0.0.4) + ffi (1.9.18) + fourflusher (2.0.1) + fuzzy_match (2.0.4) + gh_inspector (1.0.3) + i18n (0.9.0) + concurrent-ruby (~> 1.0) + jazzy (0.9.0) + cocoapods (~> 1.0) + mustache (~> 0.99) + open4 + redcarpet (~> 3.2) + rouge (~> 1.5) + sass (~> 3.4) + sqlite3 (~> 1.3) + xcinvoke (~> 0.3.0) + liferaft (0.0.6) + minitest (5.10.3) + molinillo (0.5.7) + mustache (0.99.8) + nanaimo (0.2.3) + nap (1.1.0) + netrc (0.11.0) + open4 (1.3.4) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redcarpet (3.4.0) + rouge (1.11.1) + ruby-macho (1.1.0) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sqlite3 (1.3.13) + thread_safe (0.3.6) + tzinfo (1.2.4) + thread_safe (~> 0.1) + xcinvoke (0.3.0) + liferaft (~> 0.0.6) + xcodeproj (1.5.3) + CFPropertyList (~> 2.3.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.2.3) + +PLATFORMS + ruby + +DEPENDENCIES + jazzy + +BUNDLED WITH + 1.14.6 diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix new file mode 100644 index 000000000000..7d96e2c07d26 --- /dev/null +++ b/pkgs/development/tools/jazzy/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerEnv, ruby }: + +bundlerEnv rec { + inherit ruby; + pname = "jazzy"; + gemdir = ./.; + + meta = with lib; { + description = "A command-line utility that generates documentation for Swift or Objective-C"; + homepage = https://github.com/realm/jazzy; + license = licenses.mit; + platforms = platforms.darwin; + maintainers = with maintainers; [ + peterromfeldhk + ]; + }; +} diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix new file mode 100644 index 000000000000..a88724a3de30 --- /dev/null +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -0,0 +1,343 @@ +{ + activesupport = { + dependencies = ["i18n" "minitest" "thread_safe" "tzinfo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s12j8vl8vrxfngkdlz9g8bpz9akq1z42d57mx5r537b2pji8nr7"; + type = "gem"; + }; + version = "4.2.10"; + }; + CFPropertyList = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06dddgcai6nay552h8wmnb2m93xx5hni48s16vkbf9vbym4nfw5x"; + type = "gem"; + }; + version = "2.3.5"; + }; + claide = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0az54rp691hc42yl1xyix2cxv58byhaaf4gxbpghvvq29l476rzc"; + type = "gem"; + }; + version = "1.0.2"; + }; + 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"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "050b7795jc6802wcpcgi702qkgy8vjidgq6c6mbx2alrq7l0n8q7"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-core = { + dependencies = ["activesupport" "fuzzy_match" "nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pr42lpqs6q51gnnfxmgmbx7sw0dwyawylssj588izj8av18rhpy"; + type = "gem"; + }; + version = "1.3.1"; + }; + cocoapods-deintegrate = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x4hxlip6zkrs1vcmw7sh45ayn5pxvsg782iifnmgjwn2pyskj7l"; + type = "gem"; + }; + version = "1.0.1"; + }; + cocoapods-downloader = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1664qg1wml70slcfklpnyq5ixp145f6iyn3c6pcqkqc64i1bsg87"; + type = "gem"; + }; + version = "1.1.3"; + }; + cocoapods-plugins = { + dependencies = ["nap"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16na82sfyc8801qs1n22nwq486s4j7yj6rj7fcp8cbxmj371fpbj"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-search = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-stats = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sfcwq2vq6cadj1811jdjys3d28pmk2r2a83px6w94rz6i19axid"; + type = "gem"; + }; + version = "1.0.0"; + }; + cocoapods-trunk = { + dependencies = ["nap" "netrc"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0shxr64j7f50yglp5l90vr1ba5p9pkk0a3b8apkbci2lmq5kq60b"; + type = "gem"; + }; + version = "1.3.0"; + }; + cocoapods-try = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + type = "gem"; + }; + version = "1.1.0"; + }; + colored2 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i"; + type = "gem"; + }; + version = "3.1.2"; + }; + concurrent-ruby = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "183lszf5gx84kcpb779v6a2y0mx9sssy8dgppng1z9a505nj1qcf"; + type = "gem"; + }; + version = "1.0.5"; + }; + escape = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sa1xkfc9jvkwyw1jbz3jhkq0ms1zrvswi6mmfiwcisg5fp497z4"; + type = "gem"; + }; + version = "0.0.4"; + }; + ffi = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "034f52xf7zcqgbvwbl20jwdyjwznvqnwpbaps9nk18v9lgb1dpx0"; + type = "gem"; + }; + version = "1.9.18"; + }; + fourflusher = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1dzmkxyzrk475c1yk5zddwhhj28b6fnj4jkk1h5gr1c2mrar72d5"; + type = "gem"; + }; + version = "2.0.1"; + }; + fuzzy_match = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19gw1ifsgfrv7xdi6n61658vffgm1867f4xdqfswb2b5h6alzpmm"; + type = "gem"; + }; + version = "2.0.4"; + }; + gh_inspector = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lxvp8xpjd2cazzcp90phy567spp4v41bnk9awgx8absndv70k1x"; + type = "gem"; + }; + version = "1.0.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h5wygnbpxas8kwhqkwk6n4s334dxyxvlxykc6mxfndb0m56166r"; + type = "gem"; + }; + version = "0.9.0"; + }; + jazzy = { + dependencies = ["cocoapods" "mustache" "open4" "redcarpet" "rouge" "sass" "sqlite3" "xcinvoke"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vvyszmpnzm0my5fp50z5bnqij6zq3cig2p46vgl683hsm48ldsq"; + type = "gem"; + }; + version = "0.9.0"; + }; + liferaft = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kasbbx84gzsxx8w8bgr6xjg43h9bvzzaqg7si8jirnja8yc27k3"; + type = "gem"; + }; + version = "0.0.6"; + }; + minitest = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "05521clw19lrksqgvg2kmm025pvdhdaniix52vmbychrn2jm7kz2"; + type = "gem"; + }; + version = "5.10.3"; + }; + molinillo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19h1nks0x2ljwyijs2rd1f9sh05j8xqvjaqk1rslp5nyy6h4a758"; + type = "gem"; + }; + version = "0.5.7"; + }; + mustache = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2"; + type = "gem"; + }; + version = "0.99.8"; + }; + nanaimo = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z6rbji02x75vm5jw4hbpp75khp4z5yfgbaz1h9l8aa00hqf0fxd"; + type = "gem"; + }; + version = "0.2.3"; + }; + nap = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xm5xssxk5s03wjarpipfm39qmgxsalb46v1prsis14x1xk935ll"; + type = "gem"; + }; + version = "1.1.0"; + }; + netrc = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + open4 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cgls3f9dlrpil846q0w7h66vsc33jqn84nql4gcqkk221rh7px1"; + type = "gem"; + }; + version = "1.3.4"; + }; + rb-fsevent = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf"; + type = "gem"; + }; + version = "0.10.2"; + }; + rb-inotify = { + dependencies = ["ffi"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + type = "gem"; + }; + version = "0.9.10"; + }; + redcarpet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h9qz2hik4s9knpmbwrzb3jcp3vc5vygp9ya8lcpl7f1l9khmcd7"; + type = "gem"; + }; + version = "3.4.0"; + }; + rouge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13amckbdknnc5491ag28y8pqbyfpbzx5n4rlmadxhd3wkrhp92c8"; + type = "gem"; + }; + version = "1.11.1"; + }; + ruby-macho = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i9vkz3ki3yvps4z1hca2q2axniq95x4yypnc22p9pcfjdfrbrq6"; + type = "gem"; + }; + version = "1.1.0"; + }; + sass = { + dependencies = ["sass-listen"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1167camc4ccqf9lcjlpyf96ji00f0041i7xanj2nm41fkx7kr7kr"; + type = "gem"; + }; + version = "3.5.3"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; + type = "gem"; + }; + version = "4.0.0"; + }; + sqlite3 = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + type = "gem"; + }; + version = "1.3.13"; + }; + thread_safe = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09dpbrih054mn42flbbcdpzk2727mzfvjrgqb12zdafhx7p9rrzp"; + type = "gem"; + }; + version = "1.2.4"; + }; + xcinvoke = { + dependencies = ["liferaft"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16pyq7wvx2c0fywrqxk3vg6psa3yjhbd7hw7hv2mjim6myjkdsb7"; + type = "gem"; + }; + version = "0.3.0"; + }; + xcodeproj = { + dependencies = ["CFPropertyList" "claide" "colored2" "nanaimo"]; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gvnd5ixa4wbn1cpc6jp6i9z0dxhcwlxny47irzbr6zr8wpj3ww7"; + type = "gem"; + }; + version = "1.5.3"; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/jazzy/update b/pkgs/development/tools/jazzy/update new file mode 100755 index 000000000000..58a7bd4a4539 --- /dev/null +++ b/pkgs/development/tools/jazzy/update @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p bash ruby bundler bundix + +rm Gemfile.lock +bundler install +bundix + +if [ "clean" == "$1" ]; then + rm -rf ~/.gem +fi diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60fad0499dae..975791c60040 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2772,6 +2772,8 @@ with pkgs; jade = callPackage ../tools/text/sgml/jade { }; + jazzy = callPackage ../development/tools/jazzy { }; + jd = callPackage ../development/tools/jd { }; jd-gui = callPackage_i686 ../tools/security/jd-gui { }; From 55344df0893d008c709ae7036df5145df857ce0a Mon Sep 17 00:00:00 2001 From: Michal Rus Date: Sun, 5 Nov 2017 17:51:18 +0100 Subject: [PATCH 03/98] users-groups module: use `buildEnv` in per-user profiles Resolves #31253 --- nixos/modules/config/users-groups.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index a4715175cc95..c1102d558101 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -582,13 +582,15 @@ in { { environment = { etc = mapAttrs' (name: { packages, ... }: { - name = "per-user-pkgs/${name}"; - value.source = pkgs.symlinkJoin { - name = "per-user-pkgs.${name}"; + name = "profiles/per-user/${name}"; + value.source = pkgs.buildEnv { + name = "user-environment"; paths = packages; + inherit (config.environment) pathsToLink extraOutputsToInstall; + inherit (config.system.path) ignoreCollisions postBuild; }; }) (filterAttrs (_: { packages, ... }: packages != []) cfg.users); - profiles = ["/etc/per-user-pkgs/$LOGNAME"]; + profiles = ["/etc/profiles/per-user/$USER"]; }; } ]; From 1fd86cb6b99462a2c6787be5f8582d7b8bed18de Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 4 Nov 2017 00:44:08 +0100 Subject: [PATCH 04/98] deja-dup: remove unneeded rpath wrapping --- pkgs/applications/backup/deja-dup/default.nix | 32 ++++++------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index c330aeb0092c..7382e84fa073 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -2,7 +2,7 @@ , gnome3, libnotify, intltool, itstool, glib, gtk3, libxml2 , coreutils, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at_spi2_core, dbus, libgpgerror -, appstream-glib, desktop_file_utils, atk, pango, duplicity +, appstream-glib, desktop_file_utils, duplicity }: stdenv.mkDerivation rec { @@ -44,29 +44,15 @@ stdenv.mkDerivation rec { glib-compile-schemas $out/share/glib-2.0/schemas ''; - # Manual rpath definition until https://github.com/mesonbuild/meson/issues/314 is fixed - postFixup = - let - rpath = stdenv.lib.makeLibraryPath [ - glib - gtk3 - gnome3.gnome_online_accounts - gnome3.libpeas - gnome3.nautilus - libgpgerror - libsecret - # Transitive - atk - pango - ]; - in '' - # Unwrap accidentally wrapped library - mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so + postFixup = '' + # Unwrap accidentally wrapped library + mv $out/libexec/deja-dup/tools/.libduplicity.so-wrapped $out/libexec/deja-dup/tools/libduplicity.so - for elf in "$out"/bin/.*-wrapped "$out"/libexec/deja-dup/.deja-dup-monitor-wrapped "$out"/libexec/deja-dup/tools/*.so "$out"/lib/deja-dup/*.so "$out"/lib/nautilus/extensions-3.0/*.so; do - patchelf --set-rpath '${rpath}':"$out/lib/deja-dup" "$elf" - done - ''; + # Patched meson does not add internal libraries to rpath + for elf in "$out/bin/.deja-dup-wrapped" "$out/libexec/deja-dup/.deja-dup-monitor-wrapped" "$out/libexec/deja-dup/tools/libduplicity.so"; do + patchelf --set-rpath "$(patchelf --print-rpath "$elf"):$out/lib/deja-dup" "$elf" + done + ''; meta = with stdenv.lib; { description = "A simple backup tool"; From 9e7b916852307da557334d42fe1616b8e632f0e4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 18 Sep 2017 00:18:01 -0300 Subject: [PATCH 05/98] openmsx: init at git-2017-11-02 --- pkgs/misc/emulators/openmsx/custom-nixos.mk | 9 ++++ pkgs/misc/emulators/openmsx/default.nix | 48 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 61 insertions(+) create mode 100644 pkgs/misc/emulators/openmsx/custom-nixos.mk create mode 100644 pkgs/misc/emulators/openmsx/default.nix diff --git a/pkgs/misc/emulators/openmsx/custom-nixos.mk b/pkgs/misc/emulators/openmsx/custom-nixos.mk new file mode 100644 index 000000000000..9098762e40d5 --- /dev/null +++ b/pkgs/misc/emulators/openmsx/custom-nixos.mk @@ -0,0 +1,9 @@ +# This file substitutes $sourceRoot/build/custom.mk + +VERSION_EXEC:=false +SYMLINK_FOR_BINARY:=false +INSTALL_CONTRIB:=true +INSTALL_BASE:=${out} +INSTALL_DOC_DIR:=${INSTALL_BASE}/share/doc/openmsx +INSTALL_SHARE_DIR:=${INSTALL_BASE}/share/openmsx +INSTALL_BINARY_DIR:=${INSTALL_BASE}/bin diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix new file mode 100644 index 000000000000..bb954582de5d --- /dev/null +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, pkgconfig +, python +, alsaLib, glew, mesa_noglu, libpng +, libogg, libtheora, libvorbis +, SDL, SDL_image, SDL_ttf +, freetype, tcl, zlib +}: + +stdenv.mkDerivation rec { + + name = "openmsx-${version}"; + version = "git-2017-11-02"; + + src = fetchFromGitHub { + owner = "openMSX"; + repo = "openMSX"; + rev = "eeb74206ae347a3b17e9b99f91f2b4682c5db22c"; + sha256 = "170amj7k6wjhwx6psbplqljvckvhxxbv3aw72jrdxl1fb8zlnq3s"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig python ]; + + buildInputs = [ alsaLib glew mesa_noglu libpng + libogg libtheora libvorbis freetype + SDL SDL_image SDL_ttf tcl zlib ]; + + postPatch = '' + cp ${./custom-nixos.mk} build/custom.mk + ''; + + dontAddPrefix = true; + + # Many thanks @mthuurne from OpenMSX project + # for providing support to Nixpkgs :) + TCL_CONFIG="${tcl}/lib/"; + + meta = with stdenv.lib; { + description = "A MSX emulator"; + longDescription = '' + OpenMSX is an emulator for the MSX home computer system. Its goal is + to emulate all aspects of the MSX with 100% accuracy. + ''; + homepage = https://openmsx.org; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34c24cc9dc98..54781e2b6d7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19792,6 +19792,10 @@ with pkgs; snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + openmsx = callPackage ../misc/emulators/openmsx { + python = python27; + }; + higan = callPackage ../misc/emulators/higan { inherit (gnome2) gtksourceview; }; From 3dd2a2654005d061319d245ffde0a11b307d9d0a Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Wed, 15 Nov 2017 11:33:15 +0000 Subject: [PATCH 06/98] linuxPackages.openafs-client: fixes for 4.14 --- pkgs/servers/openafs-client/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index d7ed2849d604..cb004e15cc7a 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -22,6 +22,18 @@ stdenv.mkDerivation rec { url = "http://git.openafs.org/?p=openafs.git;a=patch;h=c193e5cba18273a062d4162118c7055b54f7eb5e"; sha256 = "1yc4gygcazwsslf6mzk1ai92as5jbsjv7212jcbb2dw83jydhc09"; }) + # linux 4.14 + (fetchpatch { + name = "test-for-__vfs_write-rather-than-__vfs_read.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=929e77a886fc9853ee292ba1aa52a920c454e94b"; + sha256 = "0g4jxqzvyrjy2q7mhxc5ikhypj3ljw1wri4lipzm66crsvycp9x5"; + }) + # linux 4.14 + (fetchpatch { + name = "use-kernel_read-kernel_write-when-__vfs-variants-are-unavailable.patch"; + url = "http://git.openafs.org/?p=openafs.git;a=patch;h=5ee516b3789d3545f3d78fb3aba2480308359945"; + sha256 = "1vx55qb120y857mn1l00i58fj9cckschp86ch3g6hqrdc5q5bxv2"; + }) ]; preConfigure = '' From 7ede960a27620b183f10c1a5e875d714e16ce9c0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 20 Nov 2017 11:02:01 -0600 Subject: [PATCH 07/98] buildRustPackage: make dependencies' source writable Some packages, such as the xcb crate, do code generation at build-time; therefore, the dependencies' source tree must be writable. --- pkgs/build-support/rust/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 37ea264a53fb..57948c33bbc3 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -43,6 +43,10 @@ in stdenv.mkDerivation (args // { postUnpack = '' eval "$cargoDepsHook" + unpackFile "$cargoDeps" + cargoDepsCopy=$(stripHash $(basename $cargoDeps)) + chmod -R +w "$cargoDepsCopy" + mkdir .cargo cat >.cargo/config <<-EOF [source.crates-io] @@ -50,9 +54,11 @@ in stdenv.mkDerivation (args // { replace-with = 'vendored-sources' [source.vendored-sources] - directory = '$cargoDeps' + directory = '$(pwd)/$cargoDepsCopy' EOF + unset cargoDepsCopy + export RUST_LOG=${logLevel} export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt '' + (args.postUnpack or ""); From 2110f96f9b836be0f1f0e99d1a605e3e32b972f9 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Sat, 22 Jul 2017 23:33:37 +0200 Subject: [PATCH 08/98] otfcc: init at 0.8.6 --- pkgs/tools/misc/otfcc/default.nix | 37 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/otfcc/default.nix diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix new file mode 100644 index 000000000000..d8345cddb368 --- /dev/null +++ b/pkgs/tools/misc/otfcc/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, premake5, hostPlatform }: + +stdenv.mkDerivation rec { + name = "otfcc-${version}"; + version = "0.8.6"; + + src = fetchurl { + url = "https://github.com/caryll/otfcc/archive/v${version}.tar.gz"; + sha256 = "0kap52bzrn21fmph8j2pc71f80f38ak1p2fcczzmrh0hb1r9c8dd"; + }; + + nativeBuildInputs = [ premake5 ]; + + configurePhase = '' + premake5 gmake + ''; + + preBuild = "cd build/gmake"; + + makeFlags = ''config=release_${if hostPlatform.isi686 then "x86" else "x64"}''; + + postBuild = "cd ../.."; + + installPhase = '' + mkdir -p $out/bin + cp bin/release-x*/otfcc* $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "Optimized OpenType builder and inspector"; + homepage = https://github.com/caryll/otfcc; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ jfrankenau ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82f3ff13d17b..98b2c98ab3af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3774,6 +3774,8 @@ with pkgs; ostree = callPackage ../tools/misc/ostree { }; + otfcc = callPackage ../tools/misc/otfcc { }; + otpw = callPackage ../os-specific/linux/otpw { }; owncloud = owncloud70; From 1d896474336e24c91f4a38a732831c048bf60b2e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 19 Nov 2017 12:03:51 -0600 Subject: [PATCH 09/98] iosevka: build from source The Iosevka builder requires Node 8, which is not supported by node2nix yet; the included package-lock.json is processed in Nix to install the required dependencies offline. --- pkgs/data/fonts/iosevka/default.nix | 45 +- pkgs/data/fonts/iosevka/package-lock.json | 1017 +++++++++++++++++++++ pkgs/data/fonts/iosevka/package-lock.nix | 142 +++ pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 1199 insertions(+), 9 deletions(-) create mode 100644 pkgs/data/fonts/iosevka/package-lock.json create mode 100644 pkgs/data/fonts/iosevka/package-lock.nix diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 04f8ebc613c5..c6c0c121dbc4 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -1,18 +1,47 @@ -{ stdenv, fetchzip }: +{ + stdenv, lib, + fetchFromGitHub, fetchurl, + runCommand, writeText, + nodejs, ttfautohint, otfcc +}: + +with lib; + +let + installPackageLock = import ./package-lock.nix { inherit fetchurl lib; }; +in let version = "1.13.3"; -in fetchzip rec { name = "iosevka-${version}"; + src = fetchFromGitHub { + owner = "be5invis"; + repo ="Iosevka"; + rev = "v${version}"; + sha256 = "0wfhfiahllq8ngn0mybvp29cfcm7b8ndk3fyhizd620wrj50bazf"; + }; +in - url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/iosevka-pack-${version}.zip"; +stdenv.mkDerivation { + inherit name version src; - postFetch = '' - mkdir -p $out/share/fonts - unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka + nativeBuildInputs = [ nodejs ttfautohint otfcc ]; + + passAsFile = [ "installPackageLock" ]; + installPackageLock = installPackageLock ./package-lock.json; + + preConfigure = '' + HOME=$TMPDIR + source "$installPackageLockPath"; + npm --offline rebuild ''; - sha256 = "0103rjxcp2sis42xp7fh7g8i03h5snvs8n78lgsf79g8ssw0p9d4"; + installPhase = '' + fontdir=$out/share/fonts/iosevka + + mkdir -p $fontdir + cp -v dist/iosevka*/ttf/*.ttf $fontdir + ''; meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; @@ -23,6 +52,6 @@ in fetchzip rec { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + maintainers = with maintainers; [ cstrahan jfrankenau ]; }; } diff --git a/pkgs/data/fonts/iosevka/package-lock.json b/pkgs/data/fonts/iosevka/package-lock.json new file mode 100644 index 000000000000..4e8a9be8807c --- /dev/null +++ b/pkgs/data/fonts/iosevka/package-lock.json @@ -0,0 +1,1017 @@ +{ + "name": "iosevka", + "version": "1.13.3", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "JSONStream": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.1.tgz", + "integrity": "sha1-cH92HgHa6eFvG8+TcDt4xwlmV5o=", + "requires": { + "jsonparse": "1.3.1", + "through": "2.3.8" + } + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "bezier-js": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/bezier-js/-/bezier-js-2.2.3.tgz", + "integrity": "sha1-xVdBFqSjVkpxU41z4LDVFdqN3sU=" + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + }, + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + }, + "caryll-shapeops": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/caryll-shapeops/-/caryll-shapeops-0.2.1.tgz", + "integrity": "sha1-uEBMpQ5pAMB6vJNXubsAhbQEa8s=", + "requires": { + "bezier-js": "2.2.3", + "clipper-lib": "1.0.0" + } + }, + "child-process-promise": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz", + "integrity": "sha1-RzChHvYQ+tRQuPIjx50x172tgHQ=", + "requires": { + "cross-spawn": "4.0.2", + "node-version": "1.1.0", + "promise-polyfill": "6.0.2" + } + }, + "clipper-lib": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clipper-lib/-/clipper-lib-1.0.0.tgz", + "integrity": "sha1-6QLOsm4o7lz6YBSr33kKUe//Tss=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=" + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "coffee-script": { + "version": "1.12.7", + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", + "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==" + }, + "cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", + "requires": { + "lru-cache": "4.1.1", + "which": "1.3.0" + } + }, + "cubic2quad": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/cubic2quad/-/cubic2quad-1.1.1.tgz", + "integrity": "sha1-abGcYaP1tB7PLx1fro+wNBWqixU=" + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "1.0.3" + } + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "requires": { + "is-arrayish": "0.2.1" + } + }, + "escodegen": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", + "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", + "requires": { + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.5.7" + } + }, + "escope": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escope/-/escope-1.0.3.tgz", + "integrity": "sha1-dZ3OhJbEJI/sLQyq9BCLzz8af10=", + "requires": { + "estraverse": "2.0.0" + }, + "dependencies": { + "estraverse": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-2.0.0.tgz", + "integrity": "sha1-WuRpYyQ2ACBmdMyySgnhZnT83KE=" + } + } + }, + "esmangle": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/esmangle/-/esmangle-1.0.1.tgz", + "integrity": "sha1-2bs3uPjq+/Tm1O1reqKVarvTxMI=", + "requires": { + "escodegen": "1.3.3", + "escope": "1.0.3", + "esprima": "1.1.1", + "esshorten": "1.1.1", + "estraverse": "1.5.1", + "esutils": "1.0.0", + "optionator": "0.3.0", + "source-map": "0.1.43" + }, + "dependencies": { + "escodegen": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz", + "integrity": "sha1-8CQBb1qI4Eb9EgBQVek5gC5sXyM=", + "requires": { + "esprima": "1.1.1", + "estraverse": "1.5.1", + "esutils": "1.0.0", + "source-map": "0.1.43" + } + }, + "esprima": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz", + "integrity": "sha1-W28VR/TRAuZw4UDFCb5ncdautUk=" + }, + "estraverse": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz", + "integrity": "sha1-hno+jlip+EYYr7bC3bzZFrfLr3E=" + }, + "esutils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz", + "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA=" + }, + "fast-levenshtein": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz", + "integrity": "sha1-AXjc3uAjuSkFGTrwlZ6KdjnP3Lk=" + }, + "levn": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz", + "integrity": "sha1-uo0znQykphDjo/FFucr0iAcVUFQ=", + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "optionator": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.3.0.tgz", + "integrity": "sha1-lxWotfXnWGz/BsgkngOc1zZNP1Q=", + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "1.0.7", + "levn": "0.2.5", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "0.0.3" + } + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "requires": { + "amdefine": "1.0.1" + } + }, + "wordwrap": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", + "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=" + } + } + }, + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + }, + "esshorten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/esshorten/-/esshorten-1.1.1.tgz", + "integrity": "sha1-F0+Wt8wmfkaHLYFOfbfCkL3/Yak=", + "requires": { + "escope": "1.0.3", + "estraverse": "4.1.1", + "esutils": "2.0.2" + }, + "dependencies": { + "estraverse": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz", + "integrity": "sha1-9srKcokzqFDvkGYdDheYK6RxEaI=" + } + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.3.0" + } + } + } + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "fs-extra": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "3.0.1", + "universalify": "0.1.1" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonparse": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", + "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=" + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "libspiro-js": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/libspiro-js/-/libspiro-js-0.3.1.tgz", + "integrity": "sha1-hmUrAAmm2E6nmlMgvcpfAGEu5Dk=" + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=" + } + } + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "megaminx": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/megaminx/-/megaminx-0.3.3.tgz", + "integrity": "sha512-lZBSLMro+XYJIix9zCZ8N6nZgixpjUPkX6CKuh+Y9Wl9bir/2Fp27NWapA0cNQCPrzOOI9sAwxc4BI14aIdumw==", + "requires": { + "JSONStream": "1.3.1", + "child-process-promise": "2.2.1", + "cubic2quad": "1.1.1", + "fs-extra": "3.0.1", + "which": "1.3.0" + } + }, + "mem": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", + "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", + "requires": { + "mimic-fn": "1.1.0" + } + }, + "mimic-fn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=" + }, + "node-version": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/node-version/-/node-version-1.1.0.tgz", + "integrity": "sha512-t1V2RFiaTavaW3jtQO0A2nok6k7/Gghuvx2rjvICuT0B0dYaObBQ4U0xHL+ZTPFZodt1LMYG2Vi2nypfz4/AJg==" + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "2.0.1" + } + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "1.0.0" + } + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + }, + "p-limit": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", + "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=" + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "requires": { + "p-limit": "1.1.0" + } + }, + "pad": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pad/-/pad-1.2.1.tgz", + "integrity": "sha512-cx/l/K+9UjGXJmoYolvP0l3cEUyB9BUdUL3wj3uwskIiApboLsinvsXxU9nSNg9Luz2ZyH0zzJNbqgLSNtfIDw==", + "requires": { + "coffee-script": "1.12.7", + "wcwidth": "1.0.1" + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "1.3.1" + } + }, + "patel": { + "version": "0.32.1", + "resolved": "https://registry.npmjs.org/patel/-/patel-0.32.1.tgz", + "integrity": "sha1-nnC2sj/XqcgsV57VkbivpSF+YhI=", + "requires": { + "escodegen": "1.9.0", + "esmangle": "1.0.1", + "patrisika": "0.21.0", + "resumer": "0.0.0", + "yargs": "6.6.0" + }, + "dependencies": { + "yargs": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" + } + } + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "patrisika": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/patrisika/-/patrisika-0.21.0.tgz", + "integrity": "sha1-uCwn99QEFSLcXDG0O3xu+xnkdII=", + "requires": { + "patrisika-scopes": "0.11.0" + } + }, + "patrisika-scopes": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.0.tgz", + "integrity": "sha1-BSqddkoWXgs0zDW2ViqIJCA2tAM=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "2.0.4" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + }, + "promise-polyfill": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.0.2.tgz", + "integrity": "sha1-2chtPcTcLfkBboiUbe/Wm0m0EWI=" + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "resumer": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz", + "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", + "requires": { + "through": "2.3.8" + } + }, + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "optional": true + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + }, + "toml": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/toml/-/toml-2.3.3.tgz", + "integrity": "sha512-O7L5hhSQHxuufWUdcTRPfuTh3phKfAZ/dqfxZFoxPCj2RYmpaSGLEIs016FCXItQwNr08yefUB5TSjzRYnajTA==" + }, + "topsort": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz", + "integrity": "sha1-Ll4O6KFDlBfxAdW5stA15iAmMyE=" + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "1.1.2" + } + }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=" + }, + "unorm": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", + "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA=" + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", + "requires": { + "defaults": "1.0.3" + } + }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, + "yargs": { + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "requires": { + "camelcase": "4.1.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "read-pkg-up": "2.0.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "requires": { + "locate-path": "2.0.0" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "requires": { + "pify": "2.3.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "requires": { + "load-json-file": "2.0.0", + "normalize-package-data": "2.4.0", + "path-type": "2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "requires": { + "find-up": "2.1.0", + "read-pkg": "2.0.0" + } + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "3.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, + "yargs-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "requires": { + "camelcase": "4.1.0" + } + } + } + }, + "yargs-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "requires": { + "camelcase": "3.0.0" + } + } + } +} diff --git a/pkgs/data/fonts/iosevka/package-lock.nix b/pkgs/data/fonts/iosevka/package-lock.nix new file mode 100644 index 000000000000..4a7be92e7375 --- /dev/null +++ b/pkgs/data/fonts/iosevka/package-lock.nix @@ -0,0 +1,142 @@ +{ lib, fetchurl }: + +with lib; with builtins; + +let + # Convert a base64-encoded string into a list of quads and padding. + fromBase64 = str: + let + len = stringLength str; + quads = 3 * len - 4 * padding; + padding = + if hasSuffix "==" str then 2 else + if hasSuffix "=" str then 1 else + 0; + chars = stringToCharacters (substring 0 (len - padding) str); + table = { + "A" = [0 0 0]; + "B" = [0 0 1]; + "C" = [0 0 2]; + "D" = [0 0 3]; + "E" = [0 1 0]; + "F" = [0 1 1]; + "G" = [0 1 2]; + "H" = [0 1 3]; + "I" = [0 2 0]; + "J" = [0 2 1]; + "K" = [0 2 2]; + "L" = [0 2 3]; + "M" = [0 3 0]; + "N" = [0 3 1]; + "O" = [0 3 2]; + "P" = [0 3 3]; + "Q" = [1 0 0]; + "R" = [1 0 1]; + "S" = [1 0 2]; + "T" = [1 0 3]; + "U" = [1 1 0]; + "V" = [1 1 1]; + "W" = [1 1 2]; + "X" = [1 1 3]; + "Y" = [1 2 0]; + "Z" = [1 2 1]; + "a" = [1 2 2]; + "b" = [1 2 3]; + "c" = [1 3 0]; + "d" = [1 3 1]; + "e" = [1 3 2]; + "f" = [1 3 3]; + "g" = [2 0 0]; + "h" = [2 0 1]; + "i" = [2 0 2]; + "j" = [2 0 3]; + "k" = [2 1 0]; + "l" = [2 1 1]; + "m" = [2 1 2]; + "n" = [2 1 3]; + "o" = [2 2 0]; + "p" = [2 2 1]; + "q" = [2 2 2]; + "r" = [2 2 3]; + "s" = [2 3 0]; + "t" = [2 3 1]; + "u" = [2 3 2]; + "v" = [2 3 3]; + "w" = [3 0 0]; + "x" = [3 0 1]; + "y" = [3 0 2]; + "z" = [3 0 3]; + "0" = [3 1 0]; + "1" = [3 1 1]; + "2" = [3 1 2]; + "3" = [3 1 3]; + "4" = [3 2 0]; + "5" = [3 2 1]; + "6" = [3 2 2]; + "7" = [3 2 3]; + "8" = [3 3 0]; + "9" = [3 3 1]; + "+" = [3 3 2]; + "/" = [3 3 3]; + }; + in + take quads (concatMap (c: table.${c}) chars); + + # Convert a list of quads with padding into a base16-encoded string. + toBase16 = quads: + if length quads == 0 then "" else + if length quads == 1 then throw "toBase16: odd quads" else + let + hexad = 4 * elemAt quads 0 + elemAt quads 1; + hexits = "0123456789abcdef"; + in + substring hexad 1 hexits + toBase16 (drop 2 quads); +in + +let + fetchResolved = { resolved, integrity, ... }: + let args = { url = resolved; } // integrityHash integrity; in + fetchurl args; + integrityHash = integrity: + if hasPrefix "sha1-" integrity then integritySHA1 integrity else + if hasPrefix "sha512-" integrity then integritySHA512 integrity else + throw "don't understand integrity: ${integrity}"; + integritySHA1 = integrity: + { sha1 = toBase16 (fromBase64 (removePrefix "sha1-" integrity)); }; + integritySHA512 = integrity: + { sha512 = toBase16 (fromBase64 (removePrefix "sha512-" integrity)); }; +in + +let + depend = name: attrs@{ version, dependencies ? {}, ... }: + { + inherit name version; + src = fetchResolved attrs; + depends = mapAttrsToList depend dependencies; + }; + prepareDepend = { name, src, depends, ... }: + '' + unpackFile '${src}' + mv package '${name}' + mkdir -p '${name}/node_modules' + ( + cd '${name}/node_modules' + ${concatMapStrings prepareDepend depends} + ) + ''; +in + +packageLockFile: + +let + packageLock = fromJSON (readFile packageLockFile); + depends = mapAttrsToList depend packageLock.dependencies; +in + '' + mkdir -p node_modules + ( + cd node_modules + ${concatMapStrings prepareDepend depends} + ) + '' + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98b2c98ab3af..302f4443070c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13392,7 +13392,9 @@ with pkgs; input-fonts = callPackage ../data/fonts/input-fonts { }; - iosevka = callPackage ../data/fonts/iosevka { }; + iosevka = callPackage ../data/fonts/iosevka { + nodejs = nodejs-8_x; + }; ipafont = callPackage ../data/fonts/ipafont {}; ipaexfont = callPackage ../data/fonts/ipaexfont {}; From 0a6b3492eeafaff36f6f721b7661db504c863103 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 19 Nov 2017 12:04:30 -0600 Subject: [PATCH 10/98] iosevka: add ttuegel to maintainers --- pkgs/data/fonts/iosevka/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index c6c0c121dbc4..6c072c16d275 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation { ''; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ cstrahan jfrankenau ]; + maintainers = with maintainers; [ cstrahan jfrankenau ttuegel ]; }; } From ba9cf1f82375644e034400dd541bfbcf7c4db0f4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 19 Nov 2017 12:29:40 -0600 Subject: [PATCH 11/98] iosevka: accept custom build options --- pkgs/data/fonts/iosevka/default.nix | 61 +++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 6c072c16d275..d6d00227ad63 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,18 +2,29 @@ stdenv, lib, fetchFromGitHub, fetchurl, runCommand, writeText, - nodejs, ttfautohint, otfcc + nodejs, ttfautohint, otfcc, + + # Custom font set options. + # See https://github.com/be5invis/Iosevka#build-your-own-style + design ? [], upright ? [], italic ? [], oblique ? [], + # Custom font set name. Required if any custom settings above. + set ? null }: -with lib; +assert (design != []) -> set != null; +assert (upright != []) -> set != null; +assert (italic != []) -> set != null; +assert (oblique != []) -> set != null; let installPackageLock = import ./package-lock.nix { inherit fetchurl lib; }; in +let pname = if set != null then "iosevka-${set}" else "iosevka"; in + let version = "1.13.3"; - name = "iosevka-${version}"; + name = "${pname}-${version}"; src = fetchFromGitHub { owner = "be5invis"; repo ="Iosevka"; @@ -22,8 +33,23 @@ let }; in +with lib; +let unwords = concatStringsSep " "; in + +let + param = name: options: + if options != [] then "${name}='${unwords options}'" else null; + config = unwords (lib.filter (x: x != null) [ + (param "design" design) + (param "upright" upright) + (param "italic" italic) + (param "oblique" oblique) + ]); + custom = design != [] || upright != [] || italic != [] || oblique != []; +in + stdenv.mkDerivation { - inherit name version src; + inherit name pname version src; nativeBuildInputs = [ nodejs ttfautohint otfcc ]; @@ -36,11 +62,30 @@ stdenv.mkDerivation { npm --offline rebuild ''; - installPhase = '' - fontdir=$out/share/fonts/iosevka + configurePhase = '' + runHook preConfigure - mkdir -p $fontdir - cp -v dist/iosevka*/ttf/*.ttf $fontdir + ${optionalString custom ''make custom-config set=${set} ${config}''} + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + ${if custom then ''make custom set=${set}'' else ''make''} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + fontdir="$out/share/fonts/$pname" + install -d "$fontdir" + install "dist/$pname/ttf"/* "$fontdir" + + runHook postInstall ''; meta = with stdenv.lib; { From ffea7d8e9d9ab37c30b43de42077196e62c084bd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 20 Nov 2017 11:06:51 -0600 Subject: [PATCH 12/98] otfcc: add ttuegel to maintainers --- pkgs/tools/misc/otfcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index d8345cddb368..1384e09410df 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/caryll/otfcc; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ jfrankenau ttuegel ]; }; } From 5f5d8e67a7eeac9153bb174b63d8e52d9d626e56 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 21 Nov 2017 17:56:34 +0100 Subject: [PATCH 13/98] gnupg: 2.2.2 -> 2.2.3 This is a maintenance release. See http://lists.gnu.org/archive/html/info-gnu/2017-11/msg00008.html for release information --- pkgs/tools/security/gnupg/22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 826667c26faf..0519902308af 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "15w1q0bib742jqnir67bk07mc6ph9yik8wbc5i1bkcyf29s2rdmz"; + sha256 = "1d4482c4pbi0p1k8cc0f9c4q51k56v8navrbz5samxrrs42p3lyb"; }; nativeBuildInputs = [ pkgconfig ]; From ecdc401cc3cc91de0fc04f3c34cdd7dc3cb900dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Thu, 23 Nov 2017 01:18:11 +0100 Subject: [PATCH 14/98] oneko: init at 1.2.5 --- lib/maintainers.nix | 1 + pkgs/applications/misc/oneko/default.nix | 34 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/applications/misc/oneko/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0aed862af522..c2982abf9e35 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -697,6 +697,7 @@ womfoo = "Kranium Gikos Mendoza "; wscott = "Wayne Scott "; wyvie = "Elijah Rum "; + xaverdh = "Dominik Xaver Hörl "; xnwdd = "Guillermo NWDD "; xvapx = "Marti Serra "; xwvvvvwx = "David Terry "; diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix new file mode 100644 index 000000000000..39c9cc0afc4a --- /dev/null +++ b/pkgs/applications/misc/oneko/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, xorg, x11 }: + +stdenv.mkDerivation rec { + version = "1.2.sakura.5"; + vname = "1.2.5"; + name = "oneko-${vname}"; + src = fetchurl { + url = "http://www.daidouji.com/oneko/distfiles/oneko-${version}.tar.gz"; + sha256 = "2c2e05f1241e9b76f54475b5577cd4fb6670de058218d04a741a04ebd4a2b22f"; + }; + buildInputs = [ xorg.imake xorg.gccmakedep x11 ]; + + configurePhase = "xmkmf"; + + installPhase = '' + make install BINDIR=$out/bin + make install.man MANPATH=$out/share/man + ''; + + meta = with stdenv.lib; { + description = "Creates a cute cat chasing around your mouse cursor"; + longDescription = '' + Oneko changes your mouse cursor into a mouse + and creates a little cute cat, which starts + chasing around your mouse cursor. + When the cat is done catching the mouse, it starts sleeping. + ''; + homepage = "http://www.daidouji.com/oneko/"; + license = licenses.publicDomain; + maintainers = [ maintainers.xaverdh ]; + meta.platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a11770394963..313e33b1f776 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10056,6 +10056,8 @@ with pkgs; olm = callPackage ../development/libraries/olm { }; + oneko = callPackage ../applications/misc/oneko { }; + oniguruma = callPackage ../development/libraries/oniguruma { }; openal = self.openalSoft; From c09608f6a8a51e16a3be55626931066a73ef2593 Mon Sep 17 00:00:00 2001 From: Kier Davis Date: Fri, 24 Nov 2017 00:24:19 +0000 Subject: [PATCH 15/98] freesweep: init at 1.0.1 Freesweep is a console minesweeper game. --- pkgs/games/freesweep/default.nix | 35 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/games/freesweep/default.nix diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix new file mode 100644 index 000000000000..9d07eda74b81 --- /dev/null +++ b/pkgs/games/freesweep/default.nix @@ -0,0 +1,35 @@ +{ fetchurl, ncurses, stdenv, + updateAutotoolsGnuConfigScriptsHook }: + +stdenv.mkDerivation rec { + name = "freesweep-${version}"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/rwestlund/freesweep/archive/v${version}.tar.gz"; + sha256 = "0l2kf14558lsq9qd2hs0kcyn9bbl1jdbzwrvcs6mnyjl7zpizcpj"; + }; + + nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ]; + buildInputs = [ ncurses ]; + + preConfigure = '' + configureFlags="$configureFlags --with-prefsdir=$out/share" + ''; + + installPhase = '' + runHook preInstall + install -D -m 0555 freesweep $out/bin/freesweep + install -D -m 0444 sweeprc $out/share/sweeprc + install -D -m 0444 freesweep.6 $out/share/man/man6/freesweep.6 + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "A console minesweeper-style game written in C for Unix-like systems"; + homepage = https://github.com/rwestlund/freesweep; + license = licenses.gpl2; + maintainers = with maintainers; [ kierdavis ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d69015b748d..39b3b6a6a098 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17875,6 +17875,8 @@ with pkgs; boost = boost160; }; + freesweep = callPackage ../games/freesweep { }; + frotz = callPackage ../games/frotz { }; fsg = callPackage ../games/fsg { From 3f1c4360a8364d0a4ca8612d5df41de7096de79d Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Fri, 24 Nov 2017 22:59:44 +0000 Subject: [PATCH 16/98] system-config-printer: fix python path propagated dependencies were not added to PYTHONPATH --- .../misc/system-config-printer/default.nix | 66 +++++++++---------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 11d61cfe30f3..7f584563fa11 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -18,49 +18,47 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch ]; - buildInputs = - [ intltool pkgconfig glib udev libusb1 cups xmlto - libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils - pythonPackages.python pythonPackages.wrapPython - libnotify gobjectIntrospection gdk_pixbuf pango atk - libgnome_keyring3 - ]; + buildInputs = [ + intltool pkgconfig glib udev libusb1 cups xmlto + libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils + + libnotify gobjectIntrospection gdk_pixbuf pango atk + libgnome_keyring3 + + (pythonPackages.python.withPackages (ps: with ps; [ + pycups pycurl dbus-python pygobject3 requests pycairo pysmbc + ])) + ]; nativeBuildInputs = [ wrapGAppsHook ]; - pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; - - configureFlags = - [ "--with-udev-rules" - "--with-udevdir=$(out)/etc/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ]; + configureFlags = [ + "--with-udev-rules" + "--with-udevdir=$(out)/etc/udev" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; stripDebugList = [ "bin" "lib" "etc/udev" ]; - postInstall = - '' - buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=( - --prefix PATH : "$program_PATH" - --set CUPS_DATADIR "${cups-filters}/share/cups" - ) + postInstall = '' + gappsWrapperArgs+=( + --prefix PATH : "$program_PATH" + --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" + --set CUPS_DATADIR "${cups-filters}/share/cups" + ) - find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do - patchPythonScript "$f" - done + # The below line will be unneeded when the next upstream release arrives. + sed -i -e "s|/usr/local/bin|$out/bin|" \ + "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" - # The below line will be unneeded when the next upstream release arrives. - sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" + # Manually expand literal "$(out)", which have failed to expand + sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ + -i "$out/etc/systemd/system/configure-printer@.service" + ''; - # Manually expand literal "$(out)", which have failed to expand - sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ - -i "$out/etc/systemd/system/configure-printer@.service" - ''; - - meta = { + meta = with stdenv.lib; { homepage = http://cyberelk.net/tim/software/system-config-printer/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + license = licenses.gpl2; }; } From 147d395182294eced76cd45720bef6ab7ff9b925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Nov 2017 13:17:21 +0100 Subject: [PATCH 17/98] thunderbird: don't force-enable the sandbox This should fix build on aarch64, as there's no sandboxing possible. https://bugzilla.mozilla.org/show_bug.cgi?id=1294331 As the code defaults to enabling it where it's possible, let's drop the option. --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index c98ba2d06ad5..966e1886f34b 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,7 +72,6 @@ in stdenv.mkDerivation rec { "--enable-system-sqlite" #"--enable-system-cairo" "--enable-startup-notification" - "--enable-content-sandbox" # available since 26.0, but not much info available "--disable-crashreporter" "--disable-tests" "--disable-necko-wifi" # maybe we want to enable this at some point From 4bda3c422589e69a2a0c7247743848380aff33bf Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 25 Nov 2017 14:00:22 +0100 Subject: [PATCH 18/98] tracefilegen: 2015-11-14 -> 2017-05-13 Updated while resolving the build issue with gcc7 that is being tracked in #31747. --- .../analysis/garcosim/tracefilegen/builder.sh | 17 ------------- .../garcosim/tracefilegen/default.nix | 25 ++++++++++++------- .../analysis/garcosim/tracefilegen/gcc7.patch | 13 ++++++++++ 3 files changed, 29 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh create mode 100644 pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh b/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh deleted file mode 100644 index 6c66eb25ba31..000000000000 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source "$stdenv"/setup - -cp --recursive "$src" ./ - -chmod --recursive u=rwx ./"$(basename "$src")" - -cd ./"$(basename "$src")" - -cmake ./ - -make - -mkdir --parents "$out"/bin -cp ./TraceFileGen "$out"/bin - -mkdir --parents "$out"/share/doc/"$name"/html -cp --recursive ./Documentation/html/* "$out/share/doc/$name/html/" diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index 07e3a579d345..f96f7e9b66bd 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchgit, cmake }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { - name = "tracefilegen-2015-11-14"; + name = "tracefilegen-2017-05-13"; - src = fetchgit { - url = "https://github.com/GarCoSim/TraceFileGen.git"; - rev = "4acf75b142683cc475c6b1c841a221db0753b404"; - sha256 = "0mh661l9d1lczv0mr2y9swzqqlwikyqiv1hdd71r9v8cvm54y5ij"; + src = fetchFromGitHub { + owner = "GarCoSim"; + repo = "TraceFileGen"; + rev = "0ebfd1fdb54079d4bdeaa81fc9267ecb9f016d60"; + sha256 = "1gsx18ksgz5gwl3v62vgrmhxc0wc99i74qwhpn0h57zllk41drjc"; }; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; - builder = ./builder.sh; + patches = [ ./gcc7.patch ]; + + installPhase = '' + install -Dm755 TraceFileGen $out/bin/TraceFileGen + mkdir -p $out/share/doc/${name}/ + cp -ar $src/Documentation/html $out/share/doc/${name}/. + ''; meta = with stdenv.lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; - homepage = https://github.com/GarCoSim; + homepage = https://github.com/GarCoSim; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch b/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch new file mode 100644 index 000000000000..48301bbf61ad --- /dev/null +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/gcc7.patch @@ -0,0 +1,13 @@ +diff --git a/Utils/Logger.cpp b/Utils/Logger.cpp +index 747cd63..e3efdf1 100644 +--- a/Utils/Logger.cpp ++++ b/Utils/Logger.cpp +@@ -29,7 +29,7 @@ Logger::Logger(char* tracepath) { + trace = fopen(tracepath, "w"); + + // dot file is not used, set null as default value +- dot = '\0'; ++ dot = nullptr; + //dot = fopen("gcKons.dot", "w"); + //fprintf(dot,"digraph G {\n"); + } From bd1864aec907e149c2295cad3cd5c0813e9c4f0a Mon Sep 17 00:00:00 2001 From: Thomas Kim Pham Date: Sat, 25 Nov 2017 15:24:52 +0100 Subject: [PATCH 19/98] kompose: init at 1.5.0 (#32026) --- lib/maintainers.nix | 1 + .../networking/cluster/kompose/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kompose/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 70bbb2fc459c..816e00773b26 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -642,6 +642,7 @@ theuni = "Christian Theune "; ThomasMader = "Thomas Mader "; thoughtpolice = "Austin Seipp "; + thpham = "Thomas Pham "; timbertson = "Tim Cuthbertson "; timokau = "Timo Kaufmann "; titanous = "Jonathan Rudenberg "; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix new file mode 100644 index 000000000000..b2c97d1ea396 --- /dev/null +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "kompose-${version}"; + version = "1.5.0"; + + goPackagePath = "github.com/kubernetes/kompose"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "kubernetes"; + repo = "kompose"; + sha256 = "1r5f8jbr2c1xxb5fpfgy23w4m30zahhmrw23jlk1hpx2w1pi1iyh"; + }; + + meta = with stdenv.lib; { + description = "A tool to help users who are familiar with docker-compose move to Kubernetes"; + homepage = https://github.com/kubernetes/kompose; + license = licenses.asl20; + maintainers = with maintainers; [thpham]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d323b48013f..d7112cfab196 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19386,6 +19386,8 @@ with pkgs; keynav = callPackage ../tools/X11/keynav { }; + kompose = callPackage ../applications/networking/cluster/kompose { }; + kops = callPackage ../applications/networking/cluster/kops { }; lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; From 141644e752652fdf04132c87d31de1b7b2546105 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 25 Nov 2017 15:53:30 +0100 Subject: [PATCH 20/98] conky: fix compilation with gcc-7 --- pkgs/os-specific/linux/conky/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 8aa1cec9e12f..fd585515cf02 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, cmake # dependencies , glib, libXinerama @@ -73,6 +73,16 @@ stdenv.mkDerivation rec { sha256 = "15j8h251v9jpdg6h6wn1vb45pkk806pf9s5n3rdrps9r185w8hn8"; }; + patches = [ + # Patch to fix compilation on gcc-7 from conky PR + # https://github.com/brndnmtthws/conky/pull/402 + (fetchpatch { + name = "gcc7.patch"; + url = "https://github.com/brndnmtthws/conky/commit/6140122b82d50acc333e5d2a813cc1933ecc6d21.patch"; + sha256 = "1fblfj1w2kc0gshc2pq9lc1pxxsgmgh8byb1xs2v6amx15kj11k7"; + }) + ]; + postPatch = '' sed -i -e '/include.*CheckIncludeFile)/i include(CheckIncludeFiles)' \ cmake/ConkyPlatformChecks.cmake From 9083624cfc09d96f44d76048ba9124bcd36522b1 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 11 Nov 2017 21:35:53 +0100 Subject: [PATCH 21/98] lib.licenses: add Open Software License OSL and derivatives (AFL and NPOSL) --- lib/licenses.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 7c713c7aa8d4..1f2c448470b3 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -15,7 +15,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { afl21 = spdx { spdxId = "AFL-2.1"; - fullName = "Academic Free License"; + fullName = "Academic Free License v2.1"; + }; + + afl3 = spdx { + spdxId = "AFL-3.0"; + fullName = "Academic Free License v3.0"; }; agpl3 = spdx { @@ -426,6 +431,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Notion modified LGPL"; }; + nposl3 = spdx { + spdxId = "NPOSL-3.0"; + fullName = "Non-Profit Open Software License 3.0"; + }; + ofl = spdx { spdxId = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; @@ -441,7 +451,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "OpenSSL License"; }; - osl = spdx { + osl21 = spdx { + spdxId = "OSL-2.1"; + fullName = "Open Software License 2.1"; + }; + + osl3 = spdx { spdxId = "OSL-3.0"; fullName = "Open Software License 3.0"; }; From 11c92ba6baef016bad30253ef50627e6e2062fb9 Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 11 Nov 2017 21:42:33 +0100 Subject: [PATCH 22/98] libsmbios: 2.3.2 -> 2.3.3 --- pkgs/os-specific/linux/libsmbios/default.nix | 38 ++++++++++---------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 98ec778e2c26..5d3e0dc8c975 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -1,36 +1,38 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, perl, autoreconfHook, doxygen }: +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libtool, gettext +, libxml2, perl, doxygen }: -let - version = "2.3.2"; -in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { name = "libsmbios-${version}"; + version = "2.3.3"; - src = fetchurl { - url = "https://github.com/dell/libsmbios/archive/v${version}.tar.gz"; - sha256 = "0kvi36jrvhspyyq0pjfdyvzvimdn27fvbdpf429qm3xdmfi78y2j"; + src = fetchFromGitHub { + owner = "dell"; + repo = "libsmbios"; + rev = "v${version}"; + sha256 = "1cl5nb6qk8ki87hwqf9n1dd9nlhkjnlpdxlhzvm82za16gs7apkl"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libxml2 perl doxygen ]; + nativeBuildInputs = [ autoreconfHook doxygen gettext libtool perl pkgconfig ]; + buildInputs = [ libxml2 ]; - # It tries to install some Python stuff even when Python is disabled. - installFlags = "pkgpythondir=$(TMPDIR)/python"; + configureFlags = [ "--disable-python" "--disable-graphviz" ]; + + enableParallelBuilding = true; postInstall = '' mkdir -p $out/include - cp -va "src/include/"* "$out/include/" - cp -va "out/public-include/"* "$out/include/" + cp -a src/include/smbios_c $out/include/ + cp -a out/public-include/smbios_c $out/include/ ''; - # Hack to avoid TMPDIR in RPATHs. - preFixup = ''rm -rf "$(pwd)" ''; + preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs meta = { - homepage = http://linux.dell.com/libsmbios/main; + homepage = https://github.com/dell/libsmbios; description = "A library to obtain BIOS information"; - license = stdenv.lib.licenses.gpl2Plus; # alternatively, under the Open Software License version 2.1 + license = with stdenv.lib.licenses; [ osl21 gpl2Plus ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } From 203a59eec26272379b0d25e450ea0e64dd7aec3a Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 25 Nov 2017 16:12:06 +0100 Subject: [PATCH 23/98] restya-board: license is OSL 3.0 --- pkgs/servers/web-apps/restya-board/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 11aa87553207..946606e37013 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based kanban board"; - license = licenses.osl; + license = licenses.osl3; homepage = http://restya.com; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; From a5c6bbd25e770e4e409c6b6666b161f602763a7b Mon Sep 17 00:00:00 2001 From: Renaud Date: Sat, 25 Nov 2017 16:53:47 +0100 Subject: [PATCH 24/98] =?UTF-8?q?lr:=201.1=20=E2=86=92=201.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/system/lr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index d638a1c16b5d..0149f1d91b61 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lr-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "lr"; rev = "v${version}"; - sha256 = "171h353238s9wmhirvs2yc1151vds83a71p7wgn96wa3jpl248by"; + sha256 = "1536d723dm50gxgpf8i9yij8mr0csh662ljhs5bmz0945jwfbx4n"; }; makeFlags = "PREFIX=$(out)"; From 3385c85fb5a233a62dc9b8a7e2a30cd8af18e0e1 Mon Sep 17 00:00:00 2001 From: Yuri Aisaka Date: Sun, 26 Nov 2017 01:36:55 +0900 Subject: [PATCH 25/98] skk-dicts: init at 2017-10-26 (#30960) * skk-dicts: init at 2017-10-26 * drop darwin support --- .../inputmethods/skk/skk-dicts/default.nix | 73 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 74 insertions(+) create mode 100644 pkgs/tools/inputmethods/skk/skk-dicts/default.nix diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix new file mode 100644 index 000000000000..cecacd4af954 --- /dev/null +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, skktools }: + +let + # kana to kanji + small = fetchurl { + url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.S"; + sha256 = "15kp4iwz58fp1zg0i13x7w9wwm15v8n2hhm0nf2zsl7az5mn5yi4"; + }; + medium = fetchurl { + url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.M"; + sha256 = "1vhagixhrp9lq5x7dldxcanhznawazp00xivpp1z52kx10lnkmv0"; + }; + large = fetchurl { + url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.L"; + sha256 = "07cv0j95iajkr48j4ln411vnhl3z93yx96zjc03bgs10dbpagaaz"; + }; + + # english to japanese + edict = fetchurl { + url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.edict"; + sha256 = "18k8z1wkgwgfwbs6sylf39h1nc1p5l2b00h7mfjlb8p91plkb45w"; + }; + # misc + assoc = fetchurl { + url = "https://raw.githubusercontent.com/skk-dev/dict/f61be71246602a49e9f05ded6ac4f9f82031a521/SKK-JISYO.assoc"; + sha256 = "12d6xpp1bfin9nwl35ydl5yc6vx0qpwhxss0khi19n1nsbyqnixm"; + }; +in + +stdenv.mkDerivation rec { + name = "skk-dicts-unstable-${version}"; + version = "2017-10-26"; + srcs = [ small medium large edict assoc ]; + nativeBuildInputs = [ skktools ]; + + phases = [ "installPhase" ]; + installPhase = '' + function dictname() { + src=$1 + name=$(basename $src) # remove dir name + dict=$(echo $name | cut -b34-) # remove sha256 prefix + echo $dict + } + mkdir -p $out/share + + for src in $srcs; do + dst=$out/share/$(dictname $src) + echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line + iconv -f EUC-JP -t UTF-8 $src |\ + ${skktools}/bin/skkdic-expr2 >> $dst + done + + # combine .L .edict and .assoc for convenience + dst=$out/share/SKK-JISYO.combined + echo ";;; -*- coding: utf-8 -*-" > $dst + ${skktools}/bin/skkdic-expr2 \ + $out/share/$(dictname ${large}) + \ + $out/share/$(dictname ${edict}) + \ + $out/share/$(dictname ${assoc}) >> $dst + ''; + + meta = { + description = "A collection of standard SKK dictionaries"; + longDescription = '' + This package provides a collection of standard kana-to-kanji + dictionaries for the SKK Japanese input method. + ''; + homepage = https://github.com/skk-dev/dict; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4eb61edab4f5..a584b5e6c85f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1497,6 +1497,7 @@ with pkgs; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; skktools = callPackage ../tools/inputmethods/skk/skktools { }; + skk-dicts = callPackage ../tools/inputmethods/skk/skk-dicts { }; ibus = callPackage ../tools/inputmethods/ibus { inherit (gnome3) dconf glib; From cbe33904d659a040fd960bfb1110ab6e774bd436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sat, 25 Nov 2017 17:52:47 +0100 Subject: [PATCH 26/98] eccodes: 2.2.0 -> 2.5.0 --- pkgs/development/libraries/eccodes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index 672fed2f015a..651878182dc1 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "eccodes-${version}"; - version = "2.2.0"; + version = "2.5.0"; src = fetchurl { - url = https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-2.2.0-Source.tar.gz; - sha256 = "1hzl0akjfxphqivnaj2kg131w8ki80ba3872h0a45f4pchci4h8s"; + url = "https://software.ecmwf.int/wiki/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; + sha256 = "0kiff19gk0w7ij0kx5ydqpsmdq499ylxxxq79lrgss218jy49aqq"; }; nativeBuildInputs = [ cmake ]; From 5b190bef0cba997ded385ff0ea15e3bafa2ae61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20Kemetm=C3=BCller?= Date: Sat, 25 Nov 2017 17:59:48 +0100 Subject: [PATCH 27/98] grib-api: 1.19.0 -> 1.24.0 --- pkgs/development/libraries/grib-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index f091fedeb2de..3abea7d2d8c8 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec{ name = "grib-api-${version}"; - version = "1.19.0"; + version = "1.24.0"; src = fetchurl { url = "https://software.ecmwf.int/wiki/download/attachments/3473437/grib_api-${version}-Source.tar.gz"; - sha256 = "07cj9mw5bb249lxx1m9nmfdqb8b2a8cm7s6x62cdwca3sp16dv6a"; + sha256 = "1kbvyzaghbn1bqn97sslskmb6k3ki1dnr0g5abk5sb40n0y483bb"; }; preConfigure = '' From 3fa4e1e3ee4faa16a6ee20ece6a786939f58fd69 Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Thu, 23 Nov 2017 19:09:35 +0300 Subject: [PATCH 28/98] buildkite-agent: secrecy improvements: non-store, non-Nix provisioning of secrets --- .../buildkite-agent.nix | 62 ++++++++++++------- 1 file changed, 40 insertions(+), 22 deletions(-) diff --git a/nixos/modules/services/continuous-integration/buildkite-agent.nix b/nixos/modules/services/continuous-integration/buildkite-agent.nix index 9c06e1d43bbe..dcc5e7174601 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agent.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agent.nix @@ -4,14 +4,6 @@ with lib; let cfg = config.services.buildkite-agent; - configFile = pkgs.writeText "buildkite-agent.cfg" - '' - token="${cfg.token}" - name="${cfg.name}" - meta-data="${cfg.meta-data}" - hooks-path="${cfg.package}/share/hooks" - build-path="${cfg.dataDir}" - ''; in { @@ -39,10 +31,13 @@ in type = types.listOf types.package; }; - token = mkOption { - type = types.str; + tokenPath = mkOption { + type = types.path; description = '' The token from your Buildkite "Agents" page. + + A run-time path to the token file, which is supposed to be provisioned + outside of Nix store. ''; }; @@ -62,16 +57,22 @@ in }; openssh = - { privateKey = mkOption { - type = types.str; + { privateKeyPath = mkOption { + type = types.path; description = '' Private agent key. + + A run-time path to the key file, which is supposed to be provisioned + outside of Nix store. ''; }; - publicKey = mkOption { - type = types.str; + publicKeyPath = mkOption { + type = types.path; description = '' Public agent key. + + A run-time path to the key file, which is supposed to be provisioned + outside of Nix store. ''; }; }; @@ -84,11 +85,15 @@ in home = cfg.dataDir; createHome = true; description = "Buildkite agent user"; + extraGroups = [ "keys" ]; }; environment.systemPackages = [ cfg.package ]; systemd.services.buildkite-agent = + let copy = x: target: perms: + "cp -f ${x} ${target}; ${pkgs.coreutils}/bin/chmod ${toString perms} ${target}; "; + in { description = "Buildkite Agent"; wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; @@ -97,18 +102,26 @@ in HOME = cfg.dataDir; NIX_REMOTE = "daemon"; }; + + ## NB: maximum care is taken so that secrets (ssh keys and the CI token) + ## don't end up in the Nix store. preStart = '' - ${pkgs.coreutils}/bin/mkdir -m 0700 -p ${cfg.dataDir}/.ssh + ${pkgs.coreutils}/bin/mkdir -m 0700 -p ${cfg.dataDir}/.ssh + ${copy (toString cfg.openssh.privateKeyPath) "${cfg.dataDir}/.ssh/id_rsa" 600} + ${copy (toString cfg.openssh.publicKeyPath) "${cfg.dataDir}/.ssh/id_rsa.pub" 600} - echo "${cfg.openssh.privateKey}" > ${cfg.dataDir}/.ssh/id_rsa - ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa - - echo "${cfg.openssh.publicKey}" > ${cfg.dataDir}/.ssh/id_rsa.pub - ${pkgs.coreutils}/bin/chmod 600 ${cfg.dataDir}/.ssh/id_rsa.pub - ''; + cat > "${cfg.dataDir}/buildkite-agent.cfg" < Date: Sat, 25 Nov 2017 15:27:31 +0000 Subject: [PATCH 29/98] pythonPackages.pexpect: 4.2.1 -> 4.3.0 --- .../python-modules/pexpect/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 38 +--------------- 2 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 pkgs/development/python-modules/pexpect/default.nix diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix new file mode 100644 index 000000000000..c5d1e8ef3c44 --- /dev/null +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchPypi +, ptyprocess +}: + +buildPythonPackage rec { + pname = "pexpect"; + version = "4.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nfjmz81gsixv22dywidakm7pff3ly1i4yly950bfp8gz1r0iaq0"; + }; + + # Wants to run pythonin a subprocess + doCheck = false; + + propagatedBuildInputs = [ ptyprocess ]; + + meta = with lib; { + homepage = http://www.noah.org/wiki/Pexpect; + description = "Automate interactive console applications such as ssh, ftp, etc"; + license = licenses.mit; + maintainers = with maintainers; [ zimbatm ]; + + longDescription = '' + Pexpect is similar to the Don Libes "Expect" system, but Pexpect + as a different interface that is easier to understand. Pexpect + is basically a pattern matching system. It runs programs and + watches output. When output matches a given pattern Pexpect can + respond as if a human were typing responses. Pexpect can be used + for automation, testing, and screen scraping. Pexpect can be + used for automating interactive console applications such as + ssh, ftp, passwd, telnet, etc. It can also be used to control + web applications via "lynx", "w3m", or some other text-based web + browser. Pexpect is pure Python. Unlike other Expect-like + modules for Python Pexpect does not require TCL or Expect nor + does it require C extensions to be compiled. It should work on + any platform that supports the standard Python pty module. + ''; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 302e9dec1b92..8c7e0f82c8a0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14386,43 +14386,7 @@ in { }; }; - - pexpect = buildPythonPackage rec { - version = "4.2.1"; - name = "pexpect-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/pexpect/${name}.tar.gz"; - sha256 = "3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92"; - }; - - # Wants to run pythonin a subprocess - doCheck = false; - - propagatedBuildInputs = with self; [ ptyprocess ]; - - meta = { - homepage = http://www.noah.org/wiki/Pexpect; - description = "Automate interactive console applications such as ssh, ftp, etc"; - license = licenses.mit; - - longDescription = '' - Pexpect is similar to the Don Libes "Expect" system, but Pexpect - as a different interface that is easier to understand. Pexpect - is basically a pattern matching system. It runs programs and - watches output. When output matches a given pattern Pexpect can - respond as if a human were typing responses. Pexpect can be used - for automation, testing, and screen scraping. Pexpect can be - used for automating interactive console applications such as - ssh, ftp, passwd, telnet, etc. It can also be used to control - web applications via "lynx", "w3m", or some other text-based web - browser. Pexpect is pure Python. Unlike other Expect-like - modules for Python Pexpect does not require TCL or Expect nor - does it require C extensions to be compiled. It should work on - any platform that supports the standard Python pty module. - ''; - }; - }; + pexpect = callPackage ../development/python-modules/pexpect { }; pdfkit = buildPythonPackage rec { name = "pdfkit-${version}"; From 6e52c1f7ba37ecde218d2492321e164d7bdb8e33 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 25 Nov 2017 15:20:31 +0000 Subject: [PATCH 30/98] python3Packages.bash_kernel: init at 0.7.1 --- .../python-modules/bash_kernel/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/bash_kernel/default.nix diff --git a/pkgs/development/python-modules/bash_kernel/default.nix b/pkgs/development/python-modules/bash_kernel/default.nix new file mode 100644 index 000000000000..f35d8fae690c --- /dev/null +++ b/pkgs/development/python-modules/bash_kernel/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, ipykernel +, isPy27 +, pexpect +}: +buildPythonPackage rec { + pname = "bash_kernel"; + version = "0.7.1"; + name = "${pname}-${version}"; + format = "flit"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1s2kc7m52kq28b4j1q3456g5ani6nmq4n0rpbqi3yvh7ks0rby19"; + }; + + patches = [ + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/takluyver/bash_kernel/pull/69.diff"; + sha256 = "1qd7qjjmcph4dk6j0bl31h2fdmfiyyazvrc9xqqj8y21ki2sl33j"; + }) + ]; + + propagatedBuildInputs = [ ipykernel pexpect ]; + + doCheck = false; + + preBuild = '' + mkdir tmp + export HOME=$PWD/tmp + ''; + + postInstall = '' + python -m bash_kernel.install --prefix $out + ''; + + meta = { + description = "Bash Kernel for Jupyter"; + homepage = "https://github.com/takluyver/bash_kernel"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8c7e0f82c8a0..90d8c177b1e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -182,6 +182,8 @@ in { bap = pkgs.ocamlPackages_4_02.bap; }; + bash_kernel = callPackage ../development/python-modules/bash_kernel { }; + bayespy = callPackage ../development/python-modules/bayespy { }; bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; From 66fbc70f2e78ecb74937648598f444f353b591b9 Mon Sep 17 00:00:00 2001 From: Maximilian Bode Date: Sat, 25 Nov 2017 21:21:19 +0100 Subject: [PATCH 31/98] docker-machine: 0.12.2 -> 0.13.0 --- .../networking/cluster/docker-machine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 95ad83cb3b17..cc69be36e371 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "machine-${version}"; - version = "0.12.2"; + version = "0.13.0"; goPackagePath = "github.com/docker/machine"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "docker"; repo = "machine"; - sha256 = "0ikgjb6x6h7f43vjabxnqgrrlq516zsz7vj945hca1w919jpdwhf"; + sha256 = "1bqblgz2avrvp9xv6rlvgl0xh2ghpml3a00xhq3mmzkznayw6chq"; }; postInstall = '' From 442b73f5593eaf7f8d24996dcc0a60aae6c3173f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 25 Nov 2017 22:17:03 +0100 Subject: [PATCH 32/98] libftdi1: 1.3 -> 1.4 --- pkgs/development/libraries/libftdi/1.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 353c82aa1935..8b75f85852eb 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -9,11 +9,11 @@ assert pythonSupport -> python != null && swig != null; assert docSupport -> doxygen != null; stdenv.mkDerivation rec { - name = "libftdi1-1.3"; + name = "libftdi1-1.4"; src = fetchurl { url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2"; - sha256 = "1x41mbzh4qy7mrv2n86r2cr176rx03iacn0a99c3dkzv9g4rb34s"; + sha256 = "0x0vncf6i92slgrn0h7ghkskqbglbs534220qa84d0qg114zndpc"; }; nativeBuildInputs = [ pkgconfig ]; From fa9b33aac385ecced249a6dbc8940e295ba7e4fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 25 Nov 2017 22:30:39 +0100 Subject: [PATCH 33/98] vaapi-intel: fix missing depency to get X11 backend --- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index dcb44a408a82..49f638a7bc56 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gnum4, pkgconfig, python2 -, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland +, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnum4 pkgconfig python2 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 mesa_noglu wayland ]; + buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ]; meta = with stdenv.lib; { homepage = http://cgit.freedesktop.org/vaapi/intel-driver/; From 0b21d1b684fa50ad85e6c2c2924492be65c4a81d Mon Sep 17 00:00:00 2001 From: rbasso Date: Sat, 25 Nov 2017 19:36:20 -0200 Subject: [PATCH 34/98] exercism: 2.4.0 -> 2.4.1 --- pkgs/applications/misc/exercism/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index d0b98863d203..74aab5e7e130 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "exercism-${version}"; - version = "2.4.0"; + version = "2.4.1"; goPackagePath = "github.com/exercism/cli"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "exercism"; repo = "cli"; rev = "v${version}"; - sha256 = "1hl13sr4ymqg9sjhkxdmhf8cfw69cic3bysw34xfv2j6bjjxfwaa"; + sha256 = "1nab4459zi2gkh18k9vsm54bz39c2sb60v2xy0i72j1vd99axjjj"; }; meta = with stdenv.lib; { From c97ea968609d30e897dff4fd0d199468132526c0 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 25 Nov 2017 22:35:14 +0000 Subject: [PATCH 35/98] python.pkgs.bokeh: add myself to maintainers --- pkgs/development/python-modules/bokeh/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 61bfe7121cb9..244ee43d0aab 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -78,5 +78,6 @@ buildPythonPackage rec { description = "Statistical and novel interactive HTML plots for Python"; homepage = "http://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ orivej ]; }; } From f3e79be4268e5fcb86722374d132527ac63a1639 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Nov 2017 00:49:11 +0100 Subject: [PATCH 36/98] abiword: use remote patch --- pkgs/applications/office/abiword/default.nix | 6 +- .../office/abiword/patches/fix-13791.patch | 161 ------------------ 2 files changed, 5 insertions(+), 162 deletions(-) delete mode 100644 pkgs/applications/office/abiword/patches/fix-13791.patch diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 1563cdf3d056..ea503b8df9bd 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -15,7 +15,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ - ./patches/fix-13791.patch + # https://bugzilla.abisource.com/show_bug.cgi?id=13791 + (fetchurl { + url = https://bugzilla.abisource.com/attachment.cgi?id=5860; + sha256 = "02p8kz02xm1197zcpzjs010mna9hxsbq5lwgxr8b7qhh9yxja7al"; + }) ]; buildInputs = diff --git a/pkgs/applications/office/abiword/patches/fix-13791.patch b/pkgs/applications/office/abiword/patches/fix-13791.patch deleted file mode 100644 index 98004f01bcba..000000000000 --- a/pkgs/applications/office/abiword/patches/fix-13791.patch +++ /dev/null @@ -1,161 +0,0 @@ -From 46388f407c893123d9b3824a7570b050fc3b049b Mon Sep 17 00:00:00 2001 -From: James Cameron -Date: Thu, 17 Aug 2017 15:05:39 +1000 -Subject: [PATCH] Fix flickering -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- in GR_Caret::s_blink_timeout, avoid repeated calls by stopping the - timer, it will be restarted when needed, - -- in GR_Caret::s_enable, avoid extra unnecessary _blink calls when blink - is enabled, as they serve no purpose, - -- in XAP_UnixFrameImpl::_fe::expose, use the Cairo clip rectangle - instead of the expose event area, thanks to Hubert Figuière in - 865c1dda7e13deff04573ffc42028b71fee07f9c, - -- in XAP_UnixFrameImpl::_fe::expose, do not return FALSE, as other - handlers will need to handle the draw event, - -- in GR_UnixCairoGraphics::flush, fix excessive draw events; - gtk_widget_queue_draw only marks the widget as needing redrawing, - which causes a draw event for each call to flush, therefore every - caret blink, so use gdk_flush instead, - -Fixes AbiSource #13791. -Fixes Debian #851052. -Fixes Fedora #1287835. -Fixes Ubuntu LP: #1574278. -Fixes Sugar Labs #4915. - -Signed-off-by: James Cameron ---- - src/af/gr/gtk/gr_UnixCairoGraphics.cpp | 4 +--- - src/af/gr/xp/gr_Caret.cpp | 13 ++++--------- - src/af/xap/gtk/xap_UnixFrameImpl.cpp | 27 ++++++++++++++++++--------- - src/af/xap/gtk/xap_UnixFrameImpl.h | 2 +- - 4 files changed, 24 insertions(+), 22 deletions(-) - -diff --git a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -index 509bd37..7c3c06f 100644 ---- a/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -+++ b/src/af/gr/gtk/gr_UnixCairoGraphics.cpp -@@ -577,9 +577,7 @@ void GR_UnixCairoGraphics::_endPaint() - - void GR_UnixCairoGraphics::flush(void) - { -- if (m_Widget) { -- gtk_widget_queue_draw(m_Widget); -- } -+ gdk_flush(); - } - - bool GR_UnixCairoGraphics::queryProperties(GR_Graphics::Properties gp) const -diff --git a/src/af/gr/xp/gr_Caret.cpp b/src/af/gr/xp/gr_Caret.cpp -index 5d5d116..a8aa451 100644 ---- a/src/af/gr/xp/gr_Caret.cpp -+++ b/src/af/gr/xp/gr_Caret.cpp -@@ -155,22 +155,17 @@ void GR_Caret::s_enable(UT_Worker * _w) - { - GR_Caret * c = static_cast(_w->getInstanceData()); - -+ c->m_enabler->stop(); - c->m_worker->stop(); -- c->_blink(true); -- if (!c->m_bCursorIsOn) -- c->_blink(true); // blink again -- else -- { -- c->_blink(true); // ?? - MARCM -- c->_blink(true); -- } - c->m_worker->start(); -- c->m_enabler->stop(); -+ c->_blink(true); - } - - void GR_Caret::s_blink_timeout(UT_Worker * _w) - { - GR_Caret * c = static_cast(_w->getInstanceData()); -+ -+ c->m_blinkTimeout->stop(); - if (c->isEnabled()) - c->disable(); - } -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -index 780000e..e81961a 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp -@@ -1208,15 +1208,23 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g - } - - #if GTK_CHECK_VERSION(3,0,0) --gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) -+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) - #else - gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - #endif - { - XAP_UnixFrameImpl * pUnixFrameImpl = static_cast(g_object_get_data(G_OBJECT(w), "user_data")); - FV_View * pView = static_cast(pUnixFrameImpl->getFrame()->getCurrentView()); -+ double x, y, width, height; - #if GTK_CHECK_VERSION(3,0,0) -- GdkEventExpose *pExposeEvent = reinterpret_cast(gtk_get_current_event()); -+ cairo_clip_extents (cr, &x, &y, &width, &height); -+ width -= x; -+ height -= y; -+#else -+ x = pExposeEvent->area.x; -+ y = pExposeEvent->area.y; -+ width = pExposeEvent->area.width; -+ height = pExposeEvent->area.height; - #endif - /* Jean: commenting out next lines since the zoom update code does draw only - * part of what needs to be updated. */ -@@ -1230,20 +1238,21 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) - UT_Rect rClip; - if (pGr->getPaintCount () > 0) - return TRUE; -- xxx_UT_DEBUGMSG(("Expose area: x %d y %d width %d height %d \n",pExposeEvent->area.x,pExposeEvent->area.y,pExposeEvent->area.width,pExposeEvent->area.height)); -- rClip.left = pGr->tlu(pExposeEvent->area.x); -- rClip.top = pGr->tlu(pExposeEvent->area.y); -- rClip.width = pGr->tlu(pExposeEvent->area.width)+1; -- rClip.height = pGr->tlu(pExposeEvent->area.height)+1; --#if GTK_CHECK_VERSION(3,0,0) -+ rClip.left = pGr->tlu(x); -+ rClip.top = pGr->tlu(y); -+ #if GTK_CHECK_VERSION(3,0,0) -+ rClip.width = pGr->tlu(width); -+ rClip.height = pGr->tlu(height); - static_cast(pGr)->setCairo(cr); - pView->draw(&rClip); - static_cast(pGr)->setCairo(NULL); - #else -+ rClip.width = pGr->tlu(width)+1; -+ rClip.height = pGr->tlu(height)+1; - pView->draw(&rClip); - #endif - } -- return FALSE; -+ return TRUE; - } - - static bool bScrollWait = false; -diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h -index 30ee5d8..26fbb2e 100644 ---- a/src/af/xap/gtk/xap_UnixFrameImpl.h -+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h -@@ -152,7 +152,7 @@ protected: - static gint key_release_event(GtkWidget* w, GdkEventKey* e); - static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); - #if GTK_CHECK_VERSION(3,0,0) -- static gint draw(GtkWidget * w, cairo_t * cr); -+ static gboolean draw(GtkWidget * w, cairo_t * cr); - #else - static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); - #endif --- -2.11.0 - From 02a41b014a322b3a658ebd7ac8561ac8ae041b93 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sun, 26 Nov 2017 01:41:30 +0100 Subject: [PATCH 37/98] ipv6calc: 0.99.2 -> 1.0.0 (also fixes gcc-7 compilation) --- pkgs/tools/networking/ipv6calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index aea77f725120..b28ea0dbbe52 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "ipv6calc-${version}"; - version = "0.99.2"; + version = "1.0.0"; src = fetchurl { url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz"; - sha256 = "1vs64v8v5g9rskg46baqrzyay86vs7ln3i5r5ippa9l6ildyrvpj"; + sha256 = "1gcl8mqjdn5j1rcnv2gz2j0i8ayx747hwzjyiazl6j43c5g4bc3l"; }; buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ]; From 88df1a6374f221d0b7ebed1a9b011c11343ac758 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sat, 25 Nov 2017 22:48:39 +0100 Subject: [PATCH 38/98] maintainers: add ck3d Closes #32047 --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 39b8439cefa8..509f2da8a4bc 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -120,6 +120,7 @@ chrisrosset = "Christopher Rosset "; christopherpoole = "Christopher Mark Poole "; ciil = "Simon Lackerbauer "; + ck3d = "Christian Kögler "; ckampka = "Christian Kampka "; ckauhaus = "Christian Kauhaus "; cko = "Christine Koppelt "; From 24cd69494c5a9fe4e585ab944f44c09697fe0fcf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 4 Sep 2017 04:29:17 +0200 Subject: [PATCH 39/98] =?UTF-8?q?gnome-mpv:=200.9=20=E2=86=92=200.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/video/gnome-mpv/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/video/gnome-mpv/default.nix b/pkgs/applications/video/gnome-mpv/default.nix index c93510cb1a70..2f073d1731dc 100644 --- a/pkgs/applications/video/gnome-mpv/default.nix +++ b/pkgs/applications/video/gnome-mpv/default.nix @@ -1,25 +1,32 @@ -{ stdenv, fetchurl -, intltool, pkgconfig, wrapGAppsHook +{ stdenv, fetchFromGitHub, meson, ninja +, gettext, pkgconfig, desktop_file_utils, wrapGAppsHook , appstream-glib, epoxy, glib, gtk3, mpv }: stdenv.mkDerivation rec { name = "gnome-mpv-${version}"; - version = "0.9"; + version = "0.13"; - src = fetchurl { - sha256 = "06pgxl6f3kkgxv8nlmyl7gy3pg55sqf8vgr8m6426mlpm4p3qdn0"; - url = "https://github.com/gnome-mpv/gnome-mpv/releases/download/v${version}/${name}.tar.xz"; + src = fetchFromGitHub { + owner = "gnome-mpv"; + repo = "gnome-mpv"; + rev = "0d73b33d60050fd32bf8fae77d831548970a0b69"; # upstream forgot to update appdata + # rev = "v${version}"; + sha256 = "1cjhw3kz163iwj2japhnv354i1lr112xyyfkxw82cwy2554cfim4"; }; - nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; - buildInputs = [ appstream-glib epoxy glib.dev gtk3 mpv ]; - - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; + nativeBuildInputs = [ meson ninja appstream-glib gettext pkgconfig desktop_file_utils wrapGAppsHook ]; + buildInputs = [ epoxy glib gtk3 mpv ]; enableParallelBuilding = true; + postPatch = '' + patchShebangs . + sed -i '/gtk-update-icon-cache/s/^/#/' meson_post_install.py + ''; + doCheck = true; + checkPhase = "meson test"; meta = with stdenv.lib; { description = "Simple GTK+ frontend for the mpv video player"; From 9d2fcd33ea053cc83f913d81c62455825d69977a Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 26 Nov 2017 07:39:58 +0000 Subject: [PATCH 40/98] agg: do not enable parallel building --- pkgs/development/libraries/agg/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 2edf4e232260..c7f5ac866609 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { configureFlags = "--x-includes=${libX11.dev}/include --x-libraries=${libX11.out}/lib"; + # libtool --tag=CXX --mode=link g++ -g -O2 libexamples.la ../src/platform/X11/libaggplatformX11.la ../src/libagg.la -o alpha_mask2 alpha_mask2.o + # libtool: error: cannot find the library 'libexamples.la' + enableParallelBuilding = false; + meta = { description = "High quality rendering engine for C++"; From 43d32904e298a1da49363b7f7e142196833e8a62 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 26 Nov 2017 07:40:38 +0000 Subject: [PATCH 41/98] kid3: enable parallel building --- pkgs/applications/audio/kid3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index ac484445b1e5..b5197af64092 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/kid3-qt --prefix QT_PLUGIN_PATH : $out/lib/qt4/plugins ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "A simple and powerful audio tag editor"; longDescription = '' From aaf6b2b601b079bb47a3b1b752e9cde7ed2944f4 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 26 Nov 2017 07:42:18 +0000 Subject: [PATCH 42/98] freeciv: enable parallel building --- pkgs/games/freeciv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index a968526e5cd3..d60c4c7d0dea 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation { ++ optional (!gtkClient) "--enable-fcmp=cli" ++ optional (!server) "--disable-server"; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Multiplayer (or single player), turn-based strategy game"; From d8473c35df0f30c47d150f1e77b13c29f31cca96 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 26 Nov 2017 07:45:09 +0000 Subject: [PATCH 43/98] kdevplatform: enable parallel building --- pkgs/applications/editors/kdevelop5/kdevplatform.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix index 78881b21018c..88164c2c4585 100644 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix @@ -27,6 +27,8 @@ stdenv.mkDerivation rec { libkomparediff2 ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { maintainers = [ maintainers.ambrop72 ]; platforms = platforms.linux; From f83bb7d1eafd6ee0aa0d42c360c1a9026366e264 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 26 Nov 2017 09:15:39 +0100 Subject: [PATCH 44/98] Revert "Merge pull request #32024 from andir/unstable-fix-gnome3-printing" This reverts commit 03207c067c6fab03ff59d04c569b6b84f72e40ee, reversing changes made to 822342ffdfc01464866aca0451c55b782b2d7b07. Reverted because the change was not needed anymore: https://github.com/NixOS/nixpkgs/pull/32024#issuecomment-346947664 --- .../misc/system-config-printer/default.nix | 66 ++++++++++--------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 7f584563fa11..11d61cfe30f3 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -18,47 +18,49 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch ]; - buildInputs = [ - intltool pkgconfig glib udev libusb1 cups xmlto - libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils - - libnotify gobjectIntrospection gdk_pixbuf pango atk - libgnome_keyring3 - - (pythonPackages.python.withPackages (ps: with ps; [ - pycups pycurl dbus-python pygobject3 requests pycairo pysmbc - ])) - ]; + buildInputs = + [ intltool pkgconfig glib udev libusb1 cups xmlto + libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils + pythonPackages.python pythonPackages.wrapPython + libnotify gobjectIntrospection gdk_pixbuf pango atk + libgnome_keyring3 + ]; nativeBuildInputs = [ wrapGAppsHook ]; - configureFlags = [ - "--with-udev-rules" - "--with-udevdir=$(out)/etc/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ]; + pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + + configureFlags = + [ "--with-udev-rules" + "--with-udevdir=$(out)/etc/udev" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; stripDebugList = [ "bin" "lib" "etc/udev" ]; - postInstall = '' - gappsWrapperArgs+=( - --prefix PATH : "$program_PATH" - --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" - --set CUPS_DATADIR "${cups-filters}/share/cups" - ) + postInstall = + '' + buildPythonPath "$out $pythonPath" + gappsWrapperArgs+=( + --prefix PATH : "$program_PATH" + --set CUPS_DATADIR "${cups-filters}/share/cups" + ) - # The below line will be unneeded when the next upstream release arrives. - sed -i -e "s|/usr/local/bin|$out/bin|" \ - "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" + find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do + patchPythonScript "$f" + done - # Manually expand literal "$(out)", which have failed to expand - sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ - -i "$out/etc/systemd/system/configure-printer@.service" - ''; + # The below line will be unneeded when the next upstream release arrives. + sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" - meta = with stdenv.lib; { + # Manually expand literal "$(out)", which have failed to expand + sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ + -i "$out/etc/systemd/system/configure-printer@.service" + ''; + + meta = { homepage = http://cyberelk.net/tim/software/system-config-printer/; - platforms = platforms.linux; - license = licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; } From f689a6d1c6796c4a4f116ffec6c4624379e04bc9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 15:20:52 +0200 Subject: [PATCH 45/98] snappy: 1.1.4 -> 1.1.7 Fixes build on ARM --- pkgs/development/libraries/snappy/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/snappy/default.nix b/pkgs/development/libraries/snappy/default.nix index c5e52124ceed..5ce636e6f0ca 100644 --- a/pkgs/development/libraries/snappy/default.nix +++ b/pkgs/development/libraries/snappy/default.nix @@ -1,24 +1,28 @@ -{ stdenv, fetchurl, pkgconfig }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "snappy-${version}"; - version = "1.1.4"; + version = "1.1.7"; - src = fetchurl { - url = "http://github.com/google/snappy/releases/download/${version}/" - + "snappy-${version}.tar.gz"; - sha256 = "0mq0nz8gbi1sp3y6xcg0a6wbvnd6gc717f3vh2xrjmfj5w9gwjqk"; + src = fetchFromGitHub { + owner = "google"; + repo = "snappy"; + rev = "${version}"; + sha256 = "1x7r8sjmdqlqjz0xfiwdyrqpgaj5yrvrgb28ivgpvnxgar5qv6m2"; }; - outputs = [ "out" "dev" "doc" ]; + outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake ]; # -DNDEBUG for speed configureFlags = [ "CXXFLAGS=-DNDEBUG" ]; # SIGILL on darwin doCheck = !stdenv.isDarwin; + checkPhase = '' + (cd .. && ./build/snappy_unittest) + ''; meta = with stdenv.lib; { homepage = https://google.github.io/snappy/; From 3b21645529678162fb888b5ff672d91ccb7021fb Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 22 Nov 2017 19:36:37 +0200 Subject: [PATCH 46/98] usbredir: Fix ARM build The error from -Wformat happens on all 32-bit plaforms, not just i686. --- pkgs/development/libraries/usbredir/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index e4e053805af7..4735375de1f9 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.is64bit) "-Wno-error=format"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libusb ]; From bc98f132221546bc96b208e2fce6daf4171e5231 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 22 Nov 2017 19:38:16 +0200 Subject: [PATCH 47/98] numactl: Not supported on 32-bit ARM --- pkgs/os-specific/linux/numactl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index 389e9514d703..a5ed242e3230 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { description = "Library and tools for non-uniform memory access (NUMA) machines"; homepage = http://oss.sgi.com/projects/libnuma/; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ wkennington ]; }; } From eb3925ff62028f573ee20a0dbcb5e52ecb696b18 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Wed, 22 Nov 2017 19:37:30 +0200 Subject: [PATCH 48/98] qemu: Disable numactl on ARM 32-bit ARM doesn't do numa. --- pkgs/applications/virtualization/qemu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index cb0f772ada3a..a43ce12e83e7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -4,7 +4,7 @@ , makeWrapper , attr, libcap, libcap_ng , CoreServices, Cocoa, rez, setfile -, numaSupport ? stdenv.isLinux, numactl +, numaSupport ? stdenv.isLinux && !stdenv.isArm, numactl , seccompSupport ? stdenv.isLinux, libseccomp , pulseSupport ? !stdenv.isDarwin, libpulseaudio , sdlSupport ? !stdenv.isDarwin, SDL From 3b2056536c45c70e817e805b2b7f12b7ab468386 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 14:34:04 +0200 Subject: [PATCH 49/98] qemu: Rename x86Only option to hostCpuOnly And also make it work on ARM and Aarch64. --- pkgs/applications/virtualization/qemu/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index a43ce12e83e7..66e5928ca15f 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -12,7 +12,7 @@ , spiceSupport ? !stdenv.isDarwin, spice, spice_protocol , usbredirSupport ? spiceSupport, usbredir , xenSupport ? false, xen -, x86Only ? false +, hostCpuOnly ? false , nixosTestRunner ? false }: @@ -23,12 +23,17 @@ let audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; + + hostCpuTargets = if stdenv.isi686 || stdenv.isx86_64 then "i386-softmmu,x86_64-softmmu" + else if stdenv.isArm then "arm-softmmu" + else if stdenv.isAarch64 then "aarch64-softmmu" + else throw "Don't know how to build a 'hostCpuOnly = true' QEMU"; in stdenv.mkDerivation rec { name = "qemu-" + stdenv.lib.optionalString xenSupport "xen-" - + stdenv.lib.optionalString x86Only "x86-only-" + + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-" + stdenv.lib.optionalString nixosTestRunner "for-vm-tests-" + version; @@ -75,7 +80,7 @@ stdenv.mkDerivation rec { ++ optional seccompSupport "--enable-seccomp" ++ optional spiceSupport "--enable-spice" ++ optional usbredirSupport "--enable-usb-redir" - ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" + ++ optional hostCpuOnly "--target-list=${hostCpuTargets}" ++ optional stdenv.isDarwin "--enable-cocoa" ++ optional stdenv.isLinux "--enable-linux-aio" ++ optional xenSupport "--enable-xen"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a584b5e6c85f..a457769ff3e7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13001,16 +13001,16 @@ with pkgs; watch = callPackage ../os-specific/linux/procps/watch.nix { }; - qemu_kvm = lowPrio (qemu.override { x86Only = true; }); + qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); # See `xenPackages` source for explanations. # Building with `xen` instead of `xen-slim` is possible, but makes no sense. - qemu_xen = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-slim; }); - qemu_xen-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen-light; }); - qemu_xen_4_8 = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-slim; }); - qemu_xen_4_8-light = lowPrio (qemu.override { x86Only = true; xenSupport = true; xen = xen_4_8-light; }); + qemu_xen = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-slim; }); + qemu_xen-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen-light; }); + qemu_xen_4_8 = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-slim; }); + qemu_xen_4_8-light = lowPrio (qemu.override { hostCpuOnly = true; xenSupport = true; xen = xen_4_8-light; }); - qemu_test = lowPrio (qemu.override { x86Only = true; nixosTestRunner = true; }); + qemu_test = lowPrio (qemu.override { hostCpuOnly = true; nixosTestRunner = true; }); firmwareLinuxNonfree = callPackage ../os-specific/linux/firmware/firmware-linux-nonfree { }; From 43cb964e1773db2b8f01ccaeaaada3a641365e91 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 14:35:03 +0200 Subject: [PATCH 50/98] nixos/qemu-vm: Set QEMU command line depending on architecture --- nixos/modules/virtualisation/qemu-vm.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3c89ca68113b..22fa35964503 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -14,6 +14,12 @@ with lib; let qemu = config.system.build.qemu or pkgs.qemu_test; + qemuKvm = { + "i686-linux" = "${qemu}/bin/qemu-kvm"; + "x86_64-linux" = "${qemu}/bin/qemu-kvm -cpu kvm64"; + "armv7l-linux" = "${qemu}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; + "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt -cpu host"; + }.${pkgs.stdenv.system}; vmName = if config.networking.hostName == "" @@ -72,11 +78,10 @@ let '')} # Start QEMU. - exec ${qemu}/bin/qemu-kvm \ + exec ${qemuKvm} \ -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ -smp ${toString config.virtualisation.cores} \ - ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ From 0a2eda7a7e3cf7eadb0401f07071e1a3c22a4675 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 14:43:50 +0200 Subject: [PATCH 51/98] nixos/qemu-vm: Don't try enabling graphics/mouse on non-x86 Needs to be figured out some day, just disable them for now. --- nixos/modules/virtualisation/qemu-vm.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 22fa35964503..3f10180cd1cc 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -439,7 +439,9 @@ in virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; - virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ]; + # FIXME: Figure out how to make this work on non-x86 + virtualisation.qemu.options = + mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ "-vga std" "-usbdevice tablet" ]; # Mount the host filesystem via 9P, and bind-mount the Nix store # of the host into our own filesystem. We use mkVMOverride to From e56da6a4642c843d7ba88f513840da7d473eecec Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 14:31:50 +0200 Subject: [PATCH 52/98] nixos/qemu-vm: Use different serial port on ARM/AArch64 --- .../modules/testing/test-instrumentation.nix | 22 ++++++++++++------- nixos/modules/virtualisation/qemu-vm.nix | 7 +++++- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 7f5b55d5cca0..1d6c41406107 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -5,7 +5,13 @@ with lib; -let kernel = config.boot.kernelPackages.kernel; in +let + kernel = config.boot.kernelPackages.kernel; + # FIXME: figure out a common place for this instead of copy pasting + serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" + else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; +in { @@ -22,8 +28,8 @@ let kernel = config.boot.kernelPackages.kernel; in systemd.services.backdoor = { wantedBy = [ "multi-user.target" ]; - requires = [ "dev-hvc0.device" "dev-ttyS0.device" ]; - after = [ "dev-hvc0.device" "dev-ttyS0.device" ]; + requires = [ "dev-hvc0.device" "dev-${serialDevice}.device" ]; + after = [ "dev-hvc0.device" "dev-${serialDevice}.device" ]; script = '' export USER=root @@ -40,7 +46,7 @@ let kernel = config.boot.kernelPackages.kernel; in cd /tmp exec < /dev/hvc0 > /dev/hvc0 - while ! exec 2> /dev/ttyS0; do sleep 0.1; done + while ! exec 2> /dev/${serialDevice}; do sleep 0.1; done echo "connecting to host..." >&2 stty -F /dev/hvc0 raw -echo # prevent nl -> cr/nl conversion echo @@ -49,10 +55,10 @@ let kernel = config.boot.kernelPackages.kernel; in serviceConfig.KillSignal = "SIGHUP"; }; - # Prevent agetty from being instantiated on ttyS0, since it - # interferes with the backdoor (writes to ttyS0 will randomly fail + # Prevent agetty from being instantiated on ${serialDevice}, since it + # interferes with the backdoor (writes to ${serialDevice} will randomly fail # with EIO). Likewise for hvc0. - systemd.services."serial-getty@ttyS0".enable = false; + systemd.services."serial-getty@${serialDevice}".enable = false; systemd.services."serial-getty@hvc0".enable = false; boot.initrd.preDeviceCommands = @@ -88,7 +94,7 @@ let kernel = config.boot.kernelPackages.kernel; in # Panic if an error occurs in stage 1 (rather than waiting for # user intervention). boot.kernelParams = - [ "console=ttyS0" "panic=1" "boot.panic_on_fail" ]; + [ "console=${serialDevice}" "panic=1" "boot.panic_on_fail" ]; # `xwininfo' is used by the test driver to query open windows. environment.systemPackages = [ pkgs.xorg.xwininfo ]; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3f10180cd1cc..770e5fb848a9 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -21,6 +21,11 @@ let "aarch64-linux" = "${qemu}/bin/qemu-system-aarch64 -enable-kvm -machine virt -cpu host"; }.${pkgs.stdenv.system}; + # FIXME: figure out a common place for this instead of copy pasting + serialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" + else if pkgs.stdenv.isArm || pkgs.stdenv.isAarch64 then "ttyAMA0" + else throw "Unknown QEMU serial device for system '${pkgs.stdenv.system}'"; + vmName = if config.networking.hostName == "" then "noname" @@ -29,7 +34,7 @@ let cfg = config.virtualisation; qemuGraphics = if cfg.graphics then "" else "-nographic"; - kernelConsole = if cfg.graphics then "" else "console=ttyS0"; + kernelConsole = if cfg.graphics then "" else "console=${serialDevice}"; ttys = [ "tty1" "tty2" "tty3" "tty4" "tty5" "tty6" ]; # Shell script to start the VM. From 8762490337b69b2428628c333873c752beac9e85 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 14:45:24 +0200 Subject: [PATCH 53/98] nixos/qemu: Add virtio-rng-pci to test-driver Otherwise AArch64 KVM guests don't have enough entropy at boot. --- nixos/lib/test-driver/Machine.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index a7ed5d1faa38..a01c3c336a1b 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -146,6 +146,7 @@ sub start { ($self->{allowReboot} ? "" : "-no-reboot ") . "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . "-device virtio-serial -device virtconsole,chardev=shell " . + "-device virtio-rng-pci " . ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); chdir $self->{stateDir} or die; exec $self->{startCommand}; From f3794bb8cb417ca1fdafe785e5090b72d62b4d66 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 24 Nov 2017 14:48:18 +0200 Subject: [PATCH 54/98] nixos/qemu-guest: Ensure virtio_mmio is available in initrd ARM and AArch64 might use virtio_mmio in some cases. --- nixos/modules/profiles/qemu-guest.nix | 2 +- pkgs/build-support/vm/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix index 987eb051b98c..a1ec1d45395e 100644 --- a/nixos/modules/profiles/qemu-guest.nix +++ b/nixos/modules/profiles/qemu-guest.nix @@ -4,7 +4,7 @@ { config, pkgs, ... }: { - boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; + boot.initrd.availableKernelModules = [ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "9p" "9pnet_virtio" ]; boot.initrd.kernelModules = [ "virtio_balloon" "virtio_console" "virtio_rng" ]; boot.initrd.postDeviceCommands = diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 26c66dca8a5c..fdd7c2013b40 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -3,7 +3,7 @@ , img ? "bzImage" , storeDir ? builtins.storeDir , rootModules ? - [ "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] + [ "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] }: with pkgs; From 314f89b732d9eea75de0ffba1ee88ea52bd02e89 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Nov 2017 18:05:28 +0800 Subject: [PATCH 55/98] firefox-beta-bin: 58.0b5 -> 58.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 27cbae26cd95..67ce0c8feb01 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b5"; + version = "58.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ach/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ach/firefox-58.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "95b054d67d14b6842582df2d60d494a3f94e1eceaf2192cb972e8c53cf6e031b99b027bc7ab3ef35a1c45ad6ae68589c5b0c3f3188bbebe66023d84bebf1b1be"; + sha512 = "9445891b88377a277af6560fa8884cf1700c9c19485263c42765495bdbcbce63e14612c15b694c27c42b2c2f982a1f08f334d2e65c477c45b6040de2bf81d737"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/af/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/af/firefox-58.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "5583b8a5b06b2b60dbd1beaa927a74d78aff23669f56dab4be3e47e0a12d647b730a74a40fb61ccc1d268e76c073902a4bb95e2bbdaa26301e0f1786752337ef"; + sha512 = "c6ba7d5194ebc2854bd86a0da534e1dce53a5b8798fe19c5684f63c9445db913dd56b0c5dbcd2a454ed660e9197ab2955964ed5990de2f78d5ac9189a4b99e44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/an/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/an/firefox-58.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "8727209b35d0ee4d2f229b93fa5e482cebbec4090fed3c50065b3c33853f59cc231b3d50609d0d02738dadf2a41f9afdb7da5f19bc2c6cab5ea4436d914d0833"; + sha512 = "04e73e2c1e120e470e890293ba6449c5eada0efdea88367c3406f282af3beed98974bcc12a3051ff29648c27d01fc5768f7e5c78c6aa44c1867f72536fa5896f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ar/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ar/firefox-58.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "64aade9cd60054c607cbe3c142b30d4d1aee989ddd22572c640b44d3969237d8cca40345b392110a9b9fcfe7dc1f2df2252ebc162944c394b3dd01cb04cd19e6"; + sha512 = "46633d392e89d29a030fa31926aec2ecc6059271239f94c7b53e52f6dfc18cbd7f4a2721b5fabd42ddc2bc655d6b6d3afc65fd768a22c609362a4528a058dac6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/as/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/as/firefox-58.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "9dbd4b9fd30eb580bf817b56ddaf1dbb5389d927edf96f52e417e2e0f8867cc1456ab83f823db6f706da93a34fb2640f9a44c4e3d2ee022c8ca05e374fcb9b5b"; + sha512 = "ab19e8d6d1075a2c3d77a8abb652db1442dc17cad0e25ced97c5b70e810c5518c3cabc11858b8c6ce2ce13016d9c9a8435f303437dee6c09aa5950e763b23a97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ast/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ast/firefox-58.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "62f97db0b5105039ec04b826b2771422080a4da6ff404098174d499854362a2d4ea22adacb5dd40d260b533b1d943ae88c7326077a3c8fd0324bce718c6a2530"; + sha512 = "ab9e8c4f33d86929f0d5f5bd7b7129bf42885d73c3cd838695cfe61a964dd2ac0a867385a496ffdf9fbbe498fa109ad4f96152096baa14b17b2490d02ee23a1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/az/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/az/firefox-58.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "32f96a4fd95484b257468cd90474c0be7372158bbd2ef4d43800f11a46316c354cdf4c7dc1ca80edc585fe380984b636ba7f981367317e8384222b2a6a76e851"; + sha512 = "5eb8d011cea67f9e800e2e0f0a27146853f35ec75dd7232176a0bea9d80403c99a113618933bc548bbfce890869bd42cef60a1ffaf05f3e2b6b1409658dc29e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/be/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/be/firefox-58.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "2bf89de39dc11f947ee6b087bf25f9ed8abfc8e79dd284514e8439e36921f5b1a0a28a9a3ebea3a975cadef00cda557ed7fc1117ee9185f117ffc523518d8d93"; + sha512 = "8793614358fc843b996b29e1c459e734fd7afc099781c4bb5ced537e4b0e71b5bcab3be4df219ae7ea92892c2d2e941bdbf23260bcac9c732ef38d18f710fbea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/bg/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/bg/firefox-58.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "848ef9dbee345129a4ba9309de63b3f72e98bc0455bef0f41203f3e429ffcc7a8e582f6fc2feb6d315741b668a410acf0b7d853933a24197353d716c0cad9c83"; + sha512 = "3df02742cd1c3972a2ad0e152f402efa3d34fb82080c143a859b7a26012569317de97026c78ad407701e1f9c0aa67a843df9b97fe68f505005259188bcb3f8a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/bn-BD/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/bn-BD/firefox-58.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "f44a4ef7cab808246f19a2fa0273cce1b59ac6d0c162c203afd738b28ba4a4d6f81e0a0f28bb126bb3356b50061f99a39ed6902a0a1aa818e585374d871c8928"; + sha512 = "b06b3d6574eeb248b62236aed69d12795cab58d49054a4e92b110f81b119851522999c4b896d2c6b136366d3f0bdfeaa4a93457acb3fac21864e1420451121bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/bn-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/bn-IN/firefox-58.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "f9adf1199a1835df64ef6c9a6d1001cac4534238b9cff2a2c354775498292983dc292106b10ac9d85e0497ccce08ef6337fe84a04a60a246be4aba08a5da7003"; + sha512 = "3ec889e784ec2e500d81a043c6379b54c24d4ac039d46ab7615ecd747785fef0d7ee3a8020fc970f07ddeb36c76482e79b6c85d61c0a1b29d596c347e814b46e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/br/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/br/firefox-58.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "ac7358b3461a182d97fe1a009aec5438026e69a23f959f06ee60a13848bbe092a4e1833ad30aa8e5d2315e7b6e30711855eeedaf810dc4d50a662dc3bfe81b19"; + sha512 = "716830b0cee56e0bb54bc3926fad6c34e25f4a8f64dd6547b016c13b7d90d6ef5cbe3ed547f7a83e4789a8e5ebc7e9bbd8fb0343c0eb649cc8a2f4ceb67d728a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/bs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/bs/firefox-58.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "dd09994be3fb0555da04c5bc53c1ecf30edacfaea9a70b9969cf1473ca1d70495d7306fe56b82819b1f2d2653f20d80b08dccb74dd3c5009a6c288c9974dc5df"; + sha512 = "306e62245466881625355f934740df01856eaeaf187cbb68b1b371310e2239184619e7cecee9ecf6b4e6f64e5c218e401173f4f59fe61c3241c0b2fda4d7f54c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ca/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ca/firefox-58.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "96936578ec4bc1efe723092b6e9e33e7017afeceeb32e2cac4de5c8728f95a1031c8905b9dadabb077e752c893ff2d5c6e485bb586444a5e82f81f935719e4d3"; + sha512 = "96f65693af47a4d0107d585a074cadd92e28ab2a7c87598aa4da63a8201785c358a410a89ba6f519b84ca54c741f4c254a81f6a40aa8b1a19abfccb3792ea69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/cak/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/cak/firefox-58.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "1ea300350f54a1e7d8e367c409d33d14f94d3213939024f664c0e6b7f667ccdd00348b16c84b72238eb7f6e57cf30fc31e0c1fbce48bc23af566042c0bf079fa"; + sha512 = "ca731adbe7b36b0910401f540d66e791a5abf44571b55cd03268a35488f7108126131ca104cfa33cc173151331a8ecb0b9f8139b3d7c8580bc503a972c18551f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/cs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/cs/firefox-58.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1a0f747ed4dfed29d770cc9b880c4de97823552f8da9944308ea8a42b1d1af7add467dcaa54b8b86779d1cade7ccef0e061b7e11b50d50fd192ee113f9d27efa"; + sha512 = "8c6ead3fc20ad3d7bf1a0301623e4952fa1082902fb3a1c49640def7b383001c211f75f764cc9248fb0138083c2b6fc54884e50870816095a9856d80076b1df2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/cy/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/cy/firefox-58.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0a4ac1c67ac030800857fdf8e03bbfb0e554f2f789867b2fe3df6184521a8c38fc01f6d35449b8fe66db685be467b3d5a4a3e0c25d3883dcfee904cfb6d6e87f"; + sha512 = "46671440e5a55b6c18c5de594a4be8b7baafdf9a7e4039c7e37a247bff7294370c865aaba345ca3ac06f2e3d05cb7ba1f5c03d928921214183623698d7754827"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/da/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/da/firefox-58.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "648a9d5f86c970d25ced2ba90550236bd53838eff5026f5306b2fc3c018e3ee2b92d0d0cc59c3b1ce315077c222821decb24acb8e43e41574327949b96b420d5"; + sha512 = "282ac0c180da2f0a0f566e52bb9ad0502d96f1a59efb3a63e95f978f97f22c3786453a37eab6594c9dd6d43494ed4fc1cea0260d023e2422a62937be87d0903f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/de/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/de/firefox-58.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "418c24e6bb6fdbe7cbe5ad6d4bae4fbaac6d6b38b8ea8af4662479238bf7cfa5f290f5877f25d233c21e84c41c6d9542ff5f206cf85a0bfb637fbdde15af30f7"; + sha512 = "951be1feded62041f2111652a040de48346fcad2df5249e63a480de49d368902a15ff8971653db634d58979e69e75f5be03667d3dfb9e3ca733d4ba9a7b28f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/dsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/dsb/firefox-58.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "91dd12e35dacdeafd4e48b875a47711aa220349a0e2cb12ed1756f1d7712a124c0d460312097071424d9d7eadf2bea890978c715a8614092df8a8fd2f5558cab"; + sha512 = "1a32b5a07839b2704a55ad7c86ee2e25989e8d861b6203aeabb02d49ed64cdc1831c483b0f4a0c58bf5f34ef58c0e282fccf9805dc7c47585d928e18e2d2fc9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/el/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/el/firefox-58.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "57c1644cf30ef9a2f065a90654ee838f79c71d5d09bacc1eef7e0c1739b28be6d8e10bd95797fd29fa9fb86629d58e3b45b37ca9e347924c920e754a3e763c5a"; + sha512 = "f2be13d0363d2656c9027d73e343a8dc5ff9d579759b8d3b3e9ffe5c75d19f82ce0aa73e3c8c320cc60c79c0933327d6db611710320dbf0fd2f6961381894bc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/en-GB/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/en-GB/firefox-58.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "9140242788f2e8c0f6af0192e4ef1406083ea3ff645aa7eea59b036ca2180d1112461edeacaf9d79f539bf5cfe0f455e293c34abcc9fbf3632a7b0df5d89d41f"; + sha512 = "a569be7870730b020d5b17eab2ced906c7aa438786825f3e6db0fb0b35bf1cd816f480362d039b53a5a0d0f3879dadf89dee78039e5e5b2b9cf2adb29541f000"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/en-US/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/en-US/firefox-58.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "5a8555e521ef72330a2776f41142581ca4d0ea73b214167c182eb885da68a801ee359103b47fe1da50ac29a632c54a42d1fd72c98e948286dc564daf8aed7b75"; + sha512 = "b6edb2e462ded73316efce66dcb3731561e74439cfe9b7dfb7c616257cb9db51835194a304fb8b357362323ef62b1106f2157109a6ebdad7082060cef26675f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/en-ZA/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/en-ZA/firefox-58.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "fd17763a6d1debbb84cc2d6753151e0a89711e690b32b010413f323f339eb34845a710ec65ba104ac26b729f4097c7ddeab0937e64d30754247f16080d72fabc"; + sha512 = "3707190c9ac3fc2db8dfb7db040d1dcce04af8cb72926e63c7a7074c38bc8517cccc1ad5f1b05486c59ecca08827b47618d8f7c2cf99d261efc58d3bd94e5602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/eo/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/eo/firefox-58.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "9b8b4ae6d4ff391afc7333c441cda97e34dc82f32155bc83fd533e1ff6cd1681474f5535b6a83aa2ba1feef01f687ce4d37a27c0f46bd5e0b6b871877251a8ee"; + sha512 = "835f1546870a61c09b57cb82a968eea409c955f33acbb8a07c9e902d8f3b3858f9d682b6f106b6024ae21e6682079e3fdcfd2142e72a1c3e3dfa6712f2069bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/es-AR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/es-AR/firefox-58.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "4b81a589d643baa79c114ff376fc37102ff485e8b9803480fd0eb0f1a1fc179938f83b4d6771fccce761fcb78f401cf7628f0fdf4ea05431572febd87a1b0240"; + sha512 = "cf08f550d4c994fd1417314949a9a0cb74d138d7f2cd1cfae7bec12cff828da7caced4cd57385e241f146ad46a7f01ed3a74222e142e85960ebda0f8f37b8862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/es-CL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/es-CL/firefox-58.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "7fd29b082a1f76eff1d7e3e905b2208b362ad327addbaa2776dff6b8a7dfd6fb330b5bad8762d20a310a6b04a6b88de28e596a47db903fee7b80e21c1c74aa9b"; + sha512 = "87426650ab085420eeb0acc99e778a6275b32733af5d3c9ac091911eb6a68b8591b9755798c77079ddfe4a599ac48d065fa81724438064876e3b464ac10cd773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/es-ES/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/es-ES/firefox-58.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "0348763d178e2beb62f6a4b820267ea44798237db42e405b63266947c36c22b79c18682d04044cedc95d9a22b7638435c11d228bcb765b41caeda01712445e81"; + sha512 = "081931755f4b632f532bd528a95c058d4baadd0c6cd74454550c4f2ccdc9b0025e4f6941f33ccba67ba75c3c61c4d700862bf7f815c5aa7050e947a968cd6c1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/es-MX/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/es-MX/firefox-58.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "2ebdd7747a64c4ed6fe06a3f9cdaae0637fc1f3e9bb4f0bdbe51b55abadeb4e72b8acebcbb8190859de8e7d1aa7fe37ff75f987486c185671a548e01693decf9"; + sha512 = "a7d60f1c6bf533c17c1581c5fb7a599859f99511735b0ab435171c73c8b1ce521b16caace4b97ad4b97ffafcd98888bce02a3bd59aef37c68b4e37c64871886a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/et/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/et/firefox-58.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "24f399e621e635dd5220e067db23ac72f95d06eef51ecbbcc057c674de0a1a7b5100996624566a72b2d7b927611b182acedb4ef94697a695f6d2c797de169694"; + sha512 = "2103e4426accebc9ba6b327efb901f934e9ae03d0b4d4554ced63be114bf7db894bb1be21922ed78a7470504f506f4990b05c858314758dcb20bcfbeb4e42e97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/eu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/eu/firefox-58.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "914682f7b7d8d307f611391ef011a5d861c03494e12ef7d6c1e00d8360ba9092c7b997d3a59a3494bef6d46a9fa7c70eda13167c21cd27650fafff5ec65d26c5"; + sha512 = "fd31e1393f3587bf45006d42b315095220b0587c2298228e6d736e92f8d5699861f6ec38046b8760de41494f5e64f86342442420b0c0f007ba5f93379df35ad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/fa/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/fa/firefox-58.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f45e733473904933150983f0c16c037bd2449324b8db6733c6625b42eed58e60a5c171ee8d1a13e8d10939aae018bfa5248a5bcb9b2db0049879bafeef7bd525"; + sha512 = "71123c1a0638ee5c4eb4fbdde58e2e2b572363b319238d1d67abe2da004e9e7dbde4f40e5c3cc0275225e1cd5d93d9546db5dae6d5d40df6cd772d300000ee37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ff/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ff/firefox-58.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "a7eb6103480edd171913f807e40f3ce4549b6e7ed9fd5312efe6150f9ebd4549968ee7356a85f84542945cef3cabcf7969c2332c2cb294feb425fb90a9b72144"; + sha512 = "3f56606038c83c70c3378ff63af45317465f4e2cc717d039a4dbbe24e2bb0ad4631f8acc375de5cd4e08f0db146708808e0e0fb2dbb59c6a85f7e9c3d7c246da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/fi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/fi/firefox-58.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "043fc1bcf95f78410f679caa06e97fc97080046582e9f7ccd5427675c95f88fe731a4789921e70522ba87df183345e8bc82ca0189241f1d3b3476820989cc2a7"; + sha512 = "60f734045c0ac0eeaf8f493fdb3aba9a38ef67fdba125fdcf61853014c9b8460fa93aad19d931b23b4aafb771e6071322259bcab550a846af525d445bea5533a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/fr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/fr/firefox-58.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "77d941eac840619ecaf9b3fcb93187db06b55a936d13d880a09938edae9c4d349fe2917166d6d6ce6b5063df3236dcf3a0a64d61eb8f92c358ede42481d42a21"; + sha512 = "b4b02d11ffc51d1d474536c44e05a9cd60890a12b2dc4892409b8cd26055efb587534940ade76d13b636419f19251d6af8c1eefd5057fda2e59ddd8266bca360"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/fy-NL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/fy-NL/firefox-58.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "9336791872fbffa241a011ac60f4a092cea2f17ccc131ad4dbab083f91d0cbb3ed6b604962bb22087e2ad9cb8a0394c9481b479f436328b8d22928c9dd8ea41c"; + sha512 = "26ef7f46de8b0eff802c94cb8c89ae8acf072e422ae92ab6d9afde854632f9f56c903a591d648b48624c21e32de4391228d2662bdbf26eac0647281a49caa81a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ga-IE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ga-IE/firefox-58.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4381b4aed7e2defda967cc16e24700ae3a92e96a1a11139fc85b53f2dc0a25a770e6fffdcce68fe5dc56d2303ce47f626bd117247e5a9ce9a5de85cfe3387ebd"; + sha512 = "91c9a538af6c278c6bab99690097dd8b7f663b8dea3ab1df8e02ec3b2821ad0d48792e5b36aff9b9b16fd7e21708139e81abace4de220e027d6a8b499af39504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/gd/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/gd/firefox-58.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "f21ff92e5cab3710b85760139c4668f401bed99046dd82dc2b674f7241dbb2326efd328b0a10d057cbb63090ae34dbe7604fe0afc85433193054e2b2893f02c7"; + sha512 = "a7fdfc2b85b531afa1043a6b9a16ae1858d1775bc491b52b999a8fe2e943403c6252779626c0ac7ed6a3b5644ac8dff29f8c8be5d44349eab9f451f8f3484a58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/gl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/gl/firefox-58.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "2acfcfd6436de00c09903147fc29653ee77d32057438eb9a62b22c21715706b96e862bdead15e80dc932f7f70bd5e09aede78dd90bf9926d047450d5d327c853"; + sha512 = "53fd52fa601868cf874f1c19ced5c0c58174d4dcc567d54b6a5196de7fee726a88d03ef3c77bb8a55f9d624a99fcda937e987f968f30368f3ae5fd72a11b6ead"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/gn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/gn/firefox-58.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "4bf2c67d20aee8ea72227709d4d72eef1cc36202c1f9e699593bdd0cc9d1a2ab27fc131caf8ea2359b4bdeb63cd33c3fff698393739110a71439a2705760e299"; + sha512 = "d67a2c3772ebd33113872cc5d1ef8dea176fc680e837ca90f13464b92ecb5f0daae5c107cbc1424d6d647f37f82016e55a3669380ddd3645e4eaeb622b0070ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/gu-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/gu-IN/firefox-58.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "9afa85362ea87de31e24f2680f42f6476e6ffbd97491855a20e692d28e73002f69c9b515ccee3204201dbbdda58f9ed13c4a22bcd16de21aa3c5999ea53c1f24"; + sha512 = "b11d3de103f4fff82d5022f30234909bb0ab99436c1990d7ccc65739d9b46ab3a6a38093fdac78c38b0472c36abcf1f24a22a56e19cb3cf0c8a1f574f168f46b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/he/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/he/firefox-58.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "149b98c8313593e654bce40f2553149722777ec06e9f30e701b2d0f418c414ebaeb6d00e4af50fa685337ba8a48c491c55ae54a748e9db6c80664f4e94d98202"; + sha512 = "5ad0cf4fdb458f4eed2d1be4c8861206d8f696dbe76b6506131cb67973832ffe3df0eb6eb6c9f4a4e6f8b5aadae85c98e670b231b6e7d827493d048ae7c1822f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/hi-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/hi-IN/firefox-58.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "cd6ce18127c90001ac19b45b6fd2841a06c21e66abb74fd88b363671a86bd1669d82179bc752807040ab36a17f9ece5614c20341cc47ca5bb415a10e0b573fbe"; + sha512 = "e2f462094a527949b37bbdaae5fae8cfc47912931c9c1a5868b01fab2901ba960db35130e3201a544f8d1bb07b21d788032bd0f6d59792c50858a88c0813d6b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/hr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/hr/firefox-58.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "dbfaf5fd66a3b5dc88a13d3b1f95bf0d65c14cd33233876dc7ac5001ce9d7be523cad47c58321e1b364485616372415f33e9750f1878441e5bd5f5bd95d5a7bb"; + sha512 = "c63b97ed675083a955af6931ede608a4e825ca8bcb4cb36943ecf115229f0f27d10f132cfaa7861ff9b335ad3b065a889bc6cc95be035402180f8effaed8dd5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/hsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/hsb/firefox-58.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "306a61e0d6cf1426dfee09ccb0e36a912edc2166fcfcfe50a97b2c2741205352c654579ff0464887c7cd488c7580d7af312d21f845a29dec5c6f12cce1c636c3"; + sha512 = "1cfdcc8ef2fea728cf638568400594065ab06f87c4ab0f3b77a9372df5f644f39cf936c49294f6d8c31d1d08a84f76594eeab3b078ef88ffb7d9389118660f78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/hu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/hu/firefox-58.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "6116de4af85d002e86a4f839a91cfa52ed40fa7a91969c49e46a9cd752de5de035452b249bba6d8bbd694f36f18ce280fa81a562577a513b1451e235928b04b5"; + sha512 = "dc654bdc824495e7b0462b59d05dd0c0efb165f3a394fae94c82b0200851249b52a44ca7b4e6e5298d4e7b2ad52d03cde0372ea6fd0791f338e34d122b40bb5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/hy-AM/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/hy-AM/firefox-58.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "7c77f3e6d7f30d5f215db0747b6730e0f139d3bfbeca4a095d83b9e454a5e478b1f245bb6c49fa708e9a89afacde305e4ee608c7bfed1cb9dc61b4cce64b8a8b"; + sha512 = "3f3201250b793fc421d1e87155a70b1c630c487165093101da2f30203440b2545196b6e1c259e3e944b5b518cd21ed6ba87ddf743bdfd0cf7abe8ae88f4765fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/id/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/id/firefox-58.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "d5ca3994146a6ff3069df48595cfac7ac7148d60f32121cda74772697aa87c9a08fe0849ae9c97b59a45155523951c99d39584934eeff8beae3b7c22ca7080ef"; + sha512 = "f841c3150f1e804b9689e526a4408aed5e246fa1ad979d5020d18c2addc2d46510291559b7a397a6c99259a21bd22372b9f354fd3ad835311da526992d924b76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/is/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/is/firefox-58.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cff9f936128304792baad888590b4ee27192fee625b48fae3ba70626ec8d88d8b686f01e2d1c07b385618c811f8ed008449c3972a994569abb74285033d8ffc3"; + sha512 = "73b3132550d6a9a6eaf4e5f759000463bb3dc10d86ad2889723d7be72b4c78cfb42f5d84da5c01cca3b503f4d7e8632eae4a6be77206c3717de4883b75dd81bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/it/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/it/firefox-58.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "28ec78dfa63be210a7b37083ccc5adb0ff069926631f0c88214e34ab7197d79b5d823a38dbb632f262bc7815736c54e9a7ed33b58e1e39c942b733ab2c97e7df"; + sha512 = "29b9ff4ee644228f92ead9dd02c982158a4f1c0521483b641685bad648f1cb2e954bc467468ecec04affa5ef5cae23fe457f51c513f580831e763790296a0b1a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ja/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ja/firefox-58.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "255119e1f733571421b116755635e7adec5029bf1452042185d10ea3ca8b4a2a87f9896739378f63e27c7d7c09becd18d2c0481994f33b50022e54687a0b32f5"; + sha512 = "6e1c6819c7cb1274987f10fb8e3720a7b4d56133f3751c7244e9fc8cc03b8f05c000eefc91f3fc08669a796ce581741574045e133a596848dec0fb226f6d595f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ka/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ka/firefox-58.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "fbbfa7fc27bbcdf7def6f7f39badfd7bc362eb100f1ff02fc5d522b167006503d7cfa148288cd1f9660a191f6757588528bb715517f0f8b835f4f34ff109d5b4"; + sha512 = "557535a940fc2e395978ed5eb86a153c56444d7ffc9a6ed612c0b4bd885b1c2eeb28664c9c448c36e48f164ed36c97d9d9fc4e3c386308566e0f95504e9d9f6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/kab/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/kab/firefox-58.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "98b863cbc1847822dd44ddb3e885caea7a488d77e9bd180774f0c27c02f089750e7b8ffbeb498156c96f165ec40284c7ca668de156b268101c91c1eb00b17de0"; + sha512 = "58d4136510cde9d7b673c47b83be0b784f1e27d77d23a3f8224f8da5c075324b7ac1e9e6c97a73cb4c2e1f4ededab95549bf1b7e99b5ff28a303b2065e5fef73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/kk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/kk/firefox-58.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "b9a2edb19572f3a2b00ab46a58df09ba8ce162ccc42c8d40376989ac1917a0b7bda9a2326e6cd8e03e8837f81ae5c808888988c78debcd26ad14a35320e55e89"; + sha512 = "3c8d86ad91087d17f60a61b5370f319cb21d9ea74039e059026f15238c23bd5fb6cdd4a26a533e8d0bf4dfc771b8d65209e64f104396430db8b437d7d77ae88d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/km/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/km/firefox-58.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "0a7391d968816beffc7235214516184381e16902a8064f76b46cf1267fb176e01806a9a74093dbddeedac4ce391baf08172f55391fd1619e5214eaae8b4905d4"; + sha512 = "cdca0074c75b90b05b44c4e2ca6f517bfffa16274e2181be216cf4410d9526bc4bc128ccc5f2e842ff1fbb9d0493066383888285239638a1d650e6c878c9b2a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/kn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/kn/firefox-58.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "1b0409a1992c684b48c30803094086d1a1922f50dccd17c3a78b768bd7834661d73c1250e7148e6476022e81ee39db2760370b4fe5c70555f9b8e53b1bc21b9d"; + sha512 = "c6fa9bbb35b7fbe6ee7d45279bf93be1214013e1ab3b1ed33ab0bc305c8b82562d843aa73fd0a94c5a9e8bc2984df8b82cf90052e9c3f2238c618a8fe77af72e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ko/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ko/firefox-58.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "736c930364041a929a604eeb46cf36b0795e51a8459e8d4f88b18099ea5d9a9d8336129dd1e7ea93b5426f5a1b678cb0fcd1455deaf0ef0cf39259df501f44b5"; + sha512 = "f7c25bc3fd75d1a7af82e14fa54f7a17274bcfd3586ec6266f1a3cddd80f52246b3db3d5ae0a20d8bee5f345a7d6c20bebfacb3c4d9fd6e4632a87b1b277d75c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/lij/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/lij/firefox-58.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "7c52eeb0d26e906c6ac29af0c5af164a82488ede574d49c6f4fc67bb1f9a0c884a841908b8c07eafc3d767982fa767fcba2f3ba0c1bbbb4895b6bff170588bc2"; + sha512 = "7bade6c5a2610a38492a152a94241fd6fa80ffbda6ec747940e4fb369004f84d65663bc635795656166c8826d5cb37d64906370095178d8ad1b9eb3dc3144870"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/lt/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/lt/firefox-58.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "992d6751e200d79ca15d7698a345b9a617571a51ed48e252d72a6da3face36e6605c0b70a3d2351654da5880837033c65d87393ca99c6cfaf8030836d70fc5ac"; + sha512 = "7d2f502999f301e88efe20a5c06e1d66aeceba8a437402012d29781da32fb7206254247cddabefa99fa35a0436ee1a16c274098069a6a576bccd19cbe328b23b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/lv/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/lv/firefox-58.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "231506d444a8062dbb4fd8f59e9303a4df5c6838db1c47df447c740bae47c414f4db0a36ad87c4e5d19585ca01bd6976d2b14bfdecd1a3728247cfc82ebb8419"; + sha512 = "1133dd3c2e2e9946b8832cf2b0b3a807fc76609d2db82cc2783005e2033480c79292e74f69407cdddc55b2719a1d9dde26f9c218c8dcef46b6025515648a3ea9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/mai/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/mai/firefox-58.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "d54772844b9b8e12307fb472a1e391061729fa7bb5a73a8ad5bdce24088936bedd5af4e9c53fa5d8c8de1d779c258c6f92ad0f3cf1fce6a79f21ba2ec5744066"; + sha512 = "8a8ce94c1d031c6363d93828011e5f61517374945c1f035ecb59688795941f7f2f9fab58a02a60a9765ab57090ab0e26b5ee2a9eb936de4c8f0c96dfe708dd87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/mk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/mk/firefox-58.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "c7ebddf647d6fc471d28c0afe34c41bc08323fdf7e8398f01932680ffedbf550752e8b9461e59b1f8b5963eb8374c45a9c157a6043a7b5f674545d5711f36a6a"; + sha512 = "b94e37dc22eb6512e0de023d702a7da886cc1ddc24a514efc1777aa2363e4b356cbfbc1fd90e90c36e06fc6124e7d89dfef1d38f35cb4935d67111bd7831948b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ml/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ml/firefox-58.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "ba7a0c886673ba82df59f0bdcfd30480e8fa4b55398bf1fc81de8f7599bc67a87dfaaae36ae495184b881897294dd87848399690d72d2a66ff9feca89d35c97a"; + sha512 = "901b225f944eae74b323c593a1c835d407045813b6929c5e2899fd5a18f3af0ca65570fc7989ac572af5f96b2658525f82bed1e9d5a88ff4c3dd046724618e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/mr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/mr/firefox-58.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "eed429f769ca316b9e9cb37823837d90853c7e323b462192181d0ad4ea88fbc73bc252d1288395430d3e30a618ab7444fc42dbc5aa576e42e0359a31330d31c8"; + sha512 = "d024ed71a4146cc3ad38f504c810f3e4e2d1cf3b5f98a4910fe02b383df3acb0c252e7819a6f7452df1d1d5863f1e8cc4e269db89c7b9d603070979fd7b6df38"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ms/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ms/firefox-58.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "91f566b782f03e1fe458729d56023a1868cfbf9b20c56c2a6b71fd1548180ed40de60ecfdd6c61c36189260e96b1ccdb57ff1a417ec1d8822859ce31c6ad7a7f"; + sha512 = "220b34f09479657fb07dc1f8ff0c184646cbce89a6d523f8e26c0a668471651369568c23dd2ef202428cf13e472de966b1f9885ea60811a6052f98f9adcd82a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/my/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/my/firefox-58.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "f9ba8420a7a18cc962bf9589a6362e736285cf767d284cbf68787059c9bfade7e3358c253d78d80c7d8d346bda0b90c721424b21ed85c8502c7476d9d920ac3a"; + sha512 = "02e6c7037066c8c65f915a2e9180543607c2982dda3e3e427d96f15bc7874e50c305ec5adebf833b9a69b13f1ac2a7113b5d60c2ac7307fc25978ee236007b01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/nb-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/nb-NO/firefox-58.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "9e2beb13ff3de6558d25096816369a467bd0ec09aff05ab9d58c132bb4e0bcc3e3e562f70b4194eb656fd588a37fea4ede1de87a6e54f6c61e0359fb2fceaecf"; + sha512 = "d1edb047a4355e483634b9ffad2380e09bd90c221f84413a5500d4ecc0c3b29362a3fc392650ae7c4cb811f2097d304fdeb9bb3e04b24e0e2dc79bfc38b735c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ne-NP/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ne-NP/firefox-58.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "3cda16e657cc9224747c2485622d4638b0cb3305c9b303d007e039ac3e49d4525ac2a08825baa341dadd76adff7c372ae090ed7a9678d5a6a05a28fee8279179"; + sha512 = "bf30b024c3ef6e140c3e72bdb3d70e9946749eb08224172b6a4baf2236a6e1e21850f7b48c1a4ccecac43e6b388552977b127872b093e64573ba807c4d10de3c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/nl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/nl/firefox-58.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "36520ad354369819e35ca4f2422108765b5c689a4ab187ada939c90fe87f56de692c0c28355bdadee836adc93aff42d8b1cdc6b5f506da564c16ef3fa51290d8"; + sha512 = "1e0ae020db11857c15fe44105679994428101a632cff8abd56c30b8d3b85bac3a3eca8d4f08f9ff0318064468b4379f253fde024a0305f36df5a3bddcb303cd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/nn-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/nn-NO/firefox-58.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "87a7dde8a5f27744f78ee8dc2d93b95dedf3e7f2a002184dc6425d498f6061fe05294f57616d9f6d8eab6c06a73727c9c6820b962a9b445e84caa74000785dbf"; + sha512 = "9d664dfa50d972a856f21fe9a55c835b94524a83204e07fa8aa5a8f2a968e452902c62e978d47abef53ebc9692790ccb2b3b62543c1184d9cda9767ce0683ca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/or/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/or/firefox-58.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "7c2b16f36d26b906e7108ffc1cc2cad43f5ed2d9e43f055f86921611b9cf482f809c65e9e68d4e786e13bb9125900aa5577e45e37a5816f7ab0adbdefe7b4d44"; + sha512 = "6aa125ec7eefff78f015bff009be820180ea4fd530aa35fccb718abec24f4bb546ed58053fea2267c5e809ed17f552859b438a835a91a2b5448a7a95b01ccdfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/pa-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/pa-IN/firefox-58.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6f2f42b6d7299dc2064f1258a52406a4a798a69e884c9538ba23e86892856f15234f0265d2d65dec3cc4efeae8e1f6365b6ddffe66a72249dffdf4ae36c30128"; + sha512 = "da1f86d66e0256b7768dad5b670fdf753e7d05f1898d8d4713fc6fcfd967c9b5e682dbfd12d08fdac64bf0846e580cbee4c3f74d7c770e424ecda0b4c2dec3d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/pl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/pl/firefox-58.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "2cd355ecd0dcf5fb58d01829069556423147316e481aaa7c0584bc1ceecd5dcef99043da0bad1d0adaff0177a6c1b6e3d851a8f53876f2a282cb6562e2bb29f4"; + sha512 = "a497b0f3c61d7a53fbd0f04472788127450f54c20dd85b774e32ab40782f11d4106f118f6e263442bdff7646900a7f85d4145f6179cedb949d21b683a3ef21ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/pt-BR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/pt-BR/firefox-58.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "dfbf64410a40905193016ea5633f580fbd41bb164af8c147d424ecf9aca3b0b1dc36a03e6c9ee75d315e59c2b9a69316928911d53e611a2421238ff3142bf217"; + sha512 = "67a263381c01fc21fab760b9dbdf450eea94c5a358da782bada21e17af54077b477273014a2bedbe466765b17520e213f68cb2d248cbc2cbbc67452a68cae31d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/pt-PT/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/pt-PT/firefox-58.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5b423dbd85dd8b07cd514054bd82d20f54b97241c65e33c5590da48208767c859ce7eff1bda652594623a587fc1df37b092180c68cab7a17206bffaed6389a92"; + sha512 = "97391de44f4c37660b59de12f79f5068339a1c2d1caa7920a10943a5cec012385ca2d73e33aa43627b3f2e7d5c6d5da7adc0faa36466ea9b75d046903a9eb1e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/rm/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/rm/firefox-58.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "82d466ba889a1b3d7f8bb8a594e0db3e085a185c2c85a812b67fa5faf00723048bfa0123dc275c2e4b3c7fd551fe899f83fa3a9bbed17eb2d484c1b128fabd4e"; + sha512 = "5fa44b449afe6e861846e50b5792f0e1da6d51039633e497356bf3b9bf043d1f7dd8f85dc030afe35ced030b1bc6b888f026d241e84c02bdc9a7c93fa5c1a573"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ro/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ro/firefox-58.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "059f6423374302e2312a8d6bf1a97ce111e2c2cf74670d7634f645d473e4b0af094d6997725ce7d30b196a44526ced4c9e9676d85e38b6aaa6f9d5b90aed5534"; + sha512 = "3711d45cbf23b59e90f450b825b3b5fa4c7d4e4b8687b6d42f628469efaa03ca8af9f5758a86ca5d28ffb09d721bc7bb4d5cc4796970abdd9741314a2cf97f17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ru/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ru/firefox-58.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "bdec045f0095f7c7b7ef48cad231f7feee335ff5e2bb198e45a48af2d9998550db2da36b1513e738b5e3ede116ee97460684b916c106279b010924ecfddb5976"; + sha512 = "503ffe8680ad0846393c51e4bb9619922f50d99a516d4ca7dc73d76c2b68d7ca948857147ae0faccc819abf7170e1c85d2a3dbdb1bf553b4adb646809218a01f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/si/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/si/firefox-58.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "823260879e453440d2450dbba4eed497d7192544ccaba46815c349d98f905c391c3ef8042d97ab39c272ce296ef4c56067957a07ae83778b78a98f2fa495f5c4"; + sha512 = "8a29651310e3444b5206d7ddafaeb9e321de99362dfaf7a413f9e9a30e983c656e88390bab19cfa55988880e141619167c9c3e444baa862ab99617b3d72f17bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/sk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/sk/firefox-58.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "7f88feab4717869a658b940436564b802d657186ceaeb9a2a2ff3a28e85c1bc0e8f4ae00f36355ba95f4c43550a85485100bbb13ca1b6802474e4caa78e7393e"; + sha512 = "dc01f0ee8a3e68bdb465dd9e0bab8b001c3ac368caa2b0373b997d8408b37e20786f08e2dbba2d0357dc4aa60337a59f489b57937dda524160ddf2848d372f79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/sl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/sl/firefox-58.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "c3820f63389e0797e35bb7629e4030191f63a1087e9b76f22c8d7dc6146f8ad9fc8c9b8ced8695811b0cdf787e4477ed0dab0a38ed60341cda51b57f54ab7c1a"; + sha512 = "fc353cf10c9ddc1f50d3ef0bea41da84fd7077fcc15c8d9343cfe28fadee633154e886ce4768d87abbfaf6efed774ec53bc7ec1de5fbc0074aba629aa8c0425f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/son/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/son/firefox-58.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "2336977ec63d5a5d749be8019a4d1d4d91b007f4ab10eff91bf1c9416dfda3eda4d3731a55ea66e3d8dd325f51b63daee7de66d7b490b5941e75073969fb6722"; + sha512 = "e6ec6bdda393fc03a02daaf435de4537daecffeb4717607ebf471f36c9aa1fa52d3239ef51385f07b291a7c436c3e13438650baa64b8f75ae80e33a2740dc841"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/sq/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/sq/firefox-58.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "a935f51536be40632c6349a750841d82103fe36c3d5fc8694249a08679d6c177c7fc1de93e9775812e6a56e75a28b56108523d15c1084e46a6f0ad543aabf255"; + sha512 = "efc10085eed24cd4a8f714c3df57860f692e7447ab940b2838c17e6b2218c3490f1052cbae0755960c88e5594dbd63b5d868be1167d09660fde669a8e2c1fbc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/sr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/sr/firefox-58.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "031d38e2c8c4d838cb2334849bca6e7fcd1bbb120059cdb9c537ef97860e65c9370a29dd230e1934088da9d43423c0bdda699ac6beb1c90cb0b51a5496d5908d"; + sha512 = "283dd6c997a1b8f5dedc9e430a666e81d142ef2ecfb4b8da7ecf0a307d5edd02b09af05a4e24daab9baf51c8fd60331736ac6bf9cef2dbe097fc2aab4bcff7cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/sv-SE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/sv-SE/firefox-58.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f8e1f10da1c63bdb4760b7b178439453fb761917432d77ecc99d652797eaea011bf9dab9d214c512fe75d2837c04de063ba03a596d48e03879a7543ab74a5697"; + sha512 = "8069cac2a09fbbc75e32d16bfde17a0235017ff5100bfc835c1c86e32f5aca7955f3ed1015c25bc56eeca78f42a4e1897be09ae822453959becbe60ccdc287b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ta/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ta/firefox-58.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "32122f656ac832bbf135ad1030b006a40bbd4ae43daa69af7c7a5562cd4274b951034d7a18c7e6b81f25b78533a36d5197d4e0cb0b188a7945cf1a3e9b1674e8"; + sha512 = "5cdb897cb92c45ad4b1e0ccd43d2eed71e573f1542c541ccb591cbb570bc9b8e2fb6552eee380e548ee7a6dfa070b5186e563d723552aaa1952413a07d7b187e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/te/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/te/firefox-58.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "2d708febf7dfa897b9500982769defd64270424ea88525e4e106e5c2abe2665bc4420d0de86f33da70c8007e3c17b7c9571a4c04a3f71479e1fe4e3d7ac93967"; + sha512 = "98cf91521446e7a5fe0a4bb9ba79586d071d0aaa3595a820a813bc3022150e25897fb20fbe5bb963c1f52d12930f3518fdd67f7f00a1b49fcad61e151e270711"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/th/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/th/firefox-58.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "4876d07390bc416a47d63852e6a59de546561a3e292d5662816caaab8f23632c70250f977739ee51a629bacec23d27cd1e5f0c0d8f944fd8bae69185e0bda70f"; + sha512 = "e1f52987406a5bc39ab4e104ab6677b34604e1528107a1af1db2e907df0a8a0f5ca80523ba456a3c6f62edba91f0b5b1f754104fce694f4500d4254f0b413b17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/tr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/tr/firefox-58.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "fc310ee6c00506a8164d8f6118c4be08683dabf0b96456aa24441efed132b971d5e2ec285a4134116c4fba4317773745043d248da7e5dff977478d85eed54c60"; + sha512 = "22f2c4aa1d0170d9c04c732908d652b2cec1f3ee647733a7afcd760fb52d0a353832c41660887cdeec465a29864180776eebc765028e35e2320ec458a9f05e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/uk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/uk/firefox-58.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "79d80a03acdbab0448f6330fd557485b2ef1c67c7d8be1dbbc4ca42a63cb2687e86ed3da6aec7197add74899cc01e7167197100a6e2289a54f1c1065480ec04c"; + sha512 = "1b3d6af61a1c7cc13ec14992450b9938407381dbe60e64170e37c7170b5780fe90092004a2d6c8519ee239cbeef60d72261161774a599df045967406ef3b1c03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/ur/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/ur/firefox-58.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "dda823a5eb57b6038d2a2f8d74b22fa743a4c656a70d168200bed16034293d957ba121ce2344c392618b5e26c6228b264d1bf7a8476baa770e0d9a66141c6ad7"; + sha512 = "3cbdd0b7c95cc6d927e2a767d0025ab4e9257166181316a3dac6d9e208f3f1aad5ff5be668cc5af6b19d49c3e533ce92c1f44eb071f68b7b26d7c9b636188006"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/uz/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/uz/firefox-58.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "de547cc52cfc76a34a41a3ec06efefb0e8e64830cb2217e1cf4e85c86b9f8fbb160113c7a6eb674e068a631f331c099f24cf315dc7a31626fe811ad4bf68eed9"; + sha512 = "4b0f4adae749e4a62ba5c752a0449441291a43b293ef3f11c891fc1dc451f67153c23cbeb34bdeec4793d1543f61a414b3d4e30974f952a5ff4824ce58c478a3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/vi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/vi/firefox-58.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "512350735b95741b996965c19dc805107e22cd8da3ab360742e8bbcd115818c531eebd9a39a1009c0cdae7024856e6dca849f97439aac3d9c8783b20eeb09c75"; + sha512 = "3ed52304ca4bf1b5a5a4969917f3ce69b0d05a250015b621abf7fdf972e92083f457633c228487f2e8dc31d50e45e412495ba8bfe24f91a6dc027d75a89b63cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/xh/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/xh/firefox-58.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "ecf40ad9b192bc0cead45d46aa411009c8a5a327e415a930ae120c0f81d696d2f7c69effd30de0040ea813508a79ec6fef2d614af9038ab9e8b1cc10e231180c"; + sha512 = "84bffce0e0a63ca66eccd7940da41fbc2c2333d757f8c98c0f88012182b561acad1ea72fd250f6213792240cac4ea06bc482022782fbfd52fa09441c89b54295"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/zh-CN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/zh-CN/firefox-58.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5fedd73919c73404a0226d1a309910d48bd1f727c5c9d1f177281deb8f9b10f4a8ea02ef0a7b5a2734e581e50334463db02a2c5353fed5d174e8ce44a8636679"; + sha512 = "6ac5fca6ad7bd6577466506d1aaaff51c99937c2ba30a864bfb8b8271fbeace4cb7a2b93519a186df837f8bd2494799adf42d1025fce4aeadec25f8be5f8b596"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-x86_64/zh-TW/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-x86_64/zh-TW/firefox-58.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "f6f66d840c180c164ac0c368559b2e5a78ef187b69bc68dae4a20aff22e888cc79334ced709be172a6e6206d77b48f70a11cafd9abc27935fcca177a2e7af968"; + sha512 = "9530bddae0b725a4c028b6809855bee957a2b166c7d8b08945bd2e4db4555e751c353633be2c955dd453e8ada7b2663f7aec669984b290e92b1e1c234edfdd2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ach/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ach/firefox-58.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "24bd1ab6d118dbf25f1b43a3c60ee0b55ad15c4c37106dbc1af00b3c36b4a59a099335468f0601e6c6e67bda1a49beb2e49c0047e61f5a22a3f5366341c424f9"; + sha512 = "d2b868191a89487748962e7efb82fda393fc2b96091b0359bc3d8c8817733dd99f68103fd88a94d8bf773844687fd759a33bd596957887bfd0bc251e5c9a26c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/af/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/af/firefox-58.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "ba37fb7c805c99f95460ef75e6b4c3dd4472e0038f351969afa1845bb04abf1a135b23521773a9b9c703c17ed8db2e10197230af331dc6b00589f7c7f30b3ba9"; + sha512 = "4d42d38774f588e7b0e549bcae8fe9c8b60d241ba7dc8f1e229340170d1f8818f35e5ddf4ee2064680c192fa719ac080f9c169a433b7430a6cbf8fe113859fd2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/an/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/an/firefox-58.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "eb5b758942a03a31bdd76c46cb5cf7fdbcde8220985009b6c09c2aacc644bcfad587bac332a752a269feaa25569a5d05c5865f506fb1b9e338a63a87679b70ed"; + sha512 = "a67af0ea116d73af749763406ea66ec297f8a2c0e6f0e271a3a5c1601e5752a2f38542759c0a3746353a3b3f958140b81113aed664ded581d3eb2b91f8e64b32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ar/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ar/firefox-58.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "fe19a67bfc58a913e43711da1aa490e441225ca3219ad68b532542b465556036d75deecbbdf22774293ef2df118f4769a72464ccf83d53fa1e3e2b33b8464e34"; + sha512 = "daad67d98875235e989d15098e85b170ffcc0147506fd5cd73704aeee04a7aa38a14f4c49e72da04b62ca874f85b9ecb13eda7360bc4e6dbdb43bf64d7793aa7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/as/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/as/firefox-58.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "c3f1314271b777cd18ef063d23d19d90df5028d50a0f7a45ae75cc9eb802f7c312d73254db3aac5a600814ab5d9ad03527f63f97db6d3bdda908b3d74eb9eddf"; + sha512 = "e69788f24fefde3c0958d57173c9d7f4254a83918c98d89afaf8d1b47326bb92c85868b337ee5d6051c4f145d2ec75a17eba7053bc5bd3d9dd5bf1ac03ac8ce1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ast/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ast/firefox-58.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "5d6d419761ce2d906485e6d21a79947afa40051b5ec867c4c136fdd833f3a9316a2c16f6c8f012253226d2da9b5da2d93e0d1253eb377e098f0d025374b026ca"; + sha512 = "5cedd3c391c72509e567853dd5b8d7aed9b575be36a19a0be122317d427877057383b5fe536cea142bff8a58bb158243c23ac76224c56d76c205a2960e6bd4be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/az/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/az/firefox-58.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "8493881dbb2e079adb3d9a46475a216ef60de8ded611f29a8eaccf7a0cd7bea1757027b56b9dbe02697708df62d6995323a6948ecb6a5ae53b9cbb8f25b453e8"; + sha512 = "8629283b91ed8f7f3d8cac75708d8afcb335f47cad26d0bf6573e9abf39a3821c406bbb9801b66ad5b9fdaa560aa2e704b27f55dd8172e166408c0c7c23d469a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/be/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/be/firefox-58.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "842b5b386c22aa0265d852bcfb57b6a089f13aff99671b62376ea49d163cc241f225be2efd5f61f13d02906069d3a50784e8ca94c439db8f318b0a5f92a7dd0b"; + sha512 = "e7d77eeb295f0c24ea819116c052205d3240fc350eba7ffe24ec415f5949390c3b148adcb5b2d499f447c0090b442f7fa8f781a37f34016d190bc557e82dd02a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/bg/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/bg/firefox-58.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "8911a36ae649c76584631991c17e591ad45797368e1822def4089b8b8ee22aeac191b3264c69c14dbc36a423cae127090f66627fadf8cd1f06d66ccebd08f79d"; + sha512 = "2983d5b81ee63431f2a283015edb7dad9bd2751b81ef971cfd63d3ec63cc87f503843ea296092216e33c5000ad65c631981eddba9550553ad003b1dc7d735fee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/bn-BD/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/bn-BD/firefox-58.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "f0d22fd164ae05616b1c5cea4811533119a7e54e688a49ada19a526fec55381d2605b831eb3e3a84ae544e80511b565849ce0ca51ebddd409a7071a9ecceba1f"; + sha512 = "b1a40ebd1e9088bb15b1a31e5014cb0d6e8d56fdae059fd35e85910bc61c63c05e07bcd79887d1a2c9e311ea2ff04435d9f751127e54a904e2329ad8b59d0378"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/bn-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/bn-IN/firefox-58.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "9b3e9c0dadee6194685b035a695274b02c2ad85ebeccdd796bc6671a8cb7ac9aa57d63fac1fc958170085adca1f1ad3ee59ee81517495c689d780620afabd812"; + sha512 = "dc3113eedcdbef5aa26a9b0a51b37f66671915f067e4f03358d27c7db8012d03c7415bd75ff0cb4a99435aa6dbb5efd257300e11d9bb39d740ffacea3c31f7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/br/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/br/firefox-58.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "320f0a844aad068cd131fa094687e635246a82607a22953dea2ac502ce7726b1e4e14826e6ca9b4e6bcf54ddc7a00c0d505915f4b9a695179947a8a14076ace8"; + sha512 = "cde13b6ab0e55f29d9e12d993548780f3d67ed9af3d0d218e899640d64a2e4b951e97d8ba3af7396129c3d73254ecc7616d6d5db64506f860431b76ef79f308b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/bs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/bs/firefox-58.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "d6f98b594bdadb9c48326a05ccf92d6257a1abe81a33213a23bb58a1dc7e5e335e588aed2b58de01980dcd50af096e3b3de75579b510ddd8f7674addab4d3ddd"; + sha512 = "99ea3d0c4fdfaa444e8da733f91acb509aae09e2dc6443b2f53dc8e4b50843a0d9cfe084866b243db9d212dddfcb0e75e1cfb49a9eb4389c6cde74201af253e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ca/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ca/firefox-58.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "8625ff6ed88145bfc957e3f20ba5fcc15395936f46b7e64515cca63e2b970f060779aa108c519258b813512e6c193d2336e3fe321101e90284222c093f71e858"; + sha512 = "0ec53d5a765983ec223c2383fd47f4e456d19c392c2b4dadca797f403ed6c2fbff4bf21a286769701ca961ab119d246fc79ade38c77b37983d9e6d8e5b1c399d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/cak/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/cak/firefox-58.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a6c03faf8204bc2ae514697c6353a24a820e8dfb2c6436791bb52de0062e0db8caea4eaaff334d08e0aa2009c62fc45467adbf3ebba5fc18ed2d8a3c482c3a4e"; + sha512 = "916978c4d8199f84d6ceb321fa62b2a7cd9a02f379c9dc8909c7c368fe4a495ab38da78fed14760bfa97e0a6969154843c9dc118d12a1463124a6e6b8d5f0fa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/cs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/cs/firefox-58.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "27c895bcad7833120ed486c7117f75c115c25475687351c6194a0242c536c3f2f5f093424c66fc8c17051a9807ad240f0b2654805eb15d73af1471f799d29a3b"; + sha512 = "64e9524c2faf942c6b7d0465c7b0e3e2fd69cc365eb0849b0a9642eba2c0169d3fc0c251a24d698a760df63a0bcfc977dae0cb572f69de8076651f8803e41166"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/cy/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/cy/firefox-58.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b82a0dcfaf43cfa3d35d99b082cf2e7058be76c762bef0a02f5f5fa623bdf5203ddfebcc32112a2baec7166675ab5a675d05370eee47bd1fe1486dcdec09849d"; + sha512 = "89fe5cfa52aa53ae1e3245501eed154c0a565d7815d280e1f47d8b51d57f7ff45c85f0a8d79e064fa0733ac9b80e6be0267efea05a6b999831247018fd412460"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/da/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/da/firefox-58.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "3c77ca88134ca01aef09013039f8ae566f948babf0df6af84c9e743763de750669c094b9fd217dd3b98d4e0fe9a6f62ca0c5a692363cafccf21932e8ba9749ef"; + sha512 = "42c407e49aec4bdadec673faf3cede8f4ebc2b0b06ac785a92bca12e8c7ee85c3d20f7e99c49486b537c29b792b34febf240980f141c7dbbfc65ae1b7ea63dfb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/de/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/de/firefox-58.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "b071af2c88825642ee972d3149e0516cb820f5495fab0b4d0d1e5bf79e8bfc7b9ca7027cac699cb83b5f8f930d128a480d2cd895d544d1f1a1a2e68437b60066"; + sha512 = "b9c1710fd05aac0bad755e0c677d314b9ac44b38957d0bd476706fc18d5c61f69503e8888f807b03e7ce635d189bbf62d5cd74b74d85b2f74a6ae4afb71f515d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/dsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/dsb/firefox-58.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a07df0f523528ddd37f82db0d6e4813776fea19b2a1a7c07b36b288d9155b00a06d5dea18368c4608b83d8c99d84b565adb16765dfba39d3d28a31071145c34d"; + sha512 = "c88961f87fbb51c7413a01cf6f85a4889f92154545a5e68e38cc08fd9c81f7f52ad3351085200d9103a1b957c51edb6a629e23da6d1881b895ad97572596a938"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/el/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/el/firefox-58.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "567cc647241768f1019da7e2956ae78451fb05b23d1a1016e569b435691fa0f966fa0049eb7a89182e876b441ed98a7544d4fa42a1aef9abcc788b40a6b8237f"; + sha512 = "d8658ac30aa8b32f44fcb613fbd10c0a9980de050db8fdc5d8aedefa4bb859a7aba1f1758bfc6989d1a1111801c12d3b40bec18ed0f4bc46c449d2b1f72aec75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/en-GB/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/en-GB/firefox-58.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a5309ff4c9afaf4d75646e0ef7d0da8765c78377a8cfcee6f39b4a7a8749da015637d2968d64b571ae252870593160f6727d514c930685705e71ab2c7fe8076a"; + sha512 = "4de723ea5ff7c58818a32deb6716214710903ded651bc7ec737f40700137e0ad53d59dcb1de836376cddcfc3723f301983610df806f9e311db1efe927972565a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/en-US/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/en-US/firefox-58.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "cbe980bc4738fdd7a2f39d6035571ab194dceb81b1ecd642116cfa98f280093be1598fdd946dcfa05a53034307f5e90a11dcdf5b1ab14ad7b87b66e92cd9f095"; + sha512 = "57cbba89a05d4457b546f62b13a23ea8b87d2f3efd51f56e29dcfd337601f656a00fce82a3441614a452031cae013ab6743caddc210fb1ccf8912831e5c14b46"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/en-ZA/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/en-ZA/firefox-58.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "6d35e209149cac6e41b4e2820d8b2b925b2d19725ed4947d9f3ad1c0e20b249f0bbe1580a9c3115d40eee1059f7ed1b5add70fc04ffefb65e88f9c05e341856b"; + sha512 = "a330f56b5adbb3ea80f05a807bc6c041017b1c9e8ce1b601a3e8d6ac3d0682643522bcca0ef6279c47046ec021ee5ffd8d4c8c49fcece83f3499393e413c5cc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/eo/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/eo/firefox-58.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f6698f288f4bfa0c3899b28ea45994f4ca458977e3e6d4ded75ec62be38e21a07de5880417de9da0f17f88402b72cef976d8cdd9a04f903656d082d06864be86"; + sha512 = "7834d2e18d42e9465c6b7b29a5ac8618825fc06a9a807a8dd6f72ec74e3366b37c192464e6100c2af4bced11e0fe49f52de154bf7e2ac0306707b4a3a9961ffa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/es-AR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/es-AR/firefox-58.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "f1caedfccb8cb71ec107dc22c3977459867096f0244ba822ba11a4a2c75dbf6a72e95c5a499ad9b905056f98c46c1b996693799cbc225054c5bdd6835715df59"; + sha512 = "8ebab80b3ca7af09d259e1a87ad707af28cc5a4cbb65eab8155b1b3bf4ddf68b20309290461aff3b2c890387d883f6a69bcd6f5cd2cc0b8fa9f8916a9ee908f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/es-CL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/es-CL/firefox-58.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "ca1126c0a087aaa3cda685b727d866499af3c643b4da398ac7ee01f6f54d4b8cfa5cf38428d19fd989257ed902592936d5e0a2759bdbcbd22c243a9fa28c6647"; + sha512 = "75da96aa76ca0b22cea44dc969f7afb8d1b6e07d924797c87b2eb614b434a211ebcc5a3ecddb277be8532bfb793700d39995b2f302f7bc920cca35a294c6d9b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/es-ES/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/es-ES/firefox-58.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "04fa894a83070b99ceaafb07fabf20959149bab6edf537c67d043337b510237b438f76dab8dc52bbeb2403bced030e80b33a8d86bb7dfc53aae51f2f50c78c60"; + sha512 = "b9e933c10fc36ef33296ea9823bd2871736ad40d5346347cfe9516c61311e74b085a70b5d888a4b96a38f730cc0a01110ba2a8bccc9c6cd1f31512e9f0615bd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/es-MX/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/es-MX/firefox-58.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "9dad099ca8f09420a1eebe0ff1eac1dbbf529a3eb50c40d03fc7cb184b71f320c1b8d19751595c0b0d41b661e3b0ebf39270284949ce93f0a867cd048da789a7"; + sha512 = "cdea21d1058bbd55ebd60baf99e51233fd8f85e1b5a156612f9eaea5ef5fa988a862742268e4ebb4ccdb3f1d92a7df5bb3d1db369fbad6a7b5bc69583b7a28b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/et/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/et/firefox-58.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "accdcee9d90c65d258e71171823b1ab8cace4c5d37aa15c28f54a69cbd3d14db8f37490b7a059faa924929a5c072949dff06c4e72cab9f4b4d95ef79a976495e"; + sha512 = "00b4826c918bb9b0a4fe2aa343a7f392acdc166039527a2b48d1bccee085696dee01764a70701dc62dc96dc7b6c2321e1f731f65a91ab0a77f44c6018ee96d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/eu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/eu/firefox-58.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "682498cf216b4550ec54576004f111dfeaacfacf903b58be658a3db61fff8280b9f850f8b6273c943d02bb08236f4f91e6bf0c5d3fcb0d06a489d6baa395fa0a"; + sha512 = "4fb1edb95ed4b728bab425d41d32055eb3646daced9e834809dde6dae4671bd1e960a02866e72fa0025a23a6abf75053429c3a8b46c58e577adf68dd17f763e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/fa/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/fa/firefox-58.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "496b56c14670ee58814bac7163455f9a65deb107c77bd1055ecc66c3acb9c1a0112090f5e7b643d9d58412161ca5df00cc124a93552bd8bcf4a7b8705a7a5682"; + sha512 = "ccaa0c0be7dda4a1adc8d1c18925ca825d51a1424eab4fa42f4c922d351af9d9d9897036ff7a780f55482746c2dfd0c56d7d708f555b1b6bf8e83d27506daa21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ff/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ff/firefox-58.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e63c4bd4c6b450e409d4240174a16bfc200f4e5466c7e123737b7c2b8871e1fca9d25468048a960def17e6e1a457c6bf27c99921263bc6e037ae0e0a6664a22f"; + sha512 = "2be7b591f3fc4cfa898ec671b75872f1992e292fd53e840d528476f31fd54ebbb283dea0e15c47dafdbeb80cebf962880d505ca46e8a57437f3e3f9d36358f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/fi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/fi/firefox-58.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "bea868717089003e4edaba34c2d3494e6490871f66486c7274764e73e605d61841fd85e998317231d1f8a4415f5caac7845f04a82b29f4079831e12b26cfa829"; + sha512 = "90c02b640d1c0456210732c48417e6bb6350e06f5cb746c29121e8f374b9e01a0b2ff6f74183144b8783476cdbd562cec0b9ddb3279645ab43827c25764e3fd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/fr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/fr/firefox-58.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "80a5ed905a51176fc4f19c7d35b59105f31e0fae06268042e8ecbb9c7bd1cd88950872dde54cf5a4b10f1debba72750d72bcd8b8e3905409edca46e13043c4cd"; + sha512 = "762e1d0fbf38e23884e5ea25b37faa7fb865e9f8b2442d71171e5035ee9d05534bd4bc085735c34c9dfcc6addda3be8a614e599e3bcd093b23ff3d604d1feb37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/fy-NL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/fy-NL/firefox-58.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "1a7d8c24e6208bde29993c297013ebb325f8fe69c77df8fb929635d8d973c674e2ded01bc0b68b105823d0ca01c67d8e9530cbdb9386f7d2be9ebf32c2e574fc"; + sha512 = "09c6d1b0d2c7f8003d8c4409dfc5003dac286f41a8ee6188151e58daebe6a381fb8def7c4acf9fe59c410a7bc8a4e1387590ff18a26c7b1da7cf9e762c7aaf4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ga-IE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ga-IE/firefox-58.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "dcc35f9b88b0cf0af01dbde6c28be1d323f19370c7b25e95a671956e87f268bce1ce73970e624ae70a710648c5cf55fada5a5879b37ea5a8dede12fe2f52e61c"; + sha512 = "52026b1364b2e8ae7e0cdf383e3e6f25ae7e92a387256154c5f822be1617a88bc704b0f5a9ed53fe0278afd427e7e72cd0c83949183bb53944d90e9a712fb08e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/gd/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/gd/firefox-58.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1f116adf2246931e8a2090dc739b265dcd51d4aa113d37103a263fd5ba104cfa39f5da99a67c72b3d8c2e3a16c53c0e81a81c3ab61719201c26046cec77f4a5a"; + sha512 = "e983538dc3057a313e741b8e481e28662f07eedf8c656fafe76ad07dbd77088074ee5eff0be8d1ac5ffd90bf1a02a91f120b4f08c1ccdaee6af7b39b87541e72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/gl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/gl/firefox-58.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0b2a678c6a9ff0139525d8cbe3881dd48daba6520b7f8c965787f6ce579061d9e10f4db0a79bb5587eec19e8505b5853216b995d4fc206904ae48cf891096769"; + sha512 = "994fa27cd8d77c704f48cca48b3cad73de8ccc9df992c07575e44b3c21f626cef206e61175dddf2fa1a44b6802fe602561169591b704bb3bb2930f64f2b117e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/gn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/gn/firefox-58.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "d23b46dc56c9f6ccbfd4d40aa631a8e9a7e9d8aeebde684bd9f4b7d61402e408ae63722f36537cca7fe4f537c728978d47c787666c4d52e0d1c6c5459544ffda"; + sha512 = "2bfd7c04c6070e7bf6f899836709e18a0976d42d8168359a54d99f1122074202359940beed527ad65909c2734781a6e4b363ea5bd0e80c0a117b062f50b850ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/gu-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/gu-IN/firefox-58.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "70011e3bf455da71317acbe2a4bd76dab1c299108c7bfc383810d185b7a36c0e8c15a98a0a0dbab4483a70438e55a52474687994759e6e4f3f3d05df2e5d551c"; + sha512 = "4f5f6b62a516c2e07fe03f3afdc6fc45482f74094c88f9b16de4cc51e728e189ac1677927c0d6b7012050c63bcc345473860d0299c7a443ff51329f4ff485747"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/he/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/he/firefox-58.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9ba53a667375ed5a7c2679b264dbaba91e2cba6fa1dc8d2f30a3bf0b9a632eec1266990d7aef43feda9d27156ed145ed1c3cca74793336b6ab892f32ed1ce92a"; + sha512 = "09b3e32b8cdf5cdd66da093152a7f96e8a91eaae099cb2c55539419b5cda79b5aaa021757e0f55cfbd60723d0c91e00fb2159ce16bb44638a7a02d2002e635b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/hi-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/hi-IN/firefox-58.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "bbabacc232a012f37a986eefce36f88a2b5b1b3de1c94016ca5cf318212ce387d7a25d271e91b4ea0f3788b8d2ee6a54da2209f9f28eb54bdb641ce3b9fe49c3"; + sha512 = "059a75a962796976849f9d7fce20161a8ec650d68f2b320ca5e821baaeda7fb660ed1f6b06631941fe32dd12107979a4553c49aa90537cb3256a0ece84aa45cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/hr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/hr/firefox-58.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "adf88438ba4718585c3f9749d36c2fdf433f450629a70ebce41bba46e24cef30aa31b409d00f5a3fcdd0ee00c64dd86af5f91fbfe2e699a6719b237dff23a17e"; + sha512 = "3a1e73d37a626c1ff9d350c2eaac9a5c13754e8187a47dcec3e2695634bd3bee585f6425b1c0187f5146e5abde83eb53512c1ffd92053734f393a5e428fd4b09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/hsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/hsb/firefox-58.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2ba66d7cd01a7aa3af9b8903f7efb4a7a0dbb210774b3c0a259014a2ed3bb036bbd8714c5e06b4cc6bd666077db1ee60054808d93fd91f9a6229c63115913a0d"; + sha512 = "9af26b3f5872572e36d80ba088d86c5991e991c588cfe48431ab61169f524aab718e2b376780b4c61b33f9073b19a92baff8f8882062dbd9caa984c460d8bd8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/hu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/hu/firefox-58.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "eb12b0c60b51a133d57d5e20d74db8e8ffa7aeea251a12b58658d85afe2a9af10820b1d0d211aa05042726d9e4d7a536788c24e46f459c4be9ea6099e870be22"; + sha512 = "64ee0ec0e41df7fda2ae9abf124919f2a45f1e323c0535d31601b7bb126780452388d75542c147d33edb09d360cba42f5d00d063de38c7f935e4443d109c8e7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/hy-AM/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/hy-AM/firefox-58.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "be6d94b51ffdb2a8c51379d9b17ada2e941d9d4acf5f242ce61ba75fe2d9e44d8c96a7b7dcca134d7ea73e45c2ba61729abed8b5466a761ad9050e607900d9c3"; + sha512 = "f7f4b26f57151d2541d17c90084b931be313078a5a221344fb0d6f3276054d3d84b8117b4cf80710a05dff23f8e34cfa7fc95c9c154d30512d4dfbbac37b4bb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/id/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/id/firefox-58.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "80443c7364113fece1b30d435cb14eebfb40c29b843e7acdec75ec0dda508cf67fb199f05b7d67a2e38eda25f21678b10d47f4ea34600f985252734e1f88554b"; + sha512 = "376f99f5ffdeaead9158a3fda4f6f0ce57620276fa047e722b1841df60b89ee3a785516ae872e42ba8a9abe83953307920474a4c4bc7a31f4541e23e1759ab60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/is/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/is/firefox-58.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "faa026ccc3662b01cf4fe0ab65d121e387e5da836fea908dc5d3013172f18564382312422cb34431040b97bffd4e04024bf78bba90136ff6c62fb257f6b523b9"; + sha512 = "2d2d49d8df691936cde2dda050489ee03c8053248fd7e1df2cb8373603e4c3dd1541e616403821527d12bb338b92b4a10576f1bd6e248b04590e99601e0e0e30"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/it/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/it/firefox-58.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "dd198960e4192f460c043584d61c8289e12f4c70cef586232cb163ba465d7ba118c1a071cdedb3f43116e9c84fde8881db2647c653fc321bd662fe85f639ef55"; + sha512 = "a4b491917b9a1baf0cbb33cad31a7071b69634ecbbedc59c9ce93eed8a3d7aec22423d6bd6eebcdc4a586dcc6c489c9f3fc62f484607baa68e8528a43ac84e2e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ja/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ja/firefox-58.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "3b918eb759cc97d92c441162a6e7953e309d537863b51ae148489aac9799f6ca4eca908b7bed13f8bc23514b20ee3857d786ada0a3bce23399f15bde2fa7ce42"; + sha512 = "538394e3117d3281caadb0fb80638faf1330df680c81d9a9af82fa2faceaff10553d287b4603c4c938854911209f584d3ed719c47d98f87986a096fedf6307f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ka/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ka/firefox-58.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "2072849c486196ed2cc69c8519ea35ae1c7cc4d8d22e632579cd1cef04aa55d689aeb732e0aae4d8eb73a89c6bf74901cc11fb672496220ae3adbb7bcee9def9"; + sha512 = "1248002946a90f6722e53a851a095d6352e6ed8a113a65805b27c3840193182e774b1880ded05b75bce3a141bfe9cd1945cd737d82fe013f40b21b7942c3124e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/kab/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/kab/firefox-58.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "98cbe3a12a800937ac36f0d230485a93527d9110a9eca76b97dc135f14bd992653f1d37cc2d9c450c4a6ff8c66a1234b555b5a56e962dcb04c5a50b0ce7edd04"; + sha512 = "5c3ed67d3e224a945a51e3449ff062d27e6dc9827d0d6a2dd36bbc93115e9323d0617944af7fcaa50d8ff0e4285bc457d85905fff4fd81fbf2dcc62630f34e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/kk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/kk/firefox-58.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "272c24630341288a3364f191334b58e26425c5718d45d0420a4fb753ab73c473e3fb742b0a73701a2ff9a2bd34267b1809dbe0bba7cb78417d6670a5ff6719ea"; + sha512 = "dff22c1f491ab4a5281bc2cef2d98d72f2cb6fb13f68876ab72ca9023e8231fe83ec13964ee17d12f48ee1f104d01b63cf62f37e0aaf1466f4a45cdb4c23bfe1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/km/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/km/firefox-58.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "036331124445c3cbd8597cf1706f3398655ee67f8c6150e766436352adfdc84f32891b2ce9910f96d01d8110a7054f61918466f1ea3bd8ce1c4835cc24280273"; + sha512 = "384164e3ba18338df558c7438174512742d531e93624d74d1df2f9397683e139b981097b64af050870da84e482f3e6393e01b997d59de4492689cb5ddfaed282"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/kn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/kn/firefox-58.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "84b763bdf4157f37b09763eedd7b66e415b4bbfcda885258ec561ed7e7447f3ee5378a357d91c2929cec8f3b23c26150eb99404cda8096651e194af56db44748"; + sha512 = "5f89ee80189a06037010161b5e1e3212494f04b6570f775c9f482d16bbbc759197aec0bad3f3e18da512dcc1bda2fb7df0d01312e27468ed6d13aa4647d07641"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ko/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ko/firefox-58.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "cc72c552add2c9001d8a7cdb9b30edbd74c5034b7ba1fc3df1727f0377ce11590350ad68a1bc650375b764e85ddf4a40dcb8c0515ac4ce858ddb60d40a437bbd"; + sha512 = "a3485fb4ba7b09017747fe8028199c1063e532d3db0a99e94579e8ef27d241dbc353bc49d72d648d5e9a640e53ea517bd5ea2facb82bfb944803ca4a591d231d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/lij/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/lij/firefox-58.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "cb14cb5f32cc7cf524587c0ff6b07965d17ca81186a9fcad383533c99ea9c460f81ec0e7d8052c18f2cd48abed191c4f6708f5bd0d6f37028dca25aa889cfed4"; + sha512 = "705cfaddc797ee299fb1117cc4bfab0321853e0f9a42efd253bc7816f9ce92004b71a87aa074c1c788e16b7dde4eb7760fc2e88b4da4a278c4d36c7fe61db530"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/lt/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/lt/firefox-58.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4b05957980992e9f7b5adb51a78b4ccd30ee3839218648c82a85f13e304ad73b7301d6d3251a73d60041d88f165977e96569797772b309e31b6e342d625d08a3"; + sha512 = "0ab458000a8c09739b08fed6391d852d2c7ac80739be3e1b3d15b3c4d1434ba56b5abd79cbea2680ca20f9d5046071f7342712b722ba54de481d7239dcf3698b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/lv/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/lv/firefox-58.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "0aeabd35ff7fa0d618ab6634b25ed216a00d44d0594b91a06d1499fa7f555d77695329d1a8c8704465aa29b7694bcba4f2f4354fcd870730acec4b7d585e31f0"; + sha512 = "5d12c865f0f2d9703c2bd4cfd89a557ab85d406efd4d890002cd5330fcba7b04e520efe7b3860fc4efd460013143bfa8fc4ca076c115aa194340660134166798"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/mai/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/mai/firefox-58.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b194e345477d3276bbc612e4bd87b5ea1581106f47a52c43f1450bb2dbf7730f2e94d8eb543910bbf7a9f3f0079e17bb635de5e9a0766fe55893ec83f15a53c6"; + sha512 = "e19121b7e096b8a00dfccea284ef9cc452bc798b22d25b372ab8f849009a02981f50f79d4726226f4278dc2f0075abdb45672a6e61d7f10e1ad2f2e5de5cb717"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/mk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/mk/firefox-58.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "cdc93749b2d02e7765bc5b6a4816ec73cc5da78d25f7625d9b927ffd8468ba96a6e5239916d4ebf4cf424dd274cb8fdbc36827a8e1b4134a9be31993c4fd576f"; + sha512 = "e0e1aecc2eabb67cb8936b3ac9d94b889d690cd6729c21ab0a721da1d11559bf61191fba54535710cfcb8a66fdb17515337e9a4a06ae58c318139e4ca11a86c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ml/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ml/firefox-58.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "c32cef848670e534f11514a5571773713ca0b24e3d77cc7b200900fae4e93db0c1baec4c3198bbf06ee94e8444ed42b4f887a9783c67c718477fc1fd6e7502de"; + sha512 = "3f771cf338134fc90cd47891519b4d998f203361b63334aa611082f5ad58aaa1bb2c297a90baec0a4c42383315c13307f9d6122f03266b1a70360d79b911a5f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/mr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/mr/firefox-58.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "f15e5d9071133100e2bffa6ff9c5e04f8bde1c31602ef8ed532745bf7db574d34668ce6d631902362a86cfe625ec9e9045b24fc8e1bac266071336620fbdc8d2"; + sha512 = "479dde9f286cb92379f5e0cff8c30f981ff0a72dde7d29e488c83d69366ac9b09d9b12d0d58c8ca7c0ea3f2a8bc1261e57f4692546cca3db48e7d8aae61a4513"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ms/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ms/firefox-58.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "bfb9d4e4c7c4dfb8d577dfc34bc3482f4fa15eb7449e1875a77f2485917d8c7c7d8bdca19fc5489edab37f785a27955e8ab5bd0fd4e454c9af03a83d08d64f80"; + sha512 = "d7bcba35bb01bcbd1c2c76cd706ab9ca25e48a6f2facf3827e07ffd42de0bf0bb97eb88e133f3977ae94275c571cf96e1ace030ed2f7ba21b316dcd52c51fe39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/my/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/my/firefox-58.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "49df7fee007bf277937a53c6c85d3e6fa43c80c9364017177ed284d4fe862f153dd71f7bdeb9876a9ddea18d3d204682ffecfb178ca86ef89b2bb6a6bd9f9313"; + sha512 = "afe4bc2731fd0f1e66b74845de8c435f6a12fc65daa0b4100a8a3922b41f35b05b7465c860fb75ac6f173ed8db0e045b864c25bac3d4893c29fc0098b0a23fd7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/nb-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/nb-NO/firefox-58.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "d218a20254fb07b324026b8abb350d25280e423f7ed55b50bd081cda414b1f3b84ef5546f42244f1b4d348c21bc2ecbcb4a022a0aa98e0a11b164b72830a498e"; + sha512 = "008aeb4008fadc8f0a5a33b94d81f73816600a12bd6b293c276d110d16042a69c786b472038aa792bbca625c2f64807bc686ff7c0ecfe6a18ff30a614f9c2368"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ne-NP/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ne-NP/firefox-58.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "6ea47736aa2eb20ed03e80216368b1f175ff10d79ab201565710bda44c52ae12731245527b82ea1c5d6ee0118b0767ac2fa56fc43062784c45f93eed676f8fdc"; + sha512 = "dfd594af786b5046b13402908f137931b47d47916f2dda57a0b819eb6ca7821a95019b682b0df9f3efffbf6e85b64fb1405594ddae86b9e82c2170721ecbe6a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/nl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/nl/firefox-58.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "aa2d6db56fcc2fd4c4e0ab7451b256caa775e4d9d58dc275d477157172a47f79df66aab8c3b166f323e7f9421559d15921f17c08ac1e32e43154f0d2b468820f"; + sha512 = "1ff3383d9770ef26e7aeb44f6aff38cb0f3c59f90fce589a38d7001f933ed837376f9875d235dbb1edf75b866ae5545dec0433ecc3676118237e4d9544983602"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/nn-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/nn-NO/firefox-58.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "95f131d9d1099468ccf9a202162b027df0fbf16202122b539e0eaeec0cdc603ee8f8c8f7b99cbd6c232281ef94caf91aabdf7b0d88927c2edc23a246fa2ea1a1"; + sha512 = "4678f820080ba1e34b6e9242be6a02822d86e12d39a6dcaa706758448cb97beda9b7391a7f9153614b400c986f57c30e93c40e5c3b7c5ea1972233554defaa42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/or/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/or/firefox-58.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "29265aaa85c910cfd09ca98a32edd99563a3c30f6b46ee648b8d44abc990b65a69be022f04a1af4f4889327d3aa6989325606ff9cf3dcfcbc22cb096cc50af16"; + sha512 = "08bd533a28affd3671b013e663a05e05be21902da6159cf036405880af04de3ea5deb9c173ebbdded82ca01fc72a2afb49c664b67340e53da07cd444bc6fff94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/pa-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/pa-IN/firefox-58.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "be47cdaed36aed989f6299f61ac3df4a33798e9761f4b1a112ed9b339bfe6edf2a3fc2e62e2f4dfb3866cb331493996c439c8b145ec00b3b3c2b447c46d12476"; + sha512 = "fba22e0014e2c52ca9716a3172d3f984ad6bc140046e4cb36f0098e82fdec6e30db158538e2260731d319ef132f5f4d6200e506d480c004d3fa6d8be55cfe25b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/pl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/pl/firefox-58.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "f5058f886cdf50bfc216eccdd7986aa4177493d9e0a5ed1132e42f1c8aa6774b040e6f10cb7d30c5414ea929591b0e59b6219d9c68ff1a1681f4505bc32ed33d"; + sha512 = "3d08e0f7ab8f82d75686dac9b644337543b188d8ee69670464d630223de1b584177149d2685c61e07ca7d24f543534195b6bfda9ece0217321941b4521d379b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/pt-BR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/pt-BR/firefox-58.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "0bcd34020f158ab121659532b47e74dbffdfe8c6e36dbe8749ce03420a2a88b87bc523aac22090b793e4a7f001171241f32e9e5f751b82f91661ec901adac8f4"; + sha512 = "50ba7ed06e5ed5a3b1fd2f07cb1a2c12c05efa8509d7ad048a562f8c47011744585193576f831d045d4600a3faf4fe46388f387132c8e2d2ac48b31c42946997"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/pt-PT/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/pt-PT/firefox-58.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "083240cd451be3f5288b01ebefd87b430b675b24fd98f4e998f3607788eb6d66027737f3d315aa1191de207d701da57c38adb5a819480c9c17f7b7b41eb2f055"; + sha512 = "f49934f934e49657de0886cfb89b0df5a0b5393fffd759c8921b5076bea49b4042723ad7545869f20e5660e3afe099e09025b5d3ae82af714eee8f3a499c3f26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/rm/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/rm/firefox-58.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5ffac425171f8dc5d091db6f99ca04de46072e3c05e817e4290f6cf0c27e2604d806b7696f3f5e6e12138fb7c15420949ccd86967660da9d812430dd5289a862"; + sha512 = "7b105c8b5a24786e1b78ad139066c036a44b5ff50b3f7a396c649361f50b1bd3b04dcae3922cd983a7872c90dab9462f15725ef3525a6c23a2f79b3cd762eb6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ro/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ro/firefox-58.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "bf80dc77826ad22ccf2addedcfdb86c8280803da15425f939713fef54fc916d1a121d5b943dea664693159a3c06b01bb23e711eb8345394091f6f10afae8fb44"; + sha512 = "21e75389a70ca0ca44dacd4abd2cf755dc0bc67dffb23781b170f388371ba1a6a25cad6786c1a00499d995964acecc4b71585c040932fe6f9933d09f131d059f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ru/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ru/firefox-58.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "1590a94713a49a90ff299974b173bb134f0cc3d066c92b0c556f8a0155dc588ecbbec9746c10dcdcd32b53a3b3eac7cd3f190cfcaeeab08b00545951ba12b8aa"; + sha512 = "0bfe0d3e1380aceb201514f24000dfe21a315112262acbed1d94483771c779950074bd08ae33d5b703d044e0b3ebbafdfdd56acfe0d874ac8bb471ebb3211bb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/si/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/si/firefox-58.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "78ca337e2b3a1ed8f63251cbfa07a3e128e3c8e852da6103c510cbe59a9eab6dcb967e99c528d670e075c3cc2ff97d1b51f98c356c77d5b2d84948b2e550ed18"; + sha512 = "1f73401d991787453789a9385887104570257eb08781175c25ae261ba230b176a17747544d21f4ddadb6606cd14cbee968264fd77f6dff05bd7c8fc6f5e517d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/sk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/sk/firefox-58.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4a4f5cbd17e23cc7c83a14693a123c76c2b1e9e9348eebc166ddc5525ef194bbf4d8af107de4099564d4358a84f983c5430fcc194b805e04286cc043e775f1cb"; + sha512 = "885525f002a9bfa6b360d3e04c3571ee82a073a20c47cd0578a4320552e1bf316ad7f0fc55fc766908367ecbb69e2803b6f796ccbd55e5b71f460fd00758275a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/sl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/sl/firefox-58.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "6694ff1802d671dd9565ef2403c166e99d68cda6f79b428bf87763c8acacb080b364b75652fd1c42af5715e853e6ef03b25fbb122ad27d87e1fa3aa788dcb5be"; + sha512 = "dd8e64688eac0c01dbe183ed7759d8a9ee0e9306cce790bac610e483163a7fd5a0e81a98b2ecb57f9f275746a1949cb830b7df6e1b205434d87c324a57795548"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/son/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/son/firefox-58.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "821e89b83fd9fa4d50e3b66259aa61f05f082cee6dc7e1c6e308995be030765b16451b3429b7a8a7ac71b3b17b8a1804afb324c79de176b609e03e7d8c2fcb0b"; + sha512 = "d1314b1a3f7fc79fc1a1d9692e231a62ae0ff393d773946fc51468cbc156a9f6ee7d0f8ca151eebea49976bdfffaa0a663cac208ed520a8bb398a7f9fc56994c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/sq/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/sq/firefox-58.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ceed3c3f115e6631549619f352d8de3b12e20bb6f2943c5e667d856dec6a46f8ac9870be79bb435564099a76681320386efc64014327873a34e8c952b6afde29"; + sha512 = "6e59334adf5f07af115b0308836db941756262b11b03229cb6fc62df135b5a3ff0d4157e8a7bd6ae3222af4cd9d3f0888dcf7cb8adc4b68579f0a43832baa263"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/sr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/sr/firefox-58.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "88a3edddd63429e0b9258a0bda4e32dc861fe5951b9978399f37d213fcb5b4435dd70ab7aa016e3f4b8ff434a4b2f675154021c6f1c040d682f17a3171246392"; + sha512 = "eb5cb861a78b1be967a01e14efe6a8bd718adc418738c61c7509304a98ca9763f80f0c81f21b0dab9b5f8acb6f2fade37e44a66ff6cd755fd317fb80b87e3e32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/sv-SE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/sv-SE/firefox-58.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "2ca1899ef99690b952e46ef7057f29e3bb112ad20bd5d0a21ae066f437569de068e0d95e88703a0ab32b30bf4f497b5d85af98a6c3d357b329fb5ef1dabec2e9"; + sha512 = "615a709b38f86f6e28006d333d5e0246212d909925b76ebf0e8b2b61f1b09d8567050d053a73fc1dd4b58862810e17b52fdc52552926c90335969df3b3d9c766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ta/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ta/firefox-58.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "3606ee390076440efca1306c4d76f37142c8ffb31b7612ecae69668f0731b6564cdfa7bdf190e2a9626d37d3afb5868cbe9b91454968c1a73da1fbbba970ddd6"; + sha512 = "ecfff63c6c264d54c156582f536932ae73fd3b544bcfd87614a2a3708d0229e6633149400f8decc054edf562ac9134274fd97556a07adb820e73fbc999bb0193"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/te/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/te/firefox-58.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "9ece344c72c16487666fefa01d2fb3a3bf37c6e07433a695c2b534eb4db8740e38b120a06680cdb5560e4931645a2e87ad1374d7f5e9290886ed2905b1961428"; + sha512 = "93361fb558df912c050fffcd3d98ecd66499949ba64661f0b6bd2c57a53480383dfc04227d4db08c11c9ffaa697ae79fcaca56c86f5157986c51c9fc4d73c29e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/th/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/th/firefox-58.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "84d9709821d8fb24d77c4d1e893a5f978605d44cf4bfea19e8f3c4c278eadb259ad27b9ad4ae5cbd7f8f30fb1ee22b09b2c70d9ef44f1e71c34a582a551c0e4a"; + sha512 = "9baede6a914bc93e859711bffb5adf8735689ecb971661be1cff5f82232f5b5aa9a30693013639d941b6c1b2cacaac5f47caed3f48c26c7def95448ae51e3e79"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/tr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/tr/firefox-58.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "9a6d274ba90d85edf14c0033a4e046caa562473dff4aeecbd59af48ba890f62f2cd8402d842fc5c27cfc83a422604e03249085ef39f268ac107d25d5fbb6d8a7"; + sha512 = "4896215e8ecb2de6ff42611ef213f986fc8e58c10f077c61d3d274aee24d628816f80efad3dfa6ffc7728ee9a855e6872828d1eac303ef6eeb35c1ffe009b628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/uk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/uk/firefox-58.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "2d31078445e6bda0a72049d00b7050664ebd6e666c37435a110f47c5779fe7a8d5e8d634045205de830ba80fc6be661003bf1c7af78bc15b040cc7826e1e9815"; + sha512 = "06691e463acfa9224c694da7e0337ad17a21e9ebfa55671510265eb172e872c8dfcccbfd1c8d9316d07d76c58e60af374fca66886cb7738ca02b9cbba1719603"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/ur/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/ur/firefox-58.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "2d128057d2cdea5fe3b3f75dd10ff2a43511344dc1f153f4741d4b703716cc6c3aeb4231f4ab068c3154bfbd3b40ad52591fba9ff3026140c2246370db6d3a50"; + sha512 = "26ad6190f4a0a9e71035d34183a3ca53c76008b4b1249b17a5f66856f8af496db0695b62c0620cfbc8033b75181bd2b5fce468e6e8e66cb431bf6fb03387376e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/uz/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/uz/firefox-58.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "49e6ca00da2f8b7875827f09ed57c32925afb064c57b206d4deb70fe2d8ad28a19af9b31490752d32a921eb92b72c35ca1a5aacd526315b26be6f6b0ffefb353"; + sha512 = "2530ae763dd1d25ca392a5d49b0e544c0d4f6aa9679f88798ebd8e964e5f9a124844e3b1f31ced8f178897b962eddd5fa61257fa83f900a944467c997a4cd1ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/vi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/vi/firefox-58.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "90a9383be5edbbae3856e8753e1a2c2636f86ad74c9e5d73107dd59dec3f5ac929a76e6f3c8d345e9ac48bd14aaff563863d088f9401ff1fc721236562142ea9"; + sha512 = "998ae30f181cc138645394e5c19dcae9596a16806f5ebee23131d0fb36931d80a4433987aa2393e96927c4ef14b1e05568c94085c8a4f00abbf01e930746d7de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/xh/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/xh/firefox-58.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bb9d94ac997186da5cf0c953d8fd36dc3a1aa82fdc5ebb919a9dbd43ec58fa55f0cda3f046a75ce786eccc64fcc80905f8ccc62e6ede294afa469d7244268964"; + sha512 = "85c6c78bbe64bffe92dde178be443cd241cf670d2060182105cb47d3d894c4cb7f7a8b13e53b6b086efbe15ef06d89b5fa87301ee3b680c0a13ec3988f1051e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/zh-CN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/zh-CN/firefox-58.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "6a0dadd68a77e02db8109611e158379598f4e98894ee4a7f10e6ee46d6bf680d65527368bec4341287dd4f98e0e230e84c7202360fe2d9993a20c87c5de6c6f5"; + sha512 = "f5188f435dbe9fde617ee7d3785d1f1541bb0c37af7c4d0016a1d08f59461b4445926968a3c64eb061cc976c928d7afec713f0d5fa91d93e14b142c0d22f7d95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b5/linux-i686/zh-TW/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/58.0b6/linux-i686/zh-TW/firefox-58.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "0ec6cd2b56fc740ffd6669b88452efe705c95baea0932e798d28fad8a626461be0934a41251bc818639f386f4ceb7e47b821a38acc1d323867dfc92ca718a86c"; + sha512 = "d0fb13bbd11408d7f88076b373a7a9b306dfbc705574962de31bdf640387585fe182712bb0e48723cf546ec79272aefcbc27d785aa1600ae407cda2eaab3c7dc"; } ]; } From 5f13ee4e9f9524cc6a61fd845dafaf5a918fc93a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Nov 2017 18:05:54 +0800 Subject: [PATCH 56/98] firefox-devedition-bin: 58.0b5 -> 58.0b6 --- .../firefox-bin/devedition_sources.nix | 770 +++++++++--------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a3256b71b99c..568b9bbc10d6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "58.0b5"; + version = "58.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ach/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ach/firefox-58.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e71029462ca6475ebe863e13def88aed0bd15c2c9e69e02f1bf5598fa0dd11744182f2f7859468867c4b34098f69656ee8dc49959b758bff6544031cc7608d27"; + sha512 = "5e2df62d34be08d661ea0bac96a800bb6aeb0e15a5c10867175af4db474ff572d1df65382c1c3c05168d6eecaf2fa6123e9061ff9122945b5437e4608ac9d12e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/af/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/af/firefox-58.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "ba4d0ef8e79a5c47a0cb7990de7db683c8c88b13d152aea5c4bceecb8501f3c20921e9e850697abad6460ee7a45db83aebf152ddf69835031e6952632e1c990f"; + sha512 = "6c91efb9ac10f4b56773dfb4db96c8d593dc3a1926c390e54072c1d470e857765ff5254d6a335e5df70d669caa685fbfc95fd7555988e9eef7ce264b859446d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/an/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/an/firefox-58.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "0e6dde932d0b6bc73c974856b2f5007635cb0d0b2866480ccb6f43cd843e1a4e9b8ccac195c177682c3084d599a73166ce6e8168287e729611eb8c0bdf3ac8b8"; + sha512 = "a2d1acf704b6c182b83d10e8980861747dfcc615d691ec2441495091388390127a23b79ef53d085f4d751a0088c41c9b1ca212a8c32c19566c8e5e8843bebd36"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ar/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ar/firefox-58.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "ded97874466d23d13f75c80ac3a975b114dfd0361aea063ed4270a9bf51d77317442132f409bb00b124ce9686f2903a6a5db7cb4e61cd079348bcc2101ee6d6d"; + sha512 = "d252fa64aafcd53f1842131f49ad084c3bd34aa5e200dac6731d9926a965269c6184dfdbbf648c338982b4cf81f6a03fe277824f39e0069d4efa03266257cb5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/as/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/as/firefox-58.0b6.tar.bz2"; locale = "as"; arch = "linux-x86_64"; - sha512 = "cee8cad7a5a844aeed97802b380655bbbe65d2c1c942fd24e791e49cb650a15fdf50b5a8fbe8b70d8f9b44d9c5e8fe63abf87f451046de64c9ba185d81cb3530"; + sha512 = "7bdf73b9ec17a67a2938bf8a38b591b432275004f1c6791263b0712e59fd03a4fa12975305703575d84540a3e61a5602b0e5d0ef61d1118e8e97448e5c58c3ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ast/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ast/firefox-58.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "06356e1a2aa112e2835bbda89e1fe79dfb7c5b066c2cc06ec5f855778c0096342a2d90ac407b7c9b8396d93ac47e57d990c4f7af9194f2a8fc8072da9fd71807"; + sha512 = "a6e72a1ee9785368e2be24c2e022494fa8888efc1a77d38d784954100f477f4b4a66a041f22f562a31b70bbab8abc73dd2b77f511f70d15d7d65e704ebaf026d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/az/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/az/firefox-58.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3acdca9988b65635cce3222df02b35a158e275468608bb1b0db0cc97e15e3088e37a9ebd4552c8b47baa4143365d3b8543a90d52a3c6b4b0f393f02c0b14443a"; + sha512 = "aa8b0de6198b7e5cae9d37430dc58a71ffb21d24b99c387bfac88e0f4b38854b1341045cdcf865db129dcfde159e61f2b11b3b65f8bbe1c04977c3039f765e7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/be/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/be/firefox-58.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "fba37db880a3a199db79d8469fcc7048c2fe1375a016d415dece455e11ca402597413ace6d19778d462a1cffcbd17fe7c75b8defe16c5bda2df83be8e76e7ecb"; + sha512 = "b458d0255c968215e34655b3b8f3c8bbeb1525d9310515a334946ee90d8e64f41b379f53dd6712dc6ed0b55554013021a70115ed3093427889c52ffb1a23ae19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/bg/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/bg/firefox-58.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "9d0b88715f919495848cbb133e2327bcbb8d7ec308d5d35cdbd74f5acf502d476107a481b98389ed2e861cc912665455b5f9cd0bcf816b930a4eba8c16d93170"; + sha512 = "c5f3708e291139c8f534e1bdc5abcded48da39df0a79a0250265e8ceff902fc808c315aec5df4f7091725ef8f6ea9da7ea6ab9578a5a64249c8ff0c3d37ee958"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/bn-BD/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/bn-BD/firefox-58.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; - sha512 = "5392132f8f7718646fd3aade24b0d16cec42f3d89dd0212a0a25076533449b85f88eeeb3b251ff57ce7fac59b013861556ebe9d0674f6c4e2f1577e797f08ba3"; + sha512 = "5bb29cb81476c81f45c9ed36ba5ec86a178ceae42d0591ac4548fed63f35c11a9c6d0c876fec18122619375fdf4d49cc3f42c29b85fb28af2f0550bb19c9bea0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/bn-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/bn-IN/firefox-58.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; - sha512 = "9a7f907a4a8814b0aa211a39427dbea45107990fe4225ea4011a65e15f233706dd9232826a0ea14f30543d13410af34cd43d4cd7224ef2df1691a1e0c442de96"; + sha512 = "8474b655a4d8b7b29f24a6b192f95bf17965dfe901ddb9ca96e2f6ebb05796ee0b2abdf6119aca091bf97d1b5f3168cf372fe0762dc4d943eed53646a0ce50e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/br/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/br/firefox-58.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "940d72814a71708c7110e55ebdcdec20d3eb5cb20c1a5883f1c6ced588cdcc8a53c139668b55e51f5ec185315302ef3869c538838765d5095df9beaf819b5ed1"; + sha512 = "b46f524deaf5357f858f35e5683dae3b5282824f519224720b8e9177dea22d7ae12f793cfb3c977eee0fc3d5aca8cb185451f4c35a4d234a7d3a35523a23ea39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/bs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/bs/firefox-58.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "75d9be7a6a5a4a292bbb0852879a578af8c36eef1ca970d90a87cf98b359b795a9b5b81ee59d9305aa0e0e4c1825470e804a378cc2f0221554560444720ac632"; + sha512 = "fba62cbf5e80a76917c554a2900b082a739d9cfc7d77196b454232037ba62b259e0fb2b83da170ce148806cf89bd9abfd14d8b62cddcbdd1581497b342234946"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ca/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ca/firefox-58.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "cf775f9f9407c85b541bf54d18dcbbaba2516459b831ba5aa78a4ff74b06ec8882b03f02fb3d287c44814f0c30076bcb6167213bf73ad36cec67bd4123e7630a"; + sha512 = "153fd4f772b70e4f305ba4859cde3df876821daa3741bbba1e66bca43538c805249c191f7d8fad9cdb514a52dfc71a769192934f2b2e70d19facf1a463d180ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/cak/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/cak/firefox-58.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "da8920ea44e5c30ee0505623458b03651ce289bc4423f4300e4936c380b0f960a93f69b5f9f1b257bfa719d45219ec3a6d82d6385bd4028720bffbf7e3379f1a"; + sha512 = "d65957328824c5427ce750a28fef32815546569d0a0e490114769801fdab71cbee877371dbb760d9e8ee6126307443e0e261e092f6887213223df6bcef23e89e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/cs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/cs/firefox-58.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9a024d2d0ce1c179a842646cdec9928da2e0c7004d479d91da92a377244169f8e0b1c86bfab956c05285d8f64e2ea6bee276882c0318ca7e7b6e8b176105bc99"; + sha512 = "b8d4529e49b69bfaffa23994b57db969cc957ce69afcea7d6a063cbd11849291545c2793bddf76bf25d8df09ceedb9c5b755cad46fe5d369f211e99600f2a955"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/cy/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/cy/firefox-58.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "108d982d911dbb27ca1cc5cb3673ae34a91661867063350a4430ebe2f2075ed245fef3a9dc1a0cbacd81c0a26f7e2d19245eb71bdfaf783e2a6bb701254cfc21"; + sha512 = "3b61647dc41f38eaf553ff03b4ddcf2cc9341362477f7b9a388c8735a5bd524ae6ac002a4e7c4e72871c64bd7860f1ec41446f2be30813171f6c6b800fc35e5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/da/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/da/firefox-58.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f8d40ec5776e2dea3ff3d7f8d1798108d4f26c5e1ee9adece101d04f1f147cba33501ca4e42f51f89b3def1064a2f88da5471c0af07cf6b5924afde23953bb4d"; + sha512 = "96b3b44cd727dda9e79213d2e6e0fcff3033494de138146b58793d1fab603dec1475d39cc001a54cbf15c213e88d833bc9f50b33383312abf032342722446c17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/de/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/de/firefox-58.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "04de84eeaa83a1961550fc6de7eaa560cacfe8d751522f88715eed4d06c21930e4d4f980086e770be19a4ce054c9d95a3886cd164c5e78838ed0bb19a33f1498"; + sha512 = "f6e344d934b218acd176d0c75d2e11766f9f05eacc4102d6178fe08c446519e7bcaf65a1fc31cda85f5c39a5831a170149fbd9fbfec8362e9b3c60d0215bea3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/dsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/dsb/firefox-58.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "4b574bd38189c872eb37433569b62e257674bf3e439648ff20bd1d329be456540d82ab9c259d65e0b1ab5881d19346b19efa83422c9de8791ea0177d5880af76"; + sha512 = "1af20926c887437eddf77259d5735f4c3c3cda1d01396efc96d954114472022eb6f2f2c393d734759efb70428acf89fd13859cf8aab22c22ede6635263866c2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/el/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/el/firefox-58.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "e2ac468f8a3aa20517839f410d989dc688abe7c4090fc9295d0757e12c6a85dbbcf28fcfda0a3c6fdc1ddba96b463f00dfb22e9351ce87820e1bac5636d4a0c9"; + sha512 = "5d2bc09709aaa59f136e6c7a287ffbd67c4dde2564fe1bf0051e901d06e4e48c1e40975496393ee6046ba57a41c1c301d0781a22eb4e07610131257071be7be1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/en-GB/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/en-GB/firefox-58.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "dd5a6e234298895067e9b5e0d6f4c6b4d05b62aaea05cac313308481cf355ea5b88cab0cf59b6eecdbc7808964ac9afe6e3d3d1230520bb143e4f7ef5948811e"; + sha512 = "aa9860b1a684b12a03b53482c91c320ca0cfa47268c6f83a23986601a684e733922be51bb981ad004c78b986378c38c93f85defececbad9f9eb0c9acc6c3a556"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/en-US/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/en-US/firefox-58.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "2fb9f9734a7111ca9cac65bfcbaddfcf2f44c3a87645ea83cdf719cdb6786d81b230f6856f143ae8848b779832754fdeb7c206d75f50d850525b9b6ced93d8c1"; + sha512 = "fb1ba1b8a16c75044baaedf5a5d9a040135720492c46fb0614f9f7dc8f2dfdbdc33e3e86c1c0d892bc2fd6d9bc876a5f027b6fddf6c5e5c27babec1d7b147cd4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/en-ZA/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/en-ZA/firefox-58.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; - sha512 = "810df7f652cacf3e67d320af2637858230d7b7d2d44fa77050a68387a995597c317072bff50b9047acbca66afdaceec5da1c2923260846fd849f6a74614968e8"; + sha512 = "561859b45fdeeff6160f456bee8bfad5b44ab265f5f02c87c2d0908335c56dc003a694e339809a843c3d274b636713933cd84cc30c383038d46e5b188569f7b9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/eo/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/eo/firefox-58.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "3c57765d81443963fe0b79b4fe2539d1f4bf5849a8ef980ea108101cc85ce541c75f183297f682c165276b0d3c89f492ae2fdfec4047875a1018ce92cca591eb"; + sha512 = "08d8997cfcb667fbe87eef9c30633650a1c506cdc9f221870731329840596837382bc0b9fd6d160568c0f8acf6d785745f249294cb5394f5a7d8bf4c24ea2464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/es-AR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/es-AR/firefox-58.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ec579fd2ea3d2d97fc2ca04f71c11457e61e2d5e29615bb9c844bc90e15a279aca5d37f001ba903efefd55fc79637a6340d7f818a993538f7db2ce8e383944c8"; + sha512 = "5d76efcdeb76e909481a2a8a7a6b1172a12eb2b9ce6e8ec53d34a17c4c924d9c8b721fe8a78adafe7e440e3f77a360809969e16f922677272b0a48ba321cfe68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/es-CL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/es-CL/firefox-58.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "853e4c2c0a19271e18eb6aaceab3a4b5f47404bc1fc2cbf569754238291f878730f628d01828a664cdb4b78dabdc28f8a1d607b7b27930f030aa92afb8ac183b"; + sha512 = "3e049d2f1f7a1ef68e27d2b73cfae054e3afdc78ffc6e34f1ef9443b2a0066934ca3cbc6a86c8d80089c23e0f9e4c6a9b9b7ed5563ffe584c3965c703520348d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/es-ES/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/es-ES/firefox-58.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "c0bbe12172f841caf93694fd14e5737479a3ad7901313f563c2b6b42d431d0467ccd0d39b7f5fdbc39a4990b4b71679b756e119598cd6423fda956dc25e035f4"; + sha512 = "6faa10ca47ed83d181872add0979ce2e3a1d3bdbae7f21ed528ca7b29317e524510d87067e380ae429083e2bcf65a1c47e677b46a5f74a67e2739ed58c60fb5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/es-MX/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/es-MX/firefox-58.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "4f97e5a0853670aa1bc3c83bd927d257fbfd7d20514e38391d1f3f655e1cb603ae213aa512f9bcb8e1a2e3a0ea4c7291e7cda4290a7d303c2267a306465aace4"; + sha512 = "248f62ce41760edc359464f66aa718fea044511987d348fac9da0670d455d0f7299ebed037da1769e7447819c4cb08e31a9ac5b223b6b6514e7a8e10304bc2fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/et/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/et/firefox-58.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "5e4a8ece27e7889e10669805f4255886eb37fd36d4a07da63d69ad481df419e26008d2af5a26ec23e5b0a67dde4e8c383ae1ecefe7bec78b5e6897162d35826f"; + sha512 = "dc83daeaf8b7e38b1d262aa1c3c327284f2d2ba96232497798221a50496f02bcf8ddc8414756a9c4b3611915345233e6e58218c06c486fb289ea3c71823263c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/eu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/eu/firefox-58.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "174e28585bbb58387588f06a3fc3e499028f583860346b97b50cb17f58ef7f425d1f60f0cce984456b0c79856d42a90768fb808c0097bee9fc02354128724076"; + sha512 = "cc2672595da658d783a15bbb4fdacae45beca276fa2b361b9732850bf01b498eeee1383bf11b9a9baa953f39cf35ea0ed7d9873405017b4bfb0fe1187f020456"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/fa/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/fa/firefox-58.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "f45c7e7f94405a16e03796e44378550580cda7317fb3a9b7b21843c22847472f1e0a6883d2d06f52a7ab115582c3ec3e5e8f97dbccb60ac310fc940ba0a19dae"; + sha512 = "c1ffad76a42cf80b786007b00a089aea9d9357b931f4e7acbcc695f9e956165aefc9f9941032bfae5abc7326b56518edf09de1a1df1615d09e44d001ee70b2b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ff/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ff/firefox-58.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "fde0e94fb57e8e9c39399a5a399ad487c6f0cf218d09233f693159f55e4e74b189b48fa4fc8056c3434b4d5e1910f876d4f23dffdd8a35731be951b84e43dd4e"; + sha512 = "bda995ea43af37cc7eba6fb6dff547218ded83aa475739d0f9b00b4e6b5e25e0994cfa1ffa3a85cdca52f686631b956046f6c4353a5cda03c73ee6a530487301"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/fi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/fi/firefox-58.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "425fc6eb20c1e9c19f43e32730172666632bcfe5cc77452877c296cf7a8c41e803c4df770a8eee388836df20f591b176db256626a704cbb0b2ed2906d986e85e"; + sha512 = "5603ccfb601282f017e8f60e96744206093f7dc2d91401afcc7318ae72aa2b343a55ca5c899cb6d7ffd97390cacb79e91bb972e6da71f0b7d024a9dcfb6cef53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/fr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/fr/firefox-58.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "bdb91933eb00960faa337e5eebd0e3bbf10fb9abc3bc0c4a9fd641377ee24ad8eec0219d96fafb05e2f846d8bcd872a6d42ec1864ead5400bb630e8fdb731ec8"; + sha512 = "71a6698c066f3202d8de70e4064d250ced0aeac193e0bb7ad96eadc1d636237e1f937ed34ab5ae9c1550bde30b664d909ff00bb597fe5340a943e2823ecb038c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/fy-NL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/fy-NL/firefox-58.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "f2ad1f180f2e93993a5beac29bd8589e152293ea863874bb37f699ee0cd331ef63b0c300dfed5096a6bbd6476e7aaf2d69468fb3cf8619b63e2e311efcee2d1a"; + sha512 = "d7eb010203c01024fbbcb7ebf4842751f907817c653a79a62855dadc894b84a77d8e300d4e132035fd6c8f71076926901211afd4d9cd92a03b74fcdbe535865b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ga-IE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ga-IE/firefox-58.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d15b340d157f741593d5d8c3465fbcc1fc898d8ed3f3a3bb67c481cfa43b564d4107f60d6a5244ce22cee537393dcdd93a26a3a216343d5d2df55b3420f55aec"; + sha512 = "5389beaf6a1ab7f4f370cdde2fb567880a1fb681cd7be0f93c22687c2dcc40c42792dac669a4a350861a6629cbfad246f45b9e4e79ea0b1f0b1aa1cc66866407"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/gd/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/gd/firefox-58.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "2b31e38b89451bd342fe4728c3d5021d182bb81375e1579a5a95ff6e4a906a35d44f4dc230c756d8904fde52084a14bcd1cda41a18aea6f266dc3ed75822ec72"; + sha512 = "e95a05c6da8481ccfe721860028c2fef1d6d6ca8dcec3102d5e603fd2d8aaf2c5e394329dd5aad3ccef9bb0a7c186a2172bf1b8fc8686bbc0ac490c593fad8b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/gl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/gl/firefox-58.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "4db7ee61f8061fabc752c7470153b7cda43439580dbad2768087e48cb0f327bca573bee9fb2c702bfdc5e8b39caa7b1dd9e28cb3ecc4bd1c01a97a309ddcf0bd"; + sha512 = "c938e0b322c790e90de1f2802415fbe5bcbcce4b7aa58404b5983b28009662e42c05f140dd57ff1236b7b975f007451ea7fef39e1f9fb6194911c2af1cb6711a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/gn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/gn/firefox-58.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "b312d9f7a3a23e7188fa3a5ed74facf2273d3d636d3d0bea227d6de5e9fb872dd68a25dd358db6f98cc9fe113058ba16498617c39b85735d7d1dd6851b36d918"; + sha512 = "faee2ef9deb7c5554a7cb94a79df5ad1f00d77695e27ef45ba2a8bbc8e0de49e830b3c0140b1e04f6558e8ce28ab731b929d9b58c2804fdcdac53465885d9a4c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/gu-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/gu-IN/firefox-58.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "0589575cdc277e6c1197a1f617fd0927f65d01b0f4d0fb6a521d35e31158a8d4355441e5b7a673b1650c671458ae049be67d7ca8e2b776a4ab0fe1d01b5272d6"; + sha512 = "1e1af339607abf416a1d661d17949c35def63636e32acf5fac6550eca7c1da172c7337b02a05fbff71ca7f4ea26e42ec10d63f0707a30be44df841aa1106cec9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/he/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/he/firefox-58.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "682897f9e6d0d7c3ff0fd4fb84c463afe7241e2967f23ee7580013780e26b38aa26b1bf6481ecc0d6373155788463932402f8c3b2f50e3e341c72c0954773459"; + sha512 = "01a039748bd444d98a1af12b277356feed48ff57c6360b039f2f7735138dd444a0cca99d74a4b52d50af7054b2422eae5c6842359b772d77c9db723b261c6821"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/hi-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/hi-IN/firefox-58.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "d87945ad623feb8c8fcd0246d825189c1c1d9047323d9ccbaec1858ace8c5a4d89263b2cba83ca1fab2d931893c3eefe2a2f78c7114d24da632fef5e6d20fe85"; + sha512 = "55ec4959b2ce27bef0f066241e4f06d07e7b3f265d5715db1efc1862a76efd76cc9379b494e4bce1313ac68b77f898424101b42e9116cb44c372df2a4a82daed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/hr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/hr/firefox-58.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "317ab8b2af676a67cedcb1ba791f85775379af65c94eeafb16e78cd5907ee1b379d6066fe39ed90ca699865b7cec472f93b6d28b44b3e8f50edcbbd1e95a94b5"; + sha512 = "d19f475a87d3d49ebccac2c638ba2ea78cd3ceed0cbce2ff53ff3da52cb7662268b56789f66fcb23d3ccb0972315080d1dad0b185370ad6a0ff925adcb0b7527"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/hsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/hsb/firefox-58.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "01cd3407602b79a66ff73244fe396fc0a270ad665d3dbda285f6ea406c58debb0433553e4b411c286a0d9d9a7cbcba4c46a445cd0582f7fc5315ff43ac7af35b"; + sha512 = "23d255eb80783246abf3861c9f5b1b2215ba813e8d9723a09679b71e3922e273c6485e3fe90a07ba54fdb6cbf425c31d10d90e070a2bd8fe78135aeb543d97ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/hu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/hu/firefox-58.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a178b8d9996240cce5a1a4a4b4d4ca1b5af8ed41bec8de5da5f0d63149cae5725b43635d8a709aca5bafcd8dca61cf19540f0ed28116d2e28e66a6bf8a6b792c"; + sha512 = "52ebaebd662eb569e928fdba34448e5e439c4ad615b56b59b283b3fe7f26d5c639e8f5d29e139c5c57f0d7947a57347204cc879f3f17604be89c56161810b8ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/hy-AM/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/hy-AM/firefox-58.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "740f7eb29610aec3cfa2159d2522519b861b4566ea9304749f85ae87aefe2543f397053c863222b9826fd3bf2b34fbfdc70f6480e2fead1e0bf6aafa3749c02b"; + sha512 = "c6eac8bdd4fd90fc0d855248e1a3c6773c8af5b4119e15dcfc8949cadb9ad92df675b3cd08ea75ed805ffb5863618553a6963f6e61ca9362dd883c000b4c27e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/id/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/id/firefox-58.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "56a2367f4978abb79ce29425f8758bc74954eac425a6f2d93904b8eec2d30a665f373d943b6ce1e11bd21b53af85c82f021b5194f4fdb00806b075788ebbfca4"; + sha512 = "6cb1acdf0f8a2ebafdafac418aca17b50e7b3359c06ed53e5ccefebc04e53d4adfe63b842392b158d843490091cbb10b38b6b6adbf2204746eca78268c5d6be2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/is/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/is/firefox-58.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ab0a6814df5585efe30e8a0527713816c45e02d28f8b509a6db805b0debfe0baed179b8d694c98cb5e096368d63ebdb30dc810b90e067953cd4df4a68faad1a5"; + sha512 = "865549274f00d76d2a072691255df4015b2a8585693b529ab6215cdd64512f371bea4fdb6a1ac98bf4fb19a4cb8e8ca2f97c869ef4fc3f02b3dcf190e3e1b140"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/it/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/it/firefox-58.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "4d1feb0a21a0952a4d2b1883bdf9bc7a4873e900cc6b8ecd773e27a57945143e35e9541403bb8c3b9be2b342cd1a75cef038dca118842a82d74fc1fa30353ddc"; + sha512 = "32718d0def169802edc25a44c25b6232086c199299bb49aa6505292fefbe9d787d1ef36fae158ed7862ea0cee3f35813a7cbcf2eede28617e31d016e17d4f811"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ja/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ja/firefox-58.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "c147d490f10b317ce71469f9e6aee860d11d8e17cbe1a10ce3fe187cf2721366d22b582b63c6e565d3818454883b18ab820b6f6af3c3ac27b4335d9b031633b4"; + sha512 = "4ac1c552fded040dfc90f7331be8ad3ff953f54bd276ff8349fc628efeb01fb979501ad688592e1fbd2943291a1331dbdc26b7ba3174b38220f393e679cc7dea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ka/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ka/firefox-58.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2552f18a257d3d28d7267a7ed416d055130c8edb2a60f72e3fda56cabb2c1bffc88c7ca964eb782f613aee4e36ca6eef0c4ad795973927e1c26b98c8041e7548"; + sha512 = "c9650a8c66233fb4f1501ac8b185ae628c42b1dddea463a744fa9b0d0efe62ceb2dc6aeeb72f41e9152e9f689cf42a22169beaef13dcd39bab72c863bd3ee37a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/kab/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/kab/firefox-58.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ffce40997384b04de055f6c982d4b0c0d7e4c64b60aa2422b703d83f9085b45b2627803a78da16885ba9c0a95bd52b9e0c53a99fe9faf5fcff0955ca8b36117e"; + sha512 = "b024bbb378d44c9d93e4d6333a124210ced816069d6771e5f384bcf03aee68454768f1cdda9a9649d3be2b7930fca7e5d82d0c2102b5d52e470b8c91dbe6018a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/kk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/kk/firefox-58.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "a768c7be0bdd316e0fafc60a0cfea9189b79f42c2d119043d6e470339b25d963a90e7c1c37cea523acce2a4d3f7c8044d68dd32525a8e2d71ce951af4a5e2ae4"; + sha512 = "f57b3be23a3e429631c7d3cd8f290e6c0839bbbdf08631e809ae6147ebbad211f60e6a0722f7cc43344157fd8ca2b25112b2270989f5159c84a1e1a948b09a40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/km/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/km/firefox-58.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2d1580c79e497bbc9fe01647acda345e33f2836564ff7b8f378feda7243b2a728211308103726705cddbd73040685e7802b69b47771c9e0746b053954abe908c"; + sha512 = "8a364e9e8a02c3faa7bb0fc3758c7f2ee376ffb2862e33354bcbb7d6a04490d2cdaca2fe8203f7a9498aad670084653f953de37d12941c73a1f266277b67b3ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/kn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/kn/firefox-58.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "3e1334bafc38802a10a7d4800a1df3da124a2f16a9715c54f7e90fa9837c0b200c956a7b27518fae8f75f240ff583299b233119fadf5bef49c2a41f805f80316"; + sha512 = "097fdf5539d2fd0b7991d3689cb4e5cabc3587aae85319aa47cbb0133a41ddeca0085498a86e2344c6df2ea5c339b1a7aa611d11a6cbca5878e634eb9b456e06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ko/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ko/firefox-58.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "aec4d210afd872f5f9eba88833b5921e0e47959ea303e7883056af4ef2ea94e1015daad8a69c96b13701a74ce43ca91bc3e276f221a090f48be15207a3d24067"; + sha512 = "379d46c98aaf4bafd17cc8527c480db02f90566cf369790a86f0ec21b7a34402636f1ebc5292a3f2cd53a411d49b532e7809d50871f6ef924fa2cc476468aef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/lij/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/lij/firefox-58.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "f5a2e6358a854fb8117f0603d9b0efb344edbecab516fd552622e8b4c9b797bef9d5ef5c9e74c41f2d4c09acc12ee648b5e1b077dc36a092a7ba39705cc12b3c"; + sha512 = "2b70adb23cb8ba9a6196ca22d0a6a2d57f159396ae27199e80a2c87b6d85e84e729b7fb1b5c29ea5a752531bc97d38c4358fbc6346ce266a9e170e2db64edf54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/lt/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/lt/firefox-58.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "53f813032212c6c824e13e9c3cb2b3a1748ab3625bd1810b0f8d98655730a9941066d766c14616bfd4bd9f602d3e4c91335cf04898e8679943ab78d7868e518b"; + sha512 = "1ec956e0a06c945398d45fd867c43460543a25bea42c893ec8a7e55aa3b8dce1d600ab3f3074530c0a54aec1f15c693ba256e7c7aa1cd0cad5d99d297860ad99"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/lv/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/lv/firefox-58.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "97f80f44d26fb1b1192ffc9a5bd385af5e9b33a09c90b26852626269af8e1e85fadf8235e74577e7c83cde8597469ca203373df3a864491b4cc7d77fbcd40c3b"; + sha512 = "b8441d06fb6c7d1b71028510b5e510cb0f4c810a60875738074bfe0d70f3a4825aa9666c44cbaaac442735b454b1cea07172484bf74eb6dd37696811dca8a3ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/mai/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/mai/firefox-58.0b6.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; - sha512 = "74c36e7e0875e16da5cc56f2e505de2e59ed822b4fb6a1ae99ecd3aabc5a754958e92b797241ccc5317c5ff285f7bdde428513d1ddf4f6fe86b92cb7b1873ef7"; + sha512 = "aac2450f92407b30371015f3f5b4ced8182168a1bb4d27e1c90f42614fe99f1e7916c49a19d0d240d57948a8a0a107c2acd17022024078b10eb773b4abf706ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/mk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/mk/firefox-58.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "90798549fcbfbf6db00098e747aae0565c2da2eee02200cbc075717f37a0a10c27a0421f6860a18970d9eeebd2bd91ff0b4bb207dbce5f7eee65717a8181f2be"; + sha512 = "3130982cbb04e5843887ad32f1ab96ed2a01e50e55559b76980d6a0f5945ec642f4dc6cddf9a0f4b37a54d8a3644e5c3ebdad8d43d06b76e7cea26076f1c0612"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ml/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ml/firefox-58.0b6.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; - sha512 = "291c1595bcb186e6f9da51b085881eda7b8bc6239c319bc28e72c611e3c5a2fd6d36524dd78a9dc1733af4f8c96e78f6bd49a2d7c9cedf476f8a3b383ef65d3e"; + sha512 = "0b5e6a53ce27586c8aaff3ee442e8c1b47bf0fc0c8e83d659be0549e5362a443961bee618b28df676c1574edc2a556b715297293c634adf98e8aa98aad8d5a83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/mr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/mr/firefox-58.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "19d72b0c37399084bb71fc8384de1f4c0ff3cc3e77a39d57ea016026ceaa59f61daef20d9a24523f1d75e254bb6bd9068a308fc7db6ae00da3b74424573fa123"; + sha512 = "c175db424089d0eacd41be3c61f231e36bee090a73179f2dc551e9f3a4a8344d7d071eae399ccb0969447dda8569a0c9fad5f81723dd145fc27fee2887a8fdf2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ms/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ms/firefox-58.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "dc7bc5d13c8a4978719d707f5d4e71413f899c4d29f4837fd7a4e2ddb92522899c89f100bff9df7735aac7da87d7d9c94bc624e62ea0254038b4cc1f9f49247a"; + sha512 = "ac3031b4803c3ce03838b030fd63013444ae3b0fcec200ba141d2e7a2acf0b604ec1d89e99609725d5ea2e95c8c011617970482fce22ee7772a14dc5854b4b7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/my/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/my/firefox-58.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "b3073adea646c4c27343af1202eac4c29e9e6322c2a6857892c593c59adf8f8c834feb8b7ca82bfbab913fe24dd7ceb9448b77f106e8da75427868311fb13fbb"; + sha512 = "0baf7443362043f703bc579b8a841159611cab6d72256a604ec806f3595e644fc6984fa9bb3bab50746339be3eb9a597c0a875dbb9aa7592cd262a3018e1b3d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/nb-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/nb-NO/firefox-58.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "58cc4aee134c4bc6e091bd7159278905c8eb04defeeee232d7e2de1e17c7dff7e1725c92a9a14d9b1374f4c2d77476a3583a9c43e45a2511c9e4e7c5da09ec4b"; + sha512 = "28b775fae9d284cd2d07c513c2bbb4ede89a76ac374d4fd426f4cf4254710f5cd4b0a687b62227bdf31ecf9a439974f5f6e26bbb7d8fe7b8d38a5e6fea060515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ne-NP/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ne-NP/firefox-58.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "0d17189e0da38b1ac4623b581d39c99b9827cd0c378f2e7a5d6b194c0d4b855a8cf0e5b378ab9b4c37eefdf290268d42b1f5ba0d34fd97a139d4c2137088f515"; + sha512 = "b49de605179f0439115f80b45d75f84bbb061d44625e5c37283381ad05e474049a0d053df0c225cddd385c7317673615b196ba2850a50bd15ad7196a8261dff8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/nl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/nl/firefox-58.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "acfab217dde464c728e5031bd7a0196edb3951fc929e9f09e88113e426f928b4d30ac41a6120625929a372a05a4f51e6fdf2164d54233c4271d32f433ed8cf81"; + sha512 = "6882b0c1832cbf540b39fa0237ee56a197518958b65142782bc3cd0aeac31f80a9db28d15c6aeec573ad6a015fb24a86b3a0a33a453768543202fd470366aefd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/nn-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/nn-NO/firefox-58.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "b21d78e77fa453145e96c767a3b64fb89fcc628bc5302f2e09879df8397a7e737defa06780159f86e0e6c3f4ae11c772edba7ace25a7e0689fd724ce77c45f12"; + sha512 = "ca5b8f4a53f1b61cda3aecae3979b41189bfdbc96fb61ba6a96ef1dbb71959119ac6d1167e019ebf3a01bff84d635ff52dfeb9c8df2478df98f3bd60465f7453"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/or/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/or/firefox-58.0b6.tar.bz2"; locale = "or"; arch = "linux-x86_64"; - sha512 = "f9befc0746a661451d96d4349f05a495040d30a28751ce1b411458ca00af84e7234daebd845482fc9676572deb2a907470f5ae1013294a4a3d6a504ffe6e7996"; + sha512 = "8c053c7a616cafda2bcca4845587c536e248935c32c793291d9390478d999be462919109161f19af99ca3d376518dd3416949e9c666fc6a5960521d493b74624"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/pa-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/pa-IN/firefox-58.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "8c005c31884661c1170be077dd667a962cd0200ecef80fddf864aab23f402c0c3a7f133592c9c0ae7e181257a4c68965610426a0c1c91976c985ecf833fea2c4"; + sha512 = "394f6ddafb44275cf2475e47497cff7eeedbc9388bd29a805f0bad8a75b48cb85a6d11ce2508d2f9f4d83ec1d145dba041aea08ae8b02e2ab1ebe49cb3b66ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/pl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/pl/firefox-58.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "805c91cf8d1e9f99aeb7b415732bcb09ce953b1ce153ae8cb1c40def3edfa7f951bc7d2d551b9b53653f8b6aadc2a72e5311a0d56c4b497cc78d6ec4dbc6b8ca"; + sha512 = "0d8838408c61d23e0bfc7dbec8ba5f1e674366ad4b6e487019c0f3c731b1c2e8a55f7bbb98f72bda6ef0f04a3c28f7117e95b7cdbc762c4450b4b79855b53eba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/pt-BR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/pt-BR/firefox-58.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "7110918ce8899b74f74f17959235103cbf337074f2b737141b81abcf3e0bbed0be7fdb9da1a719b9b1865467f0765afa81d7185248e4209958874d0fec0add78"; + sha512 = "a0fa74485833d762ed499b8023b63bf343f520ab64569dfa6e87de949b3172351eb3ee204e272ae60f977fe101a7358e44dab40722a59376e0006f3c9d817eeb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/pt-PT/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/pt-PT/firefox-58.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "1d1f3299f1ff472f9a40a0de3b70c523bc9a9d5b8a26575e8f43e283c2258193ff6ff3ac15d1d530bd6c3de81f1e25a038681830dc65d9d9a0f5b8012ac56c17"; + sha512 = "e14854bd88d250302efffd0ea25c21013c1929900e7c4fff5524e2894457566a2b30eb6954f4a6a73a6eb032162b0a47ba326792586e672a581a1c390da28715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/rm/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/rm/firefox-58.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "586a1e82564542db976efbe63cb5249e049e631ddc409c7e3c5d6d8804e9235a92f6720d44cdf6ec04a1336bd01b58d5bb7246a4bfb97dcc0ef7e60a9207a552"; + sha512 = "3594e97de55ca816f482d22cf66887775bfc2a0e88be82c3d48e624cc5424407d23458609e98a93ba68116913e54892bfa84fd2663145bc8b630bea1a84561b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ro/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ro/firefox-58.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "9282dffa7be2d78b7a83e00a9e7f83310af99989d65bcefe63610cf8ad17b9c8c3b0ca64d1156a25d1216566205ed696c9b1075d05dee5a70785d2ba2a1b5237"; + sha512 = "113ee3fe7e8140828750774b186cf0587375ccf293ecdaf87d905ce5ea0c75996ad3a120f3a7f6fdae41e4f8cc71956942f66854c48f996708778d7c89782d5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ru/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ru/firefox-58.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "ce7a440c3dcc99b2c1a74d59b2baf9d9e230ce9a8568ca8fb4ee41c264af1273732fe775c5a4d5214727d4a9a9850aa959ac89726ded41fbe87c0945c3be1d6b"; + sha512 = "dd95826c8e486d788bbf3c9ed0cc9af9ba1f7bedb47439b31b2abed90b2e5ae05848d414d9941b3405ba51b94dc2626a7f823eb32ba337fcb5d7cad421ddaed5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/si/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/si/firefox-58.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0cb4f093b29a1d76a78f3d263513bd10e88f23156555ba93ca29f8a963b4af439fb07a80b2bf9c40cc425ec89e8874bceb91f30330fd79c925c8ba50c2876e96"; + sha512 = "7f98b1607948bd2ddd251f684d49ba4362f65f6ce33529cf668ca9e28d572ec3b802e5d160226f930ba954d69dcbe55d020f8d20d0d31daade8f8e62fa61d3da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/sk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/sk/firefox-58.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "275e05fd261d59e20f482ebf0384cef1822e37faa62bc310d24eb1f2d4ce10dfd1769eaee8c9b63590c5d5bf985c83b98ec34bb681e554808c6520102a6dbd6c"; + sha512 = "9a7dce3aab5b1a57332ba13bd121df2914c2acf9035ab681feeae8ac87c9f053bfb2de68208875186d7697b2da1794a6f42af99543682d3bfcb204c06567e674"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/sl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/sl/firefox-58.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "d3ca4111d9f19352e049bff533e879802f534811cca8cdcff8e7902cb8a4d44ebbde572a9246f628f6fe930beb60a8ae14bc42e12719aca89f7704ed9f379861"; + sha512 = "8293217f1a20d7209fb938be177ab8b10a58718ff74470e1ca199d9331925a88e1b4680d0b6b4d04e3dc0f8bc0acbd4560446a657ac1198a416b9f22d80eb91a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/son/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/son/firefox-58.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "bf211ffda5a262378f4b4372d59f2581c130db148667db5a0d80ce21bea6b479d860c7a563d39c78cc2d88282f9c02f50af078bee3f8c37d0c3bcddeae7eb3c1"; + sha512 = "ecfd5a4e65732e8cea50f3961c105849a84b67974353b45f95e113392577992c78f48d5dc47a4fd861ee99dd9e536acafdfe94691247feab925a5a470a66b42b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/sq/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/sq/firefox-58.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "1b0c5d8091a0f48ca1b8e74ca654edca0bc8b51a43dc2dc09703d85506c622e677bb24af6a8662260bb817011be36c438e5ba0e92b78b2202acc033e7a895ca3"; + sha512 = "c03adb0fc51f7bac8bccaeb9cfc74c8d30b60021b5346c2afb08ea39dbcf2a65c6db35c3ce51a2b18ffd8011270ce5b3f9aeade8c009e314ee1b3069a17ca0fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/sr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/sr/firefox-58.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "02a4038e36e22290ca11232b784d2009e29ea2c53b8d224257de4f851b8e8321229661838f46a4d64b7b7c6bb92a2695ef87de7195e65ce3267187f03c0499dc"; + sha512 = "288ecd8a0bf0b1a157e57029fcddb3fb708196745ec009307b2b4d86f310971f78d409169cc1421ac05aec0ca26ce48cfd6fc428e3acee88d2411072bd8b070c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/sv-SE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/sv-SE/firefox-58.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "e0c5939e89c4f59b0b5086ebc6244570bcca45383a0df4e79e73a98b2687904ea7263502199ada2ad97f870bbdb46b1056342a618f377ff52435a0f97673436e"; + sha512 = "f36b2dfc6d157941d917873133548fafb403cdb45954e0c942d83c911a26cf00662d604fb71b914f1f5c3615a9570e30046cae2ed852ce3f6ff9dafd33683b49"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ta/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ta/firefox-58.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "1b02134b80868e654638226c7ce2285df12a5286033e74ead1a8b2d6ede8abd0c8904b2818b938ee0ff34e65bcb739177ef44b3cf6f6afdd75969da8c063166f"; + sha512 = "4fb4cc8a5ce347dcb51a0e025b44d2de2b366a28d85d19661d608b1807d590158eec3b7e18fa351c6e7be01e51dc52630f6ae339234a9a6a3cebff50f7a9eb7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/te/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/te/firefox-58.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e7a196218738d82907cddac431963c86af741142aacc4ae7f628d9837172b08c74ed232624ed699e52bab289e5c8851a7a61657d4c2a6b57de5c12ac6307be81"; + sha512 = "a9285f68196fbd056443efb77e6496c1bb8dd76f7d71fdd13541406c63d3f70638d55b7b079be57629c1fbeeeb7b19581e0a3522dc04c29167cdf21461b22a28"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/th/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/th/firefox-58.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "fe039885ab90f1fc5343c6aa4ccfee5833932b5ca4f9b79a1357a36e210f470e878b12621a6cdfba0f19a43cefffc530d458a862ce313cbc3c8251d72c4280f8"; + sha512 = "6cf2c3cab136d726e6d4fd7f37fbff800cbbe15939fb7c614e27ac7404e5415aced7e2da537f81b934f7f84484f33d5280a0c978bb875c7b2c2fa0f69392ed83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/tr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/tr/firefox-58.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "ff96bcbbd1d710b655af4f2e4f6f35f1731d2496e77ce03cd247e264121e3f94e9c919bc34baba0ee58a136ff2a1143f0b0b4620b190bdbf0a82faa447206544"; + sha512 = "697e50b5a5bc0aa69a2d96adb6b0b86e78b415542c5530b0e06b8ae176fb944f02ffaf5a1f395b09e4956d16cbd1f94c254fc8ce34ad5c2af997c7cb6aa42834"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/uk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/uk/firefox-58.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "1050f5f371cd442d94904bc4d96a4d6aff6bdaae53a9f855d0f2cd93748b6eeec6577bdd5432e04e48aa9970f9a4550955c46ad9fbe1338bb004cbe3d3f222e5"; + sha512 = "2a19949ecd64a9555f9b75a1bfce8681ef9dcb41406f043869130adada3e0826a9d84a4d630e5170fc66dbdccc7c0575713b2f0934c1d4302fd9a730a2fe19fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/ur/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/ur/firefox-58.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "10a0e20c4b89eb26be4319ccd15c7b596fccecbe1e32513d228c3063ac3701725fc62a3a23ce7ec685537dae45eaf69d73e7495fadbe35ae1c6fde2c7a7440ab"; + sha512 = "b441a0a98ad18bc66b74c91fef232b9add34e73f324141125f783118b093ee9acdfd4e9f7969c2e1f26c7fe356873b9cb9b7ee4f3ff6b968d15b15ad04446e35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/uz/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/uz/firefox-58.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "84fe4950807f6c4f58f1fb0d7f0fe11e536eb3ab65df1ef302e7357266aeab429b93860d0a2f046ceb150779d5e08e66898f3232d5dc568a5c5e2dc7bfd43c27"; + sha512 = "3cfa017e0df2671851e0bac24074841b89fcb4053de5dcbfa7e85ec82b298c37f729be8b96f529e696036d273d26ae881a4953c71c06bb2c2b2f23deafcf7cf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/vi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/vi/firefox-58.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "2e5e9076b88d854065ddce5cf762c31d0dd2a987eed1e441f6536a64c4955dd40b8db0c0ce52d6158711d8c317bc9a9c91d8e6037350c8ecc74caa8038abc7a0"; + sha512 = "9b5e4c584284495b9e5cc3434cb148fee66b084014cf81b6c2e230c092e31fd4fa8141b3229ce2254e8a54011df66ba4770042e67a1efa76277f0c8fba076e64"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/xh/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/xh/firefox-58.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "5c6249ee0abe269b4e4cdcc3d2647de47d1a589a2bb55fe10876291eb6674f19ae9ece4cf0ae24fab66518d150d9d38c0602c2295e1f5b8eeac9309f771dec93"; + sha512 = "8d2022ef1543fd03e6c11ad2f20d989d87f508df52071f6d2581214db3cd6dc46da3c2157596001812f5a6822dac0c6e78c4485a3907fec32961fc48100b5cba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/zh-CN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/zh-CN/firefox-58.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "51185ccd33262e48085a8ed9b155a16d68e87999f2bb84fa653817edc12df43025eac6d9ccb1da6a3a2fca2925026dbe7f9dd7cf9d6ae4f53b31030ba17b703d"; + sha512 = "d5b9c6782d6b4a287b070cf71477f9e4c95338c5fad63ffa20d9ab70d7331a64acad72b845ac584cb73fb2142b6ddc5bdef3814b7041234e08a6bc2b5c3380d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-x86_64/zh-TW/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-x86_64/zh-TW/firefox-58.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "ec96763108ef7468940fd83d621da850a4565424139b895753e86955d13d498b003448881808d0c26457800a7ee7d8f60d0092d24da8a4fa9e6fe80158ec70bf"; + sha512 = "1d4870e1916caeb223c08d049166f777a01030dfd14e38123f905b04381c291bfda252f469fe96bd804812db7f288c2c0ad918e58c45bb332fbbd15836bd0b75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ach/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ach/firefox-58.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "94f3c3bdde7b9235eaa435d6d7719c07268bfffde60172d419e08db051efbee6bdb69fc242a7482e24e81c29b7d1e82650ca62063a2ca46cb69187f1dac0a41b"; + sha512 = "5a674af9ce636bccfc9bdf3edcaeccf73b15c23f2f7f2cf18d70a39ea4ab8f758ca7c6fc38525295f32cc3ae854b4801e0964d901843eb2a268bb760a19ecb9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/af/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/af/firefox-58.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "5a66055f05808187e7dc2ec746bbe5e1b0d23c2784760bf426908fa42c728cb271b0ff48d6bc803b927cbde464d17c022f8bf0a0990b0991b25a4ab47d3947a0"; + sha512 = "8a46c863a44030bcb4308d49e9b41121d40035bfad284b7aefd09dc7f7597562c1c826b9e652e1b5cb005549668f5b89d259df6f7e61505ef5e56ef6dff0d211"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/an/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/an/firefox-58.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "eb7443b81764dcce3c59218d04e77b31a8e463ec23558c2900202451837041beea2b742cf8e2fd2f2ce0f46266b3e597908fa70a12e6c241493cc70841a8679d"; + sha512 = "ef4f7fd304e75822b9d5abb4db67a45d5a1ff2fa08be088d79ad487dd542ecb990de6857f24ffea0d266c2a0a407a6f51fea5773e01a9c9c657dfeb87513f76a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ar/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ar/firefox-58.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "57b7409121797fa046c49c096b6c17cbdadac3071a57f725489c8ff59f229288fa8ad2b8cdc3da503bd292429726ceb5aa45f1a317d883a3db7a486ae6e62861"; + sha512 = "1f46ab8b6918890e70be153dce905cda6c7d771c10a86f39958438a56b582edd6d94e17a1c3ed583c4208df9f9677afae8336b1514d85acd321021af7b522c2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/as/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/as/firefox-58.0b6.tar.bz2"; locale = "as"; arch = "linux-i686"; - sha512 = "63d6635e1627e97776645993bbc75ad505070ab8d8f99d682c611f80073e6a7f8da33917798118246a1e6b30f496fdc0689b18dac9c575da4046455127d6c4e9"; + sha512 = "3ee3cef2bf80504a7d91c44ae9cbaaf09e604955845c7eb47f05df20296f62be528e9f5cbb6bce5911d367f5e4baf3bcd8a2e92475466a2792982828ce171301"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ast/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ast/firefox-58.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3a1818e0a8f6cf5ce6b35b1c76f71e41fe799babd40256e3839ce79a10977512dc5f682718847c0feb5bcf5a18ef257192c4294a2af44ee9d7309c218e6457a3"; + sha512 = "93be9b26397e38572cf0c04630ba26755dc1ed1746095df59e4527dd04b9ddfea728380012e1d97380dd6367da1ae879c992902b6f8a885a9118c8b6dbdf6f30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/az/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/az/firefox-58.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "3aded8587411e88b3512187ffd191d08859f3e472b2d3bb522b846d5cf39a7ca1cbf96a23883cb6193846bf120437d8da023fa61923e10a12e24a037e5a08533"; + sha512 = "e993e372c4ea0e8cdf78c097b3ca1db161db4b5f505c5d6ca80fd934044c95ee687a94ae8c3fb8be4b3034ead18d2653ffb6d90a6b3aeb612a1709a7fbfad5eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/be/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/be/firefox-58.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "c9c1e95abd710231b9ef6cbebd763e55c9a99ddb3da9e22bdc7117fa420d38b8d78372e6764d27fe933169ab606dfa0d6a9ba810188edfda01b82f5433f68647"; + sha512 = "4350041d70141bbba4fbde4113462f079bd160042f94917c09af47bd1cbdf09c485b84be9a3b00d01dafa6970de61407b72cab0a90a50f7ae5ab764206310967"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/bg/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/bg/firefox-58.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "ed2ae6539595b7d8442425a541496064861b00b066a1083e10a352126cc31c8a06c45737bae25219d71b7074e56a9c3b283357aa7873fdb4a2c89f0714420e42"; + sha512 = "ecb4e44373ee4ce5030497d13fa0210103c208d76468f41c51c4bdd8f91f7341430969069eec620d8c80948b23c66dcc67910ccd294f434a504642007b9cdba5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/bn-BD/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/bn-BD/firefox-58.0b6.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; - sha512 = "c213de25d66ba7dfe31e6183211768ffd456fa725e01e69bde9d3ac033956eb9a67c21760a96ea7910afebc1e4627879b03c34c7dac51ca82c87067f273f0549"; + sha512 = "8d48840cac97179c51b67f6015da78b17c8fdc8503751f2a6063f9470ae6a286f7e6d91d58330779cec8a010be39bd89c6611f1cad55131d6d8e1e2132d22445"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/bn-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/bn-IN/firefox-58.0b6.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; - sha512 = "d058821308af9d0494fb06830a82a74347ac31157cc29932566001a7bd4ff8600d8b3cf52f656701992786ad6e0803237e6750957a24894878006c82a29f7cf5"; + sha512 = "59866165b50248839174e621f3f698961b07c64f865c5d13afb009bbbf5259bdaaae50188df4cd1d6b05abad3245889b6afa472797e4d3774fc789cca974892d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/br/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/br/firefox-58.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "90503e179bc3c62ea9436dff62924fd37c87cab7980d012ad38cc0df90d1d34e156b145322914874ea84e798a08cbfde4362a9b5ecb519214bbcafe7a6efb3dc"; + sha512 = "d658e2bc2dc05886a7c0b2bc708165770f8cc913874d39e4d866ca873207697fe695361e5ff6d13d45ce09d4e8ecf175ba647295b9cf22dcce67f4e46e47cb84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/bs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/bs/firefox-58.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "c500e5b53d894b1ce37b273402833c22986d1c580bb79c6152a0d4bb767ddeb40358718d09386043a4998f462f1f2a4f0706f3973bc0ba7d786fbb46cc0558ca"; + sha512 = "096a6017cea5edf936681df290cc43747c42516dfede5d8b59a07a1f80a7822070d4626e69b2721f6d50cb09c17f1aa28b4ba4290868f7d496fe3ab9b4d70dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ca/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ca/firefox-58.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "db69a435ab623cc9c733cc76030fbf5ebc0da23a415159f42ed5710e66ff0553c51e7a0d2feb36fe17e697dcbdd24633222557352d6421b5cdf2478be3648fa5"; + sha512 = "16fca16aeeb2c2771c90eabf5bc4ff621d9ad23822a2e5d21ef13c19bb76da7f28bb874fdb40d59e1f8c6fe1266830e2e90bfff63fed4b44e638fb66ebe9098d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/cak/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/cak/firefox-58.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "3693d8aec2b0ab52bb7579321d9d913c9dcb5c4deba7d6f0066a2480c656b8acaf88c3e8c1c78d26a91b3429e5d61f6bab67dd66851ee46fe94ab4b4ad0937ea"; + sha512 = "09d9d75c86f397edaec7d2ebc44be033eac39bec2899e770137ed859bd7d7951344646659e50a48ed23f33c61e935cbf99849fc7788d99ba8e71ff6410f4f71a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/cs/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/cs/firefox-58.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "a7d90f52cdc4ffcedcefee2a8e6e137ea3f8e102e08f4d73e0626e344d706a6f5975ecc3e2394146955aca8aa6e9c9d35ce23686b8fd2328a4ab17190df2fc44"; + sha512 = "621720719cfc47b7ef4fc1f4d599c9ace404d7144ab3b8ae215006d78133ed6f6c16b2bfb28bd056dd5c2f3245e02b03a4d3901b1df0584869a38f41f69173f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/cy/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/cy/firefox-58.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3f48e1d23adbb36a285c9e2371c91c31575d13a6ad4a138ed99654be403fd2f693f2c3ef588d75a9c86f05a0522064bd722b4b27078671f601308e97c61cf555"; + sha512 = "facb59619845264a9d04f4e6b465efbacb226ce6288b41ed52c5eb38d30509b3d16608b3912cf1e3694825b17296daac6cda2127284db8e5e0465d63fd78ab63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/da/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/da/firefox-58.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7070b310839bb1b786e173dfea8bee333e387714f4646ea9a5ccfd0aeb8964596cfb3c86b082310f23953c3819833167ffac0e1f5f665d0cc6ed83e9157486cd"; + sha512 = "da7217d5a90117773747c4d648013ad480f12494e687c4ae394c068c303b96589c89a82238e24c8a5db57cae1f0f8f5fbf8ccd56e3729a5f71f81b84085c5fb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/de/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/de/firefox-58.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1ee664e77a44bbf7ec1e640aa97be04c809a4e03c9dd602d57979b8fcf3ca0bf32d9684582c1d023d76b4a9e79017b571d8cc9590b0f1545d13a313c3929ee1d"; + sha512 = "d6f78fe8d22434df4339aacf23c4ac65052b20cee8e87f75497bf7b80f66821184bf05ab77385b57fa8746bf1b934599dd50886b1ecab0a9dbb12c21eea3ee30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/dsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/dsb/firefox-58.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "7679b72e8959127097abe68f7e966f7e27b7e526002a479cedc8921bd97586cf2c710bc40215366306c2a597e0ce86666ed769a3d65d12c6a335e13b15b94556"; + sha512 = "d162e6c047c4c12df7ebc1299181978a2314d83474eae31da31ce3aad61674237bde269c148e766830d88bc99930427c6e6f77f742d7a242739971c31ea8d1fa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/el/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/el/firefox-58.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "9d45776b931a159717ce20562112e224107b39c69eb39f04bdd1d338bb37180c3b1a5b1984cacda706d192e14801a095541a7e4fe079431f9bcab355ba546c3c"; + sha512 = "3408d79f2fe76858af0841c380b007473df8b9e39a0a80dca2571feed82dc2c2d63be3b17995e765650bb57e3f93aab771e3c92e2329eac5b73b1f66ba7ed1eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/en-GB/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/en-GB/firefox-58.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "24fd66833819097f147badf4f32f284281bbc3bfe867b6ed33cbcfd3684ab4638bd8c0ada9f7773044c69332d57913411f063acc76a1c7ffb2f764d49063e98c"; + sha512 = "07362da9955fd33d75adba47405fdb9247fd2a320862b06c2972d949ec01c36606d2b38f4c9aad77fef28c141d6ee6078c010e57463c4c5756d6e14001db4d94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/en-US/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/en-US/firefox-58.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ea04d5fffd5d254b13a8f24bf38a18a03cf773c465e7cd11cc78afd3c3dedbd522cd5407a6c1e1aaa8b12778e661b7bf9abdaf4991b3245b8a10c525ee5e65d6"; + sha512 = "63b9617f736e825f7c183110a35396a3aa98455d47f1b52596791e94200f7b6e22e1779e5b21bcac0ce710e1db46f647e2014dacf55b98d82503ad5ba50b3c51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/en-ZA/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/en-ZA/firefox-58.0b6.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; - sha512 = "cbb2ce79490a284008424e2ef8cc76c8eed082acd42fb6c7bbf270bc73cf92dd2b790bfa226d2c0596066ff7bb11d52a492cb49dd2a3f0adc4bbdd203bedb182"; + sha512 = "54d27104290059edb427c3dc0b91914fcd5220c0cf58be8c753c9eddd119313c866132b8b872c5d7b36739b8ab69ba2a04185ae6b3b5265090099b16605722d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/eo/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/eo/firefox-58.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "e02467d79b78b0927e0dd02608975a6e127c0a02a5e985c004fcee214d6c4cfd5eac4bcc5e284f39eb33b8c82071d99676ef590b0ca8cf324b7aa8de98fc0c00"; + sha512 = "96d795724fdd46d64123c9771bd82d544cc8cda27d9c8193055768f486c3d5a7fcd3e541276b17c06997568aa12b9451a2cf3db22fe9ff8ca0576924cc96a35a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/es-AR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/es-AR/firefox-58.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "4f7afd5ae207784b4bce95584feeb5cfe2a979736f612cdcdd4ee301776a703e71dbf4862f24b4cd7b465ab33f991503902b969d68f139c201769edce03d5f28"; + sha512 = "2383e3aa848f45d40dc46957db22b4eef8afa269ec8021374edb08a9970d6aa7cf89b2e44feb84ef1f4f4bea6b119bc58086c1ab62bcb395d3ea8dd1b9ad8547"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/es-CL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/es-CL/firefox-58.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "c2ef686b6b7e987839bc474ed452fd65119e448cc1272206774ffd0135fd361fc31bdfa8a7a673a314dc53f2f87fdd5bdf5631d4700670dd86264120d901c418"; + sha512 = "a81be0fbc6ac625cdf158decc96692441cd75a62397938528769ae24abe4cd10495ebdd97b0ff94f2b6812b55eb50b63322470a6462ab02dd8eeeee90c6d24f0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/es-ES/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/es-ES/firefox-58.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5fd3621340548839e2a9b1a4eb592e0a24a0e2d3656f1f56b9c57b56c80eb921bd2196cba333ce2ec7a003f64eb116e946c9ad6a651c8b90a7a1bedeacb1e253"; + sha512 = "727188f4976840f1ba865bfa8e6e36861821048420fb3baf8b2ac53fa8d366497b434aae99ee205552e3162e5301b2f1c4fb3a3d76e077ded10a3d99735785d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/es-MX/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/es-MX/firefox-58.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e8738f5fbc120328991e9a896dda4a3b2257ef33d5e51391c3e8c893fcc7bf9cfa18582e1a6d1fd869b5794f17b61a115949a51050e051c802d6ae2a11e53674"; + sha512 = "d4b4e817302f8324df486dbdf9da22c48c5d0541501bbb321f2245defbdcd2235c7f383bae55e55e34331248b2060a9345f36d0b6d1108789ed629cc2f883ff3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/et/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/et/firefox-58.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "c7e26a6f3a63373ccfbae06531ed9f099e21fcb81e19831815475c53cbb3aa47e1abd1400a565fbf937932399dcd205a143d2d70f412ba658668d5f7a7de3bf0"; + sha512 = "efa8f73154aa55b6d083f1ceed336e88650d5c4d04e37f7777b0f6f049c9564da7783206fe44243ca97cb7054fcf489cb63713a26a442ff9ad086d088720285c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/eu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/eu/firefox-58.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "bc6ebaaecc81855eb2240794923e20705075eb415f8728adf1efb2b7ade767a2de609cefd44b03d352f7c43d5c10b908bd71ec93a34de7590753253272a66b7a"; + sha512 = "4007d5896e37348e2569bebc0a043abc42fae7f9c80aa536aa3482066b0c9e8626e36ad1cef3e5ff71fe208b9274f937dfde1b66ae52fe004045fee2d04b7e58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/fa/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/fa/firefox-58.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "b69fc8b1a8bf02fdb5f834caf5ca6fde0ab35096f4f28fbee64ac558817eb7aa51a7bd486acf8c376b0e0900e27069ba030fb71200df5d8d7ec1e0867329df81"; + sha512 = "a85d175beb4f09f7078eedaee7978de6ba50acfc2672022dfe3c1935e18911b5551f174d2e5277bcd575183bd8727e4562504d3942a93950c578ee362b8bcc8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ff/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ff/firefox-58.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "fd89cd09e061482c5ff5db661333669f528f66169bf1e35629ce122c068ab06dd223cce00d8e5c3e68ce0d9b44ee3d9b7ec7e8e443db3855bff827ea37f0a753"; + sha512 = "15bf9a17c04eee63eb2aed95c2182126fe061c99d5f2efa5be623712bf75decc73b85161f03a9733c350d40e276259340b18e57508748b4b329a1aae0f13fee2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/fi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/fi/firefox-58.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c4a396f3e1b36d838ad88ad3d7d008cccaf6b88d5ba2812b614fa2d0ba75e0b95afd878ab9e98a8a87b70eb78b6e1bbbcf33eb6aff8d791632eb190cf93b523d"; + sha512 = "8e1f2fe3563050c576d201667a960c5c6a51d36971a64ecc4af9286125ca29b90efcd477774995ec97da9185afab4f8d8d6297b043a39ea5f9a05f6d987f9cdd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/fr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/fr/firefox-58.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "88c5a65e6bd397c8e57ddaa93485c9e2830ee6fbe975e83c1a8b04fd2c1cdc903cc9074684b0ce0051afecad89086178d3116e83a23e127e7e7f0f6998f17f63"; + sha512 = "f0265d651517e08c681568065ac1091d97d753f144f7876a1e749ac8d2201ccc67cd12265582709cb879d75013642cc09311c49467c222065ea82753d39fe864"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/fy-NL/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/fy-NL/firefox-58.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c3babd7683784bbf4dfbb8896ad8e02ef4e42139d8599ddad918be74e601979d27087462c25ff36d901e1737eebae5905acd5fb133a55b5411d86d44c71831ab"; + sha512 = "d9c4b4916b38e532ce34cba6bf4c399499b7e56e6853e6ccdf3e4e307263434c42c2bb865e69dba211278f880717b0685c0fff097f5a4a7f2584b1166de41077"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ga-IE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ga-IE/firefox-58.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "06d95b504b3ea77babb65c9fd017836ee8105b4965bc04f2df9563bd90bf95c7a8cf7689744921f667b9dcf8527a528761b69f8087b493d5cddd32280e8bfc71"; + sha512 = "ef04505f848678218deaff1e35c59de1e3c1264bf0ad766bcbaa4d90c6c502b3d4ba2adeb76c039946b2ba55186e80b25c8229037991b218707000d0dffe553a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/gd/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/gd/firefox-58.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "883aea5e4df281fbb62b08e5b9152319dcfd721d39b9a968da6e43722dbd3267d6b0fd813d98904092bb38ab4f7fc859b0477b64ff2ae109a4610f968cf5b78b"; + sha512 = "13198eadb207136181e6880668c8b3896db51fe5786072b5c177eff47b8400a519c1f5e7083647d2054e5db9822e002f73656eefd5be2df6357889bc587f502e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/gl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/gl/firefox-58.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "73e6a8b56dfae1b6fb4e3c2c1116593b6ea93658087c498006e64949f8fe04b4eb1b36bf0aecc91d39dca5c142052adb35e8f415f58eead591bf486af80172c7"; + sha512 = "6714c905cda7d7ee6c4a179b8d0e62f83777b2b089437e50edd40f0f31d413bb05ebb76b3aacb1f13d63677ba95f06aba99d9d61c404821b41f6b45fa5c57a6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/gn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/gn/firefox-58.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "eab783189830861cd71c3bdef9e8cac574ce4b1e7eab777b2497c1d545742a7888f78dc79dd409a889d9073c7c9a64b12269323e2d1ce6cef58545643dbbb10c"; + sha512 = "facfa1390517177017a36a3a9f4068443dfd1512afe399b6a84f01490158b87aa97a36dfb2cf67433afb7d572b3c8baa6ec2318e6b44658e35a85bd56386f16b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/gu-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/gu-IN/firefox-58.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "09b6522f030e9b271bf599e2d1f56a93b6020faaa47bfc40585981ef8665906a98b5e2ff3eca4ba8d6afa4c51a25839c4de8db9062adb8d89698ae45efe2eeb8"; + sha512 = "a0e157c93fba8505bf2a68f0e83289253a67867cd0e980dfb77cf22367b3f2b6ffdcb8e7b4d1402ca7de2f4781303552a54b0919b9240cd729491d6e9e11c327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/he/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/he/firefox-58.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "79e611c088995770d408de52a02ebb2324f07be9d290fe198338cef7c2cc72e57c456983192b9de22533ede4c4257921baa5f97a85ad905625824a47dd0d48e0"; + sha512 = "ed90c0eb3dc259cd5a5e97b6c124394d66bcdf5515c5ff788f0ef97964d26d1fcf28879cb3607756b358e2400841a7ca8bb425aaa38eb7b15ee00807bd70fe46"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/hi-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/hi-IN/firefox-58.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "223a6981057c838bd9440ca726afe3b60a5dba1755493ec8cbf1fb06d4799253fd7ed23d0e1cec436a65247807f77299c540cfc2b0af4a742649c258d59d2848"; + sha512 = "1bb88d82b1afc6003826ad4ef7740184bfe5a15df78eba1af7ed5e34a4e41a823a30bf080ae13ec512c7ccd9bc7e2077b5a11b892ff5e7fcd307b9d7e8c41e91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/hr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/hr/firefox-58.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "5f2532b00e0037bfa5ce311f2952fc9cf598909b73b76418ffebc91d90539be9829d9ffdd1a6c4c567d4d2f977ae8c7cc65b3b12c90cc7f62bcf12e890ca19bb"; + sha512 = "5533e4100b9c1c28911a4df86cf5b0a5c35e1eaa649b9b5cd7dac1280d1de1ca1322750f9fe3ca78b2b63298403e7283c2872c3e0f46963fda63079d2f2ed6f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/hsb/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/hsb/firefox-58.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "93ca29c8ec575a6698adb50dd8446daf4fecba66148f3fe9b67f4412499ead1fa2ef8ab6851f69db503ffaa65b1537dfd1aff9e81a5aeb3db7b5d06acf9034bc"; + sha512 = "e5e1ddef0ad9541bf0edf10148a621212593a5c5f9b3eb2691a13cdd889f3fdc1b22c3f28d5f48d1cee1d50df196224b891e0f56fd98c8413a25b2da5c63270f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/hu/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/hu/firefox-58.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "8c64dd267dc979acd12dc8c1504614ffad897fd6c62a76ad5b5f71ad4b67d13fa8fb1a04fc0a7e3141dec20847f5134ebda0e197c9b8b5cc09081fe27aff75bf"; + sha512 = "e056ce98a293e33c537bc874e0602f05935d6f5d7c9ac8487900727a383b816b06bf030489ca63dca64f2c9b3a104c5adf4f8c8d2fcb23220b5979794bdfbd33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/hy-AM/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/hy-AM/firefox-58.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "aad4dc3a8ad0e4fe8bdd9792f027a009e1517040dc4d8f39fac8e1d9977f72467514771aee83829ac991bfb22504a0ba301e35eeda006778865212830b700e09"; + sha512 = "b0a2bbc764d4b42d804dd7ff3eebc518520fb39b3bb60c099e182e88e7870b17f61b217bdc883b70bf50d6a80a4521163a66b8038f2d78b3a5b6f6cc924273a1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/id/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/id/firefox-58.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "6edef81e200a0021f50279051883cdb4db27fa2ba88039cc378b4b6f4ca43d8310e6fff790823f98e416106e275cbcf6c2991339908084b2854145c3005b5924"; + sha512 = "cb45966163e8bfe6835b62cfd1fa0852c9d83acea3d2349b02a8f673a67b217ecb44dbef967b002b7dc9e8a5407a6a8bd9ba191fe21210a9b986f89572b8d1e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/is/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/is/firefox-58.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "5b52c6e225b169bb4295b24cb34f2047a5c78c97035d4639ea73f53f202e1adc767f8666796fcc78c11a1aec22af754f33fa528971ecbc25e3cb3fd38edd0a24"; + sha512 = "ae754ded5155c8816425b888ec972627af3c149216492ebfad2dd31661a3e3ae3d80c5c2d63a6ca04379a001c5040ea05e7766346e9d6e48b91c776d768ea8af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/it/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/it/firefox-58.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "13c496626e78c1de2d6e4aa88a7ba6f6ecad8e03bbfe29d0cd896f1806d78ace5807cf5ab8a543dbb3e32384d4e69e27aa516478c1268da1b345ada9723257f9"; + sha512 = "98e63cabbc61dd02b81bb40296a9ee6e4c3d28d24b3c1beee7373c7063bf67f5f8846cc182926775f16517b220b8ff4adc81db94cc919e3629231464b2fadd29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ja/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ja/firefox-58.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "6412bd80b76a205035282ea168751a3927ecc6ea79039a4de224c920a7bae578f6afc449171148147c7e198dcc46ed5b8cc0e2bf7be3a242308dc1f66e1d17fd"; + sha512 = "c54daaf44d9347aca5b4460cdee1bd5089a2f2f24bbe9e765ac8713369d3adccf1a5f5a7f4226580b2d49458171b78046ccf61db622a98023bc6a1b51d60aaaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ka/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ka/firefox-58.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "97499b04725d50b58217e74544fef59ff6692c84e73c9882a0b20469e504158f7a8e41efd9d012bc74094cf074cf52e0d43087e33137c3673b5a9d5a8fcb9f68"; + sha512 = "05d963298e34c270322aeb4185a21b893d25c4f371aa8c30b26335c75faace8ee1ca0cffe947175844b14af37d5b4b989cc8d3ff7de48312037595760a36cda3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/kab/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/kab/firefox-58.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "9b85a0eb9987ab227190ffce45b960d02b951dac78e42d3501d8e20b91fa7c57cd623b282ed3bd54aadf2f24a2b09dd921c1c4c54e1ec948be90fb7d325de033"; + sha512 = "15de02f934f97a0463860bbde3f23319c019c79f2867e094fe9ed48b7e712710add3989ea4fa84204b8c50681838cd340c67c961a44a15eb08f0d90592f69ffc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/kk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/kk/firefox-58.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "d70ed929142e7101fe9c0aaaa870d2f84f41c8d583e1c47815625f0d6dd4af67f62dcfc23c3fae51283e2eba1d472d7917f66d6b042584c27d161543e3397cf9"; + sha512 = "fe0bfba380da76eda4ac1ab3c724d81a0e529f48e4ada4b2a322b837fd5dbcbe54b1dfc1d669b4d3ccf9a8b33deecf262b7ffe0136126a9ce0f5b3d51a8a65a9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/km/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/km/firefox-58.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b378e58a112f8f32edd214e481e4adfe021bba2fb02f9074369f24e560de07c69775df4b09decd37cba121e2da659df0f727ba9cc9e1d84de34e5c45680f58b1"; + sha512 = "80e60504251394cede05851081e9a70767daa723e9bd0d65af734da0159abbf9fbab4eb98aad08ef94eec6c4ff06a935bba66d6b35264817b52e2681bb9c71dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/kn/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/kn/firefox-58.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "11870a1556e2658aa26dadd2aa23ce747d52a9936dcce05bbd2e325c79f9fda26a87630d19d23b5e7a89d30b60ec02c74252bb6278d3788a172b2fb724bceea8"; + sha512 = "02f27db6f9aaa7e50b7b36d0b08299b3ccaec63e5d499d9450bbfcca5ec805bf2cd488f47b2c7e9f997229bb8e6265eb27ca1585399fc2d951c646e2658265d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ko/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ko/firefox-58.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "65068f6848c41d7b39f38af47ab00db5aeb8669aa9153ec98f1110f1148c693f0911f748ae6b6d636b267b3127801bf430a5f36b079aaf2d08b1637ec14a8018"; + sha512 = "441d864f20877f12019b8a9141156e570241552f06aa3442c2c3f5496e7171a9447c4e13c330709ddf6fb1dd740855b6da2f8341bcd6e045a13b80005d3d3279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/lij/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/lij/firefox-58.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "7c301cccfa7eee0195699d29306b8d74c3de4b1e8fa57ffa6be28b047b90c42b720e6dc53315c4b90817cf41a8d58bd4c25b4b9cf63576eb3fb78ee663ccc222"; + sha512 = "781dcc54dfb1f7cd064ee453db3fb36c9cb970ca89988675bf6b4dc8f2e899fc7fe2c93f37f8617e45f97cb97d66288f7b6200c73e40acd9bf73ddde40cccbe7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/lt/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/lt/firefox-58.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "83b691ce6cf03bd7c18cb01e54a9ae33ad08b4f1a2e89bdc49d2203fa9a59837cad682f09c2bc79c28889911a0788e543b55d26009031f5a0b1ab099dbf896d7"; + sha512 = "8046810972b0d5ac0b8814f730781a12fdc1419fd991568e787488afb6f5b186254c6f60e3d6a35119534622b9d3c6451375e6a07162542cfb9bed7d4d56a010"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/lv/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/lv/firefox-58.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "fddd7c4d34e16451f0763384f30e1db9cda4b74b85a1c66b5766cb6af4b56a3230c8abc94c3068481986d266c7eb016f0c73f6a8b1ce06c136f334a9f058d6fd"; + sha512 = "4dec3facd824cde9641f857647c548a025fcb43606919f4c04148269e9935359ab32cbc838f75fcc6ac51f5a612029df23a31f962d1088f31b985e640605352b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/mai/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/mai/firefox-58.0b6.tar.bz2"; locale = "mai"; arch = "linux-i686"; - sha512 = "b18e9eeba7a1fc9b62ea4429fca75dee36387b9f12a86347d56fd4193f25989fb035ad2111ada4be46085b51530055fa67207fa9420642cfa932006429c32954"; + sha512 = "606426a9b1c74317308fda504dd26118e0bf57a3653edcf8c75e19822657a97ff735c89616247d192cf957adecb226396faaf5a6c6b7ca6ff35b3b7e3a6b4515"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/mk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/mk/firefox-58.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "04b5f1bebae5652e95af23f794abd45df42ebf200db5c4f5c15ab97bd1796c2a694cae926c6769c2452acc17671d5268d4d914c098fce2194a3f124a1eeffedf"; + sha512 = "89b5ff21bbf0d978cc6b8c52c13d138df5eb62bf71b832e9cc5e9f23e4bab21f36634f3417bb46f493fd1b43e4d62be2c103a0ff7e3f4a80668c0a428a5f0477"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ml/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ml/firefox-58.0b6.tar.bz2"; locale = "ml"; arch = "linux-i686"; - sha512 = "16b6e1cea737535acf80c0844cddae65b137030d2ef1aebdfe75b698409600e5fc1e9d3df2597f7208f644206eabf2643e2fcc5eae7b3b9c0ca9a7b946bad5d3"; + sha512 = "1395222dd776ad1ce90e0abb5ac6be1b6a0ef1143a23ab0b27d7b1518eb36173ff7f7ee3ff902b86d4505c230cac61fff70c8684291059e18f5b6161476fd511"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/mr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/mr/firefox-58.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "43605059d941cbccbfee2e31a6ad7b448481a54df59ab6e7791d73618c3de8fead2df3342051717b4b35476838136ac0e6f8e6eab413f1561bd1adc48b1ee496"; + sha512 = "f586e5f9687bb727dcb8dfe50fb7cf8e93080d97ca37a89523cdca9dd08e78e093c524fe6570339c5c739ac23ffafab34490368490e5155b5e03b36690e3cb44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ms/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ms/firefox-58.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "9c312053bf9c61f20051c6aa47e68295191a33a878b6d0eaea9371c7c5a8945c27b4297029d3952e57da8364a3fcc290cade93ba7fcd7d6e271d56c7d49f4923"; + sha512 = "3a99cccea3afd0e6a637d7da86017b09e256fd894e97c2984ce8a6f2f725a0d45659733bbfe0f7c3c929f81a9b19560c05f6a37c92b3a5b79c4a53ef377cd27f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/my/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/my/firefox-58.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "97e306106f3fd930897e01d773d1abb037d04acd1e99273e40413148053a92aa0ea2a849a70b63e93b084735c6e3371cb0bb3d28e8776873239ed4abadd45434"; + sha512 = "77289a3787604cd16246f1ad3e77cc11161d77c69322afd1b7e36b4ecee4fd33a6ebef77ae83f8a3556bff8925fbb70096fb7f355672e5c444674ac6b968f774"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/nb-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/nb-NO/firefox-58.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "30e1e9087cb174426b64e0debef61a8d092abe4ef2ed9f73736e2f6758817fb0004c2dfaf68549a5e4d8305c2357238a0d9b93e8ae287fae2ac2c9b70f1e68e2"; + sha512 = "37db723abc6ebbaaeb36505912258672cb6ae1d3c018c9bc405253202a902feb9c676fd4e5f89521f89b289ebb4d30804a2859b90949701419ec43401b1ad705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ne-NP/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ne-NP/firefox-58.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "1956450a23d1a033fbe1e0aba248c5f7efc58dfa0ca220b79eb300f3e6f07fb903d4eb3c8177c74cdc06e25834c746e1d8e0168f8dfd4a94c0f93279a965fb69"; + sha512 = "7ee61de40f3d087ea1e76ee5c07e9b564c463856784715d5a0e90b878af18d8f143eb43f83479fe4a7ca27d7c13e50ae17f57f5e436d81fbf3072d9abeda58d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/nl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/nl/firefox-58.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "2b21cf04b56fdd61c6a3bbc59b0a78b7ac92f21920ea2985d448629967b2806767e2b9f1dd3838c1e3e8ed4cdf9f42b6be2d6b2b157e9b39f02275dbb7d99dec"; + sha512 = "c55264c4f362b206ff2e2dfde18d792f6fac4417367d3aee33f2befcdeb993139d84555581219f0849c270546060f1823c4a09db5de0b737634a1339f82171be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/nn-NO/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/nn-NO/firefox-58.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "9aa512910bb5156894b3129e65e61a5e7f0fb8687ecfbddc55b7a8662df0efb400c4ab178e0fb120fa91c7b05e27b7d13c220d2db8974a593d2269360fcac219"; + sha512 = "3e59bb64aea47b7682d031b9a1bb645767694811f1576dbc2dede9de426d8c8938ec90f7bcf0065260e7d75a2f39a619d84172470af16ee7ee9b6eb99706dcaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/or/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/or/firefox-58.0b6.tar.bz2"; locale = "or"; arch = "linux-i686"; - sha512 = "e44a48b70f4ebb32bcc3c3b1ab1485c56b29244f1bfbe2163f382992cb8f03d430cc9f2ea82146f1ae34da024f7e8e3e55eb212573ab6e7331fb04f2eccf0e59"; + sha512 = "ef275fb4ea6c7a8cb19b6b3852c4d02a69f5cbdb0cb6bfdb5590d525cca2e6664e50557f71f8c4ec131486cf00263e4ac874045f9714eb3ac9c8577a12b45a17"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/pa-IN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/pa-IN/firefox-58.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "24157ee8afa4dae5166d0eab7d9c4dba9ecd19dddc8eaaaaa188f9a69c53eface86ecba115361dd5094edcc67b983a230991449f47564438b315940bc0d7f319"; + sha512 = "b96b2c3fbbabe7c4f234267178ee01497abaa7d9160c954e60318d597dc20f1a0161dfd17ce61004e57112195ebcef27e719e45f4f9b2a70301d84c57c273875"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/pl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/pl/firefox-58.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "23c5d762b9a1d643949c0b8686041ca4d6c6e326fa39dde07526dc8736055978e9250240f7bb974c6a536e5e90c85c034dacdf9bdb3f2cd519981a9a4fc42e66"; + sha512 = "d302d414dc998be0394f0245ded0400699bc3607f6e9d12b9474c17be39fd7170ff5b39bfdb31590d665de0378053e47dd358cc04164ea339c072f68e94956d7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/pt-BR/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/pt-BR/firefox-58.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "3960dae122b16ec56b85486f6f731cbbc1a256d2c06234a406bcabfcd3a5dcc5471a9aadbc23f770b056c21bb4f1afe26da357f5c158b1520eb95769c03a95da"; + sha512 = "e805b4db6cb1b4f240dfd11e789c1ed87cf460a54681fb51c750d6e66996562fbe397be219add0786f5e939d39eb45d5f2fd39bcbdb21f8fd299d57a16ce8768"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/pt-PT/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/pt-PT/firefox-58.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "f4f859f021dd4a14fe22f9dc759a408cc7da176f3a3a4a29113b38a07f25eecea7cd06f5004d00500ce77bbc3b7e7bd1c5d6224653180156bcc0e7437947630b"; + sha512 = "63bfc6f242133e5daf352e616d206fdc316864f665bc948c6f33f2ffa82139e78abaeb5fcb7a58ef42f59a2c4a7e17862f4b4118c09d0fb5f41032f93562c4a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/rm/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/rm/firefox-58.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e3b2d2e1dae34e75d79d0682d2bf4ec71345bf6a698c31649ddacaa656d5f7fa8bfef1936db77522ab6f6b9725a0725f70628dc0feffe21e2fef487c3ce850c5"; + sha512 = "e699b335f54f35dd9ccc5324c76655667c9c7c973a2ce8b52ac5f87674726474b6c3f388f0edc672e6eea5e89fd7767da9b74a84912360cc9cd0a8126d769cb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ro/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ro/firefox-58.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "bdc251301aa39063751166bad7da0a2db2e04125f084cef40ecb26d56d8b5a61e7b37d50ca11f13b77faa28c58fb345298ee98ce39f230371afebb71b43de117"; + sha512 = "0f04ed145d56cd33a42f295008a96df1cf2ac0407d89226a35929b4bc56e3529e974f7c849f4c9b08c2d9910bb114d048d61310d322bf3100c56f74998a4f15b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ru/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ru/firefox-58.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "b68d65fdbcea09b5ba36d2632414a11a045c269d109c89c20b242c4907669957cef7417910c1cfdd894bc1d0c599cb4e631e642a652b6070a4f653a9a9eacf50"; + sha512 = "f959bd15ee69e5f831fbcdf8bb25b6deeba40aca63aebec367fd171e6317eb3b862f51dff77587416f228c47f84ab70ef573029e05ff0f0b3a0263f2b66df071"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/si/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/si/firefox-58.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f0235d5825ce1babc3a621def4095469b504315eb7ea56816e15b600d86e591fe58ef2927363b073030bc43a7e0f2ac5c7fcaabe01241cfc71ba3f8e704a1753"; + sha512 = "43bd5d293ccc06bcec92a555f0120330cd769bb0259d1652af7e898306f2c3b6a709e4b085b92edf0ae887aa1b8db8b11cd82465ab455f735ace86e6d82783bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/sk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/sk/firefox-58.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "dc96ad3db3eca386db69acbc192b4fc58e523acf64824952c07535f57ccef5fe60edf1521017c3e4609381f99a6b1df3e4e1411a9e9a6d6e3c6b5bd932c73137"; + sha512 = "61eb156c96ab60b728153a71a3aab253d0cebe1319595b9659f8d6a5bd4dccbf0279adae83b64fbca25a458996699df00b6a249d830c48ed4886ea68eed43cd5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/sl/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/sl/firefox-58.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "1c3a2cb2ad0d8c92ec99cc45167a71a909baf9e0735a0ad597ddc9ec3a2b35ea74966136b06ef43e8543746adb83132dc7ab3e56662ab7077b8ca3ab01071462"; + sha512 = "a5b81b3cbdf734e549faed0091064e054ac6a2838c2d5cce2f28b8d199e555076c683c55e38665f7530853d417916e08da752aaea087672f02be0e62ad88b47a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/son/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/son/firefox-58.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "b6fa7e467d153a44bd9d31283bb5e9fdd900dd866024f33174e5954e7e3a6f4664431b63fbffc7b7c2d3b3f07a23be8945834a2ae463f874d4699b2ce187a687"; + sha512 = "0a2445e4070ce8486cb57ee1f0fe68c76509f84289e1e7ba65ec0f85a417328763888ae89b8f0597958bab460398c1f25bfcc52dd0fdc2bf6dcdaa90e3fa68e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/sq/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/sq/firefox-58.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "33d4e3d8c20017017f1ac4637a07d1d8f4d817c1d56bd30a8bc523378bf2c9d52c6ae7f78ca0e74ceb7261b3e5952098cd163b8cef6c94ffc3415270cfaab60a"; + sha512 = "83197daa3f341d341ee241ab4860bf59df1198af50edede42de281966e03fb3ff64bdc8ef7992e2844de959225394c2273bf5d4d9b05640a95bb5d0376ec3eb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/sr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/sr/firefox-58.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5c54883f49e5c0c3fc8a688b474e821b7c6565f4e2bb410a40e1194d3ac781967bdfbeb969a546c1b31008c4be82145c1f43c7740f056266d2b3683dc6b0c4fd"; + sha512 = "c46d13e8a6ed751a4064cf55e22ac7dd6587a9905fa5cc04561feb2a5947fe5322e32a50786369ed18bedb72f1143bd3cbd81c05fa972f9022d2fa6f5f182d48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/sv-SE/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/sv-SE/firefox-58.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "ee625a78aa5a37f2a0c76da8c0cff643b903b2fdc4df6000113c5813b560ab24aebb13bfc61d58e4a8f50fd0f512411301c6c24eaf482a1d635d199018e725ea"; + sha512 = "d708b18a56b93369898af50d70bd6159cc99585c8736955a86bac15daeb0edb4fdbcbb7b0e3699f30c9366e3738c18143f240c5c5bee53f36297d07e38967299"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ta/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ta/firefox-58.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "2beee0f3c10f5a2f0c24912f0ebf13ee08c560b81ca0360af585f6c093730890efd93ea434bd8c01563215801700dff938fe10f25605f994487b4ec8781d6f88"; + sha512 = "a82b7abfbff2ce3cd9eeb7c7e4f8b95b87ecf0ed8b27552d1fc24e7766d83425ff5623b8779fd98f93857048a0b1cb04aea3b739b72f40d7eb4aefa56be9951d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/te/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/te/firefox-58.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "58374ae9d48b9ef40882b8d62cad2d884b14eeb646b0017d1ea64209a006a5f2efb39e631cd95311c8b0a08f89bc4cc83d37c19c421c1409ce591f68c88dd04a"; + sha512 = "3dee4a7ed27016bd9d73854c257b4d492eb45f1e0d16319014d514b077d7fe614dbeedfd8cc8aacc4105dec648438831046afd081d17a11cb2c9221ab3822f8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/th/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/th/firefox-58.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "11dddd312ef2a5655af3d84b8f213bafa4fcc47fae5e1e70cd6d374857d717035992c47c1df34273821aa85abdc0aa343455a551edad2547d67d50dde7a6bf7c"; + sha512 = "7e890e4e8d476035f6e549e8bf0b77bdfea125fb81d895faca4f5ce4d6e476ea77125731a1759f2e0213cb6e7b526b176370a68968e65dcdcd7617122e67d01f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/tr/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/tr/firefox-58.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "222b67e6e7a56568e0fa680684f0a10e450c2acf7d360adb0cb19575a587c5a8833f032256603454c5ef8cd75e25fefb382d39aab6f94194e8194db2d579384f"; + sha512 = "37c4edf420a67c4fce42be055cfe0014f8e97dae09e97bcc24b0dcb9692e62298ee2565b7cb14d6c35d8eec16507dc42b1f9d9eaaa13ed0f260a59279da71c02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/uk/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/uk/firefox-58.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "61d411e75e2308dbb498e887101e21bc6db95b6d223e2918260cce2ade7289e24ab62ca7c5478cd5efa838b777294297b0163dab5152e1d8ee75a2357c464b11"; + sha512 = "1c383c4da4539e69cec551f0013b02c1c47cf6cf919532103b1cc96aa53a23d61b35b0274bbb756d949904a715d076a42ccef86b4c40abd85c6b475f195f7ecb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/ur/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/ur/firefox-58.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "7993193be699d738ca332b043b3ca8f8baf04180946ee5d6f63ea4201db71d2c512ffdcd480538cc4509139e2850098f4da1a8202f6534f5f4b5c2fc6f6c4194"; + sha512 = "c258fe599841102c4c7242e33e79c02beec2173a01ce917b0e8f8bb9401be5534ca5b6f02b5baca314b4a2e021fb4548a31a4318889d69bc5cb593277db6729d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/uz/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/uz/firefox-58.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "04a1822b47b53845f0b138b864ced275547d981e32501d8d8f723e53bc1cf3c16aa7c53409c3eacb441ca10fd1774e90c6795b5a2ea96648fca92683cf3c8fbd"; + sha512 = "e67afb13a43447c0a37d68d735ce4c57961612e913b088a3280455cd1a92974b3ed0f5bb13c5c0db42c7d3847c74d30a35a0278f3c7a6f6152542680a2df0bfc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/vi/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/vi/firefox-58.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "8748887b0f36ec1cd7b5179d24df0547579d0baf17d27803ad8b8500ce577b9971d13e85654c439b32ed5925002dc887287046f94178fc3ecec8c237b840e1ae"; + sha512 = "632f53ac884441c6e35dfeac415ee1b78c6c43061575c2622be5f05658af42b447358411a9ab04d796ffe882da0879ef51137109c8b7e902d9081bf34d0b6592"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/xh/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/xh/firefox-58.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "373abbc5de8a52c969feb8c0d1ef800f39eb0dff5f13325d3231faea25dd4d69078c13b3c551092e1270417b7b198a001b3a356e5eef23bb0fb79fc2e014c91e"; + sha512 = "a3aafdf99526f0dcbd3b25973a331ce261d74e1b4d8ccb70b2f1d89190636243a68bb751f371efe1eb5915f78c96579197e806642d5acf864a1deaba8e4ade07"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/zh-CN/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/zh-CN/firefox-58.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "a16d35770bbc39a1d30031ce9117276768ba2882f16a3e30c0fed00fd6266db343759fce0b64b13e0384412f79afe317931bf8e45c56ce767ad21a02d453abb5"; + sha512 = "7299f964c36fa3551be35a88f571fd43b5a18530cba4566080b4020f2c21da1617c3ddd8d30c1a35ed6c2680d529f62e1343f16c0e656c22acfc345a3c21446f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b5/linux-i686/zh-TW/firefox-58.0b5.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/58.0b6/linux-i686/zh-TW/firefox-58.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "c87e44b5f4ffee0a6178daaa3ae62716526c20862795f6fa8770c20549dca43b73476a7872cd28cd4b7e4edd3f3f9502e9d30eff9c4cd0f3333bdff9ac55a8c7"; + sha512 = "a33728f6768e439467944bfa06c52df0c6deed5d4626c79fc232fd898d0b4f10333056132df4ee1d36a235a8e76c3f53acc98ee2ebdd9e380695a9fa70ae58b4"; } ]; } From 167e9fbff4e38a7789c7dc43a8f4b717787ebaa0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Nov 2017 18:21:45 +0800 Subject: [PATCH 57/98] xonsh: 0.5.12 -> 0.6.0 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 92433d7ef00f..d22a66eb93ae 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "xonsh-${version}"; - version = "0.5.12"; + version = "0.6.0"; src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = version; - sha256= "1s733ay5vcpcl14x23n0amnddyjfla55irddalvw52vijhd2aljz"; + sha256= "0hfsan22i81wffx2xbamm8wwkxgpv12z4kfl37p9m22vpqgg0fdg"; }; LC_ALL = "en_US.UTF-8"; From 68626f3e0a750a8a40984a1d06a9e252733498b0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Nov 2017 18:31:21 +0800 Subject: [PATCH 58/98] sudo: 1.8.20p2 -> 1.8.21p2 --- pkgs/tools/security/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 1b32ad710071..26311cce73ce 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.20p2"; + name = "sudo-1.8.21p2"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "1na5likm1srnd1g5sjx7b0543sczw0yppacyqsazfdg9b48awhmx"; + sha256 = "0s33szq6q59v5s377l4v6ybsdy7pfq6sz7y364j4x09ssdn79ibl"; }; prePatch = '' From 5ca1c4007e10c50ff86eb173035b8654f30640c8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Nov 2017 18:56:29 +0800 Subject: [PATCH 59/98] libu2f-host: 1.1.1 -> 1.1.4 --- pkgs/development/libraries/libu2f-host/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 48d55f17c579..683682cf8ea2 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, json_c, hidapi }: stdenv.mkDerivation rec { - name = "libu2f-host-1.1.1"; + name = "libu2f-host-1.1.4"; src = fetchurl { url = "https://developers.yubico.com/libu2f-host/Releases/${name}.tar.xz"; - sha256 = "0g0f012w0c00cvj5g319x2b8prbh0d3fcac9960cy7xsd8chckg1"; + sha256 = "0vvs2p3b25cbybccv3f4ridnp7sg5i4hkzx3hx48ldcn1l1fqhv0"; }; nativeBuildInputs = [ pkgconfig ]; From cf6e90c104924ef33111d901cb21d8f1743cd8db Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 26 Nov 2017 15:57:19 +0300 Subject: [PATCH 60/98] nginx: add ModSecurity Nginx Connector (#28545) nginx: add ModSecurity Nginx Connector --- pkgs/servers/http/nginx/modules.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9f0f5ac4bb99..f59d77177568 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -47,6 +47,16 @@ ''; }; + modsecurity-beta = { + src = fetchFromGitHub { + owner = "SpiderLabs"; + repo = "ModSecurity-nginx"; + rev = "abbf2c47f6f3205484a1a9db618e067dce213b89"; + sha256 = "04ar51bnqjca6g4p2irymgdmc8rh5nsi8ml43srm4krllnkvw8qn"; + }; + inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; + }; + echo = { src = fetchFromGitHub { owner = "openresty"; From 41740ec0395059d426a4b3676c45cd886d2249ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 26 Nov 2017 14:15:33 +0000 Subject: [PATCH 61/98] ipmiview: patchelf libiKVM64.so correctly --- pkgs/applications/misc/ipmiview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix index f90784759941..ebc13766cccb 100644 --- a/pkgs/applications/misc/ipmiview/default.nix +++ b/pkgs/applications/misc/ipmiview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc }: +{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc, gcc-unwrapped }: assert stdenv.isLinux; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildPhase = with xorg; '' patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libX11 libXext libXrender libXtst libXi ]}" ./jre/lib/amd64/xawt/libmawt.so - patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so + patchelf --set-rpath "${gcc-unwrapped.lib}/lib" ./libiKVM64.so patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ libXcursor libX11 libXext libXrender libXtst libXi ]}" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java ''; From bb8866cb7dfa5199f9a3337733172b4993eeb1e0 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 26 Nov 2017 22:56:02 +0800 Subject: [PATCH 62/98] qtox: 1.12.1 -> 1.13.0 --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 9cf6f4f2a408..c71eb698417e 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { name = "qtox-${version}"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; rev = "v${version}"; - sha256 = "1l1k8s10jj6nm9i33m8xhjwdhikvp7csdp6x1gxjxdj526aak8q9"; + sha256 = "08x71p23d0sp0w11k8z3wf3k56iclmdq9x652n8ggidgyrdi9f6y"; }; buildInputs = [ From 50ad43bd395465d5d2b5a96862efc4fd1ed29cd8 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 26 Nov 2017 23:31:44 +0800 Subject: [PATCH 63/98] libqmatrixclient: init at 0.1 --- .../libraries/libqmatrixclient/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/libqmatrixclient/default.nix diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix new file mode 100644 index 000000000000..dc4981798bce --- /dev/null +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake +, qtbase }: + +# This doesn't actually do anything really yet as it doesn't support dynamic building +# When it does, quaternion and tensor should use it + +stdenv.mkDerivation rec { + name = "libqmatrixclient-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "libqmatrixclient"; + rev = "v${version}"; + sha256 = "1dlanf0y65zf6n1b1f4jzw04w07sl85wiw01c3yyn2ivp3clr13l"; + }; + + buildInputs = [ qtbase ]; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + installPhase = '' + runHook preInstall + + install -Dm644 -t $out/lib *.a + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description= "A Qt5 library to write cross-platfrom clients for Matrix"; + homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ peterhoeg ]; + hydraPlatforms = [ ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a457769ff3e7..640a5596d9b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -745,6 +745,8 @@ with pkgs; blink = callPackage ../applications/networking/instant-messengers/blink { }; + libqmatrixclient = libsForQt5.callPackage ../development/libraries/libqmatrixclient { }; + quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; From c5717d0dc8cae5939dcca0bb01e1cd16f4522db1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 26 Nov 2017 23:32:01 +0800 Subject: [PATCH 64/98] tensor: documentation regd libqmatrixclient --- .../networking/instant-messengers/tensor/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 0571946061bc..c6b930fc590f 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +# we now have libqmatrixclient so a future version of tensor that supports it +# should use that + stdenv.mkDerivation rec { name = "tensor-git-${version}"; version = "2017-02-21"; From 388c73200132b56404bbbe4ec5c37a9a95c9e1de Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 26 Nov 2017 23:32:18 +0800 Subject: [PATCH 65/98] quaternion: git -> 0.0.4 --- .../instant-messengers/quaternion/default.nix | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 08625d321235..c47075059d29 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,29 +1,29 @@ -{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }: +{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }: -mkDerivation rec { - name = "quaternion-git-${version}"; - version = "2017-10-07"; +stdenv.mkDerivation rec { + name = "quaternion-${version}"; + version = "0.0.4"; - # quaternion and tensor share the same libqmatrixclient library as a git submodule - # - # As all 3 projects are in very early stages, we simply load the submodule. - # - # At some point in the future, we should separate out libqmatrixclient into its own - # derivation. + # libqmatrixclient doesn't support dynamic linking as of 0.1 so we simply pull in the source - src = fetchgit { - url = "https://github.com/QMatrixClient/Quaternion.git"; - rev = "1007f2ca4ad5e8cc5dba437d6a0cdea07d1f1332"; - sha256 = "0hvc81ld7fcwyrxsr2q3yvzh0rzhgmflby4nmyzcbjds7b7pv0xq"; - fetchSubmodules = true; + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "Quaternion"; + rev = "v${version}"; + sha256 = "0an2nvwjs1hf7cb4maaj3rskhgsjgimzazsx53ndxskzwcssidvi"; }; - buildInputs = [ qtbase qtquickcontrols ]; + buildInputs = [ qtbase qtquickcontrols libqmatrixclient ]; + nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-Wno-dev" - ]; + enableParallelBuilding = true; + + # take the source from libqmatrixclient + postPatch = '' + rm -rf lib + ln -s ${libqmatrixclient.src} lib + ''; postInstall = '' substituteInPlace $out/share/applications/quaternion.desktop \ From 2e29a1e4b3343cfee6013093b7f504a785ebd0a6 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 26 Nov 2017 07:32:28 -0800 Subject: [PATCH 66/98] wineUnstable: 2.19 -> 2.21 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 2eb7b722e827..39bd26714e78 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -32,15 +32,15 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "2.19"; + version = "2.21"; url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; - sha256 = "15b0lvs456zjh5wwkhs9wh1ycih12ragk6170hnrrbkmk3k32wa8"; + sha256 = "1vxbnikdpsmca3nx064mqrm83xpjsfshy25mdfxmyg5vrzl09yms"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "16jps0x4srxnpdy3vxygvspz7qpd09i83c6j6kg8vv4qkna2lswi"; + sha256 = "1qznp4kgss4mhk1vvr91jmszsi47xg312r64l76jkgwijhypmvb7"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; From 3fc7f924af237394785976ce93fd7960c2999d77 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Nov 2017 12:07:04 -0500 Subject: [PATCH 67/98] linux-copperhead: 4.14.1.a -> 4.14.2.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index b85fef006973..863b6dcae782 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.14.1"; + version = "4.14.2"; revision = "a"; - sha256 = "0yp05xyz2ygxkhd17s85cqnvi93a49svgm0l1kbyb7y08mg5gp4j"; + sha256 = "0bpkff1phc68shw6spkhd6zbxgjkgvdglym8b2hp383h14845qhb"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 5c936f1f4091992bb237ef19096e8bd519ed016c Mon Sep 17 00:00:00 2001 From: name Date: Sun, 26 Nov 2017 22:47:36 +0300 Subject: [PATCH 68/98] antigen: 2.2.1 -> 2.2.2 --- pkgs/shells/antigen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/antigen/default.nix b/pkgs/shells/antigen/default.nix index b43f2d305701..fc3759803f62 100644 --- a/pkgs/shells/antigen/default.nix +++ b/pkgs/shells/antigen/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.2.1"; + version = "2.2.2"; name = "antigen-${version}"; src = fetchurl { url = "https://github.com/zsh-users/antigen/releases/download/v${version}/antigen.zsh"; - sha256 = "0s32280ak0gd0rr66g5dj6r5px0si8w47bcxlqfpaijg7i8xk1i7"; + sha256 = "0635dvnsqh7dpqdwx5qq3kx7m1cx2038zln6y9ycnbi3i0ilgj9z"; }; + phases = "installPhase"; installPhase = '' outdir=$out/share/antigen - mkdir -p $outdir cp $src $outdir/antigen.zsh ''; From 4e344bb5cec4a8458f7507b8d7908685d5702dc9 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 26 Nov 2017 20:12:23 +0000 Subject: [PATCH 69/98] retroarch: enable parallel building --- pkgs/misc/emulators/retroarch/cores.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index ab1e71380c13..c186b1a2cf18 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -16,7 +16,8 @@ let buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or []; - buildPhase = "make -f Makefile.libretro"; + makefile = "Makefile.libretro"; + installPhase = '' COREDIR="$out/lib/retroarch/cores" mkdir -p $out/bin From 620b93f10a1e7fc3e6441f1eee8e9ca20d9f0c4b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Nov 2017 20:08:53 +0000 Subject: [PATCH 70/98] ocamlPackages.ppx_import: 1.1 -> 1.4 --- pkgs/development/ocaml-modules/ppx_import/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix index 245fe3f76f66..991af1e41de1 100644 --- a/pkgs/development/ocaml-modules/ppx_import/default.nix +++ b/pkgs/development/ocaml-modules/ppx_import/default.nix @@ -4,15 +4,15 @@ buildOcaml rec { name = "ppx_import"; - version = "1.1"; + version = "1.4"; minimumSupportedOcamlVersion = "4.02"; src = fetchFromGitHub { - owner = "whitequark"; + owner = "ocaml-ppx"; repo = "ppx_import"; rev = "v${version}"; - sha256 = "1hfvbc81dg58q7kkpn808b3j0xazrqfrr4v71sd1yvmnk71wak6k"; + sha256 = "14c2lp7r9080c4hsb1y1drbxxx3v44b7ib5wfh3kkh3f1jfsjwbk"; }; buildInputs = [ cppo ounit ppx_deriving opam ]; @@ -29,4 +29,4 @@ buildOcaml rec { description = "A syntax extension that allows to pull in types or signatures from other compiled interface files"; license = licenses.mit; }; -} \ No newline at end of file +} From 3cb310a231c28d6896bfa9708862a2b6059efb87 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Nov 2017 17:21:06 -0500 Subject: [PATCH 71/98] sbt: 1.0.3 -> 1.0.4 --- pkgs/development/tools/build-managers/sbt/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 4dacfd0568ac..abfa578f3879 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, jre, bc }: +{ stdenv, fetchurl, jre }: stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { urls = [ @@ -10,14 +10,11 @@ stdenv.mkDerivation rec { "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" "https://cocl.us/sbt-${version}.tgz" ]; - sha256 = "041cv25gxqsi3rlglw5d8aqgdzb6y5ak3f52dwqvzrrj854vyx13"; + sha256 = "0gz2akifi842y8av2hh7w2z6fd6z400nvk8ip87rkyhx3gw7cdw1"; }; patchPhase = '' echo -java-home ${jre.home} >>conf/sbtopts - - substituteInPlace bin/sbt-launch-lib.bash \ - --replace "| bc)" "| ${bc}/bin/bc)" ''; installPhase = '' @@ -30,7 +27,7 @@ stdenv.mkDerivation rec { homepage = http://www.scala-sbt.org/; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; - maintainers = with maintainers; [ rickynils ]; + maintainers = with maintainers; [ nequissimus rickynils ]; platforms = platforms.unix; }; } From 346cfb8a59d4b1586f83c32756e144c9cd9fbc0c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 26 Nov 2017 22:30:21 +0000 Subject: [PATCH 72/98] qt5ct: 0.33 -> 0.34 --- pkgs/tools/misc/qt5ct/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 9da2ebc07fc0..e8170edb7f22 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -4,24 +4,27 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "qt5ct-${version}"; - version = "0.33"; + version = "0.34"; src = fetchurl { - url = "mirror://sourceforge/qt5ct/qt5ct-${version}.tar.bz2"; - sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f"; + url = "mirror://sourceforge/qt5ct/${name}.tar.bz2"; + sha256 = "0aqbilz7acx077zg5rwf2909xabw16047yjdn9nx2gmhp31y00pl"; }; - propagatedBuildInputs = [ qtbase qtsvg qttools ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ qtbase qtsvg ]; + buildInputs = [ qtbase ]; - qmakeFlags = [ ''LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease'' ]; + qmakeFlags = [ + "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" + ]; preConfigure = '' - qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix" + qmakeFlags+=" PLUGINDIR=$out/$qtPluginPrefix" ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Qt5 Configuration Tool"; homepage = https://www.opendesktop.org/content/show.php?content=168066; From 77a3331a10daa985452a65c4313730c743c184ef Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 24 Nov 2017 12:12:47 +0000 Subject: [PATCH 73/98] cloudfoundry-cli: init at 6.32.0 --- .../tools/cloudfoundry-cli/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/cloudfoundry-cli/default.nix diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix new file mode 100644 index 000000000000..fc085b3e5ea5 --- /dev/null +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -0,0 +1,36 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, go }: + +buildGoPackage rec { + name = "cloudfoundry-cli-${version}"; + version = "6.32.0"; + + goPackagePath = "code.cloudfoundry.org/cli"; + + subPackages = [ "." ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "cloudfoundry-attic"; + repo = "cli-with-i18n"; + sha256 = "16r8zvahn4b98krmyb8zq9370i6572dhz88bfxb3fnddcv6zy1ng"; + }; + + outputs = [ "out" ]; + + buildFlagsArray = '' + -ldflags= -X ${goPackagePath}/version.binaryVersion=${version} + ''; + + installPhase = '' + install -Dm555 go/bin/cli "$out/bin/cf" + remove-references-to -t ${go} "$out/bin/cf" + install -Dm444 -t "$out/share/bash-completion/completions/" "$src/ci/installers/completion/cf" + ''; + + meta = with stdenv.lib; { + description = "The official command line client for Cloud Foundry"; + homepage = https://github.com/cloudfoundry/cli; + maintainers = with maintainers; [ ris ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a457769ff3e7..a039a3b10749 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7089,6 +7089,8 @@ with pkgs; "cl-launch" = callPackage ../development/tools/misc/cl-launch {}; + cloudfoundry-cli = callPackage ../development/tools/cloudfoundry-cli { }; + coan = callPackage ../development/tools/analysis/coan { }; compile-daemon = callPackage ../development/tools/compile-daemon { }; From 6a23fb10a99217028f406e3a1b46037bde7c76f9 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sun, 26 Nov 2017 23:27:59 +0000 Subject: [PATCH 74/98] otfcc: disable aarch64 It explicitly targets either x86 or amd64. --- pkgs/tools/misc/otfcc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index 1384e09410df..00ddd12d3cfb 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Optimized OpenType builder and inspector"; homepage = https://github.com/caryll/otfcc; license = licenses.asl20; - platforms = platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ttuegel ]; }; From 167a7c2ea34b70c1c8555379ea2bb488ed4df15e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 27 Nov 2017 00:45:33 +0100 Subject: [PATCH 75/98] oneko: set correct meta.platforms --- pkgs/applications/misc/oneko/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/oneko/default.nix b/pkgs/applications/misc/oneko/default.nix index 39c9cc0afc4a..a3770715532f 100644 --- a/pkgs/applications/misc/oneko/default.nix +++ b/pkgs/applications/misc/oneko/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = "http://www.daidouji.com/oneko/"; license = licenses.publicDomain; maintainers = [ maintainers.xaverdh ]; - meta.platforms = platforms.unix; + meta.platforms = platforms.linux; }; } From a160fef26dff3a8f3efcd7333bbbd039ee041b5e Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 27 Nov 2017 00:07:53 +0000 Subject: [PATCH 76/98] otfcc: enable darwin --- pkgs/tools/misc/otfcc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index 00ddd12d3cfb..f55f4e53296d 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -26,11 +26,13 @@ stdenv.mkDerivation rec { cp bin/release-x*/otfcc* $out/bin/ ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Optimized OpenType builder and inspector"; homepage = https://github.com/caryll/otfcc; license = licenses.asl20; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jfrankenau ttuegel ]; }; From 7adc86753a1b9ebe235653135415b86092b9c477 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 27 Nov 2017 00:44:09 +0000 Subject: [PATCH 77/98] ttfautohint: 1.6 -> 1.7, Qt 4 -> Qt 5, support darwin --- pkgs/tools/misc/ttfautohint/default.nix | 21 ++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index c302bd15c41e..70320e9dbab8 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,16 +1,23 @@ -{ stdenv, fetchurl, harfbuzz, pkgconfig, qt4 }: +{ stdenv, fetchurl, pkgconfig, freetype, harfbuzz, qtbase }: stdenv.mkDerivation rec { - version = "1.6"; + version = "1.7"; name = "ttfautohint-${version}"; - + src = fetchurl { url = "mirror://savannah/freetype/${name}.tar.gz"; - sha256 = "1r8vsznvh89ay35angxp3w1xljxjlpcv9wdjyn7m61n323vi6474"; + sha256 = "1wh783pyg79ks5qbni61x7qngdhyfc33swrkcl5r1czdwhhlif9x"; }; - + + postPatch = '' + substituteInPlace configure --replace "macx-g++" "macx-clang" + ''; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ harfbuzz qt4 ]; + + buildInputs = [ freetype harfbuzz qtbase ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "An automatic hinter for TrueType fonts"; @@ -23,7 +30,7 @@ stdenv.mkDerivation rec { homepage = https://www.freetype.org/ttfautohint; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) maintainers = with maintainers; [ goibhniu ndowens ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 07518d70b573..b6123e914220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4807,7 +4807,7 @@ with pkgs; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; - ttfautohint = callPackage ../tools/misc/ttfautohint { }; + ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; tty-clock = callPackage ../tools/misc/tty-clock { }; From 37056c3724aaf1602bfff9cf138c65b2cb657263 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 27 Nov 2017 00:48:43 +0000 Subject: [PATCH 78/98] iosevka: enable parallel building --- pkgs/data/fonts/iosevka/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index d6d00227ad63..9d8843e75a91 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -70,13 +70,7 @@ stdenv.mkDerivation { runHook postConfigure ''; - buildPhase = '' - runHook preBuild - - ${if custom then ''make custom set=${set}'' else ''make''} - - runHook postBuild - ''; + makeFlags = lib.optionals custom [ "custom" "set=${set}" ]; installPhase = '' runHook preInstall @@ -88,6 +82,8 @@ stdenv.mkDerivation { runHook postInstall ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://be5invis.github.io/Iosevka/; downloadPage = "https://github.com/be5invis/Iosevka/releases"; From ca5e5708c82ac03f92257b9c04a5c8643f091aa0 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 27 Nov 2017 01:01:00 +0000 Subject: [PATCH 79/98] ttfautohint-nox: init at 1.7 This is ttfautohint without ttfautohintGUI and dependence on Qt. --- pkgs/tools/misc/ttfautohint/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index 70320e9dbab8..5dcaea3ec1ea 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freetype, harfbuzz, qtbase }: +{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, libiconv, qtbase, enableGUI ? true }: stdenv.mkDerivation rec { version = "1.7"; @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz qtbase ]; + buildInputs = [ freetype harfbuzz libiconv ] ++ lib.optional enableGUI qtbase; + + configureFlags = lib.optional (!enableGUI) "--with-qt=no"; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6123e914220..682fd7da158a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4808,6 +4808,7 @@ with pkgs; ttf2pt1 = callPackage ../tools/misc/ttf2pt1 { }; ttfautohint = libsForQt5.callPackage ../tools/misc/ttfautohint { }; + ttfautohint-nox = ttfautohint.override { enableGUI = false; }; tty-clock = callPackage ../tools/misc/tty-clock { }; From f557844c082fd1b590be3eebec2a3a84acf6973c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 27 Nov 2017 01:01:54 +0000 Subject: [PATCH 80/98] iosevka: do not depend on Qt to build --- pkgs/data/fonts/iosevka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index 9d8843e75a91..bf36d23e5c2f 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchFromGitHub, fetchurl, runCommand, writeText, - nodejs, ttfautohint, otfcc, + nodejs, ttfautohint-nox, otfcc, # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style @@ -51,7 +51,7 @@ in stdenv.mkDerivation { inherit name pname version src; - nativeBuildInputs = [ nodejs ttfautohint otfcc ]; + nativeBuildInputs = [ nodejs ttfautohint-nox otfcc ]; passAsFile = [ "installPackageLock" ]; installPackageLock = installPackageLock ./package-lock.json; From 64413dec3e20029229a208d400b19c1776a0c925 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Nov 2017 04:59:23 +0000 Subject: [PATCH 81/98] ocamlPackages.ppx_deriving_yojson: 3.0 -> 3.1 --- .../ocaml-modules/ppx_deriving_yojson/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index 5874f5eb884c..10f9df04f38c 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ppx_deriving_yojson-${version}"; - version = "3.0"; + version = "3.1"; src = fetchFromGitHub { - owner = "whitequark"; + owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; rev = "v${version}"; - sha256 = "1id1a29qq0ax9qp98b5hv6p2q2r0vp4fbkkwzm1bxdhnasw97msk"; + sha256 = "1pwfnq7z60nchba4gnf58918ll11w3gj5i88qhz1p2jm45hxqgnw"; }; buildInputs = [ ocaml findlib ocamlbuild opam cppo ounit ppx_import ]; @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; - broken = stdenv.lib.versionAtLeast ocaml.version "4.05"; }; } From 45e41b75f7a3e88d2af2096f9499486f0fc8dffd Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 26 Nov 2017 19:57:56 -0800 Subject: [PATCH 82/98] stm32flash: 1.0 -> 0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This version is newer. 1.0 was given as a placeholder, I presume, because that sourcetree wasn't versioned. [Bjørn: extend commit message.] --- pkgs/development/tools/misc/stm32flash/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index f81b327d8428..014615d5b016 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "stm32flash-1.0"; + name = "stm32flash-0.5"; src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/stm32flash/stm32flash.tar.gz"; - sha256 = "04k631g9lzvp9xr4sw51xpq1g542np61s1l8fpwx9rbsc8m5l0i6"; + url = mirror://sourceforge/stm32flash/stm32flash-0.5.tar.gz; + sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; buildFlags = [ "CC=cc" ]; @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = https://sourceforge.net/projects/stm32flash/; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms - maintainers = [ maintainers.the-kenny ]; + maintainers = with maintainers; [ the-kenny elitak ]; }; } From 40e08aa870a5162dfe70100767f60e6d9371af18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 27 Nov 2017 08:02:01 +0100 Subject: [PATCH 83/98] stm32flash: use ${name} in fetchurl to keep DRY --- pkgs/development/tools/misc/stm32flash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 014615d5b016..3da98f38ebc7 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, unzip }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "stm32flash-0.5"; src = fetchurl { - url = mirror://sourceforge/stm32flash/stm32flash-0.5.tar.gz; + url = "mirror://sourceforge/stm32flash/${name}.tar.gz"; sha256 = "01p396daqw3zh6nijffbfbwyqza33bi2k4q3m5yjzs02xwi99alp"; }; From 63428868afb950044173fdfb70e3f56888a95f3f Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Mon, 27 Nov 2017 01:39:29 -0600 Subject: [PATCH 84/98] microsoft_gsl: fix crossSystem build support cmake needs to be part of nativeBuildInputs, otherwise you get a very unhelpful debugging trace. Signed-off-by: Austin Seipp --- .../libraries/microsoft_gsl/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/microsoft_gsl/default.nix b/pkgs/development/libraries/microsoft_gsl/default.nix index b419eccfe794..1c10bd6f8fcd 100644 --- a/pkgs/development/libraries/microsoft_gsl/default.nix +++ b/pkgs/development/libraries/microsoft_gsl/default.nix @@ -1,5 +1,10 @@ -{ stdenv, fetchgit, cmake }: +{ stdenv, fetchgit, cmake +, hostPlatform, buildPlatform +}: +let + nativeBuild = hostPlatform == buildPlatform; +in stdenv.mkDerivation rec { name = "microsoft_gsl-${version}"; version = "2017-02-13"; @@ -10,8 +15,11 @@ stdenv.mkDerivation rec { sha256 = "03d17mnx6n175aakin313308q14wzvaa9pd0m1yfk6ckhha4qf35"; }; - # build phase just runs the unit tests - buildInputs = [ cmake ]; + + # build phase just runs the unit tests, so skip it if + # we're doing a cross build + nativeBuildInputs = [ cmake ]; + buildPhase = if nativeBuild then "make" else "true"; installPhase = '' mkdir -p $out/include @@ -20,9 +28,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Functions and types that are suggested for use by the C++ Core Guidelines"; - homepage = https://github.com/Microsoft/GSL; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ xwvvvvwx ]; + homepage = https://github.com/Microsoft/GSL; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice xwvvvvwx ]; }; } From 80c5cf80f2fde7b7cb96470a1ea456aa704c6391 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 27 Nov 2017 15:49:38 +0800 Subject: [PATCH 85/98] pulseaudio/nixos: set it as default for openal/libao if enabled (#32078) - /var/run -> /run as the former is deprecated - configure openal to use pulseaudio if pulseaudio is enabled - configure libao to use pulseaudio if pulseaudio is enabled --- nixos/modules/config/pulseaudio.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 8b9c3570476a..c99716b9f3c8 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -45,7 +45,7 @@ let uid = ids.uids.pulseaudio; gid = ids.gids.pulseaudio; - stateDir = "/var/run/pulse"; + stateDir = "/run/pulse"; # Create pulse/client.conf even if PulseAudio is disabled so # that we can disable the autospawn feature in programs that @@ -219,6 +219,12 @@ in { { target = "pulse/daemon.conf"; source = writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); } + + { target = "openal/alsoft.conf"; + source = writeText "alsoft.conf" "drivers=pulse"; } + + { target = "libao.conf"; + source = writeText "libao.conf" "default_driver=pulse"; } ]; # Allow PulseAudio to get realtime priority using rtkit. From 33b5995442453af9ae8c7263c3552241e5286b5b Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Mon, 27 Nov 2017 08:55:09 +0100 Subject: [PATCH 86/98] restic: 0.7.1 -> 0.8.0 --- pkgs/tools/backup/restic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index bc5755628d28..cad43773e16c 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "restic-${version}"; - version = "0.7.1"; + version = "0.8.0"; goPackagePath = "github.com/restic/restic"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "restic"; repo = "restic"; rev = "v${version}"; - sha256 = "07614wp0b6kjl8lq3qir271g0s2h8wvpdh43wsz1k6bip60nmqbf"; + sha256 = "10r2p4mkspkkzmj41jskqii02qkliwz2zfhvsabkg8clr8lzfkv9"; }; buildPhase = '' From a6e87b5c3d10c867701487eec459ac2c5b008aab Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Nov 2017 17:20:43 +0800 Subject: [PATCH 87/98] exim: Fix for CVE-2017-16943 RCE vuln --- pkgs/servers/mail/exim/cve-2017-16943.patch | 39 +++++++++++++++++++++ pkgs/servers/mail/exim/default.nix | 1 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/servers/mail/exim/cve-2017-16943.patch diff --git a/pkgs/servers/mail/exim/cve-2017-16943.patch b/pkgs/servers/mail/exim/cve-2017-16943.patch new file mode 100644 index 000000000000..69ce9150723c --- /dev/null +++ b/pkgs/servers/mail/exim/cve-2017-16943.patch @@ -0,0 +1,39 @@ +From 4e6ae6235c68de243b1c2419027472d7659aa2b4 Mon Sep 17 00:00:00 2001 +From: Jeremy Harris +Date: Fri, 24 Nov 2017 20:22:33 +0000 +Subject: [PATCH] Avoid release of store if there have been later allocations. + Bug 2199 + +--- + src/receive.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/receive.c b/src/receive.c +index e7e518a..d9b5001 100644 +--- a/src/receive.c ++++ b/src/receive.c +@@ -1810,8 +1810,8 @@ for (;;) + (and sometimes lunatic messages can have ones that are 100s of K long) we + call store_release() for strings that have been copied - if the string is at + the start of a block (and therefore the only thing in it, because we aren't +- doing any other gets), the block gets freed. We can only do this because we +- know there are no other calls to store_get() going on. */ ++ doing any other gets), the block gets freed. We can only do this release if ++ there were no allocations since the once that we want to free. */ + + if (ptr >= header_size - 4) + { +@@ -1820,9 +1820,10 @@ for (;;) + header_size *= 2; + if (!store_extend(next->text, oldsize, header_size)) + { ++ BOOL release_ok = store_last_get[store_pool] == next->text; + uschar *newtext = store_get(header_size); + memcpy(newtext, next->text, ptr); +- store_release(next->text); ++ if (release_ok) store_release(next->text); + next->text = newtext; + } + } +-- +1.9.1 diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index b4cec18d030e..79623247e3f8 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { url = "https://anonscm.debian.org/git/pkg-exim4/exim4.git/plain/debian/patches/79_CVE-2017-1000369.patch?h=4.89-2%2bdeb9u1"; sha256 = "0v46zywgkv1rdqhybqqrd0rwkdaj6q1f4x0a3vm9p0wz8vad3023"; }) + ./cve-2017-16943.patch ]; nativeBuildInputs = [ pkgconfig ]; From cd3bdc9102fdf2ad33d65022c4cd8edcb6cee465 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 27 Nov 2017 09:34:23 +0000 Subject: [PATCH 88/98] cheat: 2.2.1 -> 2.2.2 --- pkgs/applications/misc/cheat/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index a46485c5ef73..4ef1adb8e6cc 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,20 +1,26 @@ -{ stdenv, python3Packages, fetchurl }: +{ stdenv, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "cheat"; - version = "2.2.1"; + version = "2.2.2"; - propagatedBuildInputs = with python3Packages; [ docopt pygments ]; + propagatedBuildInputs = [ docopt pygments ]; - src = fetchPypi { - inherit pname version; - sha256 = "0w4k1h02p2gjv5wcr1c7r0ynb7v50qajx4hpyxz0ndh96f6x30pl"; + src = fetchFromGitHub { + owner = "chrisallenlane"; + repo = "cheat"; + rev = version; + sha256 = "1da4m4n6nivjakpll6jj0aszrv24g2zax74034lzpv3pbh84fvas"; }; # no tests available doCheck = false; + postInstall = '' + install -D man1/cheat.1.gz $out/share/man/man1/cheat.1.gz + ''; + meta = with stdenv.lib; { description = "cheat allows you to create and view interactive cheatsheets on the command-line"; maintainers = with maintainers; [ mic92 ]; From d0f3035e4800141594770ac79994eec58084d5e9 Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 27 Nov 2017 09:35:17 +0000 Subject: [PATCH 89/98] iozone: 3.434 -> 3.471 --- pkgs/development/tools/misc/iozone/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 4bcf5f1599a6..0bbab096c73f 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { - name = "iozone-3.434"; + name = "iozone-3.471"; src = fetchurl { - url = http://www.iozone.org/src/current/iozone3_434.tar; - sha256 = "0aj63mlb91aivz3z71zn8nbwci1pi18qk8zc65dm19cknffqsf1c"; + url = http://www.iozone.org/src/current/iozone3_471.tar; + sha256 = "0w63b3d4ws1sm52lpdd08sl7n4ay438dl3wy0q9la12iq81rglid"; }; license = fetchurl { From 9216f5fc56cb5305bf74b4597f0f06de3c40d412 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 27 Nov 2017 12:44:18 +0300 Subject: [PATCH 90/98] zsh-command-time: init at 2017-05-09 (#32083) --- pkgs/shells/zsh-command-time/default.nix | 31 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/shells/zsh-command-time/default.nix diff --git a/pkgs/shells/zsh-command-time/default.nix b/pkgs/shells/zsh-command-time/default.nix new file mode 100644 index 000000000000..453a57744071 --- /dev/null +++ b/pkgs/shells/zsh-command-time/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +# To make use of this plugin, need to add +# programs.zsh.interactiveShellInit = '' +# source ${pkgs.zsh-command-time}/share/zsh-command-time/command-time.plugin.zsh +# ZSH_COMMAND_TIME_MIN_SECONDS=3 +# ZSH_COMMAND_TIME_ECHO=1 +# ''; + +stdenv.mkDerivation rec { + version = "2017-05-09"; + name = "zsh-command-time-${version}"; + + src = fetchFromGitHub { + owner = "popstas"; + repo = "zsh-command-time"; + rev = "2111361cbc88c542c834fbab7802ae5ae8339824"; + sha256 = "0hr9c7196wy9cg7vkmknszr2h446yvg9pqrq0rf3213kz074dhpg"; + }; + + installPhase = '' + install -D $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time + ''; + + meta = with stdenv.lib; { + description = "Plugin that output time: xx after long commands"; + homepage = https://github.com/popstas/zsh-command-time; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 682fd7da158a..bc4c0d62faeb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5345,6 +5345,8 @@ with pkgs; zsh-powerlevel9k = callPackage ../shells/zsh-powerlevel9k { }; + zsh-command-time = callPackage ../shells/zsh-command-time { }; + zstd = callPackage ../tools/compression/zstd { }; zstdmt = callPackage ../tools/compression/zstdmt { }; From 9fc1bf7d3c493678dd1795f024c9d6a62b1710b7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 27 Nov 2017 09:25:51 +0200 Subject: [PATCH 91/98] hubstaff: Fix quoting for older Nix versions Issue #31179. --- pkgs/applications/misc/hubstaff/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index 91cf494d2574..bdbde47a33a0 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { # MojoSetups have a ZIP file at the end. ZIP’s magic string is # most often PK\x03\x04. This *should* work for future updates, # but feel free to come up with something more reasonable. - dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text $'PK\x03\x04' $curSrc | cut -d: -f1) + dataZipOffset=$(grep --max-count=1 --byte-offset --only-matching --text ''$'PK\x03\x04' $curSrc | cut -d: -f1) dd bs=$dataZipOffset skip=1 if=$curSrc of=data.zip 2>/dev/null unzip -q data.zip "data/*" rm data.zip From cb008da16755d1de08e930461eb8be742a3daabf Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 27 Nov 2017 10:05:13 +0200 Subject: [PATCH 92/98] owncloud: Don't build during evaluation Issue #29774 --- nixos/modules/services/web-servers/apache-httpd/owncloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index d689e9dd8e4c..cfddab2f5047 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -377,7 +377,7 @@ rec { ''} - ${builtins.readFile "${config.package}/.htaccess"} + Include ${config.package}/.htaccess ''; From dc5cd7800a004b9c58d0cdd5482d6980e3e47205 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 27 Nov 2017 10:14:17 +0200 Subject: [PATCH 93/98] tests/initrd-network-ssh: Don't build during evaluation Issue #29774 --- nixos/release.nix | 2 +- .../default.nix} | 25 +++------ nixos/tests/initrd-network-ssh/dropbear.priv | Bin 0 -> 1573 bytes nixos/tests/initrd-network-ssh/dropbear.pub | 1 + .../initrd-network-ssh/generate-keys.nix | 12 +++++ nixos/tests/initrd-network-ssh/openssh.priv | 51 ++++++++++++++++++ nixos/tests/initrd-network-ssh/openssh.pub | 1 + 7 files changed, 72 insertions(+), 20 deletions(-) rename nixos/tests/{initrd-network-ssh.nix => initrd-network-ssh/default.nix} (69%) create mode 100644 nixos/tests/initrd-network-ssh/dropbear.priv create mode 100644 nixos/tests/initrd-network-ssh/dropbear.pub create mode 100644 nixos/tests/initrd-network-ssh/generate-keys.nix create mode 100644 nixos/tests/initrd-network-ssh/openssh.priv create mode 100644 nixos/tests/initrd-network-ssh/openssh.pub diff --git a/nixos/release.nix b/nixos/release.nix index 6eb896106a14..ac4dd3d78923 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -263,7 +263,7 @@ in rec { tests.hibernate = callTest tests/hibernate.nix {}; tests.hound = callTest tests/hound.nix {}; tests.i3wm = callTest tests/i3wm.nix {}; - tests.initrd-network-ssh = callTest tests/initrd-network-ssh.nix {}; + tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; tests.installer = callSubTests tests/installer.nix {}; tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; diff --git a/nixos/tests/initrd-network-ssh.nix b/nixos/tests/initrd-network-ssh/default.nix similarity index 69% rename from nixos/tests/initrd-network-ssh.nix rename to nixos/tests/initrd-network-ssh/default.nix index 596610493921..9d476cb1a967 100644 --- a/nixos/tests/initrd-network-ssh.nix +++ b/nixos/tests/initrd-network-ssh/default.nix @@ -1,19 +1,6 @@ -import ./make-test.nix ({ pkgs, lib, ... }: +import ../make-test.nix ({ pkgs, lib, ... }: -let - keys = pkgs.runCommand "gen-keys" { - outputs = [ "out" "dbPub" "dbPriv" "sshPub" "sshPriv" ]; - buildInputs = with pkgs; [ dropbear openssh ]; - } - '' - touch $out - dropbearkey -t rsa -f $dbPriv -s 4096 | sed -n 2p > $dbPub - ssh-keygen -q -t rsa -b 4096 -N "" -f client - mv client $sshPriv - mv client.pub $sshPub - ''; - -in { +{ name = "initrd-network-ssh"; meta = with lib.maintainers; { maintainers = [ willibutz ]; @@ -32,9 +19,9 @@ in { enable = true; ssh = { enable = true; - authorizedKeys = [ "${readFile keys.sshPub}" ]; + authorizedKeys = [ "${readFile ./openssh.pub}" ]; port = 22; - hostRSAKey = keys.dbPriv; + hostRSAKey = ./dropbear.priv; }; }; boot.initrd.preLVMCommands = '' @@ -56,7 +43,7 @@ in { "${toString (head (splitString " " ( toString (elemAt (splitString "\n" config.networking.extraHosts) 2) )))} " - "${readFile keys.dbPub}" + "${readFile ./dropbear.pub}" ]; }; }; @@ -65,7 +52,7 @@ in { testScript = '' startAll; $client->waitForUnit("network.target"); - $client->copyFileFromHost("${keys.sshPriv}","/etc/sshKey"); + $client->copyFileFromHost("${./openssh.priv}","/etc/sshKey"); $client->succeed("chmod 0600 /etc/sshKey"); $client->waitUntilSucceeds("ping -c 1 server"); $client->succeed("ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'"); diff --git a/nixos/tests/initrd-network-ssh/dropbear.priv b/nixos/tests/initrd-network-ssh/dropbear.priv new file mode 100644 index 0000000000000000000000000000000000000000..af340535f0a3841d2b9ed2abbd60f64118f924da GIT binary patch literal 1573 zcmV+=2HN=m000Mbb7(Dcb724g00RL40RR930RXcnL#K$aebmZN3(knvZScUCfOFxd zd$z#2qR3PC5`6qIPm@mU$HJ#W?)Qio468$2%Rj+*G;J^y4d4Y9M@WyU0S4)WnF7L0 zzC5dCF${&(EkDHk03eU5yITkXgSYUTg=3$L`)N#p$H5;*FS-3BGI@zw+&|?NhzyII zcn_j}$>e?{@F}!0KOr7Si!)X3W;A8W7h@sot>{SB)YuS8qhDRwsV)u(5mvx=wLo}L zG|!_R7XVGTB9bs8@LYvH((iNUQdZe6g$XS}UHS$uGciOQSFffsvghb9TnW)W5oiJ&$kP+*9Q3SqjekH$mS)$XFtl7~$A|N$py2}lI5Z}x z5KeRAQ;tgEInhZa>DXuD4fv1%tv(&4zzRt26&}31wSs1lbq2?^Is%OfQEIgqNUxCM zl}7gc?n4MEg^|}xQOM?Etl4$7&9}Gc@F7$!@1|}bsq^bhgNBh!pxOL+J>GDy7*10^ zY^e~&-!G}rRIArII9H0f_0 z;v)&KDwH~E$;#Bd%8{sPV^p^`6h8ee#) zGlK;LR4J(w1L#kSpwCerId}`%Hi-ZL0st~pCVFc*0kDL@9u)v~6yBVSGbY;3byUjX zo2+4iIBaS_#1$h4`?_FR0!jg{m*|N736MCRw?nZ_NZ*w%L<&o3bOUG@yAOU`CfQD5 z7#(MSlD(#G5bqStCgT+4_weP2(+8TWE? z;qB4RIJM4>RgZfX4}hmnh!lAUK}dBMrcE@k3! zGL8U8X;$7fN^%2mxw}z0JN0k>)S1>`9h`oiMd)HR03kIrvfkNfw1dUC!no~@Ny%4C zrlTOfGL{J-iM7&=VpVXudt_+j%?m1OdpYtS>z@?k0RRT47R7ZzB>jc(A^UOD=WUb% zPsY)lY-aR>SK#O7JY&o8uD}8m&X7L{-2E8`Kp04e6+neP1>LVQB;6;vvj!GqTaL1X z(X>+_%VptHLYWU#F_y3p**zUnZO6b{N5~ER%IK73f)J=BO!$N~z^u|v%-b&3;@}wM zQR#YSO}zuwV0R4HKV=v7IVQ-V*Co1LdCP8QFHvtfWV4kM@Yj$TGIq{7WUY<8Q$H!T zY0|Zxg=>e04$zyel=vhph{Mwgk3WK8nU~DRde0Szu4q~YQAW^yIHXDF^?$x_Gl137 zBk8tMe3Mssqk^H1ASJ@wpxpof0RaHP3tjWYg~d2QdVgD;v{**-_IN6(Ek&-zW`aOQ z0Mw7ig&Sy>pssq(QyuUqpV^p-4S+HVb*Wh-eO-U`$U8^D{JYg;!@I<#QL4*r`fC(1 zyOzf#+87sJEvo)AHg|WIvo9aK!-GC1EE}{pUre2x<(E&*x(>T`P}Xt2bfZ{)t1o;ZZs*Z>@xP`AK!BL8w)wT z&Md&L+H8W;bbn-%LY(co7zQtbk_r*QQR)k-P_RKQjw3-gMi$DX XMOa`*T*f~{ulRWX823)RAw_1#a`g2^ literal 0 HcmV?d00001 diff --git a/nixos/tests/initrd-network-ssh/dropbear.pub b/nixos/tests/initrd-network-ssh/dropbear.pub new file mode 100644 index 000000000000..385c625522aa --- /dev/null +++ b/nixos/tests/initrd-network-ssh/dropbear.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzJ0OniLB91MpPC86I1m3wwJeAc+Gme7bAuaLIU/cSfPwxT5NO7MfCp0Pu94gYDKtDXMs/wXg0bTAVDeAFFkdIj6kBBumEmQLCTL48q2UxDIXVLT/E/AAgj6q7WwgCg7fwm4Vjn4z7aUyBx8EfRy+5/SQyeYla3D/lFYgMi5x4D6J+yeR+JPAptDE/IR5IizNV7mY0ZcoXYyHrrehI1tTYEEqjX13ZqS4OCBFWwHe1QHhRNM+jHhcATbgikjAj8FyFPtLvc+dSVtkuhQktQl36Bi8zMUQcV6+mM7Ln6DBcDlM9urHKLYPTWmUAyhxM955iglOn5z0RaAIcyNMT6hz0rHaNf0BIlmbXoTC0XGjHh/OnoOEC/zg0JqgQTnPiU45K4TnRSSXp2GfiDfiQAK0+HaXACkjuFR68u7WCZpB1Bse1OgKNClFqtRhIr5DilUb2/e5DCCmFkddMUcjmYqzZdbXNt7fo8CFULe+mbiCp8+tMg4aRTaDZ/Hk93nCvGE5TP2ypEMbfL6nRVKvXOjhdvSQQgKwx+O003FDEHCSG0Bpageh7yVpna+SPrbGklce7MjTpbx3iIwmvKpQ6asnK1L3KkahpY1S3NhQ+/S3Gs8KWQ5LAU+d3xiPX3jfIVHsCIIyxHDbwcJvxM4MFBFQpqRMD6E+LoM9RHjl4C9k2iQ== tmtynkky@duuni diff --git a/nixos/tests/initrd-network-ssh/generate-keys.nix b/nixos/tests/initrd-network-ssh/generate-keys.nix new file mode 100644 index 000000000000..0183e12d7a88 --- /dev/null +++ b/nixos/tests/initrd-network-ssh/generate-keys.nix @@ -0,0 +1,12 @@ +with import ../../.. {}; + +runCommand "gen-keys" { + buildInputs = [ dropbear openssh ]; + } + '' + mkdir $out + dropbearkey -t rsa -f $out/dropbear.priv -s 4096 | sed -n 2p > $out/dropbear.pub + ssh-keygen -q -t rsa -b 4096 -N "" -f client + mv client $out/openssh.priv + mv client.pub $out/openssh.pub + '' diff --git a/nixos/tests/initrd-network-ssh/openssh.priv b/nixos/tests/initrd-network-ssh/openssh.priv new file mode 100644 index 000000000000..816d65435fd7 --- /dev/null +++ b/nixos/tests/initrd-network-ssh/openssh.priv @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIJKAIBAAKCAgEA7+9A2PCPOTAlFmrablrUWA+VZdAuLfM6JXeHsOF7ZbC2F6lv +WmvDM925DQqhiAjcgWnt5WHWS5Y+b7lGnuzT7fyKegXd80nCRmqlpSG3srX0/lxR +aQAJLzfoDjcsF+ceswQo6GSsYnCHVxMNs007gbbVY3f7o+sWZtLdxJPD2iHvl5Zr +LK0d1RLMmU6cfIhIABlL0S8EWiv29RROepsCQnS0dnK2b+von1SCYoggvAMe2ToA +IAJ8+uqaYfGAyn9q8fjZiRHxLmKDq90tKoCUL5r/2dmEIE+t8T/3PfHoq1QzZts9 +W9idhBdT21dEXBtGyoMtckp5njk5m82LQDYiOXkuSoIUhSOteh5g7fBv1BtVSERx +Jg3UeJjPeGKFwdnzapmAKC2w/6V8xcIINNA+fhZA7B9fD1RAi2TECZ+gyMYDc4T+ +USlMSm9cfvSOrf2+5ngtFb84nHjqvClxCMLu+bCWK8HamqUzhE/a5LbR+48E7PyG +s3KV+sWFN9KOnakTjj/6iQhXZRhgeAK39F2XTk5Ms5Y+BRSStnMoMZA2grIV+jHi +1zbWokVqXPI5YRo5isR/PgtKAV6FfNWumcYoFJ9F40pMHQ6hJVEmtrCBx7EApSl3 +mSGbQJUmilLC51qNhwQRbD//ZtpIrN82HTMKzZ6kj7kDCdsff+wsnkIXmmMCAwEA +AQKCAgA4tMINw6UF7hQF3VEsnbjr6xrzCiWv5HlMm5htPI1OdlpC81+G7ksfOfrf +UzDkFrwOtftsqBfem268Nvyy2OQprfMIbdSMCFWrEM9/XJ2u1gRGDYmMGF8TUtI8 +cduw9oWx53zHl+uKBHBoKu+k/c7flFeQf63wisIroRCawhWau0SF/h3sXCndzuie +Hw8q+4aQx2m80bDkotlmCNuXbIU3MZ/pEql9gDLlXTLHmMaryM0EqAmZhx0ErGe6 +WDqJIV4kPB0loSDwRoY6GzbugZ8ENUzcruTkQhCpIOYNNNw5idfwKkaxK1vm+SBv +iYt1fVjYyfH2vhVKSNoNsaGEloa1u4Dymt/FpFztEpRzHXcw93N8BdLxJ4OUhzm2 +iAbpiyjniTIeAVVi7BUwLXh5WAx8nT0eeb1zKoZg1p1ciK5cYl1Uel7j8xRycsSW +3YgmtuPqY4Agbc9v3eXbQZNDk48JFMEqpIxk97FAkRYpzfxg5Qq14WJCp60CkdRt +T60hXy8lT/BcI8OWLfGJuBbsVLNRiC7PpwqRKQAinXSv134FpP7jrhpkMybs2oIS +5obRG7J5OfOTp925erG5mrpwqa3BPkgqx347Wj9z8quOZyuhi+XaPvqmPtvs5JOl +4RCqjt6RQlHm7xos9ZZGI4jDAIFaFWgyVZrYplOgwxWma4DTgQKCAQEA9+tizQRU +lF0lxNcEPvsFnYJo80Y+MQK9VdtlhR19YuSfwP1NCaMG1MhQ+PVBVmepOwJMRJR7 +9PLfOouNMfixKBGP12dtStMuh7jowq/BxhRI6JWp3RhTZ1yJ9ouzHze7IDrEBa6w +p0hUu9H0Sbt51LXbC3JmTyhbdhfry559DfyGW1Ma/bv/pihL9B5Y7sNf1thNp1gi +GbQ9B+o2Yyw8ZD8zY+sl+aYDSWyCtcBV/KXEF74Bkfs/a5ExJ00X0jYj/TAp2ray +T4PY0FR8wN/O10bFLP9j+Xa/ywbcPhoj8nvVRIg9VfWT/QaEd+KR0EZVxdjCCqne +enbSQksTpAZNwQKCAQEA98E+BMmS+yHUVUhNZABtQ5avwuV4+DoSN8KTp3xwQ0CH +m9fWxSDs12FdyMhDxrJPeywvHtZ18/7cl3dr8wnFVE0s4ongnRDXsNk5xN6J3AaO +KqW4HF9cbwZqzLILy8TrO+EK/EQV9FypbrxqvxAlP1kezIA2CJNzVRAgimSuV/H7 +05HTnp5W06fjtEf8U1CUrdNetoSROUo1j/IMGPYGlsBFYAGrj5y/BlKd+3T3kjRp +Xje7HpiykjrZHn0WDp04Ln+u9nveEewXmHKch313emt7HpW0xspp8JM8OZtEKozk +D5PfYdBfMJJOUlqovCCzTTJ6kNOahknKXFeO/qs5IwKCAQEAjF0/zhWikXF/fcfD +Bql2z2vTYdEmSvdjHSYff1Nn90K71DdVk5wytOxJM/sfp/z+yoMNjVKIL/IGQw5Z +va4xFx+CUhGjxlZ0pLEjT37U9gHsGYsK5jvslLvG/MixfH5AOwoqi5ERQVTpbIF9 +jvVPEAh6YSu/ExglWGJIxTsRUIblxvTxdjEnl/p+rlM0RNJnA6vpo1J51BXA7CdF +7bZQ5u0Feo/bK1I70ClYg/DGfkmYEV0pZG5cxNkqfDbgwsqWa7YGLGd94xkh+ymq +jETqxeWyozxhbQ83nYpfzeVc7t//qlJ8b5uf0wUKoRmtNr9rtp13lzP/21REzPXW +w+oxwQKCAQAoAf2Y2lAw25KlPuq4ZlU+n9u8FkBFnWMJvBMJ7c9XHNmJMf6NkLaO +RTvWy3geYvbwxf7J9QnRH+vRTciR05cY+Olxn6A03N5nwXxRrToH3MsiWeZ0NnX/ +u8KNUYcUHbV60ulqOThuYHQ/3I9EUUAijaqqjV2sXts19ke68W0x6HKpBJhuudT9 +ktPzbdhyP8Xyl/pocNnerXwexZBsi3Ye6+eIDFz+8OnsBHVcgNPluS72tvsxgqj7 +ciNTiBGCxKKo55eCWBhRPpXE2WUrf/hGPYsBMl2h6FfZMH1+M/N7B4tgdJmS+woU +Ftws8lTjJEiwA6HFN1ZxrwLNjJobx9yPAoIBAE0igsBuWWn6rXeOPylYg4264XOq +8gb94pte2n9amDgCzyCn8m6AL3snLC/AoCD19DK+gyK0ukoesXPa3iX6w2xv69ZC +urDx36Jhd4zrJb4QsFPoeKfDP+UvNVZaS41vipRRzY/y11em15prUZ4U8FA/UT1Y +FzkBo9r6iUZRnyBLppMuEfWASDtuRNmeIHynoT1AcQOH3l9vR210iEpmAuJr0CYA +bvTuz3UzzGGEAuIUvuaiRtkfKY52jBmiEr7SSPCr1HvLj3Ccz8bgjgR2kiXmcU50 +1zLnaPAD44LZ/0Fjqj+PimQGT6K7CNXPllmYh7MvoU52g3SVPf6rHlIR0Nc= +-----END RSA PRIVATE KEY----- diff --git a/nixos/tests/initrd-network-ssh/openssh.pub b/nixos/tests/initrd-network-ssh/openssh.pub new file mode 100644 index 000000000000..5b72b8085f27 --- /dev/null +++ b/nixos/tests/initrd-network-ssh/openssh.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv70DY8I85MCUWatpuWtRYD5Vl0C4t8zold4ew4XtlsLYXqW9aa8Mz3bkNCqGICNyBae3lYdZLlj5vuUae7NPt/Ip6Bd3zScJGaqWlIbeytfT+XFFpAAkvN+gONywX5x6zBCjoZKxicIdXEw2zTTuBttVjd/uj6xZm0t3Ek8PaIe+XlmssrR3VEsyZTpx8iEgAGUvRLwRaK/b1FE56mwJCdLR2crZv6+ifVIJiiCC8Ax7ZOgAgAnz66pph8YDKf2rx+NmJEfEuYoOr3S0qgJQvmv/Z2YQgT63xP/c98eirVDNm2z1b2J2EF1PbV0RcG0bKgy1ySnmeOTmbzYtANiI5eS5KghSFI616HmDt8G/UG1VIRHEmDdR4mM94YoXB2fNqmYAoLbD/pXzFwgg00D5+FkDsH18PVECLZMQJn6DIxgNzhP5RKUxKb1x+9I6t/b7meC0VvziceOq8KXEIwu75sJYrwdqapTOET9rkttH7jwTs/IazcpX6xYU30o6dqROOP/qJCFdlGGB4Arf0XZdOTkyzlj4FFJK2cygxkDaCshX6MeLXNtaiRWpc8jlhGjmKxH8+C0oBXoV81a6ZxigUn0XjSkwdDqElUSa2sIHHsQClKXeZIZtAlSaKUsLnWo2HBBFsP/9m2kis3zYdMwrNnqSPuQMJ2x9/7CyeQheaYw== tmtynkky@duuni From 299e3228a439bc12099c912b320fc8f6b30c9e51 Mon Sep 17 00:00:00 2001 From: Chris Martin Date: Mon, 27 Nov 2017 05:09:09 -0500 Subject: [PATCH 94/98] nodePackages.html-minifier: init at 3.5.7 --- .../node-packages/node-packages-v4.nix | 33 +- .../node-packages/node-packages-v6.json | 1 + .../node-packages/node-packages-v6.nix | 467 ++++++++++-------- 3 files changed, 280 insertions(+), 221 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index c34f4ef83164..14fcf145ddd1 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -2119,13 +2119,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-5.4.0" = { + "ajv-5.5.0" = { name = "ajv"; packageName = "ajv"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz"; - sha1 = "32d1cf08dbc80c432f426f12e10b2511f6b46474"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz"; + sha1 = "eb2840746e9dc48bd5e063a36e3fd400c5eab5a9"; }; }; "har-schema-2.0.0" = { @@ -4045,13 +4045,13 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "commander-2.12.0" = { + "commander-2.12.1" = { name = "commander"; packageName = "commander"; - version = "2.12.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.0.tgz"; - sha512 = "3drb1rxa9qbsn65n8gbwfj96afi8kv3kh9z30mm1x0hssz84kj7akkksd6qpbikcnpnmrm9fpxvqy5w6jw1xj9q4z3ijligiddjcl6h"; + url = "https://registry.npmjs.org/commander/-/commander-2.12.1.tgz"; + sha512 = "36cb2mrf9piidjbqiz8krwx7r9hikgirjxzfrbyk3hd39xpmg489lia9d3cmzci80sx99428hg960sz9j5b72fn7pi928z5289ln8rw"; }; }; "is-my-json-valid-2.16.1" = { @@ -4063,15 +4063,6 @@ let sha512 = "2wmvqb2vfzjbnd2znxkg4sqpksxb9mi1lbr4r5zv535ykxzfv8dbnafra1lhk415wrbg9r1lfhyimcw5xfj3k4ry7inbmcjlnr4zj51"; }; }; - "@types/node-7.0.48" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "7.0.48"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.48.tgz"; - sha512 = "3bjps45216v1znjwv914yqhiya6y0gxra26zk80bv49rzsqf84kxv7ilrzm7j6wj5895957a0jbqwsdy78ylfbx61v3w11pydlmgf9c"; - }; - }; "generate-function-2.0.0" = { name = "generate-function"; packageName = "generate-function"; @@ -4844,7 +4835,7 @@ in }) (sources."har-validator-5.0.3" // { dependencies = [ - (sources."ajv-5.4.0" // { + (sources."ajv-5.5.0" // { dependencies = [ sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -6257,11 +6248,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."commander-2.12.0" // { - dependencies = [ - sources."@types/node-7.0.48" - ]; - }) + sources."commander-2.12.1" (sources."is-my-json-valid-2.16.1" // { dependencies = [ sources."generate-function-2.0.0" diff --git a/pkgs/development/node-packages/node-packages-v6.json b/pkgs/development/node-packages/node-packages-v6.json index 3599c93401ef..82416cf3b230 100644 --- a/pkgs/development/node-packages/node-packages-v6.json +++ b/pkgs/development/node-packages/node-packages-v6.json @@ -28,6 +28,7 @@ , "gulp" , "hipache" , "htmlhint" +, "html-minifier" , "ionic" , "ios-deploy" , "istanbul" diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index 6791618cd387..021d48422794 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -265,13 +265,13 @@ let sha1 = "de03e2d16396b069f46dd9fff8521fb1a0e35e02"; }; }; - "convert-source-map-1.5.0" = { + "convert-source-map-1.5.1" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz"; - sha1 = "9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz"; + sha1 = "b8278097b9bc229365de5c62cf5fcaed8b5599e5"; }; }; "debug-2.6.9" = { @@ -2308,13 +2308,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "ajv-5.4.0" = { + "ajv-5.5.0" = { name = "ajv"; packageName = "ajv"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-5.4.0.tgz"; - sha1 = "32d1cf08dbc80c432f426f12e10b2511f6b46474"; + url = "https://registry.npmjs.org/ajv/-/ajv-5.5.0.tgz"; + sha1 = "eb2840746e9dc48bd5e063a36e3fd400c5eab5a9"; }; }; "har-schema-2.0.0" = { @@ -2821,13 +2821,13 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "commander-2.12.0" = { + "commander-2.12.1" = { name = "commander"; packageName = "commander"; - version = "2.12.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.12.0.tgz"; - sha512 = "3drb1rxa9qbsn65n8gbwfj96afi8kv3kh9z30mm1x0hssz84kj7akkksd6qpbikcnpnmrm9fpxvqy5w6jw1xj9q4z3ijligiddjcl6h"; + url = "https://registry.npmjs.org/commander/-/commander-2.12.1.tgz"; + sha512 = "36cb2mrf9piidjbqiz8krwx7r9hikgirjxzfrbyk3hd39xpmg489lia9d3cmzci80sx99428hg960sz9j5b72fn7pi928z5289ln8rw"; }; }; "is-my-json-valid-2.16.1" = { @@ -2848,15 +2848,6 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "@types/node-7.0.48" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "7.0.48"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-7.0.48.tgz"; - sha512 = "3bjps45216v1znjwv914yqhiya6y0gxra26zk80bv49rzsqf84kxv7ilrzm7j6wj5895957a0jbqwsdy78ylfbx61v3w11pydlmgf9c"; - }; - }; "generate-function-2.0.0" = { name = "generate-function"; packageName = "generate-function"; @@ -4450,13 +4441,13 @@ let sha1 = "1b63be438a133e4b671cc1935197600175910d83"; }; }; - "detective-4.5.0" = { + "detective-4.6.0" = { name = "detective"; packageName = "detective"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/detective/-/detective-4.5.0.tgz"; - sha1 = "6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"; + url = "https://registry.npmjs.org/detective/-/detective-4.6.0.tgz"; + sha512 = "1g05is493dwv51naw53l4jly2fr5xjawkkc859s2dsssgs9bjk99k401l3ms4fjkbnffv6z8s2wjx7mf3j05qvp28nidnb6mdda5yvf"; }; }; "stream-combiner2-1.1.1" = { @@ -4468,6 +4459,15 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; + "acorn-5.2.1" = { + name = "acorn"; + packageName = "acorn"; + version = "5.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; + sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; + }; + }; "path-platform-0.11.15" = { name = "path-platform"; packageName = "path-platform"; @@ -4666,13 +4666,13 @@ let sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77"; }; }; - "mime-1.5.0" = { + "mime-1.6.0" = { name = "mime"; packageName = "mime"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.5.0.tgz"; - sha512 = "3b7jw8n6ar3wh9wf19ayzzjxnb85fhnlxd0cp1rgqnw1fihixms6999bmwh9gavrl3j4k1g8swzr23c1n2xv0ivkmnsma5zh87cry5z"; + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "1x901mk5cdib4xp27v4ivwwr7mhy64r4rk953bzivi5p9lf2bhw88ra2rhkd254xkdx2d3q30zkq239vc4yx4pfsj4hpys8rbr6fif7"; }; }; "peerflix-0.34.0" = { @@ -6979,15 +6979,6 @@ let sha1 = "96bb17761daba94f46d001738b3cedf3a67fe06c"; }; }; - "acorn-5.2.1" = { - name = "acorn"; - packageName = "acorn"; - version = "5.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz"; - sha512 = "3ryzhy30vzfnn2a0crafh3qsrx145ali8i88q1bc0lzl1dz0ycmjmmwh2yn9xfjs3vmjxl7nphpwcs4imgz3da5jb8fvjqbrvnjwvcc"; - }; - }; "foreach-2.0.5" = { name = "foreach"; packageName = "foreach"; @@ -9188,13 +9179,13 @@ let sha1 = "cac328f7bee45730d404b692203fcb590e172d5e"; }; }; - "aws-sdk-2.156.0" = { + "aws-sdk-2.157.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.156.0"; + version = "2.157.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.156.0.tgz"; - sha1 = "409c06f7051d58320cb389a024ca7b61ce31f136"; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.157.0.tgz"; + sha1 = "b55b16f8413dfa9e7323b60b21fce9743206f8a1"; }; }; "buffer-4.9.1" = { @@ -10511,13 +10502,13 @@ let sha1 = "dbbd5b54ba30f287e2a8d5a249da6c0cef369459"; }; }; - "doctrine-2.0.0" = { + "doctrine-2.0.2" = { name = "doctrine"; packageName = "doctrine"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.0.tgz"; - sha1 = "c73d8d2909d22291e1a007a395804da8b665fe63"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-2.0.2.tgz"; + sha512 = "3q2dym3ya3hkv5x95fzyax46mxfd8bm53y4xhay4a3zl9mvys1sx1bk6n35x1skq8wqfyi865n2gl2mw3rxdn94m5vhmjxszbj6cjyb"; }; }; "eslint-scope-3.7.1" = { @@ -10574,6 +10565,15 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; + "globals-11.0.1" = { + name = "globals"; + packageName = "globals"; + version = "11.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-11.0.1.tgz"; + sha1 = "12a87bb010e5154396acc535e1e43fc753b0e5e8"; + }; + }; "ignore-3.3.7" = { name = "ignore"; packageName = "ignore"; @@ -10871,13 +10871,13 @@ let sha1 = "753b87a89a11c95467c4ac1626c4efc4e05c67be"; }; }; - "chardet-0.4.0" = { + "chardet-0.4.2" = { name = "chardet"; packageName = "chardet"; - version = "0.4.0"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/chardet/-/chardet-0.4.0.tgz"; - sha1 = "0bbe1355ac44d7a3ed4a925707c4ef70f8190f6c"; + url = "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz"; + sha1 = "b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"; }; }; "tmp-0.0.33" = { @@ -11015,13 +11015,13 @@ let sha512 = "1xd3zsk02nck4y601rn98n8cicrphaw5bdix278mk1yizmjv9s0wpa6akcqggd7d99c55s3byf4ylqdxkshyfsfnfx7lvwbmq2b3siw"; }; }; - "eslint-4.11.0" = { + "eslint-4.12.0" = { name = "eslint"; packageName = "eslint"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.11.0.tgz"; - sha512 = "3p35ybksp5c5qbdwb9fpd0dhspjbpnlqhfh3jj7zl6zfcpvljm3fnhfzwx35h8rqb7wi3y3r9w22nabnh4jzm8zwwhnz5lajr1f2rji"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.12.0.tgz"; + sha512 = "31dhiy1b963gcs7s1ickygwm87vm943l5mhcxxwg97yc113b7fmdrzcb1m9gr9h0pkqacrdcmn59x3mdcqg0a4bgc2gjz859lszh6rs"; }; }; "supports-color-3.2.3" = { @@ -12843,6 +12843,69 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; + "clean-css-4.1.9" = { + name = "clean-css"; + packageName = "clean-css"; + version = "4.1.9"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-css/-/clean-css-4.1.9.tgz"; + sha1 = "35cee8ae7687a49b98034f70de00c4edd3826301"; + }; + }; + "he-1.1.1" = { + name = "he"; + packageName = "he"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; + sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; + }; + }; + "ncname-1.0.0" = { + name = "ncname"; + packageName = "ncname"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz"; + sha1 = "5b57ad18b1ca092864ef62b0b1ed8194f383b71c"; + }; + }; + "relateurl-0.2.7" = { + name = "relateurl"; + packageName = "relateurl"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + }; + "uglify-js-3.2.0" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.0.tgz"; + sha512 = "2vgdxdcacmfv1079k2pbqi0cmgyg2xha1l1h91dnjb80wym2krmbq4i3kwk0ivknhj3mxm7iq584kx0rjyscz31cjkz38117fah7prg"; + }; + }; + "xml-char-classes-1.0.0" = { + name = "xml-char-classes"; + packageName = "xml-char-classes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz"; + sha1 = "64657848a20ffc5df583a42ad8a277b4512bbc4d"; + }; + }; + "source-map-0.6.1" = { + name = "source-map"; + packageName = "source-map"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; + sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; + }; + }; "@ionic/cli-framework-0.1.2" = { name = "_at_ionic_slash_cli-framework"; packageName = "@ionic/cli-framework"; @@ -16506,15 +16569,6 @@ let sha512 = "3aibvz85l13j140w4jjdk8939q6r7dnf8ay2licxgkaaldk7wbm093c1p5g7k5cg80rl0xslmczyraawfgdr82hhxn7rfsm1rn6rac4"; }; }; - "he-1.1.1" = { - name = "he"; - packageName = "he"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/he/-/he-1.1.1.tgz"; - sha1 = "93410fd21b009735151f8868c2f271f3427e23fd"; - }; - }; "supports-color-4.4.0" = { name = "supports-color"; packageName = "supports-color"; @@ -18765,13 +18819,13 @@ let sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df"; }; }; - "snyk-1.49.5" = { + "snyk-1.51.0" = { name = "snyk"; packageName = "snyk"; - version = "1.49.5"; + version = "1.51.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.49.5.tgz"; - sha1 = "3cce8e6863b1d7d95bbf1a6e4a571482f5aeb444"; + url = "https://registry.npmjs.org/snyk/-/snyk-1.51.0.tgz"; + sha1 = "cba4d405d607f009dabada3fd62845f7283ce0b5"; }; }; "spawn-please-0.3.0" = { @@ -18873,6 +18927,15 @@ let sha512 = "0r929vp7mqx07wqr1k9xzww6yawkvf2c3s3cyx38mm65r72v8p16acis2y8ircl6spzh5slxv5adqpd70l7khw0fi8x4smjs812cgzp"; }; }; + "snyk-php-plugin-1.1.2" = { + name = "snyk-php-plugin"; + packageName = "snyk-php-plugin"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.1.2.tgz"; + sha512 = "1vn9mfsmi72rnk8g69y27cpw9ljwv7qjnqmal344d0m20jjak38sz78xafc9l63j0s05bgax693548dn88ivgy5af2y8l8jp970vqp9"; + }; + }; "snyk-policy-1.7.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -19452,13 +19515,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.4.3" = { + "service-runner-2.4.4" = { name = "service-runner"; packageName = "service-runner"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.3.tgz"; - sha1 = "8fcb3d9e5da9b83efa507a8e30ee0aa7e025a0a7"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.4.4.tgz"; + sha1 = "336f5fdfb1c5be7ea78044a013bb08d58b9ce08f"; }; }; "simplediff-0.1.1" = { @@ -19885,13 +19948,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.2.0" = { + "multicast-dns-6.2.1" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.0.tgz"; - sha512 = "3cdywd5v2sl4rvlc2vlf7j8vhffdrncnxz7rf44fiksmqhkga6x16p21gmxbwn4r5adr6n494fs74pv3xj8kphvan770q4n9dd2lx5n"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.1.tgz"; + sha512 = "3gm760icxiv0bkil78dgsjkss4vwg3ya76jl3v8a5fa86wdv0ksvi1n7lnzisk4x4sa8chxnfxasyfpgay45ilaykqz2zbc8xrgypdr"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -21608,15 +21671,6 @@ let sha1 = "1958cc0b4c9426e9ed367fb1c8e854891b0fa3ff"; }; }; - "source-map-0.6.1" = { - name = "source-map"; - packageName = "source-map"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"; - sha512 = "3p7hw8p69ikj5mwapmqkacsjnbvdfk5ylyamjg9x5izkl717xvzj0vk3fnmx1n4pf54h5rs7r8ig5kk4jv4ycqqj0hv75cnx6k1lf2j"; - }; - }; "async-2.1.5" = { name = "async"; packageName = "async"; @@ -22175,13 +22229,13 @@ let sha1 = "a69d9da76847b4d5834c1465ea25c0653a1fbf66"; }; }; - "es-abstract-1.9.0" = { + "es-abstract-1.10.0" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.9.0"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.9.0.tgz"; - sha512 = "3frzxsmb5c319c73k3r0zn7djgqbzvnjch99hni35lram09a0q8jlh666m8mjaag9gjnlqjd9gl9xb769gkjd4pb3lhvv58h8kchkcj"; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz"; + sha512 = "04nd5ylkfffc08vn5kjhz0saqh44nj19f5j3ahrrhf3zvc9da5rf6snnh63xv4gfhacjbax1jajzgqv4zpm77v806jf883a2w77zs7y"; }; }; "es-to-primitive-1.1.1" = { @@ -22904,13 +22958,13 @@ let sha1 = "b951f4abb6bd617e66f63eb891498e391763e309"; }; }; - "webpack-sources-1.0.2" = { + "webpack-sources-1.1.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.2.tgz"; - sha512 = "1mk1l1f1bv2cnxbyr13i5rbiwm9cgv91d28rk3mmy8z2m6f0xksgkjv5k00xcmvkd3sjsbrica8a1xrlzz0crydrfix3sdgq1s1vdb3"; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz"; + sha512 = "19rska638yxsrpxavydnjckcljiy6ylh63b802hylac396p3mm6j9bj85rhyvi81jk48c33sq580ixwjkbghgwp7cl1i9hgr7bjk9ka"; }; }; "es6-map-0.1.5" = { @@ -22940,13 +22994,13 @@ let sha1 = "754bb5bfe55451da69a58b94d45f4c5b0462d58f"; }; }; - "es5-ext-0.10.35" = { + "es5-ext-0.10.37" = { name = "es5-ext"; packageName = "es5-ext"; - version = "0.10.35"; + version = "0.10.37"; src = fetchurl { - url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.35.tgz"; - sha1 = "18ee858ce6a3c45c7d79e91c15fcca9ec568494f"; + url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.37.tgz"; + sha1 = "0ee741d148b80069ba27d020393756af257defc3"; }; }; "es6-iterator-2.0.3" = { @@ -24699,7 +24753,7 @@ in sources."babel-register-6.26.0" sources."babel-runtime-6.26.0" sources."babel-template-6.26.0" - sources."convert-source-map-1.5.0" + sources."convert-source-map-1.5.1" sources."debug-2.6.9" sources."json5-0.5.1" sources."minimatch-3.0.4" @@ -24987,7 +25041,7 @@ in dependencies = [ sources."readable-stream-2.0.6" sources."async-2.6.0" - sources."commander-2.12.0" + sources."commander-2.12.1" ]; }) sources."ssh-key-to-pem-0.11.0" @@ -25055,7 +25109,7 @@ in sources."has-color-0.1.7" sources."ansi-styles-2.2.1" sources."strip-ansi-3.0.1" - sources."@types/node-7.0.48" + sources."@types/node-8.0.53" sources."@types/request-2.0.8" sources."@types/uuid-3.4.3" sources."is-buffer-1.1.6" @@ -25082,7 +25136,7 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -25423,7 +25477,7 @@ in sources."astw-2.2.0" sources."acorn-4.0.13" sources."stream-splicer-2.0.0" - sources."detective-4.5.0" + sources."detective-4.6.0" sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" sources."path-parse-1.0.5" @@ -25466,7 +25520,7 @@ in sources."got-1.2.2" sources."internal-ip-1.2.0" sources."keypress-0.2.1" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."minimist-1.2.0" (sources."peerflix-0.34.0" // { dependencies = [ @@ -25690,9 +25744,8 @@ in sources."voc-1.0.0" sources."concat-stream-1.6.0" sources."exit-on-epipe-1.0.1" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."typedarray-0.0.6" - sources."@types/node-7.0.48" sources."sax-1.2.4" sources."underscore-1.6.0" ]; @@ -25736,7 +25789,7 @@ in ]; }) sources."cli-table2-0.2.0" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."humanize-plus-1.8.2" sources."ora-1.3.0" sources."follow-redirects-1.2.6" @@ -25781,7 +25834,6 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" - sources."@types/node-7.0.48" sources."cli-cursor-2.1.0" sources."cli-spinners-1.1.0" sources."log-symbols-1.0.2" @@ -26001,7 +26053,7 @@ in sources."lexical-scope-1.2.0" sources."astw-2.2.0" sources."stream-splicer-2.0.0" - sources."detective-4.5.0" + sources."detective-4.6.0" sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" sources."json-stable-stringify-0.0.1" @@ -26107,10 +26159,9 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."is-my-json-valid-2.16.1" sources."pinkie-promise-2.0.1" - sources."@types/node-7.0.48" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -26480,7 +26531,7 @@ in sources."JSONStream-1.3.1" sources."async-2.6.0" sources."aws4-1.6.0" - sources."aws-sdk-2.156.0" + sources."aws-sdk-2.157.0" sources."ini-1.3.5" sources."optimist-0.6.1" sources."request-2.83.0" @@ -26525,7 +26576,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -26618,7 +26669,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."is-my-json-valid-2.16.1" sources."pinkie-promise-2.0.1" sources."ansi-styles-3.2.0" @@ -26626,7 +26677,6 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-3.0.1" sources."ansi-regex-2.1.1" - sources."@types/node-7.0.48" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -26828,7 +26878,7 @@ in sources."babel-traverse-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" - sources."convert-source-map-1.5.0" + sources."convert-source-map-1.5.1" sources."debug-2.6.9" sources."json5-0.5.1" sources."lodash-4.17.4" @@ -26943,13 +26993,13 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "4.11.0"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-4.11.0.tgz"; - sha512 = "3p35ybksp5c5qbdwb9fpd0dhspjbpnlqhfh3jj7zl6zfcpvljm3fnhfzwx35h8rqb7wi3y3r9w22nabnh4jzm8zwwhnz5lajr1f2rji"; + url = "https://registry.npmjs.org/eslint/-/eslint-4.12.0.tgz"; + sha512 = "31dhiy1b963gcs7s1ickygwm87vm943l5mhcxxwg97yc113b7fmdrzcb1m9gr9h0pkqacrdcmn59x3mdcqg0a4bgc2gjz859lszh6rs"; }; dependencies = [ - sources."ajv-5.4.0" + sources."ajv-5.5.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" @@ -26960,7 +27010,7 @@ in sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" sources."debug-3.1.0" - sources."doctrine-2.0.0" + sources."doctrine-2.0.2" sources."eslint-scope-3.7.1" sources."espree-3.5.2" sources."esquery-1.0.0" @@ -26969,7 +27019,7 @@ in sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-9.18.0" + sources."globals-11.0.1" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inquirer-3.3.0" @@ -27061,7 +27111,7 @@ in sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" - sources."chardet-0.4.0" + sources."chardet-0.4.2" sources."iconv-lite-0.4.19" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" @@ -27097,10 +27147,10 @@ in eslint_d = nodeEnv.buildNodePackage { name = "eslint_d"; packageName = "eslint_d"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.1.0.tgz"; - sha512 = "3a69fni3gypbhmr458lzxnz7qpik5v7zsxhv4sfb85a7ygngibaxazv5z4i39zvcyivab5z8mnayn496z7v6m0r8j0zkfm39d6i5gwq"; + url = "https://registry.npmjs.org/eslint_d/-/eslint_d-5.2.0.tgz"; + sha512 = "3isjjj3hxs689ajwa1mhqdhi4sq6ibk7sgdlrckn0f77nn60pl0j165hqz5wkc7gfznv7m6jlk5ylbcl0hj1n10jw5zsiicbapzvy9i"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -27108,7 +27158,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."eslint-4.11.0" // { + (sources."eslint-4.12.0" // { dependencies = [ sources."chalk-2.3.0" sources."supports-color-4.5.0" @@ -27122,7 +27172,7 @@ in sources."has-ansi-2.0.0" sources."strip-ansi-4.0.0" sources."ansi-regex-3.0.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" (sources."babel-code-frame-6.26.0" // { dependencies = [ sources."chalk-1.1.3" @@ -27131,7 +27181,7 @@ in sources."concat-stream-1.6.0" sources."cross-spawn-5.1.0" sources."debug-3.1.0" - sources."doctrine-2.0.0" + sources."doctrine-2.0.2" sources."eslint-scope-3.7.1" sources."espree-3.5.2" sources."esquery-1.0.0" @@ -27140,7 +27190,7 @@ in sources."file-entry-cache-2.0.0" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.2" - sources."globals-9.18.0" + sources."globals-11.0.1" sources."ignore-3.3.7" sources."imurmurhash-0.1.4" sources."inquirer-3.3.0" @@ -27225,7 +27275,7 @@ in sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" - sources."chardet-0.4.0" + sources."chardet-0.4.2" sources."iconv-lite-0.4.19" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" @@ -27397,7 +27447,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -28022,6 +28072,37 @@ in }; production = true; }; + html-minifier = nodeEnv.buildNodePackage { + name = "html-minifier"; + packageName = "html-minifier"; + version = "3.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.7.tgz"; + sha512 = "31dxgy9vqkpkkmxi45mlnp7ijqigjx1s1z9j7ngvklwp6n4rck5cs3ilw3qxz0glsgj2k9n884wrcad9433ljjsh7z8w3hamagrg10q"; + }; + dependencies = [ + sources."camel-case-3.0.0" + sources."clean-css-4.1.9" + sources."commander-2.12.1" + sources."he-1.1.1" + sources."ncname-1.0.0" + sources."param-case-2.1.1" + sources."relateurl-0.2.7" + sources."uglify-js-3.2.0" + sources."no-case-2.3.2" + sources."upper-case-1.1.3" + sources."lower-case-1.1.4" + sources."source-map-0.6.1" + sources."xml-char-classes-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; + homepage = http://kangax.github.io/html-minifier/; + license = "MIT"; + }; + production = true; + }; ionic = nodeEnv.buildNodePackage { name = "ionic"; packageName = "ionic"; @@ -28217,7 +28298,7 @@ in sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" - sources."chardet-0.4.0" + sources."chardet-0.4.2" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" sources."escape-string-regexp-1.0.5" @@ -28376,7 +28457,7 @@ in sources."chai-4.1.2" sources."chai-as-promised-7.1.1" sources."chalk-2.3.0" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."fast-json-patch-2.0.6" sources."glob-7.1.2" sources."iterare-0.0.8" @@ -28408,7 +28489,6 @@ in sources."color-convert-1.9.1" sources."color-name-1.1.3" sources."has-flag-2.0.0" - sources."@types/node-7.0.48" sources."deep-equal-1.0.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.6" @@ -28541,11 +28621,10 @@ in sources."proto-list-1.2.4" sources."ini-1.3.5" sources."bluebird-3.5.1" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."lru-cache-3.2.0" sources."semver-5.4.1" sources."sigmund-1.0.1" - sources."@types/node-7.0.48" sources."pseudomap-1.0.2" sources."minimist-0.0.8" sources."abbrev-1.1.1" @@ -28606,7 +28685,7 @@ in sha512 = "0m7az6dvfn65fbak1y42663yxkachpj1fyyxxpdhkpny3bbsmgn0hpp8fb5sllmzbfyqspkqh1icpqb14pbsfnbsj7w665xmnj4a9g5"; }; dependencies = [ - sources."commander-2.12.0" + sources."commander-2.12.1" sources."graphlib-2.1.1" sources."js-yaml-3.10.0" sources."lodash-4.17.4" @@ -28614,7 +28693,6 @@ in sources."path-loader-1.0.4" sources."slash-1.0.0" sources."uri-js-3.0.2" - sources."@types/node-7.0.48" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" @@ -28626,7 +28704,7 @@ in sources."form-data-2.3.1" sources."formidable-1.1.1" sources."methods-1.1.2" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."qs-6.5.1" sources."readable-stream-2.3.3" sources."ms-2.0.0" @@ -28763,7 +28841,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -28933,7 +29011,7 @@ in sources."isbinaryfile-3.0.2" sources."lodash-3.10.1" sources."log4js-0.6.38" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."minimatch-3.0.4" sources."optimist-0.6.1" sources."qjobs-1.1.5" @@ -29414,7 +29492,7 @@ in sources."restore-cursor-2.0.0" sources."onetime-2.0.1" sources."mimic-fn-1.1.0" - sources."chardet-0.4.0" + sources."chardet-0.4.2" sources."iconv-lite-0.4.19" sources."tmp-0.0.33" sources."is-promise-2.1.0" @@ -29581,7 +29659,7 @@ in sources."extend-shallow-2.0.1" sources."json-stable-stringify-1.0.1" sources."jsonify-0.0.0" - sources."convert-source-map-1.5.0" + sources."convert-source-map-1.5.1" sources."minimist-0.0.8" sources."is-utf8-0.2.1" sources."first-chunk-stream-1.0.0" @@ -29745,7 +29823,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -30023,10 +30101,9 @@ in sha1 = "0161a13e2b3378759e36b9e05be34b46a06decd5"; }; dependencies = [ - sources."commander-2.12.0" + sources."commander-2.12.1" sources."js-yaml-3.10.0" sources."json-refs-2.1.7" - sources."@types/node-7.0.48" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" @@ -30044,7 +30121,7 @@ in sources."form-data-2.3.1" sources."formidable-1.1.1" sources."methods-1.1.2" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."qs-6.5.1" sources."readable-stream-2.3.3" sources."ms-2.0.0" @@ -30168,7 +30245,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -30316,7 +30393,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -31198,7 +31275,7 @@ in sources."performance-now-2.1.0" sources."uuid-3.1.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -31427,7 +31504,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -31521,7 +31598,7 @@ in sources."chalk-1.1.3" sources."cint-8.2.1" sources."cli-table-0.3.1" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."fast-diff-1.1.2" sources."find-up-1.1.2" sources."get-stdin-5.0.1" @@ -31536,7 +31613,7 @@ in }) sources."semver-5.4.1" sources."semver-utils-1.1.1" - (sources."snyk-1.49.5" // { + (sources."snyk-1.51.0" // { dependencies = [ sources."update-notifier-0.5.0" ]; @@ -31554,7 +31631,6 @@ in sources."supports-color-4.5.0" sources."ansi-regex-3.0.0" sources."colors-1.0.3" - sources."@types/node-7.0.48" sources."path-exists-2.1.0" sources."pinkie-promise-2.0.1" sources."pinkie-2.0.4" @@ -31576,6 +31652,7 @@ in sources."snyk-module-1.8.1" sources."snyk-mvn-plugin-1.1.0" sources."snyk-nuget-plugin-1.3.2" + sources."snyk-php-plugin-1.1.2" sources."snyk-policy-1.7.1" sources."snyk-python-plugin-1.4.0" sources."snyk-recursive-readdir-2.0.0" @@ -31843,7 +31920,7 @@ in sources."onetime-2.0.1" sources."signal-exit-3.0.2" sources."mimic-fn-1.1.0" - sources."chardet-0.4.0" + sources."chardet-0.4.2" sources."iconv-lite-0.4.19" sources."tmp-0.0.33" sources."os-tmpdir-1.0.2" @@ -31994,7 +32071,7 @@ in sources."request-2.83.0" sources."semver-5.4.1" sources."serve-favicon-2.4.5" - sources."service-runner-2.4.3" + sources."service-runner-2.4.4" sources."simplediff-0.1.1" sources."uuid-3.1.0" sources."yargs-7.1.0" @@ -32110,7 +32187,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -32227,7 +32304,7 @@ in sources."clivas-0.2.0" sources."inquirer-1.2.3" sources."keypress-0.2.1" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."network-address-1.1.2" sources."numeral-1.5.6" sources."open-0.0.5" @@ -32292,7 +32369,7 @@ in sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" sources."dns-txt-2.0.2" - sources."multicast-dns-6.2.0" + sources."multicast-dns-6.2.1" sources."multicast-dns-service-types-1.1.0" sources."dns-packet-1.2.2" sources."thunky-1.0.2" @@ -32761,7 +32838,7 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."is-my-json-valid-2.16.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -32769,7 +32846,6 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."@types/node-7.0.48" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -32932,7 +33008,7 @@ in sources."astw-2.2.0" sources."acorn-4.0.13" sources."stream-splicer-2.0.0" - sources."detective-4.5.0" + sources."detective-4.6.0" sources."stream-combiner2-1.1.1" sources."path-platform-0.11.15" sources."path-parse-1.0.5" @@ -32958,7 +33034,7 @@ in sources."concat-map-0.0.1" sources."optimist-0.6.1" sources."colors-1.1.2" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."mute-stream-0.0.7" sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" @@ -33026,7 +33102,7 @@ in }; dependencies = [ sources."body-parser-1.18.2" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."cookie-parser-1.4.3" sources."express-4.16.2" sources."less-2.7.3" @@ -33060,7 +33136,6 @@ in sources."media-typer-0.3.0" sources."mime-types-2.1.17" sources."mime-db-1.30.0" - sources."@types/node-7.0.48" sources."cookie-0.3.1" sources."cookie-signature-1.0.6" sources."accepts-1.3.4" @@ -33265,8 +33340,8 @@ in dependencies = [ sources."commoner-0.10.8" sources."jstransform-10.1.0" - sources."commander-2.12.0" - sources."detective-4.5.0" + sources."commander-2.12.1" + sources."detective-4.6.0" sources."glob-5.0.15" sources."graceful-fs-4.1.11" sources."iconv-lite-0.4.19" @@ -33274,8 +33349,7 @@ in sources."private-0.1.8" sources."q-1.5.1" sources."recast-0.11.23" - sources."@types/node-7.0.48" - sources."acorn-4.0.13" + sources."acorn-5.2.1" sources."defined-1.0.0" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -33384,7 +33458,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -33614,7 +33688,7 @@ in dependencies = [ sources."bcrypt-nodejs-0.0.3" sources."cheerio-0.17.0" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."event-stream-3.3.4" sources."express-4.16.2" sources."lodash-2.4.2" @@ -33641,7 +33715,6 @@ in sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."inherits-2.0.3" - sources."@types/node-7.0.48" sources."through-2.3.8" sources."duplexer-0.1.1" sources."from-0.1.7" @@ -33717,7 +33790,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -33799,7 +33872,7 @@ in sources."express-json5-0.1.0" sources."body-parser-1.18.2" sources."compression-1.7.1" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."js-yaml-3.10.0" sources."cookies-0.7.1" sources."request-2.83.0" @@ -33879,7 +33952,6 @@ in sources."compressible-2.0.12" sources."on-headers-1.0.1" sources."safe-buffer-5.1.1" - sources."@types/node-7.0.48" sources."argparse-1.0.9" sources."esprima-4.0.0" sources."sprintf-js-1.0.3" @@ -33905,7 +33977,7 @@ in sources."uuid-3.1.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -34084,7 +34156,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" sources."once-1.3.0" @@ -34309,7 +34381,7 @@ in sources."esprima-4.0.0" sources."sprintf-js-1.0.3" sources."define-properties-1.1.2" - sources."es-abstract-1.9.0" + sources."es-abstract-1.10.0" sources."has-1.0.1" sources."function-bind-1.1.1" sources."foreach-2.0.5" @@ -34590,13 +34662,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.1.10"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.1.10.tgz"; - sha512 = "09szjsihyy6320ca7niy2c4iwn2qr4jxndxak8fqy2pf6cr607ysb9zhxbfhn4n54km6kglcaslram2yrgddk43k2s6gxbvdh2pgsfj"; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.2.0.tgz"; + sha512 = "2vgdxdcacmfv1079k2pbqi0cmgyg2xha1l1h91dnjb80wym2krmbq4i3kwk0ivknhj3mxm7iq584kx0rjyscz31cjkz38117fah7prg"; }; dependencies = [ - sources."commander-2.11.0" + sources."commander-2.12.1" sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; @@ -34610,10 +34682,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.2.3"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.2.3.tgz"; - sha512 = "1yzmrpf0x0hz7kval4k8j6mrbg360mbakl7m9x3x9x1yyqpvk5s0icd8c3npblm7jfhsk1qbhbik3d5324hzawcxvb34cbzrfhzcf1i"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.3.0.tgz"; + sha512 = "06zgy1ilw44nwvz1vdxa067j95gmpswcr0fa5r57vmb3s0v6bmw0kwblgd3cridr88rlm4aidb7gvb6z9972897cya191mm97g6xr5r"; }; dependencies = [ sources."async-2.5.0" @@ -34725,7 +34797,7 @@ in sources."forwarded-0.1.2" sources."ipaddr.js-1.4.0" sources."destroy-1.0.4" - sources."mime-1.5.0" + sources."mime-1.6.0" sources."crc-3.4.4" sources."on-headers-1.0.1" sources."uid-safe-2.1.5" @@ -34795,7 +34867,7 @@ in sources."tunnel-agent-0.6.0" sources."uuid-3.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" @@ -35041,7 +35113,7 @@ in sources."sntp-1.0.9" sources."delayed-stream-1.0.0" sources."chalk-1.1.3" - sources."commander-2.12.0" + sources."commander-2.12.1" sources."is-my-json-valid-2.16.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -35049,7 +35121,6 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.1.1" - sources."@types/node-7.0.48" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-4.0.1" @@ -35083,7 +35154,7 @@ in sources."acorn-4.0.13" ]; }) - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."ajv-keywords-2.1.1" sources."async-2.6.0" sources."enhanced-resolve-3.4.1" @@ -35105,7 +35176,7 @@ in ]; }) sources."watchpack-1.4.0" - (sources."webpack-sources-1.0.2" // { + (sources."webpack-sources-1.1.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -35123,7 +35194,7 @@ in sources."esrecurse-4.2.0" sources."estraverse-4.2.0" sources."d-1.0.0" - sources."es5-ext-0.10.35" + sources."es5-ext-0.10.37" sources."es6-iterator-2.0.3" sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" @@ -35435,7 +35506,7 @@ in sources."babel-traverse-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" - sources."convert-source-map-1.5.0" + sources."convert-source-map-1.5.1" sources."debug-2.6.9" sources."json5-0.5.1" sources."path-is-absolute-1.0.1" @@ -35485,7 +35556,7 @@ in sources."safe-buffer-5.1.1" sources."string_decoder-1.0.3" sources."util-deprecate-1.0.2" - sources."@types/node-7.0.48" + sources."@types/node-8.0.53" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.3" @@ -35634,7 +35705,7 @@ in sources."spdx-expression-parse-1.0.4" sources."spdx-license-ids-1.2.2" sources."concat-stream-1.6.0" - sources."doctrine-2.0.0" + sources."doctrine-2.0.2" sources."eslint-scope-3.7.1" sources."espree-3.5.2" sources."esquery-1.0.0" @@ -35689,7 +35760,7 @@ in sources."through-2.3.8" sources."restore-cursor-1.0.1" sources."onetime-1.1.0" - sources."chardet-0.4.0" + sources."chardet-0.4.2" sources."iconv-lite-0.4.19" sources."is-promise-2.1.0" sources."tryit-1.0.3" @@ -35709,7 +35780,7 @@ in sources."es6-map-0.1.5" sources."es6-weak-map-2.0.2" sources."d-1.0.0" - sources."es5-ext-0.10.35" + sources."es5-ext-0.10.37" sources."es6-iterator-2.0.3" sources."es6-set-0.1.5" sources."es6-symbol-3.1.1" @@ -36074,7 +36145,7 @@ in sources."has-flag-2.0.0" sources."restore-cursor-1.0.1" sources."onetime-1.1.0" - sources."chardet-0.4.0" + sources."chardet-0.4.2" sources."iconv-lite-0.4.19" sources."tmp-0.0.29" sources."os-tmpdir-1.0.2" @@ -36120,7 +36191,7 @@ in sources."tunnel-agent-0.6.0" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - sources."ajv-5.4.0" + sources."ajv-5.5.0" sources."har-schema-2.0.0" sources."co-4.6.0" sources."fast-deep-equal-1.0.0" From 13bb5ff4027bb148754fd1cfdf2a5653d7f77101 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 15 Sep 2017 00:08:16 +0200 Subject: [PATCH 95/98] nixos/xserver: fix X.org session script logging --- nixos/modules/rename.nix | 4 ++ .../services/x11/display-managers/default.nix | 45 +++++++++---------- .../services/x11/display-managers/lightdm.nix | 2 +- .../services/x11/display-managers/sddm.nix | 2 +- .../services/x11/display-managers/xpra.nix | 2 +- 5 files changed, 29 insertions(+), 26 deletions(-) diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index f30cbe427f09..eb10d4f428be 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -48,6 +48,10 @@ with lib; (mkRemovedOptionModule [ "services" "rmilter" "bindInetSockets" ] "Use services.rmilter.bindSocket.* instead") (mkRemovedOptionModule [ "services" "rmilter" "bindUnixSockets" ] "Use services.rmilter.bindSocket.* instead") + # Xsession script + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "job" "logsXsession" ] [ "services" "xserver" "displayManager" "job" "logToFile" ]) + (mkRenamedOptionModule [ "services" "xserver" "displayManager" "logToJournal" ] [ "services" "xserver" "displayManager" "job" "logToJournal" ]) + # Old Grub-related options. (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ]) (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ]) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 3fa482fb6722..43ed21c95fee 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -59,12 +59,6 @@ let # Now it should be safe to assume that the script was called with the # expected parameters. - ${optionalString cfg.displayManager.logToJournal '' - if [ -z "$_DID_SYSTEMD_CAT" ]; then - _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@" - fi - ''} - . /etc/profile cd "$HOME" @@ -72,16 +66,23 @@ let sessionType="$1" if [ "$sessionType" = default ]; then sessionType=""; fi - ${optionalString (!cfg.displayManager.job.logsXsession && !cfg.displayManager.logToJournal) '' - exec > ~/.xsession-errors 2>&1 - ''} - ${optionalString cfg.startDbusSession '' if test -z "$DBUS_SESSION_BUS_ADDRESS"; then exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType" fi ''} + ${optionalString cfg.displayManager.job.logToJournal '' + if [ -z "$_DID_SYSTEMD_CAT" ]; then + export _DID_SYSTEMD_CAT=1 + exec ${config.systemd.package}/bin/systemd-cat -t xsession "$0" "$sessionType" + fi + ''} + + ${optionalString cfg.displayManager.job.logToFile '' + exec &> >(tee ~/.xsession-errors) + ''} + # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' ${optionalString (!config.hardware.pulseaudio.systemWide) @@ -306,26 +307,24 @@ in description = "Additional environment variables needed by the display manager."; }; - logsXsession = mkOption { + logToFile = mkOption { type = types.bool; default = false; description = '' - Whether the display manager redirects the - output of the session script to - ~/.xsession-errors. + Whether the display manager redirects the output of the + session script to ~/.xsession-errors. ''; }; - }; + logToJournal = mkOption { + type = types.bool; + default = true; + description = '' + Whether the display manager redirects the output of the + session script to the systemd journal. + ''; + }; - logToJournal = mkOption { - type = types.bool; - default = true; - description = '' - By default, the stdout/stderr of sessions is written - to ~/.xsession-errors. When this option - is enabled, it will instead be written to the journal. - ''; }; }; diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 1733f2fd39b2..b5e936830918 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -190,7 +190,7 @@ in services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { - logsXsession = true; + logToFile = true; # lightdm relaunches itself via just `lightdm`, so needs to be on the PATH execCmd = '' diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index facaea131ae5..2d4cb8aa20a5 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -205,7 +205,7 @@ in services.xserver.displayManager.slim.enable = false; services.xserver.displayManager.job = { - logsXsession = true; + logToFile = true; environment = { # Load themes from system environment diff --git a/nixos/modules/services/x11/display-managers/xpra.nix b/nixos/modules/services/x11/display-managers/xpra.nix index 8f5ce3dccc6a..b46ede550c16 100644 --- a/nixos/modules/services/x11/display-managers/xpra.nix +++ b/nixos/modules/services/x11/display-managers/xpra.nix @@ -220,7 +220,7 @@ in ''; services.xserver.displayManager.job = { - logsXsession = true; + logToFile = true; execCmd = '' ${optionalString (cfg.pulseaudio) From ee933bdb1d69c831c36f1a0bb26b19e31a8f42e4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Nov 2017 18:44:52 +0800 Subject: [PATCH 96/98] fish: 2.6.0 -> 2.7.0 --- pkgs/shells/fish/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 5832c8ef8911..494425e8302e 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -35,11 +35,11 @@ let # source both, but source the more global configuration files earlier # than the more local ones, so that more local configurations inherit # from but override the more global locations. - + if test -f /etc/fish/config.fish source /etc/fish/config.fish end - + # # ############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ############### ''; @@ -88,13 +88,15 @@ let fish = stdenv.mkDerivation rec { name = "fish-${version}"; - version = "2.6.0"; + version = "2.7.0"; etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; src = fetchurl { - url = "http://fishshell.com/files/${version}/${name}.tar.gz"; - sha256 = "1yzx73kg5ng5ivhi68756sl5hpb8869110l9fwim6gn7f7bbprby"; + # There are differences between the release tarball and the tarball github packages from the tag + # Hence we cannot use fetchFromGithub + url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${name}.tar.gz"; + sha256 = "1jvvm27hp46w0cia14lfz6161dkz8b935j1m7j38i7rgx75bfxis"; }; buildInputs = [ ncurses libiconv pcre2 ]; From 2b74650b4f83c64753ebce74b2901c0823f4fe48 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 27 Nov 2017 08:13:56 -0500 Subject: [PATCH 97/98] hipchat: 4.30.0.1663 -> 4.30.2.1665 --- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 4d4b32453a4f..770c2fc02c5e 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.30.0.1663"; + version = "4.30.2.1665"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "13mh49nx75pvaygzi70sg96iad3mn9ym0p4p3ja46amkxbdkq7h7"; + sha256 = "0gk1h2p5apppw94353378b2z93c5kllhgadb91z1g3mczczsbm0n"; } else throw "HipChat is not supported on ${stdenv.system}"; From ba3a792435ee13269d1da5997581454145e2d626 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 27 Nov 2017 13:34:31 +0000 Subject: [PATCH 98/98] fish: enable parallel building --- pkgs/shells/fish/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 494425e8302e..ec99f2bbf8de 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -159,6 +159,8 @@ let tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Smart and user-friendly command line shell"; homepage = http://fishshell.com/;