From 4735d5b328f5b8b65a1265968790c19909f270bb Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 28 Jun 2023 01:39:29 +0200 Subject: [PATCH 1/5] chromium: 114.0.5735.133 -> 114.0.5735.198 https://chromereleases.googleblog.com/2023/06/stable-channel-update-for-desktop_26.html This update includes 4 security fixes. CVEs: CVE-2023-3420 CVE-2023-3421 CVE-2023-3422 (cherry picked from commit 251bcbf1a2763c835d3bd1b94aa20cb38b39ad9e) --- .../networking/browsers/chromium/upstream-info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 183e13dfbad7..15c631d47744 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "114.0.5735.133", - "sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2", - "sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g", + "version": "114.0.5735.198", + "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9", + "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92", "deps": { "gn": { "version": "2023-04-19", From da4bcf034a44de1d19cc5d72428df9f8d3e244a6 Mon Sep 17 00:00:00 2001 From: networkException Date: Wed, 28 Jun 2023 13:23:23 +0200 Subject: [PATCH 2/5] ungoogled-chromium: 114.0.5735.133 -> 114.0.5735.198 https://chromereleases.googleblog.com/2023/06/stable-channel-update-for-desktop_26.html This update includes 4 security fixes. CVEs: CVE-2023-3420 CVE-2023-3421 CVE-2023-3422 (cherry picked from commit dd96e7a2d7d438938011f38788c649278eaed2c3) --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 183e13dfbad7..dbd77dcfc7ec 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "114.0.5735.133", - "sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2", - "sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g", + "version": "114.0.5735.198", + "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9", + "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92", "deps": { "gn": { "version": "2023-04-19", @@ -56,8 +56,8 @@ "sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk" }, "ungoogled-patches": { - "rev": "114.0.5735.133-1", - "sha256": "1i9ql4b2rn9jryyc3hfr9kh8ccf5a4gvpwsp9lnp9jc2gryrv70y" + "rev": "114.0.5735.198-1", + "sha256": "1zda5c7n43zviwj3n2r2zbhmylkrfy54hggq8cisbdrhhfn96vii" } } } From 84a3e097c973a5ddf8d7be4f3246da8c3c973a3e Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 30 May 2023 22:27:40 +0900 Subject: [PATCH 3/5] python3Packages.scikit-optimize: mark broken This library has not been updated since Oct 12, 2021 and has not kept up with numpy updates. (cherry picked from commit 172f721a57b5235b828d1f4cfee546ce3ecc7627) --- pkgs/development/python-modules/scikit-optimize/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index 5e87c585116a..eb859c207487 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -39,5 +39,6 @@ buildPythonPackage rec { homepage = "https://scikit-optimize.github.io/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + broken = true; # It will fix by https://github.com/scikit-optimize/scikit-optimize/pull/1123 }; } From 43ca47571ee64ecbd6894049dc9df1aedcf3de4c Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 29 Jun 2023 13:18:41 +0200 Subject: [PATCH 4/5] gitlab: 15.11.9 -> 15.11.10 (#240505) https://gitlab.com/gitlab-org/gitlab/-/blob/v15.11.10-ee/CHANGELOG.md --- .../applications/version-management/gitlab/data.json | 12 ++++++------ .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index ebce8f0e5f92..4dfe25589bee 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,14 +1,14 @@ { - "version": "15.11.9", - "repo_hash": "sha256-G8Z8EYEtsSg3MH4ILeX9m/WLmE+XbcgZsPMORcyIKKw=", + "version": "15.11.10", + "repo_hash": "sha256-9s9RlUFI70UoJWKRTSf4bcR0ZPix5MqgGSraJCjQoNU=", "yarn_hash": "02ipm7agjy3c75df76c00k3qq5gpw3d876f6x91xnwizswsv9agb", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v15.11.9-ee", + "rev": "v15.11.10-ee", "passthru": { - "GITALY_SERVER_VERSION": "15.11.9", - "GITLAB_PAGES_VERSION": "15.11.9", + "GITALY_SERVER_VERSION": "15.11.10", + "GITLAB_PAGES_VERSION": "15.11.10", "GITLAB_SHELL_VERSION": "14.18.0", - "GITLAB_WORKHORSE_VERSION": "15.11.9" + "GITLAB_WORKHORSE_VERSION": "15.11.10" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 229a7f7e5c10..279563661de4 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -11,7 +11,7 @@ let gemdir = ./.; }; - version = "15.11.9"; + version = "15.11.10"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -22,7 +22,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-ISrSU2r+IUDBSdMhfbpO08fqhdlEtliyU6UHTkQ+koE="; + sha256 = "sha256-iIaLxvGz+VFOdCzrNbp1RuY1OW/TYOSAeLk4HVavBUI="; }; vendorSha256 = "sha256-gJelagGPogeCdJtRpj4RaYlqzZRhtU0EIhmj1aK4ZOk="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 79eb0d4dd574..b2ed3d411666 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 = "15.11.9"; + version = "15.11.10"; src = fetchFromGitLab { owner = data.owner; From 19bc92bc2c37df87ca58cd94fec3bf16ec122875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 28 Jun 2023 22:27:18 -0700 Subject: [PATCH 5/5] imagemagick: 7.1.1-11 -> 7.1.1-12 Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.1-11...7.1.1-12 (cherry picked from commit e0334495f78fd862cbb6985b25b41dd197bb462c) --- pkgs/applications/graphics/ImageMagick/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 77e1adeb619b..3af12bcfb344 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-11"; + version = "7.1.1-12"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-/CZRnNy/p87sEcH94RkRYgYXexFSU0Bm809pcvDFdV4="; + hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big