From 163779839a377679b3d3b1d65d05f75221faecdb Mon Sep 17 00:00:00 2001 From: HigherOrderLogic <73709188+HigherOrderLogic@users.noreply.github.com> Date: Wed, 22 Jul 2026 07:02:45 +0000 Subject: [PATCH 01/49] xwayland-satellite: 0.8.1 -> 0.8.2 (cherry picked from commit 80abbdebacc10da544ccf60b1ab22ef3fe7b84aa) --- pkgs/by-name/xw/xwayland-satellite/package.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix index 9c8ea3f12b3f..55440713e509 100644 --- a/pkgs/by-name/xw/xwayland-satellite/package.nix +++ b/pkgs/by-name/xw/xwayland-satellite/package.nix @@ -11,16 +11,15 @@ xwayland, withSystemd ? true, }: - rustPlatform.buildRustPackage (finalAttrs: { pname = "xwayland-satellite"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "Supreeeme"; repo = "xwayland-satellite"; tag = "v${finalAttrs.version}"; - hash = "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA="; + hash = "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk="; }; postPatch = '' @@ -28,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/local/bin' "$out/bin" ''; - cargoHash = "sha256-16L6gsvze+m7XCJlOA1lsPNELE3D364ef2FTdkh0rVY="; + cargoHash = "sha256-Saa3SRsQuY6u6pfBGezaEExOt/ReblnrG7pAXjA6Dk8="; nativeBuildInputs = [ installShellFiles From 43b3561bb133568ccb239c86e91109ef7764b254 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 4 Feb 2026 15:34:56 -0500 Subject: [PATCH 02/49] opencloud.idp-web: Migrate to pnpmBuildHook (cherry picked from commit 4bb1c1c90b4bf19de92f31c3c3f3e0e023b1ad8b) --- pkgs/by-name/op/opencloud/idp-web.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index d45cf16afd54..45b2a07eaf65 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -5,6 +5,7 @@ pnpm_9, fetchPnpmDeps, pnpmConfigHook, + pnpmBuildHook, nodejs, }: stdenvNoCC.mkDerivation (finalAttrs: { @@ -25,19 +26,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook + pnpmBuildHook pnpm_9 ]; - buildPhase = '' - runHook preBuild - - cd $pnpmRoot - pnpm build + postBuild = '' mkdir -p assets/identifier/static cp -v src/images/favicon.svg assets/identifier/static/favicon.svg cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg - - runHook postBuild ''; installPhase = '' From ccc951062d8f7fdabc3659dd90908053a000def9 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 3 Jun 2026 13:48:13 +0300 Subject: [PATCH 03/49] opencloud.idp-web: fix after #487046 (cherry picked from commit 064da749a3b2e5bfc46f10c1a53a9a1a42e9eb5e) --- pkgs/by-name/op/opencloud/idp-web.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 45b2a07eaf65..0b31c9cbc460 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -31,16 +31,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; postBuild = '' - mkdir -p assets/identifier/static - cp -v src/images/favicon.svg assets/identifier/static/favicon.svg - cp -v src/images/icon-lilac.svg assets/identifier/static/icon-lilac.svg + mkdir -p services/idp/assets/identifier/static + cp -v services/idp/src/images/favicon.svg services/idp/assets/identifier/static/favicon.svg + cp -v services/idp/src/images/icon-lilac.svg services/idp/assets/identifier/static/icon-lilac.svg ''; installPhase = '' runHook preInstall mkdir $out - cp -r assets $out + cp -r services/idp/assets $out runHook postInstall ''; From ecd4a3a2718c34201b86d8618a0248d12cd22bb3 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 8 Jun 2026 09:48:03 +0300 Subject: [PATCH 04/49] opencloud{,-web}: 7.0.0 -> 7.1.0 Diff: https://github.com/opencloud-eu/opencloud/compare/v7.0.0...v7.1.0 Changelog: https://github.com/opencloud-eu/opencloud/blob/v7.1.0/CHANGELOG.md (cherry picked from commit 3b4b66aa34551bbb1762b75042dade6dd31f685f) --- pkgs/by-name/op/opencloud/idp-web.nix | 10 +++++----- pkgs/by-name/op/opencloud/package.nix | 4 ++-- pkgs/by-name/op/opencloud/web.nix | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 0b31c9cbc460..9cb501702c2f 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -2,7 +2,7 @@ stdenvNoCC, lib, opencloud, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, pnpmBuildHook, @@ -17,17 +17,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; + pnpm = pnpm_11; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; - fetcherVersion = 3; - hash = "sha256-E0bP15T2Ekj992Y1xFXL/4rko34AY+I5Lbn+blJhXYg="; + fetcherVersion = 4; + hash = "sha256-NN5MmWYQgaG4s8+mnLWo8EzOobACOnYhdwt4+/4kz9o="; }; nativeBuildInputs = [ nodejs pnpmConfigHook pnpmBuildHook - pnpm_9 + pnpm_11 ]; postBuild = '' diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 9e18e43206c6..500c89f0f85f 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule (finalAttrs: { pname = "opencloud"; - version = "7.0.0"; + version = "7.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-5bGsJcmrF01E0zXKxwRQpTZl/OinfW7da3nf3/T74hg="; + hash = "sha256-Lr/YF+vuaBIe6sQ+CeVuqV6BDe9jAIQLTZbCKyvn6As="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 1a33c6925eb3..7a679bc9d8c2 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -3,33 +3,33 @@ stdenvNoCC, fetchFromGitHub, nodejs, - pnpm_10, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-kkNdP3IpWnfOv5GEhQqKJwnnRXCHyxMcI2RA6vK7NrA="; + hash = "sha256-awEGCmdauqHkigXqumOYs8woOyY8gIccmzKOyrZ7SwQ="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10; - fetcherVersion = 3; - hash = "sha256-Md6KcP5BV9Pskqg+o9D3RD0WconqyiizAvXNMZ9htfw="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-oIVbhvFiVu0S7sSs5u14M0A1+Q1WmiAsyoBt8QtojyE="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10 + pnpm_11 ]; buildPhase = '' From fb51130d6d215da0e28981bed1ef75a481c0fe8f Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 25 Jun 2026 16:13:14 +0300 Subject: [PATCH 05/49] opencloud: 7.1.0 -> 7.2.0 Diff: https://github.com/opencloud-eu/opencloud/compare/v7.1.0...v7.2.0 Changelog: https://github.com/opencloud-eu/opencloud/blob/v7.2.0/CHANGELOG.md (cherry picked from commit cb262ee05de93b8998123b04668c0b2f5deed637) --- pkgs/by-name/op/opencloud/idp-web.nix | 2 +- pkgs/by-name/op/opencloud/package.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencloud/idp-web.nix b/pkgs/by-name/op/opencloud/idp-web.nix index 9cb501702c2f..1d7f65bda3e5 100644 --- a/pkgs/by-name/op/opencloud/idp-web.nix +++ b/pkgs/by-name/op/opencloud/idp-web.nix @@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpm = pnpm_11; sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pnpmRoot}"; fetcherVersion = 4; - hash = "sha256-NN5MmWYQgaG4s8+mnLWo8EzOobACOnYhdwt4+/4kz9o="; + hash = "sha256-pQ01vBvC29B5oxDWtt7anI5QtFbvQFFBVamQtA2WTNo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix index 500c89f0f85f..983299455638 100644 --- a/pkgs/by-name/op/opencloud/package.nix +++ b/pkgs/by-name/op/opencloud/package.nix @@ -28,13 +28,13 @@ let in buildGoModule (finalAttrs: { pname = "opencloud"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "opencloud"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lr/YF+vuaBIe6sQ+CeVuqV6BDe9jAIQLTZbCKyvn6As="; + hash = "sha256-GAoDEXk7sBN7N0V/msi/fcJS72RqqlF6Qb5B9hArmvk="; }; postPatch = '' From 05a341d715d6e6f088cae509ec57012fd1a08a47 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 28 Jun 2026 19:22:47 +0300 Subject: [PATCH 06/49] opencloud.web: 7.1.0 -> 7.1.2 Diff: https://github.com/opencloud-eu/web/compare/v7.1.0...v7.1.2 Changelog: https://github.com/opencloud-eu/web/blob/v7.1.2/CHANGELOG.md (cherry picked from commit 35edb8aaa8caccd963c9428d4d93148f2e7e81da) --- pkgs/by-name/op/opencloud/web.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 7a679bc9d8c2..63367385af39 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -10,20 +10,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "7.1.0"; + version = "7.1.2"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-awEGCmdauqHkigXqumOYs8woOyY8gIccmzKOyrZ7SwQ="; + hash = "sha256-zwD/Mn7jL960EVaG3gVqFo6FPPMhQTMz3LKy8ZnOObk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-oIVbhvFiVu0S7sSs5u14M0A1+Q1WmiAsyoBt8QtojyE="; + hash = "sha256-YEdZ5B11I6U140qam7e1TMOacRqUeINhr/TI13ddAa0="; }; nativeBuildInputs = [ From cea6672d6b179ba39046cf2aec3a29b717e9ae8d Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 14 Jul 2026 20:57:23 +0300 Subject: [PATCH 07/49] opencloud.web: 7.1.2 -> 7.2.0 Diff: https://github.com/opencloud-eu/web/compare/v7.1.2...v7.2.0 Changelog: https://github.com/opencloud-eu/web/blob/v7.2.0/CHANGELOG.md (cherry picked from commit 0f718c1de397cfca76e6d5e1345a20202e8e5153) --- pkgs/by-name/op/opencloud/web.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix index 63367385af39..13e0d4a25879 100644 --- a/pkgs/by-name/op/opencloud/web.nix +++ b/pkgs/by-name/op/opencloud/web.nix @@ -10,20 +10,20 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "opencloud-web"; - version = "7.1.2"; + version = "7.2.0"; src = fetchFromGitHub { owner = "opencloud-eu"; repo = "web"; tag = "v${finalAttrs.version}"; - hash = "sha256-zwD/Mn7jL960EVaG3gVqFo6FPPMhQTMz3LKy8ZnOObk="; + hash = "sha256-BiOue8+zQ3+6RLiDbLMnxKEen2aav3bljji4d+0Hr5c="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-YEdZ5B11I6U140qam7e1TMOacRqUeINhr/TI13ddAa0="; + hash = "sha256-gCsgnOEi9rvtwTZy8J/i63D92Gl2V9ZihxCJ+Y5hLUE="; }; nativeBuildInputs = [ From fe3267a102c06c5aa295dc42cdcf0d2cf7507af8 Mon Sep 17 00:00:00 2001 From: eymeric Date: Wed, 5 Aug 2026 16:06:11 +0700 Subject: [PATCH 08/49] mautrix-meta: add mautrix-instagram binary build (cherry picked from commit 855c95817188cf9cc4ba4d916399c192c8788df9) --- pkgs/by-name/ma/mautrix-meta/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 437f5622a114..5a7ce245476b 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -18,7 +18,10 @@ buildGoModule rec { version = "26.05"; tag = "v0.2605.0"; - subPackages = [ "cmd/mautrix-meta" ]; + subPackages = [ + "cmd/mautrix-meta" + "cmd/mautrix-instagram" + ]; src = fetchFromGitHub { owner = "mautrix"; From c32c500f42ee0322371901b643e90fe5944ce174 Mon Sep 17 00:00:00 2001 From: eymeric Date: Wed, 5 Aug 2026 16:06:35 +0700 Subject: [PATCH 09/49] nixos/mautrix-meta: automatically select the right binary based on mode instagram or others (cherry picked from commit 0ca90c55e00641b0d95eee609df8de48c87dd80e) --- nixos/modules/services/matrix/mautrix-meta.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/matrix/mautrix-meta.nix b/nixos/modules/services/matrix/mautrix-meta.nix index a0576c79edb3..1645ef3cdc8a 100644 --- a/nixos/modules/services/matrix/mautrix-meta.nix +++ b/nixos/modules/services/matrix/mautrix-meta.nix @@ -18,6 +18,7 @@ let settingsFileUnsubstituted = cfg: settingsFormat.generate "mautrix-meta-config.yaml" cfg.settings; metaName = name: "mautrix-meta-${name}"; + packageName = network: if network == "instagram" then "mautrix-instagram" else "mautrix-meta"; enabledInstances = lib.filterAttrs ( name: config: config.enable @@ -471,7 +472,7 @@ in cp '${settingsFile cfg}' '${settingsFile cfg}.tmp' echo "Generating registration file" - mautrix-meta \ + ${lib.getExe' upperCfg.package (packageName cfg.settings.network.mode)} \ --generate-registration \ --config='${settingsFile cfg}.tmp' \ --registration='${cfg.registrationFile}' @@ -568,7 +569,7 @@ in EnvironmentFile = cfg.environmentFile; ExecStart = lib.escapeShellArgs [ - (lib.getExe upperCfg.package) + (lib.getExe' upperCfg.package (packageName cfg.settings.network.mode)) "--config=${settingsFile cfg}" ]; }; From d9e24e7d7daad04178e3c3a10c6e7c0ad8162f37 Mon Sep 17 00:00:00 2001 From: eymeric Date: Fri, 7 Aug 2026 08:26:25 +0700 Subject: [PATCH 10/49] nixos/mautrix-meta: update settings description example generation method (cherry picked from commit a6a86e4929a19fdf6d8b449607b2b446f740edae) --- nixos/modules/services/matrix/mautrix-meta.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/matrix/mautrix-meta.nix b/nixos/modules/services/matrix/mautrix-meta.nix index 1645ef3cdc8a..9fbd58b18d2a 100644 --- a/nixos/modules/services/matrix/mautrix-meta.nix +++ b/nixos/modules/services/matrix/mautrix-meta.nix @@ -201,8 +201,10 @@ in ''; description = '' {file}`config.yaml` configuration as a Nix attribute set. - Configuration options should match those described in - [example-config.yaml](https://github.com/mautrix/meta/blob/main/example-config.yaml). + Configuration options should match those described in the example configuration. + Get an example configuration by executing one of those commands + - `mautrix-meta -c example.yaml --generate-example-config` + - `mautrix-instagram -c example.yaml --generate-example-config` Secret tokens should be specified using {option}`environmentFile` instead From 38535a20d91aa873adcac83f5c39dc780377b4e3 Mon Sep 17 00:00:00 2001 From: eymeric Date: Thu, 6 Aug 2026 09:45:27 +0700 Subject: [PATCH 11/49] nixos/tests/matrix/mautrix-meta: fix tests for newer mautrix versions Co-authored-by: Gemini CLI (cherry picked from commit 61c0c7acdb6a43eaa0d8bd77429f38a768e7a5b4) --- nixos/tests/matrix/mautrix-meta-postgres.nix | 35 ++++++++----- nixos/tests/matrix/mautrix-meta-sqlite.nix | 54 +++++++++++++------- 2 files changed, 58 insertions(+), 31 deletions(-) diff --git a/nixos/tests/matrix/mautrix-meta-postgres.nix b/nixos/tests/matrix/mautrix-meta-postgres.nix index b1ecf5da3cdd..bf28b889ecec 100644 --- a/nixos/tests/matrix/mautrix-meta-postgres.nix +++ b/nixos/tests/matrix/mautrix-meta-postgres.nix @@ -90,12 +90,21 @@ in as_token = "$AS_TOKEN"; hs_token = "$HS_TOKEN"; - database = { - type = "postgres"; - uri = "postgres:///mautrix-meta-instagram?host=/var/run/postgresql"; + bot = { + username = botUserName; + avatar = ""; }; + }; - bot.username = botUserName; + database = { + type = "postgres"; + uri = "postgres:///mautrix-meta-instagram?host=/var/run/postgresql"; + }; + + encryption = { + allow = false; + default = false; + require = false; }; bridge.permissions."@${userName}:server" = "user"; @@ -127,13 +136,14 @@ in import functools import asyncio - from nio import AsyncClient, RoomMessageNotice, RoomCreateResponse, RoomInviteResponse + from nio import AsyncClient, RoomMessageText, RoomCreateResponse, RoomInviteResponse - async def message_callback(matrix: AsyncClient, msg: str, _r, e): + async def message_callback(matrix: AsyncClient, expected_msg: str, expected_sender: str, _r, e): print("Received matrix text message: ", e) - assert msg in e.body - exit(0) # Success! + if getattr(e, "sender", "") == expected_sender and expected_msg in getattr(e, "body", ""): + print("Success!") + exit(0) # Success! async def run(homeserver: str): @@ -151,9 +161,9 @@ in assert isinstance(response, RoomInviteResponse) callback = functools.partial( - message_callback, matrix, "Hello, I'm an Instagram bridge bot." + message_callback, matrix, "Hello, I'm a Instagram bridge bot.", "@${botUserName}:${homeserverDomain}" ) - matrix.add_event_callback(callback, RoomMessageNotice) + matrix.add_event_callback(callback, RoomMessageText) print("Waiting for matrix message...") await matrix.sync_forever(timeout=30000) @@ -171,11 +181,10 @@ in def extract_token(data): stdout = data[1] stdout = stdout.strip() - line = stdout.split('\n')[-1] - return line.split(':')[-1].strip("\" '\n") + return stdout.split(':')[-1].strip("\" '\n") def get_token_from(token, file): - data = server.execute(f"cat {file} | grep {token}") + data = server.execute(f"grep -E '^\\s*{token}:' {file}") return extract_token(data) def get_as_token_from(file): diff --git a/nixos/tests/matrix/mautrix-meta-sqlite.nix b/nixos/tests/matrix/mautrix-meta-sqlite.nix index d4692dec718e..085910eeb19b 100644 --- a/nixos/tests/matrix/mautrix-meta-sqlite.nix +++ b/nixos/tests/matrix/mautrix-meta-sqlite.nix @@ -4,7 +4,7 @@ let homeserverUrl = "http://server:8008"; username = "alice"; instagramBotUsername = "instagrambot"; - facebookBotUsername = "facebookbot"; + metaBotUsername = "metabot"; in { name = "mautrix-meta-sqlite"; @@ -60,7 +60,16 @@ in appservice = { port = 8009; - bot.username = facebookBotUsername; + bot = { + username = metaBotUsername; + avatar = ""; + }; + }; + + encryption = { + allow = false; + default = false; + require = false; }; bridge.permissions."@${username}:server" = "user"; @@ -79,7 +88,16 @@ in appservice = { port = 8010; - bot.username = instagramBotUsername; + bot = { + username = instagramBotUsername; + avatar = ""; + }; + }; + + encryption = { + allow = false; + default = false; + require = false; }; bridge.permissions."@${username}:server" = "user"; @@ -136,16 +154,17 @@ in import functools import asyncio - from nio import AsyncClient, RoomMessageNotice, RoomCreateResponse, RoomInviteResponse + from nio import AsyncClient, RoomMessageText, RoomCreateResponse, RoomInviteResponse - async def message_callback(matrix: AsyncClient, msg: str, _r, e): + async def message_callback(matrix: AsyncClient, expected_msg: str, expected_sender: str, _r, e): print("Received matrix text message: ", e) - assert msg in e.body - exit(0) # Success! + if getattr(e, "sender", "") == expected_sender and expected_msg in getattr(e, "body", ""): + print("Success!") + exit(0) # Success! - async def run(username: str, bot_username: str, homeserver: str): + async def run(username: str, bot_username: str, homeserver: str, expected_msg: str): matrix = AsyncClient(homeserver, f"@{username}:${homeserverDomain}") response = await matrix.login("foobar") @@ -161,16 +180,16 @@ in assert isinstance(response, RoomInviteResponse) callback = functools.partial( - message_callback, matrix, "Hello, I'm an Instagram bridge bot." + message_callback, matrix, expected_msg, f"@{bot_username}:${homeserverDomain}" ) - matrix.add_event_callback(callback, RoomMessageNotice) + matrix.add_event_callback(callback, RoomMessageText) print("Waiting for matrix message...") await matrix.sync_forever(timeout=30000) if __name__ == "__main__": - asyncio.run(run(sys.argv[1], sys.argv[2], sys.argv[3])) + asyncio.run(run(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4])) '' ) ]; @@ -181,11 +200,10 @@ in def extract_token(data): stdout = data[1] stdout = stdout.strip() - line = stdout.split('\n')[-1] - return line.split(':')[-1].strip("\" '\n") + return stdout.split(':')[-1].strip("\" '\n") def get_token_from(token, file): - data = server.execute(f"cat {file} | grep {token}") + data = server.execute(f"grep -E '^\\s*{token}:' {file}") return extract_token(data) def get_as_token_from(file): @@ -216,8 +234,8 @@ in client.succeed("register_user ${username} ${homeserverUrl} >&2") with subtest("ensure messages can be exchanged"): - client.succeed("do_test ${username} ${facebookBotUsername} ${homeserverUrl} >&2") - client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} >&2") + client.succeed("do_test ${username} ${metaBotUsername} ${homeserverUrl} \"Hello, I'm a Facebook Messenger bridge bot.\" >&2") + client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} \"Hello, I'm a Instagram bridge bot.\" >&2") with subtest("ensure as_token and hs_token stays same after restart"): generated_as_token_facebook = get_as_token_from(config_yaml) @@ -252,7 +270,7 @@ in assert generated_hs_token_facebook == new_hs_token_facebook, f"hs_token should stay the same after restart inside the registration file (is: {new_hs_token_facebook}, was: {generated_hs_token_facebook})" with subtest("ensure messages can be exchanged after restart"): - client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} >&2") - client.succeed("do_test ${username} ${facebookBotUsername} ${homeserverUrl} >&2") + client.succeed("do_test ${username} ${instagramBotUsername} ${homeserverUrl} \"Hello, I'm a Instagram bridge bot.\" >&2") + client.succeed("do_test ${username} ${metaBotUsername} ${homeserverUrl} \"Hello, I'm a Facebook Messenger bridge bot.\" >&2") ''; } From 04cbd0d0c5d853895ddcfa1692dc33cf777930cf Mon Sep 17 00:00:00 2001 From: Gerhard Schwanzer Date: Mon, 10 Aug 2026 21:42:07 +0200 Subject: [PATCH 12/49] python3Packages.pypdf: 6.14.2 -> 6.15.0 https://redirect.github.com/py-pdf/pypdf/releases/tag/6.15.0 This release bounds /ToUnicode token parsing and CID width expansion for malformed PDFs. Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol) (cherry picked from commit 33932a69a45474acae8fbc22c4891e3011f23579) --- pkgs/by-name/pd/pdfding/package.nix | 1 + pkgs/development/python-modules/pypdf/default.nix | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pd/pdfding/package.nix b/pkgs/by-name/pd/pdfding/package.nix index c31c6ef1d0ec..c2b7ad980447 100644 --- a/pkgs/by-name/pd/pdfding/package.nix +++ b/pkgs/by-name/pd/pdfding/package.nix @@ -141,6 +141,7 @@ python.pkgs.buildPythonPackage (finalAttrs: { "huey" "nh3" "psycopg2-binary" + "pypdf" "pypdfium2" ]; diff --git a/pkgs/development/python-modules/pypdf/default.nix b/pkgs/development/python-modules/pypdf/default.nix index 24c6076065e9..4c8cb142a090 100644 --- a/pkgs/development/python-modules/pypdf/default.nix +++ b/pkgs/development/python-modules/pypdf/default.nix @@ -12,9 +12,11 @@ myst-parser, # optionals + arabic-reshaper, cryptography, fonttools, pillow, + python-bidi, # tests fpdf2, @@ -24,7 +26,7 @@ buildPythonPackage rec { pname = "pypdf"; - version = "6.14.2"; + version = "6.15.0"; pyproject = true; src = fetchFromGitHub { @@ -33,7 +35,7 @@ buildPythonPackage rec { tag = version; # fetch sample files used in tests fetchSubmodules = true; - hash = "sha256-h7JuQTTUZ5tWoAhixjp+grDVA3JQ8PbHcMBzIyCMOJU="; + hash = "sha256-e39xclCnXlX4oagx4TnFCf99VKdJZeM2Kc3set1KXuo="; }; outputs = [ @@ -55,10 +57,14 @@ buildPythonPackage rec { ]; optional-dependencies = rec { - full = crypto ++ fonts ++ image; + full = crypto ++ fonts ++ image ++ rtl_text; crypto = [ cryptography ]; fonts = [ fonttools ]; image = [ pillow ]; + rtl_text = [ + arabic-reshaper + python-bidi + ]; }; pythonImportsCheck = [ "pypdf" ]; From e7557380bd8c262283e6b4600a7060e9b552f612 Mon Sep 17 00:00:00 2001 From: UwU 420 <164377175+uwu-420@users.noreply.github.com> Date: Mon, 3 Aug 2026 10:37:49 +0200 Subject: [PATCH 13/49] nixosTests.opencloud: fix LDAPS and aarch64 WebDriver setup OpenCloud 7.2 switched the IDM default listener from LDAPS on port 9235 to LDAP on port 9236. Enable the LDAPS listener explicitly because the test configures clients to use it. Pass geckodriver to Selenium explicitly. Selenium Manager does not support aarch64-linux even though geckodriver is already installed by the test. Assisted-by: OpenAI Codex (GPT-5) (cherry picked from commit f54c56f1492ebb1d96c695aff61cb66a23c97bd5) --- nixos/tests/opencloud.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/tests/opencloud.nix b/nixos/tests/opencloud.nix index 919ed99f4b5d..25bd5295f68c 100644 --- a/nixos/tests/opencloud.nix +++ b/nixos/tests/opencloud.nix @@ -21,12 +21,14 @@ let from selenium.webdriver.common.by import By from selenium.webdriver import Firefox from selenium.webdriver.firefox.options import Options + from selenium.webdriver.firefox.service import Service from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC options = Options() options.add_argument('--headless') - driver = Firefox(options=options) + service = Service(executable_path="${lib.getExe pkgs.geckodriver}") + driver = Firefox(options=options, service=service) host = sys.argv[1] user = sys.argv[2] @@ -71,6 +73,7 @@ in environment = { ADMIN_PASSWORD = adminPassword; IDM_CREATE_DEMO_USERS = "true"; + IDM_LDAPS_ADDR = "127.0.0.1:9235"; IDM_LDAPS_CERT = "${certs.${domain}.cert}"; IDM_LDAPS_KEY = "${certs.${domain}.key}"; OC_INSECURE = "false"; From 9bd28a500f7019eaef0edac5db9325abca14901b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Aug 2026 16:46:39 +0000 Subject: [PATCH 14/49] domination: 1.3.4 -> 1.3.5 (cherry picked from commit fc730f1be7aa879cdb85e4627d9a150c7dd8b365) --- pkgs/by-name/do/domination/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/do/domination/package.nix b/pkgs/by-name/do/domination/package.nix index 736ee6533a8a..c20b07542e65 100644 --- a/pkgs/by-name/do/domination/package.nix +++ b/pkgs/by-name/do/domination/package.nix @@ -30,7 +30,7 @@ let in stdenv.mkDerivation { pname = "domination"; - version = "1.3.4"; + version = "1.3.5"; # The .zip releases do not contain the build.xml file src = fetchsvn { @@ -40,8 +40,8 @@ stdenv.mkDerivation { # https://sourceforge.net/p/domination/code/HEAD/tree/Domination/ChangeLog.txt # Alternatively, look for revs like "changelog update", # "new version x.y.z info on website", or "website update for x.y.z". - rev = "2664"; - hash = "sha256-bkaHpqJSc3UvwNT7LwuPUT8xN0g6QypfLSHlLmm8nX8="; + rev = "2778"; + hash = "sha256-OsCpSL/0QgaaUAzoyPPrAlJixRlqsLJu2D8FkEuo0Ak="; }; nativeBuildInputs = [ From 9d80977ece9b31cfb30b65f83e9fba21b1ccc083 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Thu, 13 Aug 2026 17:29:11 +0200 Subject: [PATCH 15/49] libvirt: fix security vulnerabilities Fixes: CVE-2026-15268 Fixes: CVE-2026-18917 Fixes: CVE-2026-63622 Fixes: CVE-2026-63623 Not-cherry-picked-because: Unstable is already on newer libvirt versions --- pkgs/by-name/li/libvirt/package.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index 45bb395d06d0..2b2b50a61a7d 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -135,6 +135,26 @@ stdenv.mkDerivation rec { patches = [ ./0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch + # CVE-2026-15268 + (fetchpatch { + url = "https://gitlab.com/libvirt/libvirt/-/commit/f74495c7a157618e3df6fa61079678084c4cc685.patch"; + hash = "sha256-ZOC7ApQiowMyLC0iB51rwDe4dIDwRmpFHpdAdHnEjHY="; + }) + # CVE-2026-18917 + (fetchpatch { + url = "https://gitlab.com/libvirt/libvirt/-/commit/5a62cbf2907d4590283597b46da9c0f41e7b4d4f.patch"; + hash = "sha256-EjNp97J2++Wn7MLFaC99HPsJYUj4Nid8Fuk8fGq3Cis="; + }) + # CVE-2026-63622 + (fetchpatch { + url = "https://gitlab.com/libvirt/libvirt/-/commit/801160fd414ca2cc402bc01ead09b7ed4c3b8f5b.patch"; + hash = "sha256-balBw0Rs2fSrnOeeiaqKRDnloXIWA1eITuciaZQ7zsk="; + }) + # CVE-2026-63623 + (fetchpatch { + url = "https://gitlab.com/libvirt/libvirt/-/commit/69335a484768d550854da1133d5490074695e825.patch"; + hash = "sha256-3UCMOVOq//bKkKfRsn9NVq1j9rN3CZlBOsEeYQufleU="; + }) # CVE-2026-61478 (fetchpatch { url = "https://gitlab.com/libvirt/libvirt/-/commit/68da70aae766c6271b8d3b466374d3cc7d1a8afb.patch"; From 6670a73d2ba09355e5cbd8672ce0aa4bb9be1626 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Aug 2026 15:05:30 +0200 Subject: [PATCH 16/49] python312: 3.12.13 -> 3.12.14 https://docs.python.org/release/3.12.14/whatsnew/changelog.html (cherry picked from commit 688b25aceb07460e0cc141f6d0a60f15358bd02f) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 1d7b5fe795e0..ea04b0c60bd1 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -59,10 +59,10 @@ sourceVersion = { major = "3"; minor = "12"; - patch = "13"; + patch = "14"; suffix = ""; }; - hash = "sha256-wIvGWoGXHB3VeDGCgmUDNpRmx+ZzdNFkZRmt8FIHtoQ="; + hash = "sha256-XIRir1eQuvQ6MhoVWdvg2wbRvkMA+4X7U8QAYGaOVIo="; inherit passthruFun; }; From 7e8abe3eb489cc5f69b410c37c38652561485994 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 13 Aug 2026 15:17:56 +0200 Subject: [PATCH 17/49] python311: 3.11.15 -> 3.11.16 https://docs.python.org/release/3.11.16/whatsnew/changelog.html (cherry picked from commit 937cdf10634cb59d21698638e7bc510ad529273c) --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index ea04b0c60bd1..b377eaf6d1f1 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -47,10 +47,10 @@ sourceVersion = { major = "3"; minor = "11"; - patch = "15"; + patch = "16"; suffix = ""; }; - hash = "sha256-JyF53dmi5BoPyOQuM9+9ygs3EapavzctPy1RVD0JtiU="; + hash = "sha256-kbzev93iOaADrpNzin/OD5Iw/uXEvCuG9uboxvmKq+g="; inherit passthruFun; }; From 8920474c9e3a765b7ffebc842881f7d392f45c71 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 13 Aug 2026 17:16:42 +0200 Subject: [PATCH 18/49] nixos/miniflux: fix AppArmor profile (cherry picked from commit 72f451bd01d7804715ee124152ac7e9bfb174b7e) --- nixos/modules/services/web-apps/miniflux.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix index 2130427813f5..412426a217f0 100644 --- a/nixos/modules/services/web-apps/miniflux.nix +++ b/nixos/modules/services/web-apps/miniflux.nix @@ -214,7 +214,13 @@ in abi , include - profile ${cfg.package}/bin/miniflux { + # Flag `attach_disconnected` is necessary + # because the PostgreSQL socket path appears + # as a "disconnected" path: `run/postgresql/.s.PGSQL.XXXX`, + # without the trailing slash, which AppArmor can't resolve. + # The flag prepends a `/`, which isn't recommended, + # but there aren't any alternative currently. + profile ${cfg.package}/bin/miniflux flags=(attach_disconnected) { include include include @@ -222,6 +228,8 @@ in include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}" ${cfg.package}/bin/miniflux r, /run/miniflux/** rw, + /run/postgresql/.s.PGSQL.* rw, + /run/credentials/** r, include if exists } ''; From 7c3b7ae19c2d1af381c73dde766367aa8632aac5 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Thu, 13 Aug 2026 17:18:32 +0200 Subject: [PATCH 19/49] nixosTests.miniflux: Revert "remove apparmor" This reverts commit 533498ea0a3814ad7efbf1f5a1f299a33866faaa. (cherry picked from commit 266cedd5f19392886e533966d885f84144157b6e) --- nixos/tests/miniflux.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix index 3bdf4480e7e2..549dd4966439 100644 --- a/nixos/tests/miniflux.nix +++ b/nixos/tests/miniflux.nix @@ -29,6 +29,7 @@ in default = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; inherit adminCredentialsFile; @@ -38,6 +39,7 @@ in withoutSudo = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; inherit adminCredentialsFile; @@ -48,6 +50,7 @@ in customized = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; config = { @@ -82,6 +85,7 @@ in externalDb = { ... }: { + security.apparmor.enable = true; services.miniflux = { enable = true; createDatabaseLocally = false; @@ -105,6 +109,7 @@ in machine.succeed( f"curl 'http://localhost:{port}/v1/me' -u '{user}' -H Content-Type:application/json | grep '\"is_admin\":true'" ) + machine.fail('journalctl -b --no-pager --grep "^audit: .*apparmor=\\"DENIED\\""') default.start() withoutSudo.start() From 37b50c9e125aaca69122f818847424da44901748 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Fri, 14 Aug 2026 00:29:48 +0200 Subject: [PATCH 20/49] go_1_27: 1.27rc2 -> 1.27rc3 Announcement: https://groups.google.com/g/golang-announce/c/6X8FgujJjUU (cherry picked from commit b27a12e4e2d583e6c9cea4fda66722fe90df442f) --- pkgs/development/compilers/go/1.27.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.27.nix b/pkgs/development/compilers/go/1.27.nix index 3a553d29a1c5..b6a0efa1040e 100644 --- a/pkgs/development/compilers/go/1.27.nix +++ b/pkgs/development/compilers/go/1.27.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.27rc2"; + version = "1.27rc3"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-hg/XowsoXuFqKuDsXURBy0fEiHKgowy2DK40iUf0iiU="; + hash = "sha256-6eIO3RcgCV+RCWluljpmBp0/bUjQDrk4jIiM4GYx31w="; }; strictDeps = true; From 76bae500720feb5e5f101e6eb3219448ca2ae60f Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Fri, 14 Aug 2026 00:19:17 +0200 Subject: [PATCH 21/49] go_1_25: 1.25.12 -> 1.25.13 Changelog: https://go.dev/doc/devel/release#go1.25.minor (cherry picked from commit 65a751fbda382daac0d6f3dd9755a52c22a46a13) --- pkgs/development/compilers/go/1.25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix index 13eb53bd54cb..9930dd0af21b 100644 --- a/pkgs/development/compilers/go/1.25.nix +++ b/pkgs/development/compilers/go/1.25.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.25.12"; + version = "1.25.13"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-+Q3O5L0CP6N2N06gpabr5VNTeznEJv/YxolGm0VRmTI="; + hash = "sha256-HX4vcLHum5PH3478ynH1rcxqWXl6QzbC0QFxvUwXRhQ="; }; strictDeps = true; From 62353f74b1ce81de92817e0290064f4cc7a56031 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Fri, 14 Aug 2026 08:19:30 +0200 Subject: [PATCH 22/49] kanidm_1_11: 1.11.0 -> 1.11.1 Changelog: https://github.com/kanidm/kanidm/releases/tag/v1.11.1 (cherry picked from commit 32edd5f8d328be198e2baa034aaf4ffab6e4e0ab) --- pkgs/servers/kanidm/1_11.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/kanidm/1_11.nix b/pkgs/servers/kanidm/1_11.nix index c06b30750207..f32d50c1d5b1 100644 --- a/pkgs/servers/kanidm/1_11.nix +++ b/pkgs/servers/kanidm/1_11.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.11.0"; - hash = "sha256-3dcJxJx8UFebW6WMdVTH6kfsNBed+55JFwHWVhZulOU="; - cargoHash = "sha256-qOs/uSs3iaiTGsqydpNbZ6KSLNE+k+5bM7k3ijRzNT0="; + version = "1.11.1"; + hash = "sha256-IQmXHl+Gx7QLuLUCmIh919o+ziCy2q2NvVabwQwhML0="; + cargoHash = "sha256-DSYynKWb9jjFp3u3c6z9dFXts8ydgEho7xoFlL6cPXs="; } From 2849f5553ff21150016651953724774834d7e77f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Aug 2026 08:39:01 +0000 Subject: [PATCH 23/49] prometheus-speedtest-exporter: 1.0.0 -> 1.1.0 (cherry picked from commit 6c35fcaa40efeee05a012edac8846a62e55dd830) --- pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix index 8eee84e785da..35418e89eae5 100644 --- a/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-speedtest-exporter/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "prometheus-speedtest-exporter"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "podocarp"; repo = "speedtest_exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-n9eunZRssS13mTOeFeZ/PpfSj430DKf3ZRS10hY4Ps8="; + hash = "sha256-xXTyxwECGlYv9bBco09zvlOpF4GcHeT3yZMNUQTPPoo="; }; vendorHash = "sha256-HBg44D0CUc4HYCBwGrswnrqG5o5ltA6UT8L0oWetlIc="; From ee66d2aa7d2277c54a0bd6fbc3a9cb753d96cc17 Mon Sep 17 00:00:00 2001 From: Jhony Elmer Angulo Fabian Date: Tue, 26 May 2026 17:01:42 -0500 Subject: [PATCH 24/49] codex: 0.133.0 -> 0.134.0 (cherry picked from commit 1ae180a454f1238342d0d93f162e5fd5d5c7a515) --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 1211101245e7..aa0e8587ae06 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.133.0"; + version = "0.134.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-RTxhhZjZ/64N60pmbNVzLwcSBomn67pPDpOjkL6RPUw="; + hash = "sha256-eHe4bjUIvSK512ZTlFcOBqv5hhM+zfzkxcLfrzDA7L4="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-J4wvPn4lSTSsJrTG56vkhJe2F2b+fUvJLEd+qKQ9LUg="; + cargoHash = "sha256-DjqTn6DWfOlwdQ387eWeT5fs6qIgaD2rAXjxNStKgrs="; # Match upstream's release build for the codex binary only. cargoBuildFlags = [ From 9bc31aac0a9dd26d4a1bf956d779913f37ebce9f Mon Sep 17 00:00:00 2001 From: Jhony Elmer Angulo Fabian Date: Thu, 28 May 2026 18:07:22 -0500 Subject: [PATCH 25/49] codex: 0.134.0 -> 0.135.0 (cherry picked from commit 0d6ed67a90a1ea30175e7e4688caac68949c9b5e) --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index aa0e8587ae06..6f8fb50b84b3 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.134.0"; + version = "0.135.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-eHe4bjUIvSK512ZTlFcOBqv5hhM+zfzkxcLfrzDA7L4="; + hash = "sha256-7Ak7rpogcN2kNezk7aMdMmkgNyPxH58f6lFdXOd/mgc="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-DjqTn6DWfOlwdQ387eWeT5fs6qIgaD2rAXjxNStKgrs="; + cargoHash = "sha256-v1ggzNoncBVcOiJDQNNKPxYqWASNGjVjLMCXhsIbrVI="; # Match upstream's release build for the codex binary only. cargoBuildFlags = [ From 15971f588eeae9837d83ae40eb5b16039cd14359 Mon Sep 17 00:00:00 2001 From: Jhony Elmer Angulo Fabian Date: Mon, 1 Jun 2026 18:38:42 -0500 Subject: [PATCH 26/49] codex: 0.135.0 -> 0.136.0 (cherry picked from commit 4007180d0a9f1cbacbb56b5b88eec16fe126802a) --- pkgs/by-name/co/codex/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 6f8fb50b84b3..801358b7f90d 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,20 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.135.0"; + version = "0.136.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-7Ak7rpogcN2kNezk7aMdMmkgNyPxH58f6lFdXOd/mgc="; + hash = "sha256-MI9VrfMFuUOup0e8KECaFA8SbkrPLEG+6K/wqLA8rs8="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-v1ggzNoncBVcOiJDQNNKPxYqWASNGjVjLMCXhsIbrVI="; + cargoHash = "sha256-zHNOUHUnyNxYSWn13H77ZdIuv09kHSlJfQBatTugLUA="; + + __structuredAttrs = true; # Match upstream's release build for the codex binary only. cargoBuildFlags = [ From 3b9c4bb71ebc9b70ccdeed25b5fb03fb17f17d20 Mon Sep 17 00:00:00 2001 From: Marc Scholten Date: Fri, 5 Jun 2026 12:15:11 +0200 Subject: [PATCH 27/49] codex: 0.136.0 -> 0.137.0 Assisted-by: Claude Code (Claude Opus 4.8) (cherry picked from commit 4e336001b4fcbf7fc0873d0e973ab8fa7cd5df65) --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 801358b7f90d..56ebb1faba9f 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.136.0"; + version = "0.137.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-MI9VrfMFuUOup0e8KECaFA8SbkrPLEG+6K/wqLA8rs8="; + hash = "sha256-puszZqi1lZeq8iXWAD9U9+WMnNvzMYKf6wVT9mtjSUU="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-zHNOUHUnyNxYSWn13H77ZdIuv09kHSlJfQBatTugLUA="; + cargoHash = "sha256-SX5LMO+IWismbH61Jd0g1mgykfav8DrqG+wjyNCWyCo="; __structuredAttrs = true; From 16938938edf9d52906ba6f429ff43c0d60ea9a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20Ol=C3=A1h?= Date: Tue, 9 Jun 2026 10:35:40 +0200 Subject: [PATCH 28/49] codex: 0.137.0 -> 0.139.0 Update LTO replacement from "fat" to "thin" to accomodate upstream change. Link with explicit lld path on Darwin. (cherry picked from commit b502e8ddbf5e53714afbfa8041020786e9815ad0) --- pkgs/by-name/co/codex/package.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 56ebb1faba9f..13a1a98bf7a9 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -15,6 +15,7 @@ inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; }, livekit-libwebrtc, + lld, makeBinaryWrapper, nix-update-script, pkg-config, @@ -25,18 +26,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.137.0"; + version = "0.139.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-puszZqi1lZeq8iXWAD9U9+WMnNvzMYKf6wVT9mtjSUU="; + hash = "sha256-XjzlkBUkBey+P3tFLDYB3ae5oseUfW5tmzhLzqlqj2E="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-SX5LMO+IWismbH61Jd0g1mgykfav8DrqG+wjyNCWyCo="; + cargoHash = "sha256-8mN4OTRJvt2mBYHQXZS55PSOChLqEIiXwPu2y+2MZ9o="; __structuredAttrs = true; @@ -58,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \ --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" substituteInPlace Cargo.toml \ - --replace-fail 'lto = "fat"' "" \ + --replace-fail 'lto = "thin"' "" \ --replace-fail 'codegen-units = 1' "" ''; @@ -95,6 +96,11 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ); RUSTY_V8_ARCHIVE = librusty_v8; + } + // lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Link with lld on Darwin. nixpkgs' classic open-source ld64 fails to insert + # ARM64 branch thunks for this binary, producing `b(l) ARM64 branch out of range`. + NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}"; }; # NOTE: part of the test suite requires access to networking, local shells, From 295ca5b879b946fe5b14d6283820ab6c52e4d0f7 Mon Sep 17 00:00:00 2001 From: Jhony Elmer Angulo Fabian Date: Mon, 15 Jun 2026 17:55:41 -0500 Subject: [PATCH 29/49] codex: 0.139.0 -> 0.141.0 (cherry picked from commit 00b8fd1da9607df3e3c90fdb4ea2b1c3a371ec09) --- pkgs/by-name/co/codex/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 13a1a98bf7a9..a310f105cd68 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,18 +26,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.139.0"; + version = "0.141.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-XjzlkBUkBey+P3tFLDYB3ae5oseUfW5tmzhLzqlqj2E="; + hash = "sha256-1ZOaZlwAkH6DJpxlInfbXpaqmsbOIOGrFoj2dYehBMA="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-8mN4OTRJvt2mBYHQXZS55PSOChLqEIiXwPu2y+2MZ9o="; + cargoHash = "sha256-bQPeRKTrNYeGCO20hpu+F37sScFOGr1EPOVf1E0FU+4="; __structuredAttrs = true; @@ -60,7 +60,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" substituteInPlace Cargo.toml \ --replace-fail 'lto = "thin"' "" \ - --replace-fail 'codegen-units = 1' "" + --replace-fail 'codegen-units = 4' "" ''; nativeBuildInputs = [ From fedb29c13cf635ae491d78c089e029cd944c0e01 Mon Sep 17 00:00:00 2001 From: Jakob Stender Guldberg Date: Tue, 23 Jun 2026 09:11:58 +0200 Subject: [PATCH 30/49] codex: 0.141.0 -> 0.142.0 (cherry picked from commit 862009492e9dccc43a36432dfa8f49020551c845) --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index a310f105cd68..4514766a1ba0 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,18 +26,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.141.0"; + version = "0.142.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-1ZOaZlwAkH6DJpxlInfbXpaqmsbOIOGrFoj2dYehBMA="; + hash = "sha256-F8wlv0vSuljNFDgIzoeuVxvD0dk90z2FBtpBTMih7AA="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-bQPeRKTrNYeGCO20hpu+F37sScFOGr1EPOVf1E0FU+4="; + cargoHash = "sha256-fvEFNE12J6zaLZrN6oQB8X+jXoKPSCWrL17Sl28+7/c="; __structuredAttrs = true; From fe6ce90b8642b92f12fb4fd9c4d96ae24f676b86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 26 Jun 2026 21:09:54 +0000 Subject: [PATCH 31/49] codex: 0.142.0 -> 0.142.2 (cherry picked from commit 398e27c34805b8195374d00621886e22f0baae86) --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 4514766a1ba0..4dded060e51a 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,18 +26,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.142.0"; + version = "0.142.2"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-F8wlv0vSuljNFDgIzoeuVxvD0dk90z2FBtpBTMih7AA="; + hash = "sha256-580LZSn3+lqyW5x7zkVX0TjW+d6apb/P1eG4q586dio="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-fvEFNE12J6zaLZrN6oQB8X+jXoKPSCWrL17Sl28+7/c="; + cargoHash = "sha256-1gDiCB3Nf/0aIm+EoL3g9C0xbCi3cv6TfH5VytjJpOY="; __structuredAttrs = true; From eebecaba6fbee7a42a549a3f07198713bc7f10db Mon Sep 17 00:00:00 2001 From: ultsaza Date: Mon, 29 Jun 2026 03:04:16 +0900 Subject: [PATCH 32/49] codex: 0.142.2 -> 0.142.3 (cherry picked from commit cdc182f67c30d8f1feffafe967b4d0ccb615a2f4) --- pkgs/by-name/co/codex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 4dded060e51a..ddce6625ad54 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,13 +26,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.142.2"; + version = "0.142.3"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-580LZSn3+lqyW5x7zkVX0TjW+d6apb/P1eG4q586dio="; + hash = "sha256-dxkyaWpgzqpAVFojDYQ6JpMPNBIX+d7xjIyLic4Cs8A="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; From d11221ae890e0a135513ec317ccb85cce31f3f6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 5 Jul 2026 03:17:10 +0000 Subject: [PATCH 33/49] codex: 0.142.3 -> 0.142.5 (cherry picked from commit 38bc3d8f2cac3d221b0a8918432fd2f22872783d) --- pkgs/by-name/co/codex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index ddce6625ad54..bb15ec6f77af 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,13 +26,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.142.3"; + version = "0.142.5"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-dxkyaWpgzqpAVFojDYQ6JpMPNBIX+d7xjIyLic4Cs8A="; + hash = "sha256-Ua1UVArTvjHcg3bPK1FYyShYiIUH3AOxtoUTvA4UZwU="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; From 4dcce686d72f201934df96ae8e531eab652f825f Mon Sep 17 00:00:00 2001 From: Jhony Angulo Date: Wed, 8 Jul 2026 09:12:28 -0500 Subject: [PATCH 34/49] codex: 0.142.5 -> 0.144.1 (cherry picked from commit 4e6c396fbc0974adf2d938594afe665df15999fd) --- pkgs/by-name/co/codex/package.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index bb15ec6f77af..6fa2aff8ea20 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,29 +26,34 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.142.5"; + version = "0.144.1"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-Ua1UVArTvjHcg3bPK1FYyShYiIUH3AOxtoUTvA4UZwU="; + hash = "sha256-KHgrqIZyAmLhTZSRYbb7huBO8neOib/B1Vx/oPW2nEU="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-1gDiCB3Nf/0aIm+EoL3g9C0xbCi3cv6TfH5VytjJpOY="; + cargoHash = "sha256-S4dsZXfmKvJItL2XYKyxfhqdCMATEG6oPjrtVRwkuYc="; __structuredAttrs = true; - # Match upstream's release build for the codex binary only. + # Match upstream's release build for the codex binary, plus its + # codex-code-mode-host runtime companion for out-of-process V8 execution. cargoBuildFlags = [ "--package" "codex-cli" + "--package" + "codex-code-mode-host" ]; cargoCheckFlags = [ "--package" "codex-cli" + "--package" + "codex-code-mode-host" ]; postPatch = '' From b32e9fd3518446df905b25a5d4b3a43501c81097 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jul 2026 09:13:16 +0000 Subject: [PATCH 35/49] codex: 0.144.1 -> 0.144.4 (cherry picked from commit f361a82ad8e4170a3bcdcfa7816206d8f5fd066e) --- pkgs/by-name/co/codex/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 6fa2aff8ea20..ad87fcd174e5 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -26,13 +26,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.144.1"; + version = "0.144.4"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-KHgrqIZyAmLhTZSRYbb7huBO8neOib/B1Vx/oPW2nEU="; + hash = "sha256-NmYZxjNFPkRWN4rw+eeka10pJt6/oU3ZoLXBxj3dPRU="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; From b769b19f323999906f74e4a27f7c0bec8052d2de Mon Sep 17 00:00:00 2001 From: Jhony Angulo Date: Tue, 21 Jul 2026 15:25:17 -0500 Subject: [PATCH 36/49] codex: 0.144.4 -> 0.145.0 Remove obsolete WebRTC workaround (cherry picked from commit fa905e6a7245802fb54f3ebe02c31293d7ad3a49) --- pkgs/by-name/co/codex/package.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index ad87fcd174e5..6b7f883be89f 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,7 +14,6 @@ librusty_v8 ? callPackage ./librusty_v8.nix { inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; }, - livekit-libwebrtc, lld, makeBinaryWrapper, nix-update-script, @@ -26,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.144.4"; + version = "0.145.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-NmYZxjNFPkRWN4rw+eeka10pJt6/oU3ZoLXBxj3dPRU="; + hash = "sha256-/r4mBoJhHB1v5NTA4Hk565/D5B0deYJf9xJW330hyf0="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-S4dsZXfmKvJItL2XYKyxfhqdCMATEG6oPjrtVRwkuYc="; + cargoHash = "sha256-t9IMRK9R+Z67ThEcgBI0HQU0E4aJHcOjKp22RFclh9U="; __structuredAttrs = true; @@ -57,12 +56,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; postPatch = '' - # webrtc-sys asks rustc to link libwebrtc statically by default, - # but nixpkgs provides libwebrtc as a shared library. - # use LK_CUSTOM_WEBRTC to point to the packaged library and adjust linking - # to use the shared library instead - substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \ - --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" substituteInPlace Cargo.toml \ --replace-fail 'lto = "thin"' "" \ --replace-fail 'codegen-units = 4' "" @@ -91,7 +84,6 @@ rustPlatform.buildRustPackage (finalAttrs: { # character-conversion warning-as-error disabled. env = { LIBCLANG_PATH = "${lib.getLib libclang}/lib"; - LK_CUSTOM_WEBRTC = lib.getDev livekit-libwebrtc; NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" From cdbe9e571fe5214a624200c915447d50e026aecc Mon Sep 17 00:00:00 2001 From: LarsZauberer Date: Wed, 29 Jul 2026 12:36:42 +0200 Subject: [PATCH 37/49] codex: 0.145.0 -> 0.146.0 (cherry picked from commit 80909675e45dbc43db9f8a77376f58a6c77d5a26) --- pkgs/by-name/co/codex/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 6b7f883be89f..5a7e936addda 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -25,18 +25,18 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.145.0"; + version = "0.146.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-/r4mBoJhHB1v5NTA4Hk565/D5B0deYJf9xJW330hyf0="; + hash = "sha256-/kTIOX/klxm1nq2bJsBqS8f1jZZp2ilaTeULQFPJgDk="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-t9IMRK9R+Z67ThEcgBI0HQU0E4aJHcOjKp22RFclh9U="; + cargoHash = "sha256-N9jbH/cgAyu2QxneSnpkdaF0MgV3ZtDmN9q6rr9u+hE="; __structuredAttrs = true; From 7feae94c6a88cae67cf86a9a5974bc2a2e253f3e Mon Sep 17 00:00:00 2001 From: Chris Moultrie <821688+tebriel@users.noreply.github.com> Date: Mon, 10 Aug 2026 09:11:28 -0400 Subject: [PATCH 38/49] fittrackee: mark as insecure by GHSA-rc38-72q6-pc7w --- pkgs/by-name/fi/fittrackee/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index f261ac07eae6..de8b77f8f573 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -112,5 +112,9 @@ python3Packages.buildPythonApplication (finalAttrs: { tebriel traxys ]; + knownVulnerabilities = [ + # https://github.com/SamR1/FitTrackee/security/advisories/GHSA-rc38-72q6-pc7w + "GHSA-rc38-72q6-pc7w: JWT logout bypass in FitTrackee" + ]; }; }) From 8191a53815af4e26429df7bcfab71ae9708c6285 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Fri, 14 Aug 2026 12:51:29 +0200 Subject: [PATCH 39/49] mastodon: 4.6.5 -> 4.6.6 Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.6.6 (cherry picked from commit 3ef7a3f1bebdd551cfa039cac14011a7fe027dbb) --- pkgs/by-name/ma/mastodon/source.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mastodon/source.nix b/pkgs/by-name/ma/mastodon/source.nix index 52eb60bc9c23..0dbbda460bde 100644 --- a/pkgs/by-name/ma/mastodon/source.nix +++ b/pkgs/by-name/ma/mastodon/source.nix @@ -6,14 +6,14 @@ patches ? [ ], }: let - version = "4.6.5"; + version = "4.6.6"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-ZTqVCsiYEvEHACgtIfj1V7jlFXuFoxrfERvr/7bAgac="; + hash = "sha256-V/mhT11IJ60kT7Q1dP17XOEUIVGNuJoitseDBX1sbjI="; passthru = { inherit version; yarnHash = "sha256-VlOG91ZuO+1UXTbtwIrYUbqHjmSfPSfLhrf4TxCJqJ0="; From 2d6708a1fb66613e3da2ee2a9519125c06635396 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 12 Aug 2026 10:02:35 +0000 Subject: [PATCH 40/49] python3Packages.whenever: 0.10.4 -> 0.10.5 (cherry picked from commit cd99a78cd95b3b3eea1c6bd0f761f0ee5a53d218) --- pkgs/development/python-modules/whenever/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix index b76997879701..7767a5601904 100644 --- a/pkgs/development/python-modules/whenever/default.nix +++ b/pkgs/development/python-modules/whenever/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "whenever"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; src = fetchFromGitHub { owner = "ariebovenberg"; repo = "whenever"; tag = version; - hash = "sha256-yDI5TAnEyVPNYXqsCEitFrQnk+Ed0CyRKcCykxFqeWU="; + hash = "sha256-axysocowBamYcNZ9IS58SefSltWC8mdO1Ovf65vMxTk="; }; cargoDeps = rustPlatform.fetchCargoVendor { From 770fe309d99935d999cfe0418d9953e2a6c50e5d Mon Sep 17 00:00:00 2001 From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com> Date: Sat, 8 Aug 2026 08:54:03 +0400 Subject: [PATCH 41/49] equibop: 3.2.1 -> 3.2.2 (cherry picked from commit 5cc3e6808e30627466c8ed5b46dd0e22c7053f86) --- pkgs/by-name/eq/equibop/node-modules.nix | 4 ++-- pkgs/by-name/eq/equibop/package.nix | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/eq/equibop/node-modules.nix b/pkgs/by-name/eq/equibop/node-modules.nix index b1168f7e2073..d095089c7967 100644 --- a/pkgs/by-name/eq/equibop/node-modules.nix +++ b/pkgs/by-name/eq/equibop/node-modules.nix @@ -50,8 +50,8 @@ stdenvNoCC.mkDerivation { outputHash = { - x86_64-linux = "sha256-dLATw5Mb9grQnI/JTdlRdNP2JETELeqY8aXqb5dCXOA="; - aarch64-linux = "sha256-Zrk0aTHw7nrN6lKFa/ap7Hz1OJwnY4jtCLw2KWWqyJQ="; + x86_64-linux = "sha256-TKFL47b+Xh8ChlSyXdhRY+zmPAnkHJss2vNblBvOSmw="; + aarch64-linux = "sha256-S5JNtQvDLFrOT+XCSMqFltrTlcRAzWcbXbRZk4CEkrA="; } .${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix index 74a2ed33ed2d..19b7a58fbc35 100644 --- a/pkgs/by-name/eq/equibop/package.nix +++ b/pkgs/by-name/eq/equibop/package.nix @@ -6,7 +6,7 @@ makeWrapper, makeDesktopItem, copyDesktopItems, - electron_41, + electron_43, python3Packages, pipewire, libpulseaudio, @@ -18,17 +18,17 @@ withMiddleClickScroll ? false, }: let - electron = electron_41; + electron = electron_43; in stdenv.mkDerivation (finalAttrs: { pname = "equibop"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "Equicord"; repo = "Equibop"; tag = "v${finalAttrs.version}"; - hash = "sha256-WqfxrVAJvD6Y6ZjkhbvibL6Bps7PL2lx3JBY94Yd6kk="; + hash = "sha256-foKgtyN1jr4+PHwJHTVXrYzWNVYtR1Sq8rLG4VEnujs="; }; postPatch = '' @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail -baseline "" ''; - node-modules = callPackage ./node-modules.nix { }; + node-modules = callPackage ./node-modules.nix { equibop = finalAttrs.finalPackage; }; # helps when the parent package is overidden nativeBuildInputs = [ bun From a7b7e5faa3653fc17e9107caad4976930409e2c5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 13 Aug 2026 15:20:54 +0000 Subject: [PATCH 42/49] firefox-beta-unwrapped: 154.0b9 -> 154.0b10 (cherry picked from commit 19ffacf167f1402df5e06ac92b9093289d2ecf68) --- .../networking/browsers/firefox/packages/firefox-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index f78ba2306d10..8935ef5e314f 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix @@ -10,11 +10,11 @@ buildMozillaMach rec { pname = "firefox-beta"; binaryName = "firefox-beta"; - version = "154.0b9"; + version = "154.0b10"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "a374ecaf21678f0cca685eed7a09763b3f14ac3d4415c27227a4e06f050042df5e31ade4188d3ab7191102b811b1161638336b41d9de82b9527d39049fe0d3d2"; + sha512 = "ddbe3ff45217a16df9eecfac52fcb12425accae76457e7054b20bd085f5b22908940a20448f213c3dc62d1276bb1c81f38194432336ba97459b2c17393ebd3cd"; }; meta = { From 3c53d70bdba2dd22f12c190ea16e366feb038af2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Thu, 13 Aug 2026 15:21:03 +0000 Subject: [PATCH 43/49] firefox-devedition-unwrapped: 154.0b9 -> 154.0b10 (cherry picked from commit 45f7d9cf8288bfaed00b4c916532091d5f8fe01b) --- .../browsers/firefox/packages/firefox-devedition.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 1314ad2eb9d8..d9918265f160 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "154.0b9"; + version = "154.0b10"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "83d15ab019fd49076f21574770c27e04d431b5b230d4bb3246a2c9190e26ae3f626bdb8241905bc91b87803586f312e4f6cfd7ce7908e5766fb1aa6a0669cff6"; + sha512 = "e2275579e4769a0690010d8fbba528a0e347d86f0dc981d1702b3e627d9c73f3fd7399d3e618c514bf6a3c0059fa3aa5a29f9cdec802e52955a03b1122ca8d39"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but From 8f75bfd6975e310b9e2e5f75a2bcedd772e919fc Mon Sep 17 00:00:00 2001 From: Defelo Date: Fri, 14 Aug 2026 17:22:59 +0000 Subject: [PATCH 44/49] radicle-desktop: 0.14.0 -> 0.15.0 Changelog: https://radicle.network/nodes/seed.radicle.dev/rad:z4D5UCArafTzTQpDZNQRuqswh3ury/tree/CHANGELOG.md (cherry picked from commit b3e43855f26600521c4b2f5d7af1c23b32a76da3) --- pkgs/by-name/ra/radicle-desktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ra/radicle-desktop/package.nix b/pkgs/by-name/ra/radicle-desktop/package.nix index 25e83ab44e24..b10fed53e593 100644 --- a/pkgs/by-name/ra/radicle-desktop/package.nix +++ b/pkgs/by-name/ra/radicle-desktop/package.nix @@ -26,13 +26,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "radicle-desktop"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromRadicle { seed = "seed.radicle.dev"; repo = "z4D5UCArafTzTQpDZNQRuqswh3ury"; tag = "releases/${finalAttrs.version}"; - hash = "sha256-yT51MCHt00JEUbuC6rcXN3L4Vul3aBa8YCgpGVzM5rQ="; + hash = "sha256-L5QfFvswU/iPgObhh09/SAlMRy5w+Qs1kXDGpY31wjA="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git_head @@ -53,10 +53,10 @@ rustPlatform.buildRustPackage (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-HsPz3S2TL7TJzDU7c7IWgT7kO+FkloMsAWc8g5ZKofw="; + hash = "sha256-4gRc/nNrOEi7PU+5bSsR22z3f55cINebSrlFQ1NGTfk="; }; - cargoHash = "sha256-BTSmfMrxNwAdoPuYn4hbx9C9myE1wJh+1FXPG78IgeU="; + cargoHash = "sha256-DZM1YX3lzCvKGtrSxxeJkinR91HFWe5SpdqQ+oP1Hgc="; twemojiAssets = fetchFromGitHub { owner = "twitter"; From a1ffa676ec027f5d14505986e3e78a0d9c9ccb88 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 14 Aug 2026 22:15:26 +0200 Subject: [PATCH 45/49] postgresql_14: 14.23 -> 14.24 Release Notes: https://www.postgresql.org/about/news/postgresql-186-1711-1615-1519-1424-and-19-beta-3-released-3365/ (cherry picked from commit 25c7c0b6da27a6ba08db89a35d464f1ae2112f85) --- pkgs/servers/sql/postgresql/14.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/14.nix b/pkgs/servers/sql/postgresql/14.nix index 184d0a7b3b73..32855ec6c21a 100644 --- a/pkgs/servers/sql/postgresql/14.nix +++ b/pkgs/servers/sql/postgresql/14.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "14.23"; - rev = "refs/tags/REL_14_23"; - hash = "sha256-fjoboaUhrHFDqusmIXzSS5ZnIpSRHO9+qcqvkchl2dM="; + version = "14.24"; + rev = "refs/tags/REL_14_24"; + hash = "sha256-yfZJFXk10vJ4QEhbUXe1gtz8rBS2YOEcD3unEjSHzjk="; muslPatches = { disable-test-collate-icu-utf8 = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql14/disable-test-collate.icu.utf8.patch?id=56999e6d0265ceff5c5239f85fdd33e146f06cb7"; From e1f5a6dcfdc84b8cc27c80bad7820e711a47be35 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 14 Aug 2026 22:16:04 +0200 Subject: [PATCH 46/49] postgresql_15: 15.18 -> 15.19 Release Notes: https://www.postgresql.org/about/news/postgresql-186-1711-1615-1519-1424-and-19-beta-3-released-3365/ (cherry picked from commit bc408022552ecc06f346c590c05c39193dc5324e) --- pkgs/servers/sql/postgresql/15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/15.nix b/pkgs/servers/sql/postgresql/15.nix index 633131478a21..3db632cdaa2a 100644 --- a/pkgs/servers/sql/postgresql/15.nix +++ b/pkgs/servers/sql/postgresql/15.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "15.18"; - rev = "refs/tags/REL_15_18"; - hash = "sha256-tw1zzgLXx7Jr4bi8rMKRmTJzOSQFGvrP2nHr9FcVrjs="; + version = "15.19"; + rev = "refs/tags/REL_15_19"; + hash = "sha256-y5QarcJSMifu+ctjsQOdG/Njo9KvFvIgncBJBjCVG3Y="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql15/dont-use-locale-a-on-musl.patch?id=f424e934e6d076c4ae065ce45e734aa283eecb9c"; From 7d3271b8b4929ef7cab705f6f5f79f03cfc37af1 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 14 Aug 2026 22:16:23 +0200 Subject: [PATCH 47/49] postgresql_16: 16.14 -> 16.15 Release Notes: https://www.postgresql.org/about/news/postgresql-186-1711-1615-1519-1424-and-19-beta-3-released-3365/ (cherry picked from commit 78007d9caa9202be84d21e1a69a18e76e9f88fe3) --- pkgs/servers/sql/postgresql/16.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/16.nix b/pkgs/servers/sql/postgresql/16.nix index 22027d48d97c..2aceefec3074 100644 --- a/pkgs/servers/sql/postgresql/16.nix +++ b/pkgs/servers/sql/postgresql/16.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "16.14"; - rev = "refs/tags/REL_16_14"; - hash = "sha256-g2+OdB2dGIKBSFJ24Z3Yy7oRAFywNMSVDdWfnsaeJJQ="; + version = "16.15"; + rev = "refs/tags/REL_16_15"; + hash = "sha256-HHNROwOzfTatZif+hog/DZnDafV+mZ2Z9Jrq87XN0cY="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql16/dont-use-locale-a-on-musl.patch?id=08a24be262339fd093e641860680944c3590238e"; From 5cf5dcbdffa082a7f75d0315e21a9fb8f2e3ad97 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 14 Aug 2026 22:16:39 +0200 Subject: [PATCH 48/49] postgresql_17: 17.10 -> 17.11 Release Notes: https://www.postgresql.org/about/news/postgresql-186-1711-1615-1519-1424-and-19-beta-3-released-3365/ (cherry picked from commit a248c2dd552c1259761f7efb14adc10c9302fea1) --- pkgs/servers/sql/postgresql/17.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/17.nix b/pkgs/servers/sql/postgresql/17.nix index c5298a23de81..20fc50661101 100644 --- a/pkgs/servers/sql/postgresql/17.nix +++ b/pkgs/servers/sql/postgresql/17.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "17.10"; - rev = "refs/tags/REL_17_10"; - hash = "sha256-3ZAqlT3R8ywhNH13oqz2VUbSwpOJ2JaICbxZ29awaMw="; + version = "17.11"; + rev = "refs/tags/REL_17_11"; + hash = "sha256-pkVBg4Rxku3rEnNhPvVoAoab55vqrDqZfW1z+umealE="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e"; From 354e36e9fdf65f08e060cdd83ae6159bd57f7c47 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 14 Aug 2026 22:17:16 +0200 Subject: [PATCH 49/49] postgresql_18: 18.4 -> 18.6 Release Notes: https://www.postgresql.org/about/news/postgresql-186-1711-1615-1519-1424-and-19-beta-3-released-3365/ Note: 18.5 was not shipped due to a regression. (cherry picked from commit 8404bf489572c1afb116b757ff1d396b2dcd2439) --- pkgs/servers/sql/postgresql/18.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/postgresql/18.nix b/pkgs/servers/sql/postgresql/18.nix index 4d70b2474f27..0650fd2fb1b3 100644 --- a/pkgs/servers/sql/postgresql/18.nix +++ b/pkgs/servers/sql/postgresql/18.nix @@ -1,7 +1,7 @@ import ./generic.nix { - version = "18.4"; - rev = "refs/tags/REL_18_4"; - hash = "sha256-Ac/Dqcj8vjcW3my5vsnKaMiQqTq/HPtUzckJ3SMyrfA="; + version = "18.6"; + rev = "refs/tags/REL_18_6"; + hash = "sha256-ySffxlG7jlNyzx++BmIN+WuaQ9TMAJt/qER9wIjd6B8="; muslPatches = { dont-use-locale-a = { url = "https://git.alpinelinux.org/aports/plain/main/postgresql17/dont-use-locale-a-on-musl.patch?id=d69ead2c87230118ae7f72cef7d761e761e1f37e";