From 734f5d117c8a00d24c061de0b817dd3d587a1745 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 19 Sep 2023 03:23:03 +0200 Subject: [PATCH 01/24] libcef: 112.3.0 -> 116.0.24 --- pkgs/development/libraries/libcef/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 3d3fe36b45b5..63c72b7a8ced 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0qn412iv3sl843vwx38c5wc9nwf0sx34a4x78qkdn17wjbrfjj79"; - platforms."x86_64-linux".sha256 = "02vipzdcmq5cvpmra44r82z8y9d53yqpnymsc2mfk98fvkvgz2j9"; + platforms."aarch64-linux".sha256 = "0q7bd44zj8m493pqviw3xhnygls5p7dvwafgvsflkwn1jzxjbjgg"; + platforms."x86_64-linux".sha256 = "1gc7rc8x7lrz05dqgzd3yzhvqh4j63495d7b23cwhpyzq2viwgyg"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "112.3.0"; - gitRevision = "b09c4ca"; - chromiumVersion = "112.0.5615.165"; + version = "116.0.24"; + gitRevision = "5332865"; + chromiumVersion = "116.0.5845.190"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; From 4eb43290a7f42ed4b4f2a175b74076a796d0be25 Mon Sep 17 00:00:00 2001 From: Rhys Davies Date: Sat, 9 Sep 2023 14:20:57 +1200 Subject: [PATCH 02/24] microsoft-edge: 115.0.1901.188 -> 116.0.1938.76 (cherry picked from commit e7807d695dd67aa9d1dad0ad3d6f809a1fb9da06) --- .../networking/browsers/microsoft-edge/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix index c60a867055ca..9ef09ebe13d4 100644 --- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "111.0.1661.44"; + version = "116.0.1938.76"; revision = "1"; - sha256 = "sha256-ePViYQZUteMBkV7AkvsoQwPVxibMB68LDWgg7d82iIE="; + sha256 = "sha256-zSnNgnpsxR2sRgoG+Vi2K3caaVUPLiJJ9d+EjjIzu7Y="; }; beta = import ./browser.nix { channel = "beta"; - version = "112.0.1722.15"; + version = "117.0.2045.21"; revision = "1"; - sha256 = "sha256-Ba6f5MOBTtY8bUxCcMySQCWqDvOiI1hLnuwcIspReq8="; + sha256 = "sha256-vsZy9WGlT4Yqf/tHmsgZV8Pj7D0nmhmziKYGrRj7Bi0="; }; dev = import ./browser.nix { channel = "dev"; - version = "113.0.1741.1"; + version = "118.0.2060.1"; revision = "1"; - sha256 = "sha256-1d92bQAoiTkqWgiWdUBn3VKBYCRP1KCvPiu7cQTFVio="; + sha256 = "sha256-OKjCmULPjYuoumqAqivyCFzHSR1IOutEIWTqXtDgMhM="; }; } From 02bcfc2902d5157b97d63e667e43b08d113cd029 Mon Sep 17 00:00:00 2001 From: Colt Frederickson Date: Wed, 13 Sep 2023 16:58:43 -0600 Subject: [PATCH 03/24] jna: add macos platforms (cherry picked from commit 3b605d204dae49e76fb3bc790f49df569abade39) --- pkgs/development/java-modules/jna/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/java-modules/jna/default.nix b/pkgs/development/java-modules/jna/default.nix index 615df5c72b36..00f4cd5fba83 100644 --- a/pkgs/development/java-modules/jna/default.nix +++ b/pkgs/development/java-modules/jna/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Java Native Access"; license = with licenses; [ lgpl21 asl20 ]; maintainers = with maintainers; [ nagy ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; changelog = "https://github.com/java-native-access/jna/blob/${version}/CHANGES.md"; }; } From 867ca05fff46fdc4e2c6d4ab9e2e0f703e421a9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Mon, 18 Sep 2023 20:43:53 -0600 Subject: [PATCH 04/24] linux/hardened/patches/6.5: init at 6.5.3-hardened1 (cherry picked from commit 52e17b92bad46db2d59e4c37bd8c2d4bbe534f8f) --- nixos/tests/kernel-generic.nix | 1 + pkgs/os-specific/linux/kernel/hardened/patches.json | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/linux-kernels.nix | 2 ++ 4 files changed, 15 insertions(+) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index e4a8e06df1ef..8458c4902f2d 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -32,6 +32,7 @@ let linux_5_15_hardened linux_6_1_hardened linux_6_4_hardened + linux_6_5_hardened linux_rt_5_4 linux_rt_5_10 linux_rt_5_15 diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index c024f03dd0c4..659fc1a65c14 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -68,5 +68,15 @@ }, "sha256": "1phlx375ln5pslw5vjqm029cdv6pzf4ang10xlrf90x5sb4fgy93", "version": "6.4.15" + }, + "6.5": { + "patch": { + "extra": "-hardened1", + "name": "linux-hardened-6.5.3-hardened1.patch", + "sha256": "0p92x3f129hmk5r5xmxs5ihvg5cdl2bmqlhqza3wy4314f1kngl7", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.5.3-hardened1/linux-hardened-6.5.3-hardened1.patch" + }, + "sha256": "0kzbcc3iar9i0hb99xf9k3b16lxb4f8qzmia0gwxrn3vn7vi7b2c", + "version": "6.5.3" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0302d8595ef0..7abd6d1ee143 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27095,6 +27095,8 @@ with pkgs; linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; linuxPackages_6_4_hardened = linuxKernel.packages.linux_6_4_hardened; linux_6_4_hardened = linuxKernel.kernels.linux_6_4_hardened; + linuxPackages_6_5_hardened = linuxKernel.packages.linux_6_5_hardened; + linux_6_5_hardened = linuxKernel.kernels.linux_6_5_hardened; # Hardkernel (Odroid) kernels. linuxPackages_hardkernel_latest = linuxKernel.packageAliases.linux_hardkernel_latest; diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index 6e5f2613bcad..99b6f7e30557 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -275,6 +275,7 @@ in { linux_5_15_hardened = hardenedKernelFor kernels.linux_5_15 { }; linux_6_1_hardened = hardenedKernelFor kernels.linux_6_1 { }; linux_6_4_hardened = hardenedKernelFor kernels.linux_6_4 { }; + linux_6_5_hardened = hardenedKernelFor kernels.linux_6_5 { }; } // lib.optionalAttrs config.allowAliases { linux_4_9 = throw "linux 4.9 was removed because it will reach its end of life within 22.11"; @@ -623,6 +624,7 @@ in { linux_5_15_hardened = recurseIntoAttrs (packagesFor kernels.linux_5_15_hardened); linux_6_1_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_1_hardened); linux_6_4_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_4_hardened); + linux_6_5_hardened = recurseIntoAttrs (packagesFor kernels.linux_6_5_hardened); linux_zen = recurseIntoAttrs (packagesFor kernels.linux_zen); linux_lqx = recurseIntoAttrs (packagesFor kernels.linux_lqx); From 7147e78702635495c32c2fd8cf548d4c671abbab Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 19 Sep 2023 10:10:30 +0200 Subject: [PATCH 05/24] mautrix-whatsapp: 0.10.0 -> 0.10.1 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 480e7eac8bdd..1a0845e8752d 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-NbIDVBfh/6NXEvQhypOC5ToOq0EEkKKiMMahGJdXX0g="; + hash = "sha256-I1qM1hq6bnBgbtfzgWvySairfr+Q6TthMIQM+Mregc8="; }; buildInputs = [ olm ]; - vendorSha256 = "sha256-5S5uq7CRixw6PvtE4xz+AWfS+VsKE4+JVZjfyXmvbsM="; + vendorHash = "sha256-TH353K6BOTzFC/iPIf1S7rV0DSIxjJEg42ru5H8NbSE="; doCheck = false; From 7ba9bf355b65c17a4fc4c6857407b4d05d7fb662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Sep 2023 18:11:36 +0200 Subject: [PATCH 06/24] nextcloud25: 25.0.10 -> 25.0.11 (cherry picked from commit d8f4c08f371f72e6bea1b4106fc852d2b9e6e4ce) --- pkgs/servers/nextcloud/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 1093d49b3202..aec0e05c5646 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -6,7 +6,7 @@ let generic = { - version, sha256 + version, hash , eol ? false, extraVulnerabilities ? [] , packages }: let @@ -17,7 +17,7 @@ let src = fetchurl { url = "https://download.nextcloud.com/server/releases/${pname}-${version}.tar.bz2"; - inherit sha256; + inherit hash; }; # This patch is only necessary for NC version <26. @@ -60,8 +60,8 @@ in { ''; nextcloud25 = generic { - version = "25.0.10"; - sha256 = "sha256-alvh0fWESSS5KbfiKI1gaoahisDWnfT/bUhsSEEXfQI="; + version = "25.0.11"; + hash = "sha256-UkOCknG6t9uN8ry3dGZ0y7DS3KlQu7mS5K6UO+N+rtE="; packages = nextcloud25Packages; }; From d7085e23922d67e1f5bebb0669dffed868cd99cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Sep 2023 18:11:46 +0200 Subject: [PATCH 07/24] nextcloud26: 26.0.5 -> 26.0.6 (cherry picked from commit 3f2929850f3dcd236298251adc3cd4deb63274a9) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index aec0e05c5646..27216660b012 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -66,8 +66,8 @@ in { }; nextcloud26 = generic { - version = "26.0.5"; - sha256 = "sha256-nhq0aAY4T1hUZdKJY66ZSlirCSgPQet8YJpciwJw1b4="; + version = "26.0.6"; + hash = "sha256-LKyP2S0kgjDc0Ea7u0RGmyIPWLAQ5j+V2APZhXVer2Y="; packages = nextcloud26Packages; }; From c3c65171afa0dc51b4f5edce5653b21ab0c02be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 18 Sep 2023 18:11:55 +0200 Subject: [PATCH 08/24] nextcloud27: 27.0.2 -> 27.1.0 (cherry picked from commit ff404e6b415aa67dfcdc8c8cec63bbe78d72d362) --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 27216660b012..5c0ead3ea5fa 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -72,8 +72,8 @@ in { }; nextcloud27 = generic { - version = "27.0.2"; - sha256 = "sha256-ei3OpDqjuPswM0fv2kxvN3M8yhE8juFt2fDl+2jHIS8="; + version = "27.1.0"; + hash = "sha256-wxZwWeacUXt64H87sLgyQz0yRnWFkIH+lT6kG8ffEkI="; packages = nextcloud27Packages; }; From ebcd533bf5fde4975f9adc5f98710cbc3b805178 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 19 Sep 2023 12:55:53 +0200 Subject: [PATCH 09/24] bitcoin: add shell completions (cherry picked from commit 5dacf3a0d80dab7bc04a376db04e81369134e241) --- .../blockchains/bitcoin/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix index 01a3f3e1587a..24f7d78e4f56 100644 --- a/pkgs/applications/blockchains/bitcoin/default.nix +++ b/pkgs/applications/blockchains/bitcoin/default.nix @@ -3,6 +3,7 @@ , fetchurl , autoreconfHook , pkg-config +, installShellFiles , util-linux , hexdump , autoSignDarwinBinariesHook @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = - [ autoreconfHook pkg-config ] + [ autoreconfHook pkg-config installShellFiles ] ++ lib.optionals stdenv.isLinux [ util-linux ] ++ lib.optionals stdenv.isDarwin [ hexdump ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ] @@ -53,7 +54,19 @@ stdenv.mkDerivation rec { ++ lib.optionals withWallet [ db48 sqlite ] ++ lib.optionals withGui [ qrencode qtbase qttools ]; - postInstall = lib.optionalString withGui '' + postInstall = '' + installShellCompletion --cmd bitcoin-cli --bash contrib/completions/bash/bitcoin-cli.bash-completion + installShellCompletion --cmd bitcoind --bash contrib/completions/bash/bitcoind.bash-completion + installShellCompletion --cmd bitcoin-tx --bash contrib/completions/bash/bitcoin-tx.bash-completion + + installShellCompletion --fish contrib/completions/fish/bitcoin-cli.fish + installShellCompletion --fish contrib/completions/fish/bitcoind.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-tx.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-util.fish + installShellCompletion --fish contrib/completions/fish/bitcoin-wallet.fish + '' + lib.optionalString withGui '' + installShellCompletion --fish contrib/completions/fish/bitcoin-qt.fish + install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin" install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png From 7d11cf0797e04f65a23331166747701d11493a32 Mon Sep 17 00:00:00 2001 From: Isa Date: Tue, 19 Sep 2023 10:09:21 +0200 Subject: [PATCH 10/24] gitlab: 16.3.3 -> 16.3.4 (cherry picked from commit 6ab77d221c18cf802ee0ea2848759412b21ec7bc) --- .../version-management/gitlab/data.json | 14 +++++++------- .../version-management/gitlab/gitaly/default.nix | 4 ++-- .../gitlab/gitlab-pages/default.nix | 4 ++-- .../gitlab/gitlab-workhorse/default.nix | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index d0c88d1ecb48..955edc421ac8 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,15 +1,15 @@ { - "version": "16.3.3", - "repo_hash": "sha256-+h3ksxuphegTvjrKTWk68fgan1n2g64b1sn5nMoYhLc=", + "version": "16.3.4", + "repo_hash": "sha256-VM3yH+6R8FyzwAhXtjbQsoMhPVALvDxQvmwyNZE0JCQ=", "yarn_hash": "02g51sfpn065513n5ngcw6rqvzaws6yfq0y7gyj4lc4d8fhis088", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v16.3.3-ee", + "rev": "v16.3.4-ee", "passthru": { - "GITALY_SERVER_VERSION": "16.3.3", - "GITLAB_PAGES_VERSION": "16.3.3", + "GITALY_SERVER_VERSION": "16.3.4", + "GITLAB_PAGES_VERSION": "16.3.4", "GITLAB_SHELL_VERSION": "14.26.0", - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.8", - "GITLAB_WORKHORSE_VERSION": "16.3.3" + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.3.10", + "GITLAB_WORKHORSE_VERSION": "16.3.4" } } diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index d5705250f437..66abdc0d7975 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -13,7 +13,7 @@ }: let - version = "16.3.3"; + version = "16.3.4"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -24,7 +24,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-V9uh5QkvQ1ifO5DNCivg47NBjgE06Ehz7DnmBeU3lVY="; + hash = "sha256-5fNRoxWNBky7dJLFg+OyshfIcAqCAj41hvfrQRPIuzg="; }; vendorHash = "sha256-abyouKgn31yO3+oeowtxZcuvS6mazVM8zOMEFsyw4C0="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix index e94d32d27a63..65873fa84035 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-pages/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "16.3.3"; + version = "16.3.4"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - hash = "sha256-TPXMXuxckALObfEcIguJbGToIGp8b2bpd974epaXpyk="; + hash = "sha256-hz5YCQi1O+/ana/Vpawh2nQj7fmcI6huvKFTG9rVDjw="; }; vendorHash = "sha256-Pdb+bWsECe7chgvPKFGXxVAWb+AbGF6khVJSdDsHqKM="; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 4b4580a9ba87..6e539ad8652f 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 = "16.3.3"; + version = "16.3.4"; src = fetchFromGitLab { owner = data.owner; From b0852a669d324476d786756d53fb8e1ff80c39ef Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:32:41 +0300 Subject: [PATCH 11/24] linux-6.5: hash -> sha256 That's what the updater script expects, at least for now (cherry picked from commit 2c73000ef028fe16f8d242bf1727fd0cdbb9d272) --- pkgs/os-specific/linux/kernel/linux-6.5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.5.nix b/pkgs/os-specific/linux/kernel/linux-6.5.nix index 614a07b66a28..1c6b4df4c0e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.5.nix @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - hash = "sha256-TKwT97F72Nz5AyrWj5Ejq1MT1pjJ9ZQWBDFlFQdj608="; + sha256 = "sha256-TKwT97F72Nz5AyrWj5Ejq1MT1pjJ9ZQWBDFlFQdj608="; }; } // (args.argsOverride or { })) From fafc2e9e95ec04fc984a6d96e8ac1cd8fb7dafdf Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:02 +0300 Subject: [PATCH 12/24] linux: 5.10.194 -> 5.10.195 (cherry picked from commit cdc7c3a9f50b073633a57a4d7880916651ce6244) --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f340b5d9f5d2..213bf7e670f3 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.194"; + version = "5.10.195"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "15fr7krhpmqz0xqjg78m2xvfllbni3xh8xyhxh9ni31ppd3mw394"; + sha256 = "0n4vg2i9sq89wnz85arlyvwysh9s83cgzs5bk2wh98bivi5fwfs1"; }; } // (args.argsOverride or {})) From 8c859fdcc0811c096d1fe14b849a37d7d1c824fe Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:05 +0300 Subject: [PATCH 13/24] linux: 5.15.131 -> 5.15.132 (cherry picked from commit db9470470f8b976cdac377f7db4bfb01612bfe4c) --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index e189e7201088..d86b0cf0ce64 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.131"; + version = "5.15.132"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0sacnbw48lblnqaj56nybh588sq4k84gwf0r5zinzyrryj8k6z4r"; + sha256 = "1b0qjsaqjw2rk86shmmrj2aasblkn27acjmc761vnjg7sv2baxs1"; }; } // (args.argsOverride or { })) From 5a3236cb089b99556ff1a0c9c88cae74ced3ba49 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:09 +0300 Subject: [PATCH 14/24] linux: 6.1.53 -> 6.1.54 (cherry picked from commit 9fbd118235420dcaf1498126351e301741f87072) --- pkgs/os-specific/linux/kernel/linux-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.1.nix b/pkgs/os-specific/linux/kernel/linux-6.1.nix index a9de8074de49..df99c9868510 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.1.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.1.53"; + version = "6.1.54"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "0zpdg3fcc12iyjhfs5w7cw75700z4i8m9jcg38mlzlhh92hf0msz"; + sha256 = "09sfrq2l8f777mx2n9mhb6bgz1064bl04921byqnmk87si31w653"; }; } // (args.argsOverride or { })) From 20a338cfa1cdf271402004da764136c488c16cc5 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:14 +0300 Subject: [PATCH 15/24] linux: 6.5.3 -> 6.5.4 (cherry picked from commit b0ff9b40b4a73cd867b279f130124768e978031b) --- pkgs/os-specific/linux/kernel/linux-6.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-6.5.nix b/pkgs/os-specific/linux/kernel/linux-6.5.nix index 1c6b4df4c0e3..28557090de61 100644 --- a/pkgs/os-specific/linux/kernel/linux-6.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-6.5.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "6.5.3"; + version = "6.5.4"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = versions.pad 3 version; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; - sha256 = "sha256-TKwT97F72Nz5AyrWj5Ejq1MT1pjJ9ZQWBDFlFQdj608="; + sha256 = "0s8nzd8yaq06bq8byk7aakbk95gh0rhlif26h1biw94v48anrxxx"; }; } // (args.argsOverride or { })) From 843a8561aa1933a1bf8268a587b4b440c8d0651c Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:33:56 +0300 Subject: [PATCH 16/24] linux-rt_6_1: 6.1.46-rt13 -> 6.1.46-rt14 (cherry picked from commit a3f94d23e545e34ec6a0918c5f2baf5bc2265999) --- pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix index cfb84c25f275..d599c3bda311 100644 --- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "6.1.46-rt13"; # updated by ./update-rt.sh + version = "6.1.46-rt14"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -25,7 +25,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "00pj02mvamxvlkwrca1j3baaa18rg6dra7al1xsvgw3ypckwyafz"; + sha256 = "0mrpsy175iz0b51hwgqbj15w83lm3m57il3gqwb489gln7mpzy17"; }; }; in [ rt-patch ] ++ kernelPatches; From f1b389040a45ae5f0572ec01574d752806a17206 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:34:02 +0300 Subject: [PATCH 17/24] linux_latest-libre: 19397 -> 19408 (cherry picked from commit 41d7b6b90788ca4a7c98e5044c73054c926a2bc3) --- 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 6a0f7c2325e0..ef020b7eb56c 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 = "19397"; - sha256 = "130q08my839kwbi1v8lqwvs6w8s6328ki7s243as4yz4kfrlymr3"; + rev = "19408"; + sha256 = "1bfpzdfd7k859ids5d5ixzn36c7f62gh2lw6gv4szwakw032gh9i"; } , ... }: From a0b370abbef2e14f82ad057b03e632d372e6126d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:37:43 +0300 Subject: [PATCH 18/24] linux/hardened/patches/6.1: 6.1.52-hardened1 -> 6.1.53-hardened1 (cherry picked from commit 2562793942b1cb6e13b940f73d0552b985c58226) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 659fc1a65c14..783353d6da0d 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -52,12 +52,12 @@ "6.1": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.1.52-hardened1.patch", - "sha256": "1xp8m9d927g3nb8l6pc4xzm0yspxxa0kpiv6hi1x0cal5a1bwnb3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.52-hardened1/linux-hardened-6.1.52-hardened1.patch" + "name": "linux-hardened-6.1.53-hardened1.patch", + "sha256": "1v8k4rb3f24cpzvng7nyxllypmi8dc4cv0yj2jfvr64pxr7vzlkw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.53-hardened1/linux-hardened-6.1.53-hardened1.patch" }, - "sha256": "0lis73mxnl7hxz8lyja6sfgmbym944l3k1h7dab6b4mw1nckfxsn", - "version": "6.1.52" + "sha256": "0zpdg3fcc12iyjhfs5w7cw75700z4i8m9jcg38mlzlhh92hf0msz", + "version": "6.1.53" }, "6.4": { "patch": { From cae6fb048bdd6ae8093d1eadb37cf04e0365ec93 Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 19 Sep 2023 14:37:48 +0300 Subject: [PATCH 19/24] linux/hardened/patches/6.4: 6.4.15-hardened1 -> 6.4.16-hardened1 (cherry picked from commit 7629da1298d85379466acf80cad36e701cc6aaa8) --- pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 783353d6da0d..594b303a25a8 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -62,12 +62,12 @@ "6.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-6.4.15-hardened1.patch", - "sha256": "1r6c1yzr0cmfhqv0qirj9nbc2hgmmh43mwal1gmyhk5qisq7h1rf", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.15-hardened1/linux-hardened-6.4.15-hardened1.patch" + "name": "linux-hardened-6.4.16-hardened1.patch", + "sha256": "10lydnnhhq9ynng1gfaqh1mncsb0dmr27zzcbygs1xigy2bl70n9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.16-hardened1/linux-hardened-6.4.16-hardened1.patch" }, - "sha256": "1phlx375ln5pslw5vjqm029cdv6pzf4ang10xlrf90x5sb4fgy93", - "version": "6.4.15" + "sha256": "0zgj1z97jyx7wf12zrnlcp0mj4cl43ais9qsy6dh1jwylf2fq9ln", + "version": "6.4.16" }, "6.5": { "patch": { From 7e1289e29083903de38b916c39a6e510e57caabd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 25 May 2023 01:59:04 +0300 Subject: [PATCH 20/24] aws-sdk-cpp: disable more flaky tests (cherry picked from commit 50f080e8a53793cfdf67fd37e038212a227174e9) --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index e1711d4cd59e..68ea44122836 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -45,6 +45,8 @@ stdenv.mkDerivation rec { # Flaky on Hydra rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp + rm tests/aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp + rm tests/aws-cpp-sdk-core-tests/aws/client/AwsConfigTest.cpp # Includes aws-c-auth private headers, so only works with submodule build rm tests/aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp # TestRandomURLMultiThreaded fails @@ -88,10 +90,6 @@ stdenv.mkDerivation rec { "-Wno-error=deprecated-declarations" ]; - # aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp - # seem to have a datarace - enableParallelChecking = false; - postFixupHooks = [ # This bodge is necessary so that the file that the generated -config.cmake file # points to an existing directory. From eddfbeab41d621c4e526b50790271ffd58f1a083 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 19 Sep 2023 09:53:11 -0400 Subject: [PATCH 21/24] prismlauncher: include libusb1 as a runtime dependency (cherry picked from commit 590e87b7d3aa75522dfe5e413c8eb1ada6ff4cd2) --- pkgs/games/prismlauncher/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/prismlauncher/wrapper.nix b/pkgs/games/prismlauncher/wrapper.nix index 89b0b08c229e..c95a5c00bcf0 100644 --- a/pkgs/games/prismlauncher/wrapper.nix +++ b/pkgs/games/prismlauncher/wrapper.nix @@ -17,10 +17,12 @@ , flite , mesa-demos , udev +, libusb1 , msaClientID ? null , gamemodeSupport ? stdenv.isLinux , textToSpeechSupport ? stdenv.isLinux +, controllerSupport ? stdenv.isLinux , jdks ? [ jdk17 jdk8 ] , additionalLibs ? [ ] , additionalPrograms ? [ ] @@ -71,6 +73,7 @@ symlinkJoin { ] ++ lib.optional gamemodeSupport gamemode.lib ++ lib.optional textToSpeechSupport flite + ++ lib.optional controllerSupport libusb1 ++ additionalLibs; runtimePrograms = [ From a826685a0ebafc2cfc3af33cd2401dde0ab2e1da Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 19 Sep 2023 10:08:41 -0400 Subject: [PATCH 22/24] prismlauncher: add meta.mainProgram attribute (cherry picked from commit 9a147d14d0f5ddb46a9dc82b373222a387664eed) --- pkgs/games/prismlauncher/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/prismlauncher/default.nix b/pkgs/games/prismlauncher/default.nix index 63c6901326ee..9f260aaba9d5 100644 --- a/pkgs/games/prismlauncher/default.nix +++ b/pkgs/games/prismlauncher/default.nix @@ -98,6 +98,7 @@ rec { dontWrapQtApps = true; meta = with lib; { + mainProgram = "prismlauncher"; homepage = "https://prismlauncher.org/"; description = "A free, open source launcher for Minecraft"; longDescription = '' From cec6bc93977a970caf009cc874da739dd085c25b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 18 Sep 2023 21:56:15 +0200 Subject: [PATCH 23/24] hydron: mark as vulnerable to CVE-2023-4863 (cherry picked from commit fd45d4a3cbe3184240a20fa0c48d6ffa287d424d) --- pkgs/servers/hydron/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix index d0614dec6c10..9a3381843b55 100644 --- a/pkgs/servers/hydron/default.nix +++ b/pkgs/servers/hydron/default.nix @@ -31,6 +31,7 @@ buildGoModule rec { homepage = "https://github.com/bakape/hydron"; description = "High performance media tagger and organizer"; license = with licenses; [ lgpl3Plus ]; + knownVulnerabilities = [ "CVE-2023-4863" ]; # Via https://github.com/chai2010/webp dep maintainers = with maintainers; [ Madouura ]; }; } From 79f5c8771e89a8d8882a4fd3f4c38f48450a872b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Tue, 19 Sep 2023 02:53:09 +0200 Subject: [PATCH 24/24] smooth: unvendor all the things (cherry picked from commit 11c29642f03f26adc9ef64303da2e841d37fcf6c) --- pkgs/development/libraries/smooth/default.nix | 21 +++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/smooth/default.nix b/pkgs/development/libraries/smooth/default.nix index 52d125a8801e..bc4a5601dc45 100644 --- a/pkgs/development/libraries/smooth/default.nix +++ b/pkgs/development/libraries/smooth/default.nix @@ -3,9 +3,17 @@ , fetchFromGitHub , pkg-config -, gtk3 +, bzip2 , curl +, fribidi +, gtk3 +, iconv +, libcpuid +, libjpeg +, libpng +, libwebp , libxml2 +, zlib }: stdenv.mkDerivation rec { @@ -25,12 +33,21 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" + "config=systemlibbz2,systemlibcpuid,systemlibcurl,systemlibfribidi,systemlibiconv,systemlibjpeg,systemlibpng,systemlibwebp,systemlibxml2,systemzlib" ]; buildInputs = [ - gtk3 + bzip2 curl + fribidi + gtk3 + iconv + libcpuid + libjpeg + libpng + libwebp libxml2 + zlib ]; meta = with lib; {