From 4f262f4f646137ce0a7f8b30c5699ff4c4d5b117 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 8 Jul 2022 17:48:11 +0300 Subject: [PATCH 1/8] python3Packages.poetry: 1.1.12 -> 1.1.14 (cherry picked from commit 0a5a747b65d58a99fd1024e40260781936ceec43) --- pkgs/development/python-modules/poetry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 5efbe56ac5bd..22de7d71bcc8 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.12"; + version = "1.1.14"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "1fm4yj6wxr24v7b77gmf63j7xsgszhbhzw2i9fvlfi0p9l0q34pm"; + sha256 = "sha256-n/GZOUoIMxWlULDqOe59Gt7Hz/+Mc4QcZT+1+HtQovs="; }; postPatch = '' From d96e79fce8879100731094b9a3e76234a7ddaf77 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Fri, 5 Aug 2022 09:16:59 +0200 Subject: [PATCH 2/8] ungoogled-chromium: 103.0.5060.134 -> 104.0.5112.81 (cherry picked from commit 1ad5e92e8dffe435de63b68af9fcae1ae5318378) --- .../browsers/chromium/ungoogled-flags.toml | 1 - .../browsers/chromium/upstream-info.json | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml index f2bf29cda24b..10cd77df21a7 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml +++ b/pkgs/applications/networking/browsers/chromium/ungoogled-flags.toml @@ -7,7 +7,6 @@ enable_js_type_check=false enable_mdns=false enable_mse_mpeg2ts_stream_parser=true enable_nacl=false -enable_one_click_signin=false enable_reading_list=false enable_remoting=false enable_reporting=false diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 093ef530490e..0fa81d908d8e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,19 +45,19 @@ } }, "ungoogled-chromium": { - "version": "103.0.5060.134", - "sha256": "0wdmy15602qxrb403p8yyx69k7py85fbawdsgap1l6z4h4j2g2p4", - "sha256bin64": "143jc70cyns2bh5cizy32fdsfl6hq22rphx216vywhncdsd96cnw", + "version": "104.0.5112.81", + "sha256": "0x17jzzvn2aqx3ahqyi6ijyn70sn79kg648r0ks9m5gib1bbgf0y", + "sha256bin64": null, "deps": { "gn": { - "version": "2022-05-11", + "version": "2022-06-08", "url": "https://gn.googlesource.com/gn", - "rev": "578a7fe4c3c6b0bc2ae1fd2e37f14857d09895bf", - "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" + "rev": "2ecd43a10266bd091c98e6dcde507c64f6a0dad3", + "sha256": "1q06vsz9b4bb764wy1wy8n177z2pgpm97kq3rl1hmq185mz5fhra" }, "ungoogled-patches": { - "rev": "103.0.5060.134-1", - "sha256": "00mpmyaa8bqxf1f4vhk1waxhjbhcwab8m1x1vf341al64f6bmr1r" + "rev": "104.0.5112.81-1", + "sha256": "0dvwh470h06x5a4p8kw22pi4lvch16knh90i2kh10y0wfggqz78w" } } } From aadbfbc65eff6edcdb4213b5676a11355cfa4402 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 30 Jun 2022 09:57:25 +1000 Subject: [PATCH 3/8] linuxPackages.bbswitch: 0.8 -> unstable-2021-11-29 Switch to the development branch, as it's basically stable at this point, and pinch Arch's 5.18 compat patch. Also remove existing patches: - PR 102 was rejected upstream, the actual issue is https://github.com/Bumblebee-Project/bbswitch/issues/112, and can be worked around via acpi_osi=Linux - PR 196 is applied upstream. (cherry picked from commit e1c59eaf85139abf379954d52340a25570ab09d3) --- pkgs/os-specific/linux/bbswitch/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 4f19c29e1c38..a56ff80c5f13 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -2,7 +2,7 @@ let baseName = "bbswitch"; - version = "0.8"; + version = "unstable-2021-11-29"; name = "${baseName}-${version}-${kernel.version}"; in @@ -13,18 +13,14 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Bumblebee-Project"; repo = "bbswitch"; - rev = "v${version}"; - hash = "sha256-FHC8myKnouNDERVds2QCJj1ZstjHrOzFpb+FDiSBjL4="; + rev = "23891174a80ea79c7720bcc7048a5c2bfcde5cd9"; + hash = "sha256-50v1Jxem5kaI1dHOKmgBbPLxI82QeYxiaRHhrHpWRzU="; }; patches = [ (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; - sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; - }) - (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/196.patch"; - sha256 = "02ihy3piws7783qbm9q0mb9s18ipn5ckdy1iar74xn31qjrsn99n"; + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/0bd986055ba52887b81048de5c61e618eec06eb0/trunk/0003-kernel-5.18.patch"; + sha256 = "sha256-va62/bR1qyBBMPg0lUwCH7slGG0XijxVCsFa4FCoHEQ="; }) ]; @@ -64,6 +60,5 @@ stdenv.mkDerivation { homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2Plus; - broken = kernel.kernelAtLeast "5.18"; }; } From 72f492e275fc29d44b3a4daf952fbeffc4aed5b8 Mon Sep 17 00:00:00 2001 From: Sandro Date: Fri, 5 Aug 2022 15:24:25 +0200 Subject: [PATCH 4/8] Update pkgs/os-specific/linux/bbswitch/default.nix (cherry picked from commit 7ee214f8e36e00b2122f5051299adf1b6dfec1ef) --- pkgs/os-specific/linux/bbswitch/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index a56ff80c5f13..886bf3e6fee8 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "Bumblebee-Project"; repo = "bbswitch"; + # https://github.com/Bumblebee-Project/bbswitch/tree/develop rev = "23891174a80ea79c7720bcc7048a5c2bfcde5cd9"; hash = "sha256-50v1Jxem5kaI1dHOKmgBbPLxI82QeYxiaRHhrHpWRzU="; }; From 1e37265b924aa9530b64b0907b18710cd196690c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 6 Aug 2022 15:31:30 +0200 Subject: [PATCH 5/8] nifi: switch src to a working and stable URL The previous one apparently only works for the last release. (cherry picked from commit 9f43cb37527eb00792cddbf6348f8eb0f364d642) --- pkgs/servers/web-apps/nifi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/nifi/default.nix b/pkgs/servers/web-apps/nifi/default.nix index b53b53aaf5c7..a934864eb77f 100644 --- a/pkgs/servers/web-apps/nifi/default.nix +++ b/pkgs/servers/web-apps/nifi/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.16.1"; src = fetchurl { - url = "https://dlcdn.apache.org/nifi/${version}/nifi-${version}-bin.tar.gz"; + url = "https://archive.apache.org/dist/nifi/${version}/nifi-${version}-bin.tar.gz"; sha256 = "sha256-wC+oKq8QGEKuD6B22Ny92NK0z3SBKmRoTEit3vAXJQs="; }; From 1b1ecfe111fdca29d699fa9ca77f781f99a64d05 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 5 Aug 2022 00:19:54 +0200 Subject: [PATCH 6/8] php80: 8.0.21 -> 8.0.22 https://www.php.net/ChangeLog-8.php#8.0.22 (cherry picked from commit 2b483c62db1853f5fad114a771d5a721327ebc79) --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 193eabe6c01f..5e346788ee48 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.21"; - hash = "sha256-HLd2LR/+zOruuvufbiQTLKI/sUQ8tWMND8z1PwTPoSY="; + version = "8.0.22"; + hash = "sha256-40KRjT7NQi8QAy3wrD/7Dhf1aPrWz44jK296ah/cPJw="; }); in From ea1bf40b0793e14e27bfb32fdace5daaa6fcef4e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 5 Aug 2022 00:20:10 +0200 Subject: [PATCH 7/8] php81: 8.1.8 -> 8.1.9 https://www.php.net/ChangeLog-8.php#8.1.9 (cherry picked from commit da6ccfbab2bd54f1a925d58abed861ebbc2f247d) --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index e56ff13864bb..37e471601ddb 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.8"; - hash = "sha256-uIFaWgJDFFPUJh41mL0fKFFuTANU8yjBKJDyV4cOTAE="; + version = "8.1.9"; + hash = "sha256-nrsOLlcdtv1ZMEKNyy0Z7T4FAzjsHxNHwoLK6S/Ahv8="; }); in From 290eb1c46da5df7a023b863b574942e67c585cd0 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 6 Aug 2022 17:46:01 +0100 Subject: [PATCH 8/8] gpac: mark with several knownVulnerabilities (cherry picked from commit f5d6209b00624b5c6313b912ad68b3f4b54b2fa5) --- pkgs/applications/video/gpac/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index 6fd7a2036c56..6390558013f5 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -41,5 +41,14 @@ stdenv.mkDerivation rec { license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; + knownVulnerabilities = [ + "CVE-2022-1035" + "CVE-2022-1172" + "CVE-2022-1222" + "CVE-2022-1795" + "CVE-2022-2453" + "CVE-2022-2454" + "CVE-2022-2549" + ]; }; }