From e16cacff3982ac0221f57449f32ed3a4637bd1b2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 08:33:52 +0000 Subject: [PATCH 1/7] linux_latest: 5.13.13 -> 5.14 (cherry picked from commit 5d1c50837be54312b71ac83ddc1d1b6629d09073) --- pkgs/os-specific/linux/kernel/linux-5.14.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/kernel/linux-5.14.nix diff --git a/pkgs/os-specific/linux/kernel/linux-5.14.nix b/pkgs/os-specific/linux/kernel/linux-5.14.nix new file mode 100644 index 00000000000..e6a76146ce7 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.14.nix @@ -0,0 +1,18 @@ +{ lib, buildPackages, fetchurl, perl, buildLinux, nixosTests, modDirVersionArg ? null, ... } @ args: + +with lib; + +buildLinux (args // rec { + version = "5.14"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "1cki6af9r30k8820j73qdyycp23mwpf2a2rjwl82p9i61mg8n1ky"; + }; +} // (args.argsOverride or { })) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b492b7c634f..f1ef7399bff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20449,6 +20449,13 @@ in ]; }; + linux_5_14 = callPackage ../os-specific/linux/kernel/linux-5.14.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + ]; + }; + linux-rt_5_10 = callPackage ../os-specific/linux/kernel/linux-rt-5.10.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -20731,7 +20738,7 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_13; + linuxPackages_latest = linuxPackages_5_14; linux_latest = linuxPackages_latest.kernel; # Realtime kernel packages. @@ -20756,6 +20763,7 @@ in linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_10); linuxPackages_5_13 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_13); + linuxPackages_5_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_14); # When adding to the list above: # - Update linuxPackages_latest to the latest version From 4cc89568451343ff857ea9860c615f131df4332d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 30 Aug 2021 07:46:49 +0000 Subject: [PATCH 2/7] linux_latest-libre: 18260 -> 18268 (cherry picked from commit e6f7a48269fd807a1cc65335aad6f5ce2ba367d8) --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index a183b685949..91134e18a8a 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18260"; - sha256 = "11mmdix0vq9yrivx300ay6np3xx1gdqdr4cqdxr1wa84dbl7c2dm"; + rev = "18268"; + sha256 = "050rk485csj41yfydr1cvn60vhb3lzbb3486sm832vp55d34i8fd"; } , ... }: From d8e386b70df90b9c48ebd9bfd2c83cdfa6e888ed Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 3 Sep 2021 13:00:00 +0200 Subject: [PATCH 3/7] gitlab: 14.2.1 -> 14.2.3 (cherry picked from commit 6ede6d2740c0625531b58d69d5a80a06821c6635) --- .../version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/gitaly/Gemfile | 4 ++-- .../gitlab/gitaly/Gemfile.lock | 10 +++++----- .../gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitaly/gemset.nix | 8 ++++---- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/gitlab/rubyEnv/Gemfile | 6 +++--- .../gitlab/rubyEnv/Gemfile.lock | 18 +++++++++--------- .../gitlab/rubyEnv/gemset.nix | 14 +++++++------- 9 files changed, 38 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 9b58febf8bb..7425af1f98a 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "14.2.1", - "repo_hash": "0ivymkqcwl2lrnv0lkcw2ch26iyz9ixklrkc2jq38pbwc0igf89z", + "version": "14.2.3", + "repo_hash": "06fr8srz5ii0h65b1h2zfm8kzqz9g8jy2aq4g5js6kmv44zjya1p", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v14.2.1-ee", + "rev": "v14.2.3-ee", "passthru": { - "GITALY_SERVER_VERSION": "14.2.1", + "GITALY_SERVER_VERSION": "14.2.3", "GITLAB_PAGES_VERSION": "1.42.0", "GITLAB_SHELL_VERSION": "13.19.1", - "GITLAB_WORKHORSE_VERSION": "14.2.1" + "GITLAB_WORKHORSE_VERSION": "14.2.3" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile index 76c193ed06c..7eaf3c0f218 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile @@ -7,7 +7,7 @@ gem 'activesupport', '~> 6.1.3.2' gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.1', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.4.gitlab.1', require: false -gem 'grpc', '~> 1.38.0' +gem 'grpc', '~> 1.30.2' gem 'sentry-raven', '~> 3.0', require: false gem 'faraday', '~> 1.0' gem 'rbtrace', require: false @@ -29,5 +29,5 @@ group :development, :test do gem 'factory_bot', require: false gem 'pry', '~> 0.12.2', require: false - gem 'grpc-tools', '= 1.38.0' + gem 'grpc-tools', '= 1.30.2' end diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index e87bd703acd..f0e06b761dc 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -77,10 +77,10 @@ GEM google-protobuf (3.17.3) googleapis-common-protos-types (1.1.0) google-protobuf (~> 3.14) - grpc (1.38.0) - google-protobuf (~> 3.15) + grpc (1.30.2) + google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) - grpc-tools (1.38.0) + grpc-tools (1.30.2) i18n (1.8.10) concurrent-ruby (~> 1.0) ice_nine (0.11.2) @@ -225,8 +225,8 @@ DEPENDENCIES gitlab-labkit (~> 0.20.0) gitlab-markup (~> 1.7.1) google-protobuf (~> 3.17.0) - grpc (~> 1.38.0) - grpc-tools (= 1.38.0) + grpc (~> 1.30.2) + grpc-tools (= 1.30.2) licensee (~> 9.14.1) pry (~> 0.12.2) rbtrace diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 21dc5a95e87..f272c7a6e46 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -10,7 +10,7 @@ let copyGemFiles = true; gemdir = ./.; }; - version = "14.2.1"; + version = "14.2.3"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; in @@ -22,7 +22,7 @@ buildGoModule { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-B3NtdS1UcT+nYIdoXs+tW2gnXZ0ew+NiIcCNi5z5fOc="; + sha256 = "sha256-TSA5CoNaLeMu7O02rsaR/rNciLwzxSIUUQsCo40Z15c="; }; vendorSha256 = "sha256-WhkNK+V7yXK+le1u8StAKajZIBzVKqV/WIau27oZBXE="; diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index 7f3ba7d5014..f5e562ddf6e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -311,20 +311,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12"; + sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5"; type = "gem"; }; - version = "1.38.0"; + version = "1.30.2"; }; grpc-tools = { groups = ["development" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sfbf5s19nfgznlb7m2sfw9l0ppvypj46ijjvq5p35fc6b8by5aq"; + sha256 = "0k9zhsqhamp02ryzgfb4y2bbick151vlhrhj0kqbbz9lyhms0bd4"; type = "gem"; }; - version = "1.38.0"; + version = "1.30.2"; }; i18n = { dependencies = ["concurrent-ruby"]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 6edf8beb598..68d82bf3bb3 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -5,7 +5,7 @@ in buildGoModule rec { pname = "gitlab-workhorse"; - version = "14.2.1"; + version = "14.2.3"; src = fetchFromGitLab { owner = data.owner; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index ff806aa1ad7..35017bd87d9 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -101,7 +101,7 @@ gem 'graphql', '~> 1.11.8' # TODO: remove app/views/graphiql/rails/editors/show.html.erb when https://github.com/rmosolgo/graphiql-rails/pull/71 is released: # https://gitlab.com/gitlab-org/gitlab/issues/31747 gem 'graphiql-rails', '~> 1.4.10' -gem 'apollo_upload_server', '~> 2.0.2' +gem 'apollo_upload_server', '~> 2.1.0' gem 'graphql-docs', '~> 1.6.0', group: [:development, :test] gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) @@ -310,7 +310,7 @@ gem 'pg_query', '~> 2.1' gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation -gem 'gitlab-labkit', '~> 0.21.0' +gem 'gitlab-labkit', '~> 0.21.1' # Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 # because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 gem 'thrift', '>= 0.14.0' @@ -479,7 +479,7 @@ gem 'gitaly', '~> 14.2.0.pre.rc2' # KAS GRPC protocol definitions gem 'kas-grpc', '~> 0.0.2' -gem 'grpc', '~> 1.38.0' +gem 'grpc', '~> 1.30.2' gem 'google-protobuf', '~> 3.17.1' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index f43f8610196..3c5286b5edd 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -73,9 +73,9 @@ GEM aes_key_wrap (1.1.0) akismet (3.0.0) android_key_attestation (0.3.0) - apollo_upload_server (2.0.2) + apollo_upload_server (2.1.0) + actionpack (>= 4.2) graphql (>= 1.8) - rails (>= 4.2) asana (0.10.3) faraday (~> 1.0) faraday_middleware (~> 1.0) @@ -468,10 +468,10 @@ GEM fog-json (~> 1.2.0) mime-types ms_rest_azure (~> 0.12.0) - gitlab-labkit (0.21.0) + gitlab-labkit (0.21.1) actionpack (>= 5.0.0, < 7.0.0) activesupport (>= 5.0.0, < 7.0.0) - grpc (~> 1.38) + grpc (~> 1.30.2) jaeger-client (~> 1.1) opentracing (~> 0.4) pg_query (~> 2.1) @@ -566,8 +566,8 @@ GEM graphql (~> 1.6) html-pipeline (~> 2.8) sass (~> 3.4) - grpc (1.38.0) - google-protobuf (~> 3.15) + grpc (1.30.2) + google-protobuf (~> 3.12) googleapis-common-protos-types (~> 1.0) gssapi (1.2.0) ffi (>= 1.0.1) @@ -1385,7 +1385,7 @@ DEPENDENCIES acts-as-taggable-on (~> 7.0) addressable (~> 2.8) akismet (~> 3.0) - apollo_upload_server (~> 2.0.2) + apollo_upload_server (~> 2.1.0) asana (~> 0.10.3) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) @@ -1471,7 +1471,7 @@ DEPENDENCIES gitlab-dangerfiles (~> 2.3.0) gitlab-experiment (~> 0.6.4) gitlab-fog-azure-rm (~> 1.1.1) - gitlab-labkit (~> 0.21.0) + gitlab-labkit (~> 0.21.1) gitlab-license (~> 2.0) gitlab-mail_room (~> 0.0.9) gitlab-markup (~> 1.7.1) @@ -1493,7 +1493,7 @@ DEPENDENCIES graphlient (~> 0.4.0) graphql (~> 1.11.8) graphql-docs (~> 1.6.0) - grpc (~> 1.38.0) + grpc (~> 1.30.2) gssapi guard-rspec haml_lint (~> 0.36.0) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 84c1222dbbc..eb4a7467d50 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -195,15 +195,15 @@ version = "0.3.0"; }; apollo_upload_server = { - dependencies = ["graphql" "rails"]; + dependencies = ["actionpack" "graphql"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xk54h9mmzhrbgbmk33v38pavb8w6421mx2yrgsdarkfl9fr90y3"; + sha256 = "0klhppx4vjfdvgz12wb63bcxy5ymk0mp8wkh01fpgjn2l3fwkwz5"; type = "gem"; }; - version = "2.0.2"; + version = "2.1.0"; }; asana = { dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"]; @@ -1987,10 +1987,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dzdxrn2ra21nyfnabj44fbwbccjkp3i7cjpym99pzbsx8dkna8z"; + sha256 = "09xci7jw5sckagnwfjlglz4cywylrf16r83f82asnnngvxadvvmq"; type = "gem"; }; - version = "0.21.0"; + version = "0.21.1"; }; gitlab-license = { groups = ["default"]; @@ -2278,10 +2278,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16qxl287kkf34h71djlf9x3wxmd5ylcm83y2zhnrv81gbrhn8k12"; + sha256 = "1rsglf7ag17n465iff7vlw83pn2rpl4kv9sb1rpf17nx6xpi7yl5"; type = "gem"; }; - version = "1.38.0"; + version = "1.30.2"; }; gssapi = { dependencies = ["ffi"]; From 544ad3ea4bff23f633fbc814bfaadb428d8149d2 Mon Sep 17 00:00:00 2001 From: Yureka Date: Fri, 3 Sep 2021 12:03:25 +0200 Subject: [PATCH 4/7] gitlab: add back grpc patch They downgraded grpc in the fix release (cherry picked from commit f007b794c758000a275b00dd0695d2fb155195f0) --- .../applications/version-management/gitlab/default.nix | 6 ++++++ .../version-management/gitlab/fix-grpc-ar.patch | 10 ++++++++++ .../version-management/gitlab/gitaly/default.nix | 10 ++++++++++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/applications/version-management/gitlab/fix-grpc-ar.patch diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 4348788f879..8753def1121 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -22,6 +22,12 @@ let gemset = let x = import (gemdir + "/gemset.nix"); in x // { + # grpc expects the AR environment variable to contain `ar rpc`. See the + # discussion in nixpkgs #63056. + grpc = x.grpc // { + patches = [ ./fix-grpc-ar.patch ]; + dontBuild = false; + }; # the openssl needs the openssl include files openssl = x.openssl // { buildInputs = [ openssl ]; diff --git a/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch new file mode 100644 index 00000000000..9b95e668e04 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/fix-grpc-ar.patch @@ -0,0 +1,10 @@ +--- a/src/ruby/ext/grpc/extconf.rb ++++ b/src/ruby/ext/grpc/extconf.rb +@@ -27,6 +27,7 @@ ENV['MACOSX_DEPLOYMENT_TARGET'] = '10.7' + if ENV['AR'].nil? || ENV['AR'].size == 0 + ENV['AR'] = RbConfig::CONFIG['AR'] + ' rcs' + end ++ENV['AR'] = ENV['AR'] + ' rcs' + if ENV['CC'].nil? || ENV['CC'].size == 0 + ENV['CC'] = RbConfig::CONFIG['CC'] + end diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index f272c7a6e46..6f391b129a0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -9,6 +9,16 @@ let inherit ruby; copyGemFiles = true; gemdir = ./.; + gemset = + let x = import (gemdir + "/gemset.nix"); + in x // { + # grpc expects the AR environment variable to contain `ar rpc`. See the + # discussion in nixpkgs #63056. + grpc = x.grpc // { + patches = [ ../fix-grpc-ar.patch ]; + dontBuild = false; + }; + }; }; version = "14.2.3"; gitaly_package = "gitlab.com/gitlab-org/gitaly/v${lib.versions.major version}"; From 546c9a981b0396e02331a2380d3304ee9dd42e0d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 1 Sep 2021 12:52:54 +0200 Subject: [PATCH 5/7] chromium: 92.0.4515.159 -> 93.0.4577.63 https://chromereleases.googleblog.com/2021/08/stable-channel-update-for-desktop_31.html This update includes 27 security fixes. CVEs: CVE-2021-30606 CVE-2021-30607 CVE-2021-30608 CVE-2021-30609 CVE-2021-30610 CVE-2021-30611 CVE-2021-30612 CVE-2021-30613 CVE-2021-30614 CVE-2021-30615 CVE-2021-30616 CVE-2021-30617 CVE-2021-30618 CVE-2021-30619 CVE-2021-30620 CVE-2021-30621 CVE-2021-30622 CVE-2021-30623 CVE-2021-30624 (cherry picked from commit d04f44f7e8d6f475e91e5539becf156676caff5c) --- .../browsers/chromium/upstream-info.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 34d9dcf73a8..f095138416b 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,20 +1,20 @@ { "stable": { - "version": "92.0.4515.159", - "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", - "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", + "version": "93.0.4577.63", + "sha256": "0ls8r77la6p7474j84wchvs4rvnxwfv7c8xvbxjm8h7jqak4zwza", + "sha256bin64": "1kv742arnv710mhakm2v59dwfypg7j01k7rd5if8h0s49yzdw3qc", "deps": { "gn": { - "version": "2021-05-07", + "version": "2021-07-08", "url": "https://gn.googlesource.com/gn", - "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810", - "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" + "rev": "24e2f7df92641de0351a96096fb2c490b2436bb8", + "sha256": "1lwkyhfhw0zd7daqz466n7x5cddf0danr799h4jg3s0yvd4galjl" } }, "chromedriver": { - "version": "92.0.4515.107", - "sha256_linux": "12yckzjhlhxp14j7aphnvlw4xv713vllj44h5pba181ivxavmky3", - "sha256_darwin": "0gm0zazwy053rip9h0ma2s53rc65b8pzy57x48ch0fpq7rrsbycp" + "version": "93.0.4577.15", + "sha256_linux": "11wcimkcgaiz740k9xibi5hq1kd4zgy1vk6bd6cp31wjw4y21x5f", + "sha256_darwin": "0cxf3cg5pg9rigq7wmbap6wvmgpdr6v44bndisyaqhlw7s2hhndn" } }, "beta": { From 06f9502809ad0733f82975e08ea5a2111cb0013f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 3 Sep 2021 12:28:58 +0200 Subject: [PATCH 6/7] signal-desktop: 5.15.0 -> 5.16.0 (cherry picked from commit c5130a6205c9b89d31b7140f6478fdc9014e06ea) --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index dff7e233d3a..0a52c6fd723 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.15.0"; # Please backport all updates to the stable channel. + version = "5.16.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0cbz2l31cg87n6qlbvwdjy92q9qgmmkrsvaj37cc34ajh7asd833"; + sha256 = "1na5ja68h14smfwxrli1kfr6fhf5dshyvcdaj0c4mwms838bdl4j"; }; nativeBuildInputs = [ From 478fecce96ce6629b737e87d99b7bdcea2d325b1 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 3 Sep 2021 23:13:43 +0200 Subject: [PATCH 7/7] llvmPackages_13.compiler-rt: Mark as broken on Aarch64 To avoid unnecessary builds but this needs to be fixed ASAP. Chromium already depends on it and a lot of additional packages, including Mesa, will depend on it after the stable release. (cherry picked from commit 5661f7dbeeee708a401d2524ddb40374dda4c6a7) --- pkgs/development/compilers/llvm/13/compiler-rt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix index eb3446342b4..bea49f54e80 100644 --- a/pkgs/development/compilers/llvm/13/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/13/compiler-rt/default.nix @@ -110,5 +110,7 @@ stdenv.mkDerivation { # "All of the code in the compiler-rt project is dual licensed under the MIT # license and the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; + # TODO/FIXME: Build fails on Hydra: + broken = stdenv.isAarch64; }; }