From 12b1adec9a81bc8aeb7c1b80bf9ddd220cfbd082 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 May 2026 06:38:51 +0000 Subject: [PATCH 001/260] noto-fonts: 2026.04.01 -> 2026.05.01 --- pkgs/by-name/no/noto-fonts/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix index 1fb53f8b6dd4..bcff72bf737c 100644 --- a/pkgs/by-name/no/noto-fonts/package.nix +++ b/pkgs/by-name/no/noto-fonts/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "noto-fonts${suffix}"; - version = "2026.04.01"; + version = "2026.05.01"; src = fetchFromGitHub { owner = "notofonts"; repo = "notofonts.github.io"; tag = "noto-monthly-release-${finalAttrs.version}"; - hash = "sha256-f5A9vFTO+TgZTarN0cDmRZfBQxeqedzJp3KdCnua4Yw="; + hash = "sha256-Zph+4YJGSQ5hubzQjKV6YruGciQEle28YMaYyVh8/Ro="; }; nativeBuildInputs = [ From f069e07d2bff540335b01f31920c54c6877f5e97 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:11 +0300 Subject: [PATCH 002/260] discord-canary: 1.0.962 -> 1.0.1033 --- .../instant-messengers/discord/sources.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 2ca81a052f0e..57551f4e5e5d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -1,73 +1,73 @@ { "linux-canary": { "distro": { - "hash": "sha256-4xA+Kh6UiwtoUt5A2kPI5rcbSEc/SoZzJbwFdjMNVpE=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/full.distro" + "hash": "sha256-rZ9gCLa8f0k19Dnvxl+/DbBf7zyDciE0WgBxWKLBzQc=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-3dcVKm/Sz9bqhEm8xVMtRcWrU6JWtv2Dh8oz/3K489E=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_cloudsync/1/full.distro", + "hash": "sha256-/HimiJX86kCnWTPqhvKQnNLFJUmQ7iezvi2n0u/r/Ho=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-7zcFkh3f9BVjHlevCkZXUFNdeLCkM2+sysuSUyPcQlA=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_desktop_core/1/full.distro", + "hash": "sha256-dvzQYjcqPvIGS6OSqNTvaWBUUFtnxfoYq6yLEJUhRts=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-TD1vWHt4y3xkAEc/BV2HZe3tNdP0PTZsXhVeeHvRAU4=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_dispatch/1/full.distro", + "hash": "sha256-dHqfDXW60NektT+Su2KYg4FaqH49ddrCQlncdkAltuo=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-nv6kKT+ZWfwkH4BvOWtjF8VZoznzYRN0hK8kiTbcX/I=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_erlpack/1/full.distro", + "hash": "sha256-1npmkifvbGXFtdajGRKOWI58PHv3UOpmoidgJu+jbtw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-Ru8zXxDGwHrpMnnraAVR0Z7jRA4PRLHX7pBz8jctar8=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_game_utils/1/full.distro", + "hash": "sha256-rhzTUbNDM9XPWWwOo5hQk12DWcP32KCiMaHPEKtSjac=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-zkhTv+8qzyrZBHpZeCzJX6z8HCK0M4Jt6Kr+InbVT80=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_krisp/1/full.distro", + "hash": "sha256-H87TILw5hKxfuqUAz5f3/XL9NMGAgnpDS6u0x49pkgE=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-j5UE4ZugIF4HTsOgxK3Dfp0WP3Sya1fbDjERxGu2qSM=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_modules/1/full.distro", + "hash": "sha256-y0svIIpZtF8d3L/EAEUCQ99J5p5/zpssXNuzYlJ8N6I=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-HaUt+G05Im2uNkUB9Ry1c6X/iadc7xLrcEgJCVgpgsY=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_rpc/1/full.distro", + "hash": "sha256-telD7FdWiZQQ56fjnZJMSSpxFa3YyWQy2G+OBhuEJ9g=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-8cOwisLqnxGsbqPYStBAaKEaALIM0M5d3RPLtoHxClw=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_spellcheck/1/full.distro", + "hash": "sha256-oZ3H/uFZJybt+ZrRzYzD2tv6rSZwvYjRH3LbhHaz+uA=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-hfQu3fT9ON0j8xEAwCRY7/ALYYq/a70W/8HeT3KhZF0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_utils/1/full.distro", + "hash": "sha256-4sLz1RBus6BWq7Eb+Tf0XBy0QDFRfe5Mr3Zb4IwDbt0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-JJXt5wHat6AtxW1GIzsPnMHJPzX1DlPgB3kDcg9Bnts=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_voice/1/full.distro", + "hash": "sha256-su7qGFOH1fL/zkqbE97NDlSrxRX1aWWT/sfehCIZIvM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-PMlqdAI44AngVh75Eq66zHLEoJkI0262FcFUffPykCk=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.962/discord_zstd/1/full.distro", + "hash": "sha256-Z8hxOdCKyJGt3DBAQ+mkKf37LcQrdkyV79dmgD272Qs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1033/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.962" + "version": "1.0.1033" }, "linux-development": { "distro": { From b45dc30858ce125bb5ba6d117a2072df10783909 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:13 +0300 Subject: [PATCH 003/260] discord-development: 1.0.976 -> 1.0.980 --- .../instant-messengers/discord/sources.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 57551f4e5e5d..86bb1774de2e 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -71,73 +71,73 @@ }, "linux-development": { "distro": { - "hash": "sha256-6MLiRO2GYXkBRQjzOwmKHVqMqGsVjk0E3ocvdYyg8qs=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/full.distro" + "hash": "sha256-d7G9+oIKiao7uRL8gsRk2LxzAG5I2J6BcyCPXMOeHw8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-6yEFPNHqs5Mk+1V2x4R/ZwFgwb2Z+O9iOrX78/G3ynM=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_cloudsync/1/full.distro", + "hash": "sha256-YUa4415UU7/ZqxkOJfbxcoakgWXNj7ilGkKSeK8PkcY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-Z82Y9I4brUOvGiZhgL5V+wXRFfDH/XazWJG3OMYyo3s=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_desktop_core/1/full.distro", + "hash": "sha256-pBEVWEKZjAf5SBYeQkO8WUkvFHZ7MyVOmxmX9EveCM0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-MTjgc8SfL7i4O+QkYQu0Os04iAM1x85AAZxuooI5Oog=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_dispatch/1/full.distro", + "hash": "sha256-oRgIGU86rvW6QVF7WCxFC7aVcYTuIw4JTtVKP55Rse8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-JQAgkIpev2+1dlfPW/bg/Iek/cL3+V92IpZIa8e+Fp8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_erlpack/1/full.distro", + "hash": "sha256-SJzSCh4NVt8U1ebt0zSvoquk1FCbyMeHKSxFLlIt0L0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-ixKdUlXhDVmk3P41gFixSpPJCMnd3c/yLQF1J7DYI+M=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_game_utils/1/full.distro", + "hash": "sha256-OM2v5ps8X8h4UG9NOLRFgEm+BVnrEufhOYETYDD9HQQ=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-UJmBXQm0SXbCOjtJN72BZJCViULhpJgc0rgqDrhhNR0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_krisp/1/full.distro", + "hash": "sha256-dLLnwg82KPtDM0VI7xG2S/DF5t9nziB6LQennSpqsOo=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-+TH9x91upIuX9nwvpF9pX4w58YRqu6+hbF1RSyiykdM=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_modules/1/full.distro", + "hash": "sha256-gdH5vvVhTkdE0uMDaoN+3AJTMDe9dfILcUHjSHlwBEk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-cGK1qN8jUiw2l9KNbb7eucWWPw191AHzh/4C6T8gI44=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_rpc/1/full.distro", + "hash": "sha256-ZzOiBXsAJhpevHteLRUvUzRKpCtGvv69voi2RCar7YE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-b/X24WJi2Mi0x7Ynqphmtr6FSYUMSR9dDPPUF/k/TN8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_spellcheck/1/full.distro", + "hash": "sha256-FUcWLGRwAXuf9QyGtJwneOCF/S6FWjCtS4b1P5g3eaI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-+dslIrgHH5r7sz95Ixb+5DDOQA8PEr4BcqkJTchf3WQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_utils/1/full.distro", + "hash": "sha256-8evbMbvbKDoaL/Q2JebHQCSgcMkfhan1b3eEpYU9gPI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-7rg5Ct/BPJaOak0HOeTuYMbfdhHBvI4qML1nnYzZ+IE=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_voice/1/full.distro", + "hash": "sha256-HZoqUGlUySWHzBS0fOrM98ycW62n8xTAqn/KeQ1A4tc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-XKJNd/9l3PJX1GTHT0hvsB9pqI6oDkAvay2L3bOIk/0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.976/discord_zstd/1/full.distro", + "hash": "sha256-iFvOlG14dVyDkF9c8q4L8JnxtGNiZCRjy09Lt5FJj/w=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.980/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.976" + "version": "1.0.980" }, "linux-ptb": { "distro": { From a7c378c095f4f13bd1be524c4f668dd95e60259b Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:14 +0300 Subject: [PATCH 004/260] discord-ptb: 1.0.188 -> 1.0.189 --- .../instant-messengers/discord/sources.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 86bb1774de2e..7474e32edd6c 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -141,73 +141,73 @@ }, "linux-ptb": { "distro": { - "hash": "sha256-dVLGOL//a1mCw0NyekrCemfu9u7pA9t1+UnQ8zmMCwI=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/full.distro" + "hash": "sha256-rPe3N7n3QkYa+pS4ZKRfeCnhK/MnkNrJIhr51XPY9XE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-cLqmwjFWUnRnBY3iEqpyv2mtuHI4TanGxbI1cT4V9Ic=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_cloudsync/1/full.distro", + "hash": "sha256-T/SapvIHT7X8FFgMolRfcgKe6cL3ldQX4goiWlWaW3Q=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-UmAYyAVVwVZINIobQejXSEK01C/oQJBjxBQ1p45AMOg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_desktop_core/1/full.distro", + "hash": "sha256-e4GrIxx0KpQ9qAx4O4rO8jPV17U7XxtRY5Ox72SSmgg=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-/WfqrWgqCXSUodMqlhgiHTQAiRSfg1dfA4c3CxKZuJk=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_dispatch/1/full.distro", + "hash": "sha256-gZoKMgS/0c0llQWPIc0PmJiqzoV75hdJ6pw3whsmrwU=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-MXBUoaeC1Refb80mqyZQ6vE8lRV04K5yZbhHMN5XuTY=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_erlpack/1/full.distro", + "hash": "sha256-l8xKWZ8kNI6gdiMzEAh0CGAM6Xa1w0Py7znGElZT+a4=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-P4s5/5aeLjzaD0HwHlpHCWaiVlsq+TFlfEqfCym4rH0=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_game_utils/1/full.distro", + "hash": "sha256-cacgFbMHO5HCiwpOCyrB39FVqLFZ7tP1Pp0wr8Q3C80=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-hwLHumM78aJv/OSX1LAxqpUGZmiVWGg2Sc6SmOdg+Oc=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_krisp/1/full.distro", + "hash": "sha256-621qH2NG4tkligBd4253HFIZiNefxAeQqYrSmjYG6v8=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-UGS9Znl5QWiQ5nG2I2GxUmQ3sRaaXcCyPPzh3AjAyQA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_modules/1/full.distro", + "hash": "sha256-xEVg3yscqnLzK3sQdzbmDDG0vFVWxabjyAHRQf5t0pY=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-izqFS9ePjv+4VTqrrnwdlNCdpQik5Y7D3pmznP74ULA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_rpc/1/full.distro", + "hash": "sha256-p20egYYvTbGGmZD0bF8MqK2wDa5tWKpf/zFX4HfSZ9U=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-ykwur5DajvoAvNyhTb3wbtduv2NgLhrEEKKI2O/CqC8=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_spellcheck/1/full.distro", + "hash": "sha256-7p/cTlPCyFmoA6MiSsxDsbPeUCm32h+UdHBhQafHpk0=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-HKHbGqYK8AyJu+PnVaZIv+HJr6pc6LtnnXI29rSFPmI=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_utils/1/full.distro", + "hash": "sha256-WoDot6uM79syGwfaYLdV70zYMKJYLQXcWhddf6rg0mk=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-HL/eZQpc0r+5N7LBFZdUVZWQT4nUtX3gBZlOPR1pLfs=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_voice/1/full.distro", + "hash": "sha256-HHOoCOSzfa/EpFPmi7rSluI2iF7YCAxhuN4QMNTCfEg=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-P/8cVdak4Sz7SfHzi8DJPgZi9LRu6FWWI9hjoe8LY8o=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.188/discord_zstd/1/full.distro", + "hash": "sha256-le4KCmo2owtka6k/KGIkE8mntYZQIkfmgpSHgBRFq0c=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.189/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.188" + "version": "1.0.189" }, "linux-stable": { "hash": "sha256-N4gdcj8LYiXxvkbZhZyiWr375vaXt6JnwcoqLOKMsGg=", From 48dd7b3c34fff167391ced88bc97a1b66e7cd353 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:15 +0300 Subject: [PATCH 005/260] discord: 0.0.134 -> 0.0.135 --- .../networking/instant-messengers/discord/sources.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 7474e32edd6c..5e75bae0683a 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -210,10 +210,10 @@ "version": "1.0.189" }, "linux-stable": { - "hash": "sha256-N4gdcj8LYiXxvkbZhZyiWr375vaXt6JnwcoqLOKMsGg=", + "hash": "sha256-vMuoz1OR0cKvrfT/ilkNXEtEP3zEwyNGh6AW5iQADws=", "kind": "legacy", - "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.134/discord-0.0.134.tar.gz", - "version": "0.0.134" + "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.135/discord-0.0.135.tar.gz", + "version": "0.0.135" }, "osx-canary": { "hash": "sha256-tR52aLUTW5iLzOQnXVS6muqsu44rXplHeXNKsR3u4Sw=", From 0f6c97b536c10d40518fb2dbc28e5b747f137374 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 14:21:57 +0300 Subject: [PATCH 006/260] discord: update distro source generation --- .../instant-messengers/discord/update.py | 91 ++++--------------- 1 file changed, 16 insertions(+), 75 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/update.py b/pkgs/applications/networking/instant-messengers/discord/update.py index 49f90ca9e1c5..71dd5b665907 100755 --- a/pkgs/applications/networking/instant-messengers/discord/update.py +++ b/pkgs/applications/networking/instant-messengers/discord/update.py @@ -4,28 +4,16 @@ from dataclasses import asdict, dataclass, field from enum import StrEnum from typing import List -from subprocess import PIPE, Popen +import base64 import json import urllib.request -import re import os.path -SRC_NAME = "source" - -VERSION_REGEX = re.compile(r"\/([\d.]+)\/") - class Platform(StrEnum): LINUX = "linux" MACOS = "osx" - def format_type(self): - if self.value == Platform.LINUX.value: - return "tar.gz" - elif self.value == Platform.MACOS.value: - return "dmg" - raise RuntimeError("Invalid platform") - class Branch(StrEnum): STABLE = "stable" @@ -35,8 +23,6 @@ class Branch(StrEnum): class Kind(StrEnum): - # Single tarball or dmg fetched via discord.com/api/download redirect - LEGACY = "legacy" # Brotli-compressed host + module distros from the distributions API DISTRO = "distro" @@ -57,50 +43,10 @@ def serialize_variant(variant: Variant) -> str: return f"{variant.platform}-{variant.branch}" -def url_for_variant(variant: Variant) -> str: - return f"https://discord.com/api/download/{variant.branch.value}?platform={variant.platform.value}&format={variant.platform.format_type()}" - - def distro_manifest_url_for_variant(variant: Variant) -> str: return f"https://updates.discord.com/distributions/app/manifests/latest?channel={variant.branch.value}&platform={variant.platform.value}&arch=x64" -def fetch_redirect_url(url: str) -> str: - headers = {"user-agent": "Nixpkgs-Discord-Update-Script/0.0.0"} - # note that urllib follows redirects by default. So we can extract the final url from the response object - req = urllib.request.Request(url, headers=headers) - with urllib.request.urlopen(req) as response: - return response.url - - -def version_from_url(url: str) -> str: - matches = VERSION_REGEX.search(url) - assert matches, f"Url {url} must contain version number" - version = matches.group(1) - assert version - return version - - -def prefetch(url: str) -> str: - with Popen(["nix-prefetch-url", "--name", "source", url], stdout=PIPE) as p: - assert p.stdout - b32_hash = p.stdout.read().decode("utf-8").strip() - with Popen( - ["nix-hash", "--to-sri", "--type", "sha256", b32_hash], stdout=PIPE - ) as p: - assert p.stdout - sri_hash = p.stdout.read().decode("utf-8").strip() - return sri_hash - - -@dataclass -class LegacySource: - version: str - url: str - hash: str - kind: Kind = Kind.LEGACY - - @dataclass class DistroRef: url: str @@ -133,6 +79,10 @@ def version_triple_to_str(triple: list) -> str: return ".".join(str(x) for x in triple) +def sri_from_sha256_hex(hex_hash: str) -> str: + return "sha256-" + base64.b64encode(bytes.fromhex(hex_hash)).decode("utf-8") + + def fetch_distro_source(variant: Variant) -> DistroSource: manifest = fetch_distro_manifest(variant) @@ -141,46 +91,37 @@ def fetch_distro_source(variant: Variant) -> DistroSource: name: DistroModule( version=mod["full"]["module_version"], url=mod["full"]["url"], - hash=prefetch(mod["full"]["url"]), + hash=sri_from_sha256_hex(mod["full"]["package_sha256"]), ) for name, mod in manifest["modules"].items() } return DistroSource( version=version_triple_to_str(manifest["full"]["host_version"]), - distro=DistroRef(url=distro_url, hash=prefetch(distro_url)), + distro=DistroRef( + url=distro_url, + hash=sri_from_sha256_hex(manifest["full"]["package_sha256"]), + ), modules=modules, ) -def fetch_legacy_source(variant: Variant) -> LegacySource: - url = fetch_redirect_url(url_for_variant(variant)) - return LegacySource( - version=version_from_url(url), - url=url, - hash=prefetch(url), - ) - - def main(): variants: List[Variant] = [ - Variant(Platform.LINUX, Branch.STABLE, Kind.LEGACY), + Variant(Platform.LINUX, Branch.STABLE, Kind.DISTRO), Variant(Platform.LINUX, Branch.PTB, Kind.DISTRO), Variant(Platform.LINUX, Branch.CANARY, Kind.DISTRO), Variant(Platform.LINUX, Branch.DEVELOPMENT, Kind.DISTRO), - Variant(Platform.MACOS, Branch.STABLE, Kind.LEGACY), - Variant(Platform.MACOS, Branch.PTB, Kind.LEGACY), - Variant(Platform.MACOS, Branch.CANARY, Kind.LEGACY), - Variant(Platform.MACOS, Branch.DEVELOPMENT, Kind.LEGACY), + Variant(Platform.MACOS, Branch.STABLE, Kind.DISTRO), + Variant(Platform.MACOS, Branch.PTB, Kind.DISTRO), + Variant(Platform.MACOS, Branch.CANARY, Kind.DISTRO), + Variant(Platform.MACOS, Branch.DEVELOPMENT, Kind.DISTRO), ] sources = {} for v in variants: - source = ( - fetch_distro_source(v) if v.kind == Kind.DISTRO else fetch_legacy_source(v) - ) - sources[serialize_variant(v)] = asdict(source) + sources[serialize_variant(v)] = asdict(fetch_distro_source(v)) with open(os.path.join(os.path.dirname(__file__), "sources.json"), "w") as f: json.dump(sources, f, indent=2, sort_keys=True) From fda82730c08c4dc68f53917f8530a635aae60279 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:16 +0300 Subject: [PATCH 007/260] discord-canary: 0.0.1088 -> 0.0.1102 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 5e75bae0683a..2f9f8f7fc456 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -216,10 +216,94 @@ "version": "0.0.135" }, "osx-canary": { - "hash": "sha256-tR52aLUTW5iLzOQnXVS6muqsu44rXplHeXNKsR3u4Sw=", - "kind": "legacy", - "url": "https://canary.dl2.discordapp.net/apps/osx/0.0.1088/DiscordCanary.dmg", - "version": "0.0.1088" + "distro": { + "hash": "sha256-wQlaOR2PYbfKl4b6kVeM1Uy8dkgXMYUUcl20lAD0xSQ=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-CrGlifM5ueOBujGd/QOJnvDYMwJaldMqS5BVxLYuyyM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-6d3A2/BZxN6Zj0G1g+IP0gtqRlxUhs9LZ9lvZIY2a9A=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-heZgQ4S8Adc4avG2mynZOGe6yf5TELJyZB6WK8Y/ZmY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-As8c8MJ7/cGpUD+vTwTSXhFLlmMLdfpj9HkPxj8vDRk=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-wa7oeH1lh/wC9N8LUYFhns5J4wEzG60LH+cbJnvRhD0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-2aiIIKV2x60aBDbtnjPzWHINtOCiLvpGSPakSv1ljCU=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-wfB8/FEDm9NLEZsPmOckGY7KW6pv2GECIvyCHumJF9w=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_krisp/2/full.distro", + "version": 2 + }, + "discord_ml": { + "hash": "sha256-Ha32zoNYXG/j8tvW1EKWXi0aNXKNsDgu8QVdyCSgrXk=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-p8TsMEBjLr32FhoySty10Y8gk+23buKbf2rW/CUZa0o=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-c0UNFWEKjwP8SJsARnXMuwZgCRAVUcxtOZSPz3KbAqY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-pLbJODfGx51Ysp58S7aIdZhIvi6an0+BPqHkuYXOvDM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-TiXMgJ2tLVKEKQFtJ2DG4/pvDDWfGJZo0wiZ8hP37yc=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-vkPu6xaH6uZXummgs1zl9k8S5roMJi4BfXI/GxzaJJw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-+8itKyOGtocpt3pUE/qwsemZmUpqZ4jrkjrDzAygi5Q=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_voice/4/full.distro", + "version": 4 + }, + "discord_webauthn": { + "hash": "sha256-bKVnWFyBTwTAbYZNb2OvOXEZZsqrjM2pAC/9LflNW7M=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-VDckm6+FUaa5OidWc9L0jfP93p/siSOtoFbTnB9sRh0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1102/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "0.0.1102" }, "osx-development": { "hash": "sha256-gyZ2H9dsGYRlkPtRSE7hwRfFl6sr4pK2kB6Jq/51dhE=", From 19aa7391cae79ed6b97917f5f331ddee0fc476cb Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:17 +0300 Subject: [PATCH 008/260] discord-development: 1.0.982 -> 1.0.987 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 2f9f8f7fc456..c91a79872ab5 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -306,10 +306,94 @@ "version": "0.0.1102" }, "osx-development": { - "hash": "sha256-gyZ2H9dsGYRlkPtRSE7hwRfFl6sr4pK2kB6Jq/51dhE=", - "kind": "legacy", - "url": "https://development.dl2.discordapp.net/apps/osx/1.0.982/DiscordDevelopment.dmg", - "version": "1.0.982" + "distro": { + "hash": "sha256-KuvWcUPFXfj4QW3K8IGS8E0BiffEEMknncjxbMCkvTI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-vX0ZzFkcIJGlZ6CVixrc1U1LGDAszZhexXSWFtbSVpk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-m/+55zUpSXI/nwZKMaIknAzDsYlnCIcxyGoSeLafDEM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-vvofUseRpHi4wMMbOaM2mI8eYYrwlI1F6dfKyZX8jvU=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-D9/lpVfwXKj26dMrreSLBPaND/4iCMmC9/u3+T1NVPE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-vsAIH6YnxbXAiDqDeeLSuinZLmLn+3D6mbdRJb5L99Y=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-1JO4nwtiduv+JZqoPparHV1dgjPVKhYeWzDzuUzWTTs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-1oO+B/78bZhlQfRl1V1PHH9zMWJb+2mi2DlVK3NCmVk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_ml": { + "hash": "sha256-RunRar9d7lbF9PkOmQwokmjgfFblc0u4pu2gQGtrc/E=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-vkz0ZWMFFatdrMgEWM16AMuWSaFSI+HFFzq3oP+3dJ4=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-/h00K6D/bZBwea852GO+4+1w4oLDFQP7OlrTsupBcwc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-3f7O1xyYd4XdOe4+RU1o6TCcwYA8VK4oC6/zlQHIWBE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-j+rwWr+pq+Cg3NaaF8EoO31lUDt7Za6h/M033CJjaxQ=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-nXryRxbYrJ1cO+wXGfu52oWPIxj5Efs6J4EQqeronrI=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-sEtDXKyrA5Y2yuHzHX06LJUx4zibt2tlZtXmVohyL6c=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_voice/1/full.distro", + "version": 1 + }, + "discord_webauthn": { + "hash": "sha256-kFfptFhrbFkluiBmupcXasbSlq9ygbWkH9S4wTbG0rs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-2TuxeigNLFPe70njbSaBSmzHsTjb369o7mSxC9XpKVk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.987/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "1.0.987" }, "osx-ptb": { "hash": "sha256-WlygpcUv+CrmQdZyZ0t3EEb58oopHetbKQbKsLUdI1w=", From b851333c77487f0e6a680bc0305d4b321b4ca0df Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:18 +0300 Subject: [PATCH 009/260] discord-ptb: 0.0.231 -> 0.0.232 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index c91a79872ab5..e8f89ed9d3c6 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -396,10 +396,94 @@ "version": "1.0.987" }, "osx-ptb": { - "hash": "sha256-WlygpcUv+CrmQdZyZ0t3EEb58oopHetbKQbKsLUdI1w=", - "kind": "legacy", - "url": "https://ptb.dl2.discordapp.net/apps/osx/0.0.231/DiscordPTB.dmg", - "version": "0.0.231" + "distro": { + "hash": "sha256-LWvTisilV3o7ndSkJylscpjRk/8e6HOG+sEqwss1Xz0=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-0TatK0N39jOtnuNPrZqIVvYRBkgieuWLGUnVffNfvIo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-mtx5lpSiz/Yw3WfyaHYhetFcTrwH2xtm++23Yp8Zt3g=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-8RcoOm4kw1nZaT3q4YY2SpsMOWojSVRuYA5xOJ8EaUE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-8TDGUAxW5WortWglbmTz3nNWW0WoYL7GPjvgWX2pmoU=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-UC5CZ8p3WCEqMmmCD42jiG/7bYEz4rzBX7MDoHHz6Cw=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-xlJ4Y/JtIMNTlUk1kIBvZDBwlzWh5VSNvR4XdrX6k4s=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-60GGDVDSWtWanNt0mI7YknvMp0MTt1G3UFgYqiS3GjM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_ml": { + "hash": "sha256-6Ok4E72wvwBQksVWlN/Jg4b9ejF1AUT8fCT1asiKeMM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-JVWqNae2VkLcvZ0y95vhNwgohntziiNy0B+7ILvFu/A=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-S9bZdYqI3I7dx2oSIokigivjNy6ftLgm63y+F2u717w=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-FGjHeX1p+TP+o74aVCqqO1LLhcxYwNBpaNa5SkRmbRo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-Lu+cE+Ypla7d2yu26dEkg6lUvkqhc49ZilYCNM33GWw=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-36eRP9D1M62vivqUBmT8Q69MV223M1tOmVCAoIyUE7o=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-HH4hoDBaWVPHSoSnUz3D+TS3unVFSS2cCZZ8QUKudE0=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_voice/1/full.distro", + "version": 1 + }, + "discord_webauthn": { + "hash": "sha256-hWsS4gNEC+y5RWhw6yb3JzSydSFLvpZEAeS2OTTlt1o=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-tgFVUfraQfI5M/5WTTU6TrvysQPuqHAhiQSo6BzSkp4=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.232/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "0.0.232" }, "osx-stable": { "hash": "sha256-H+Odwt2Ry3C1+OMhVdr9PjAXOnI8vmsUkSBL8dieakc=", From b7c15d7f2e30e0db5549f1deb97eb2519fde1233 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 13:54:20 +0300 Subject: [PATCH 010/260] discord: 0.0.387 -> 0.0.389 --- .../instant-messengers/discord/sources.json | 92 ++++++++++++++++++- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index e8f89ed9d3c6..75b84c0d4e7d 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -486,9 +486,93 @@ "version": "0.0.232" }, "osx-stable": { - "hash": "sha256-H+Odwt2Ry3C1+OMhVdr9PjAXOnI8vmsUkSBL8dieakc=", - "kind": "legacy", - "url": "https://stable.dl2.discordapp.net/apps/osx/0.0.387/Discord.dmg", - "version": "0.0.387" + "distro": { + "hash": "sha256-G5Ji8fsStgyhwx2XY+l5WUb9cMtIENAKv5k52s2g/3g=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-yGdWuaJplBkwUoLwd5uJFIWFF2XjyOwOWY3SJdmx1q0=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-97utI2ZNnFOCMxJHc7RRoXxZ2GzdFs8ll+N0Imr/LNM=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-XwABjhRMMDKQsmHGeyzRveAxwJJWSIMIJoF8nJQ7SzA=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-4nz4TeACvEdhKZzlTMuSKN1uf9LWqm+ro4Gx/kt41Mg=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-wKF4difrMuX8m5NsUUVK9sdsBKiTQG1B+ckrBW6LTZQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_intents": { + "hash": "sha256-MHj9MtTcxFs3h2P5MfI/i8f2I64oZ2fKt+ByJPlVMLc=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_intents/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-XCCBJer4RPs/Nk+YKTH1BAVxSFu1XAJNeb5ai4uFaKU=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_ml": { + "hash": "sha256-U1sRjCzeLFg7j/MR6AsC76Ib6ULXs/RqN6FSB3IzCdc=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_ml/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-IElPJUwEz2QL0WDWCju8JR7Z81X3t92JHEXhs8NUF8k=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_modules/1/full.distro", + "version": 1 + }, + "discord_notifications": { + "hash": "sha256-0+XuBfb0lhx3YUAqRRBEAHqDQJa2/8ebcZhnh821ltE=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_notifications/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-i0tChHCi1aSAXsieRg/rxKptU8R3zI3Wxmdxi1Til2s=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-MsSCA7Jdk+MeMpsFYcUSmGNbmfnZrTy3LbSUI7e9yOo=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-2YStzx57sx666H/CTIvmdgTWw+tJOgICx8sY0zVERak=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-Tag4GSeN+1Y/LK69R4HOxMlFDE9BUg4/EcEDFVXI5Bk=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_voice/1/full.distro", + "version": 1 + }, + "discord_webauthn": { + "hash": "sha256-ouEP2+k2xZpMxaLD6RiloL94faW4WsVcMFxWYTy7OW4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_webauthn/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-zUyoJ3i1iYmBCRm6uFTo8QUKly3uDzL4xqebWQ7LH4k=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.389/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "0.0.389" } } From 2a82a95464b9aae569a39e9018cf12e25b3d9fc3 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 14:21:57 +0300 Subject: [PATCH 011/260] discord: use distro layout on Darwin --- .../instant-messengers/discord/darwin.nix | 72 +++++++++++++++++-- 1 file changed, 68 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index aabb23a155a1..b8ff915a0ff0 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -8,9 +8,10 @@ self, lib, fetchurl, - undmg, makeWrapper, writeScript, + writeShellScript, + brotli, python3, runCommand, branch, @@ -34,7 +35,45 @@ let enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods); inherit (source) version; - src = fetchurl { inherit (source) url hash; }; + + src = fetchurl { inherit (source.distro) url hash; }; + + moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules; + + moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules; + + configDirName = lib.replaceStrings [ " " ] [ "" ] (lib.toLower binaryName); + + fixDistroSymlinks = writeScript "discord-fix-distro-symlinks.py" '' + #!${python3.interpreter} + import pathlib + import sys + import tarfile + + with tarfile.open(sys.argv[1]) as tar: + for member in tar: + if not member.issym(): + continue + parts = pathlib.PurePosixPath(member.name).parts[1:] + if not parts: + continue + path = pathlib.Path(sys.argv[2], *parts) + path.unlink(missing_ok=True) + path.symlink_to(member.linkname) + ''; + + stageModules = writeShellScript "discord-stage-modules" '' + store_modules="$1" + modules_dir="$HOME/Library/Application Support/${configDirName}/${version}/modules" + if [ ! -f "$modules_dir/installed.json" ]; then + mkdir -p "$modules_dir" + for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do + ln -sfn "$store_modules/$m" "$modules_dir/$m" + done + echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \ + > "$modules_dir/installed.json" + fi + ''; disableBreakingUpdates = runCommand "disable-breaking-updates.py" @@ -62,22 +101,47 @@ stdenv.mkDerivation { ; nativeBuildInputs = [ - undmg + brotli makeWrapper ]; sourceRoot = "."; + dontUnpack = true; + installPhase = '' runHook preInstall mkdir -p $out/Applications - cp -r "${desktopName}.app" $out/Applications + + extractDistro() { + local src="$1" + local dest="$2" + local tarball + tarball=$(mktemp) + brotli -d < "$src" > "$tarball" + tar xf "$tarball" --strip-components=1 -C "$dest" + + # Discord's distro tarballs store symlinks with mode 000, which makes + # them unreadable on Darwin. Recreate them with normal permissions. + ${fixDistroSymlinks} "$tarball" "$dest" + rm "$tarball" + } + + extractDistro "$src" "$out/Applications" + + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: src: '' + mkdir -p "$out/Applications/${desktopName}.app/Contents/Resources/modules/${name}" + extractDistro ${src} "$out/Applications/${desktopName}.app/Contents/Resources/modules/${name}" + '') moduleSrcs + )} # wrap executable to $out/bin mkdir -p $out/bin makeWrapper "$out/Applications/${desktopName}.app/Contents/MacOS/${binaryName}" "$out/bin/${binaryName}" \ --run ${lib.getExe disableBreakingUpdates} \ + --run "${stageModules} $out/Applications/${desktopName}.app/Contents/Resources/modules" \ --add-flags ${lib.escapeShellArg commandLineArgs} runHook postInstall From b49b623ae22c544c250e891d3fdbec82ed5f3393 Mon Sep 17 00:00:00 2001 From: FlameFlag Date: Sat, 2 May 2026 14:21:57 +0300 Subject: [PATCH 012/260] discord: use distro layout for stable on Linux --- .../instant-messengers/discord/linux.nix | 93 ++++++------------- .../instant-messengers/discord/sources.json | 72 +++++++++++++- 2 files changed, 96 insertions(+), 69 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index cf5ec0193b11..0e725bd3e103 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -87,31 +87,13 @@ let ]; enabledDiscordModsCount = builtins.length (lib.filter (x: x) discordMods); - # Starting with discord-development 0.0.235, the linux tarball ships only a - # small `updater_bootstrap` ELF that downloads the real app at first launch - # - # That binary always fetches the latest version from Discord's CDN with no way - # to pin, making the build impure and the nix version a lie - # - # Instead we fetch the app directly from the distributions API at build time: - # https://updates.discord.com/distributions/app/manifests/latest?channel=... - # The host + module distros are brotli-compressed tars on Discord's CDN at - # predictable URLs with SHA256 hashes in the manifest - isDistro = source.kind == "distro"; - inherit (source) version; - src = - if isDistro then - fetchurl { inherit (source.distro) url hash; } - else - fetchurl { inherit (source) url hash; }; + src = fetchurl { inherit (source.distro) url hash; }; - moduleSrcs = lib.optionalAttrs isDistro ( - lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules - ); + moduleSrcs = lib.mapAttrs (_: mod: fetchurl { inherit (mod) url hash; }) source.modules; - moduleVersions = lib.optionalAttrs isDistro (lib.mapAttrs (_: mod: mod.version) source.modules); + moduleVersions = lib.mapAttrs (_: mod: mod.version) source.modules; libPath = lib.makeLibraryPath ( [ @@ -218,8 +200,8 @@ stdenv.mkDerivation (finalAttrs: { libxshmfence wrapGAppsHook3 makeShellWrapper - ] - ++ lib.optionals isDistro [ brotli ]; + brotli + ]; dontWrapGApps = true; @@ -228,20 +210,20 @@ stdenv.mkDerivation (finalAttrs: { libgbm nspr nss - ] - # The new distro layout ships prebuilt `.node` modules: - # discord_dispatch is linked against openssl 1.1, discord_voice against libpulseaudio. - # Ignore the missing dependency on insecure openssl_1_1: discord_dispatch is - # effectively unused in practice. - ++ lib.optionals isDistro [ libpulseaudio ]; + # The distro layout ships prebuilt `.node` modules: + # discord_dispatch is linked against openssl 1.1, discord_voice against libpulseaudio. + # Ignore the missing dependency on insecure openssl_1_1: discord_dispatch is + # effectively unused in practice. + libpulseaudio + ]; strictDeps = true; - dontUnpack = isDistro; + dontUnpack = true; inherit libPath; - autoPatchelfIgnoreMissingDeps = lib.optionals isDistro [ + autoPatchelfIgnoreMissingDeps = [ "libssl.so.1.1" "libcrypto.so.1.1" ]; @@ -250,41 +232,22 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/{bin,opt/${binaryName},share/icons/hicolor/256x256/apps} - '' - + ( - if isDistro then - '' - # Distro layout (currently discord-ptb, discord-canary and discord-development): - # - # The host distro is a brotli-compressed tar with all files under a `files/` - # prefix (the channel binary, libffmpeg.so, resources/, etc). Module distros - # follow the same format with module contents under `files/` - # - # The module directory layout must match what Discord's node runtime - # expects: modules// (the moduleUpdater extracts zips into - # path.join(moduleInstallPath, moduleName) see processUnzipQueue) - brotli -d < $src | tar xf - --strip-components=1 -C $out/opt/${binaryName} - chmod +x $out/opt/${binaryName}/${binaryName} + # The host distro is a brotli-compressed tar with all files under a `files/` + # prefix (the channel binary, libffmpeg.so, resources/, etc). Module distros + # follow the same format with module contents under `files/` + brotli -d < $src | tar xf - --strip-components=1 -C $out/opt/${binaryName} + chmod +x $out/opt/${binaryName}/${binaryName} - # Extract native modules - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (name: src: '' - mkdir -p $out/opt/${binaryName}/modules/${name} - brotli -d < ${src} | tar xf - --strip-components=1 -C $out/opt/${binaryName}/modules/${name} - '') moduleSrcs - )} - - '' - else - '' - # Tarball layout (stable): the tarball unpacks into a - # directory containing the channel binary directly - mv * $out/opt/${binaryName} - chmod +x $out/opt/${binaryName}/${binaryName} - '' - ) - + '' + # The module directory layout must match what Discord's node runtime + # expects: modules// (the moduleUpdater extracts zips into + # path.join(moduleInstallPath, moduleName) see processUnzipQueue) + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (name: src: '' + mkdir -p $out/opt/${binaryName}/modules/${name} + brotli -d < ${src} | tar xf - --strip-components=1 -C $out/opt/${binaryName}/modules/${name} + '') moduleSrcs + )} wrapProgramShell $out/opt/${binaryName}/${binaryName} \ "''${gappsWrapperArgs[@]}" \ @@ -297,7 +260,7 @@ stdenv.mkDerivation (finalAttrs: { --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName} \ ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \ - ${lib.strings.optionalString isDistro ''--run "${stageModules} $out/opt/${binaryName}/modules"''} \ + --run "${stageModules} $out/opt/${binaryName}/modules" \ --add-flags ${lib.escapeShellArg commandLineArgs} ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 75b84c0d4e7d..c6bdbeed05b4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -210,10 +210,74 @@ "version": "1.0.189" }, "linux-stable": { - "hash": "sha256-vMuoz1OR0cKvrfT/ilkNXEtEP3zEwyNGh6AW5iQADws=", - "kind": "legacy", - "url": "https://stable.dl2.discordapp.net/apps/linux/0.0.135/discord-0.0.135.tar.gz", - "version": "0.0.135" + "distro": { + "hash": "sha256-RlQEGuQlnvISzvNAXtJAEaHSvC/8AhNcfEc8paV9JKA=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/full.distro" + }, + "kind": "distro", + "modules": { + "discord_cloudsync": { + "hash": "sha256-9x/7+65hT5mcOOlUcSkWa7As+6Bxdv9vps/ZYgj+8TI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_cloudsync/1/full.distro", + "version": 1 + }, + "discord_desktop_core": { + "hash": "sha256-9ocCcvhubWXUCwPewJdKolt0CRbunzVIjWUsser1NA4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_desktop_core/1/full.distro", + "version": 1 + }, + "discord_dispatch": { + "hash": "sha256-3Hqi3/5zfmDheMIbWN9l8qb/bNo9/pzfxQqYureCfMI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_dispatch/1/full.distro", + "version": 1 + }, + "discord_erlpack": { + "hash": "sha256-lSR9PV2nG5+vgNqpjUrC8ygKv8bfvUk+i+F7nCEjV1Q=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_erlpack/1/full.distro", + "version": 1 + }, + "discord_game_utils": { + "hash": "sha256-jf3Gf95QmZVjzAB0Ui2eSErP58hNd+YRyyYKe9xtQlQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_game_utils/1/full.distro", + "version": 1 + }, + "discord_krisp": { + "hash": "sha256-jrEaudW1wI4dKIvZd+1/CfybdWainF9TApptzffxQiI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_krisp/1/full.distro", + "version": 1 + }, + "discord_modules": { + "hash": "sha256-jN+R1e8aDVXyq6J+1+h8Hienli7pj+xhZU8PUKCtXn8=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_modules/1/full.distro", + "version": 1 + }, + "discord_rpc": { + "hash": "sha256-f/rSx/dFSmORLVPNvG5iqJb1KN5CBchXEUzwJwP21zU=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_rpc/1/full.distro", + "version": 1 + }, + "discord_spellcheck": { + "hash": "sha256-t1Y8DGpVQ1pzCz6tScaTnY9KvxSnUnIk26twTVupdX4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_spellcheck/1/full.distro", + "version": 1 + }, + "discord_utils": { + "hash": "sha256-FH0Fb4M+L+WETHQBJuFqbS/h0nLlWTTTnV7lp1lqcCU=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_utils/1/full.distro", + "version": 1 + }, + "discord_voice": { + "hash": "sha256-X5u3XuXdco84LG0lZS0uAgks0XjesxOltYGn0XP3akQ=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_voice/1/full.distro", + "version": 1 + }, + "discord_zstd": { + "hash": "sha256-tZgzaVh2/CrvtYPOVJE3vrZuWbs9JxQSi74KeNf0mJw=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.137/discord_zstd/1/full.distro", + "version": 1 + } + }, + "version": "1.0.137" }, "osx-canary": { "distro": { From 2f445dcc0bb89403bbeb9f790ed7445c765b1ba2 Mon Sep 17 00:00:00 2001 From: Tol Wassman Date: Thu, 30 Apr 2026 04:59:50 +0000 Subject: [PATCH 013/260] firefox-beta-unwrapped: 150.0b9 -> 151.0b9 --- .../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 6864ad465b89..a1037c52818f 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 = "150.0b9"; + version = "151.0b9"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "5afa7b27ee38e809717ca02fede9aa5ebe27f9aeb78d7953e7b0790e30edb663bf0053335e42e258b7bf01b8859e6b0a10c23851cf8b495217f954ac41a386d4"; + sha512 = "2d50cbe82dd470ab94148ab57585324ff98950fa25b806065b61ab2f541c795d826f4d9a454225ec798cdcd77dfd453dc50d26f0ccf8bdb5fcdf010244aec45a"; }; meta = { From 0e25019d277e6510b1dd2c2cb845fc0109e5df0b Mon Sep 17 00:00:00 2001 From: Harinn Date: Tue, 12 May 2026 13:50:00 +0700 Subject: [PATCH 014/260] python3Packages.amazon-ion: disable broken benchmark spec tests --- pkgs/development/python-modules/amazon-ion/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index 7ad129f4ec1e..596108794f5f 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -95,6 +95,9 @@ buildPythonPackage rec { disabledTests = [ # ValueError: Exceeds the limit (4300) for integer string conversion "test_roundtrips" + # benchmark multi-top-level cbor/json fixtures mismatch upstream + "multiple_top_level_object_cbor" + "multiple_top_level_object_json" ]; disabledTestPaths = [ From c6368f51c61effdf5620254f7ae725d5351eb088 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 09:24:58 +0000 Subject: [PATCH 015/260] thunderbird-esr-bin-unwrapped: 140.10.1esr -> 140.10.2esr --- .../thunderbird-bin/release_esr_sources.nix | 794 +++++++++--------- 1 file changed, 397 insertions(+), 397 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index 6e1361154078..6d728fcd4747 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,1193 +1,1193 @@ { - version = "140.10.1esr"; + version = "140.10.2esr"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/af/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/af/thunderbird-140.10.2esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "b9a3dee67dea96b54d9053f3ab3714d68874b451e4de4c4afcbad96f97eb0456"; + sha256 = "f07d0adbc1379a673080d322915aad26792b1ca45cf6dbb8abcdbf1a41fe6518"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ar/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ar/thunderbird-140.10.2esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8e225a6df59b37334e75d9ed5ea42dac06ec03affdebfbb44c59e1df1c3c67a1"; + sha256 = "e6dfab3267803ff5dba69a1f05876e3600c39eca8cee6d50fb91ea99dea0be2d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ast/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ast/thunderbird-140.10.2esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "f4b1339258dd8f44328c73dccfc7776a9bb6e3b4b26bc44d4de956432fecd06c"; + sha256 = "22c3202e02ca8c2bd4f72d66a4527d60730b4603375a179ee43200e7b0da6b1e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/be/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/be/thunderbird-140.10.2esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "58582d54163a36e568d50a9a7ecd1ee7d45f1257a36b44c227a10c497387be21"; + sha256 = "3fa732494f41fcb03a44ac8080c830c0f3768aa06d22547364ffe5db149e3963"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/bg/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/bg/thunderbird-140.10.2esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ff150b2db92f347ed284652ee3b49d01c297d35975c322606ca55a5e090c30d0"; + sha256 = "340bfc45eb0c8b97d9ed485af4979dbc090b787332b7300d7d84ca6bf96a13f3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/br/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/br/thunderbird-140.10.2esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "7f6ad1ee8267e99a9f0addcf3d710431dc0b692d9dea59fd08774e5ff473b7fb"; + sha256 = "79b29f53917af17f89b34de8a2e8ccc15a78ae8a80f1329c84fe6cf47c3c5fec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ca/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ca/thunderbird-140.10.2esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6b5120b7f60ad85e9837f97e7ec696f0917883ad5c67a063668707a35fb7f4df"; + sha256 = "db43a6a163ed55544f1ae5457248e7a937ea8087a816cb2bc0b0b1aa6c546dc5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/cak/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/cak/thunderbird-140.10.2esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "216d640c975811d82d6ad8df15505210abe8b8d7bea208bf9875cb87edbffd0c"; + sha256 = "119709cfb7271a9ecb09882f82445034db3944ca8d575c433f49e257424f5717"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/cs/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/cs/thunderbird-140.10.2esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a7428498257d57e339d0208446d99c2a5d4c1f54370b47d77bf6163c474dcd21"; + sha256 = "1fc846dc0b3f17d41be4fed04972132df00d047e538777a6e929d891daff2fb3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/cy/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/cy/thunderbird-140.10.2esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "63f355147a8dd1fc3e3ad15dfe84449319da8bb44cbc9603fd8e2e388804f0d3"; + sha256 = "5945f52f7955886e68b4f380b8dd652ba9bc851a51198ee9970bff4727ec2463"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/da/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/da/thunderbird-140.10.2esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5af68eeed79c97e9326688b8aaf032c49bf8e5315f113ae8c39504c42bba8008"; + sha256 = "fb0ab9f5a5102d6435a2312ed807d43bcab4a17552816d813c54ba7a9b84a5f6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/de/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/de/thunderbird-140.10.2esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "7aaeed80363a82f10eca630fd97016d41a4226ae2f09bf8d31e12e68872c8314"; + sha256 = "45f23692cdf2452e9e0718da54091b1fd53dda3c3d84775cade8ba4bb1f1d8bb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/dsb/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/dsb/thunderbird-140.10.2esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "66571ff2dc72ecdf50eb0135b2c0809d80424eb244edfb23658097c70100e2dc"; + sha256 = "53f8785000e5e8cac2426a36630956c81ba01a4d12064b91c927d46336165d99"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/el/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/el/thunderbird-140.10.2esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "e4173bd367f25158118e3a6662ab6bdf71547bfb04975da851196f4965567e86"; + sha256 = "d090a0ea056ad75652b8b6448a112fe6ed648b852da15fca7388438a27d60e1d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/en-CA/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/en-CA/thunderbird-140.10.2esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "ba50093598d0add12dc28b8f2c6ef27ccbc8ec4e329c4ee19ff885a82d395d75"; + sha256 = "63f5974fc2751a941624def18fe00d39568ce4f1634d65615a607b1f3c4228df"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/en-GB/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/en-GB/thunderbird-140.10.2esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "b127d24395338c484278506fe6e16dd5c3d3245327f01b925027a41c808746eb"; + sha256 = "2dae9414776bde2e1d8c885297a5708a30d43d00479147e8f177f4d6b92e4127"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/en-US/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/en-US/thunderbird-140.10.2esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "419a73f4fc435646ed82be11f45c0b4f9b9ca733b5608fe338348b600d4fe454"; + sha256 = "75560f92724f06b6a8af683da53dc944e6ab655f3120b8749db96f741f3936ef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/es-AR/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/es-AR/thunderbird-140.10.2esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "a3add8b61c7776a674d71e9b65da1088377bf1e09512ace6c80cc7bafa3888e7"; + sha256 = "e8ae3bb00350dd3445fe1f6bdb91840de4881c8de1636a457b16f3640aae09fb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/es-ES/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/es-ES/thunderbird-140.10.2esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f4359f7a07f7c62c7e38b1998ecd81078e45336fdf6a12aa28512b8fba49445e"; + sha256 = "69a4f3ce8ab2092f747082d0e4d888719754a78d7fc7adcf3373ecd411dd16e7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/es-MX/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/es-MX/thunderbird-140.10.2esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e9aa3017b5bc7d44b4c90bf2ea4d0537e5aa5b46246810acea3d9a06402fadea"; + sha256 = "915efe1ba4044fe8f7409cc5d8f79caae74cae2deceaf9de04e0c51461a09e3b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/et/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/et/thunderbird-140.10.2esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "24544e9ed938257acee2e796e3a4e80580a664969083ef45e107dd374359f245"; + sha256 = "9f22901047eecc62ca3c90bc7b7b2353a5c6a06334d68b9b8b2ad74e9bca36a4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/eu/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/eu/thunderbird-140.10.2esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "b0f4cecbede4acb710f5c2e56912c6c4194ba83c6c2b7b9dd59e716dcdec2268"; + sha256 = "dfb547f6f37f8903cc6888a69830b5596411a67218d68fe9d95a7f5959c84bc9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/fi/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/fi/thunderbird-140.10.2esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "308db3894a1e0707ad9e01ea88fca5fe2ebd790b3f39c485f255ea77288ad5ed"; + sha256 = "617c85dcb0e40da55b5438088d3976193efae080dc9ef0682a6940d01d9566c1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/fr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/fr/thunderbird-140.10.2esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3091afee1c1b22695d4624400bdf27922b39db70267d857d7f74e248e2779f41"; + sha256 = "59f44ba1dee82c801a92674a5650864be7e302169a2cb5cd1d13eaeb478d91d6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/fy-NL/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/fy-NL/thunderbird-140.10.2esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "1b059e5c3a10db792ee36cfd412f2029cd2b0e410f733e0849653a5eeb4f46b5"; + sha256 = "1e28cac68bf5a29fbc1197465a75a82ab585f17ba1a711d61bbad31751b19837"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ga-IE/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ga-IE/thunderbird-140.10.2esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "71434195c189633d4e8d0279792ff9a59a473ff4a3b91526b52365ff0c90f193"; + sha256 = "50d949ac085671654eb9f20c5c292e5c2a84ca7a1b0d310247ac689e5650525c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/gd/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/gd/thunderbird-140.10.2esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "3e3d326c7a40b59463b08aaeb512d5f9f4bff4beb7e47663d9f438bd5d299e1b"; + sha256 = "bf40e2510795e4355a21e555aab30c8ed716e0fe866ab63a63369b3ea2731d82"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/gl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/gl/thunderbird-140.10.2esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "20f7585e81787f4cb97faf43bc4a30cfbc98bc9223eb54b8ff02a9d9165278d0"; + sha256 = "78c96636c04746c8ebdedba44055fad683097ae8623ff418d0ce6d389c14868a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/he/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/he/thunderbird-140.10.2esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "9e5eb4607e29a183bd35e34bfd53db1e099c673311beb0ce89b79cd4c38907b3"; + sha256 = "8c0a9986c723cb038891f9f55864f306a2a6079d1ce3afeada0196c8481458bb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/hr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/hr/thunderbird-140.10.2esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "63c7809e9c0705e091bf09cf085ac0eccc8d7cc9744d78f200a496386fc96c9d"; + sha256 = "8fb3cb8d6ba4162b3f597f11eaad9873125dc11278f00f39124320000b742847"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/hsb/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/hsb/thunderbird-140.10.2esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "465e1368bbc5077d52cf9f17ad590fd9665a73385a03f7fbfd9b5fcae345253e"; + sha256 = "413dc3c31bbf97fa69085fb22b41125d66b037b234053e17229cfe97aecbfc11"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/hu/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/hu/thunderbird-140.10.2esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3385e2f794dfdc7ba44fac052f45a4faeaa8c93e186bd51f33af77e8d15f44e3"; + sha256 = "26b17c048e18cf67ea875bcd58d7c3d6a81548ed7aecccced8efa2aaa8a49caa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/hy-AM/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/hy-AM/thunderbird-140.10.2esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4c78d41d1f8bcfc65290664b0efcf4d117faf4c44146fbd7e55aab345a1aa16f"; + sha256 = "24984975c5933eba1761d4e3f8e7960bbede1c035948420e59c9bb2c30716b4d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/id/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/id/thunderbird-140.10.2esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "1490f0b29b1a99f031d1c3178860e48f0b6b1fb47bc229336f9b3b6b60083acd"; + sha256 = "50b2e12a8dcc402ac2e498e726782eefd02ea4a56e1358265cd8b765700cff0b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/is/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/is/thunderbird-140.10.2esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "d427c95977b8ca8a6e486878b9d933503ae1a901ecc928153e6a899d22549a98"; + sha256 = "40be0e295bf3f9298a32e95e11cb7679c7af10caeaf9776c289c3d8b754311c8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/it/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/it/thunderbird-140.10.2esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "e1eaaf80b2b6292330afcddc22bfa76083916655ef94f861d68be7ba53e07ded"; + sha256 = "5a7781db7eb8902a6ec1cbb34b64fc405b3a7f0440fd817b880bfaa83d98ee18"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ja/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ja/thunderbird-140.10.2esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "791ba64947ae5fe27eb3a28c9045587e4e4dfda8c0239af10402b7f8a14d3069"; + sha256 = "753438ba6c1a9c057af40f345167ae30d30b45c81757a67b57e8b01d8e0c40c0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ka/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ka/thunderbird-140.10.2esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "d8630c1d596cfeef49e537088e3a760257f6b1ba2c5e2893bb97a8cb368a2556"; + sha256 = "4e6f55855fba81c50cf7605a50cd397d4f4178ccabe6446db245e35786984483"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/kab/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/kab/thunderbird-140.10.2esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "26e6ab3d42e81794b476083ebf6aaaa42bb614d08747e8359f0d6c1a20810288"; + sha256 = "6fe4208cab1011033732022afa32cb43f41c183909f8ac985a6930e0ca61b9ba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/kk/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/kk/thunderbird-140.10.2esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "41e837d9dea7eaaf357c44611f74534c17cf5c792473e9d5844bedf55d56eac5"; + sha256 = "9dbb1485dabe9a0b33fa19f1177a0890e1439324506932ced7ecd67e97d1168b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ko/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ko/thunderbird-140.10.2esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1464d85091738e9d092d9b998d057276c00954be095c378f12b044db01c28b8f"; + sha256 = "a491775207d989dcce5e5ba4da6b63e67cc75ce8b96b3cd98648ad441d98fa73"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/lt/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/lt/thunderbird-140.10.2esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "27da41fe9627117428d852ad5d9c4fe164bf5a3d38b652714754abc98e17444c"; + sha256 = "127d024139e8019ef57e2b992539ccb2386ae137d7acbcc9613e8e549f6745f4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/lv/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/lv/thunderbird-140.10.2esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "7d0e7418f7d0dd476f285661bf53c2df921aae7e563284c20dc4bde75ee8e3a3"; + sha256 = "475252207b4acd8c063cf2423c9844a7e1b4bca36df8e0d4b75f304d62205ef1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ms/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ms/thunderbird-140.10.2esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "0b856724310f3e5c3c734b527cd713d2ffebdea859e61823528eccd33aec7bb2"; + sha256 = "cdb4763a0a07441c9d676dec50c6a4377ba7841052c7fda8dd8ed7c2278d800a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/nb-NO/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/nb-NO/thunderbird-140.10.2esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "e325750c8ff5caa3468271f5572af1981a3fd9cb5a41c778be5930de2abee33b"; + sha256 = "230610cf6384474a2afb2605f53ba29d416be9c714d2e511ed90421ac437f586"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/nl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/nl/thunderbird-140.10.2esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "e45a4522c2db254edf28dd7cdfed9d98009f665d5f80fa10d20e94af6629c47b"; + sha256 = "5e66d3c4087fd0546ed5d7d1c8d8d65a3e507164d571c3ab134bd9e808a2476d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/nn-NO/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/nn-NO/thunderbird-140.10.2esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "286fc61dec1d3c5319d92e963f3353e3573f463c14dd173bb586c6c609a5ee9c"; + sha256 = "822a9bd887e6648e7a08d7f7466aadb5706e49d1f2bb369933d1f57d8260a8dd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/pa-IN/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/pa-IN/thunderbird-140.10.2esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9a2340bf0d4d4541829f4ff3e801fe69de77b8485dca205d19e2c4eaec9cd9a0"; + sha256 = "5f09a4b86c7d9da53e9390a572890ec699cff3d25210da83debb66b9c69f9d92"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/pl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/pl/thunderbird-140.10.2esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "16239700d9ba66dab8fb34d1c07168d585ea0c3faf3bcbe3a457ad180f35e396"; + sha256 = "d0d0381606089fc47f0296dd2e54706ccaac9f08b49f60c3e022a1b8b763d99e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/pt-BR/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/pt-BR/thunderbird-140.10.2esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "0a0dc8b84ed8115f7556cd9a55d139b5923451c2c604ed4a5e1edfe5cd0613e5"; + sha256 = "14130e9287350291a0f48a0714aed6a85391a4ccf510009315b0ffd3c8d41f56"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/pt-PT/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/pt-PT/thunderbird-140.10.2esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "26562d7ce2b418aef219f142e77f63ffa84ee20595ac59f93fbaec06621344d4"; + sha256 = "38084a283cb82fdb516cd89c8deb92fe77e1d1ede6491aa70662b53187f7a1ba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/rm/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/rm/thunderbird-140.10.2esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "33f4e2d531cf66a611b4e498e3eaf8de83cb53d629c0adff0eeeb015c60b9676"; + sha256 = "bbc0a67b49d6e406fbaf488f03cc0ef0eb60b01ebd69436b998a996349be655e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ro/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ro/thunderbird-140.10.2esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "3a7f5afdb251b3fb578cb0ab7be777e2c1947ab02d145d49bc2565b8e97e8876"; + sha256 = "f2aa5492962704470077a99f0c313ddf350b9ecd238106a30817c841c99f5100"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/ru/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/ru/thunderbird-140.10.2esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "ee0ba0a1bb017136f41118e4f12f36173515857edf7e1ed6a08f93ee2a225ef0"; + sha256 = "bd93bd8347f5ea58dd2aefe9d68dfdd8b0cf8757f7702a3321af551f1ac42ab5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/sk/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/sk/thunderbird-140.10.2esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "31a783f4305c444b8253c3a2bc9e911bc0b93946cc1bb372bd1a780345b501c3"; + sha256 = "28a7142384c99d2acdb44543a75b941c49eabd86122ed555aa19865091497bcc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/sl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/sl/thunderbird-140.10.2esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "03717681604fb5460724b90302bb6b3fde61367c662bcc217e7bb426f9cc5938"; + sha256 = "8e5ac51c9bb352efc09bf40266347dc5a16b9e6b1d1fe955f5968d05a1bb5080"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/sq/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/sq/thunderbird-140.10.2esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "315881d19f1d93fed6ca9985c87df9e5d844cae331b7324fa34ce606343d0b1c"; + sha256 = "300930a93f3b2789a13bd7cbabab1b604de97da92de14b523acb92f287ba908e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/sr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/sr/thunderbird-140.10.2esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "4d00ed88327ad117e69b46eafefec51ce08032262fc90347c34edeb2ee765575"; + sha256 = "1f96e11dd8878bf3c1e72966b4ef929f70175d044b1b7b7eb905d99c4e24dceb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/sv-SE/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/sv-SE/thunderbird-140.10.2esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "20c99c14346892f052a0df1e464196c93a0ff5ce86ee1318110a753ce97876d5"; + sha256 = "b9825c93c2523ead647f8efdaa24e84c23133c3aabe87fac27bdc0c3dc3b2475"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/th/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/th/thunderbird-140.10.2esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "f0caaa9ab01357af78122310db34267ee0312025cabfff8da13a606d694608f9"; + sha256 = "443de99d32913ef0a690071812e7f5aa0ea86995fdeb2107a4c14237674c7279"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/tr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/tr/thunderbird-140.10.2esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4bc49aa816e5dcf4a56737efa1eec63a55eaaecf66cdf7a362d7a43c2c2c956a"; + sha256 = "e05c1fe60912d66d1e2803bc2df9cd3792bcf7aa5e7b7cf9971ffbf1395fbf0f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/uk/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/uk/thunderbird-140.10.2esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "429df7a59720917dba0c97ee8362de6d52e3d4cc5434731019f509cffd856b78"; + sha256 = "65deff1c367ae506387ebdee7ea9e945b187f2949d0e30edddbe45be16c8c80f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/uz/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/uz/thunderbird-140.10.2esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "2687a8c4517ef36f68f1f3463b316e5cfd81dd010a29aaee45d38e8cbe6ec760"; + sha256 = "72b45bb221aa45278cd5b182d6d22538f93950b85f006df01b34da38196aab7c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/vi/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/vi/thunderbird-140.10.2esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "41cd26dd6bf03ef4e8c0d52e17a9e6c4f7b914aee84534117d0faaf742cabde8"; + sha256 = "bf5169cacb8b83d2be0c6f185c73f360276b4c3685e7476e6f9fe6bed7f5c856"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/zh-CN/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/zh-CN/thunderbird-140.10.2esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "7fc1a3a5c9be1dab3c980accb081b6577124ef758924da43fc4316443aa683db"; + sha256 = "ae82bc160f71296f5cf0f658b80668e475fd71f17264849f2398251e323f4c29"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-x86_64/zh-TW/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-x86_64/zh-TW/thunderbird-140.10.2esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "46f99d06981794ab3012d9e71bc9262e8a4cff1b778aee77ee936b873c8de5b6"; + sha256 = "33578d1cd19ec8c9a61f6979c2bf064c043f5191eef52656443ab58d39a39570"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/af/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/af/thunderbird-140.10.2esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "ab00c8406ad9efd1d02e02987ca5b662cf978e7533926c4e74df5aa77ed58879"; + sha256 = "5c9042375384dcab312d03cae946c6d2b3f5c0f7df29f452f7e513ae396491b0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ar/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ar/thunderbird-140.10.2esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "328a78848d3093f08bd71d68aefc296511f5decb25a2de7417100eb1d01c3e42"; + sha256 = "c54a367d9c5b636137af504bdbdb22ccd72d4c275370d5bc5515a0268d6b081b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ast/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ast/thunderbird-140.10.2esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "78589cc6ec9ffacfb8a682e905221471447faa797604e8997ab45813815f1e6a"; + sha256 = "7324eecaa5499d4c4428e8fa78cfd1bfa4fe542f6e31da70ca68771632cf5246"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/be/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/be/thunderbird-140.10.2esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "ec644633e09063e8e8dfd8477abc2850d840697bd8dc5c55e870de6fd6547c69"; + sha256 = "e5e83cd64f8921748d6b49e41cf4efeae6073889e313594cb70b4a1c9e08fd6e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/bg/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/bg/thunderbird-140.10.2esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "2cb49eacd0b7bfe693934709a650dc9f84d9309d42a40c404132bc6772d932e9"; + sha256 = "9b2c7c73831dc12771472defc7730890a711c3a1bd25c7f804e2b42b146f2a46"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/br/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/br/thunderbird-140.10.2esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "2b0a97b077b6462b0ad25cff42ed789e4d954529ab466eb358a88ea3f351964b"; + sha256 = "ddceefebced957647a882b0aa6a7dcbc78457e30f394721f5d85e6174df34c9a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ca/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ca/thunderbird-140.10.2esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "bf2956e4c89d7679c45f466d331aaf0be0f8e4feccc80f16ffd1296d05e323c8"; + sha256 = "1e97fdf39d20fbfdb9f3c29b87e8df6200e8cde220ef28b0315e8a50fb19201c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/cak/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/cak/thunderbird-140.10.2esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "1ea81c9ec504580dc0e50efbc554a8f2f216c929803ae08ab46d0143e605b5eb"; + sha256 = "32b1909ae19f74429bc01c88b1f177c1c10783e04e3547d9f13c8e581b897fc7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/cs/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/cs/thunderbird-140.10.2esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "4bb1d92cc17518f5e6d67e7f744a6fb8c558a82b964bc72a17fb12f96878eff5"; + sha256 = "8324d55bb79830d3dae0a83988901b99cd31dc891aeae6721ca6e429563dae6e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/cy/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/cy/thunderbird-140.10.2esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "b46bcb98d82aab3071a9178f1d4842275abfd48e04394e0b835b6ffdfc6f4472"; + sha256 = "1e4d3f7379a93b7e1f9cfff6d87c9b7599785164d84a15c656881a1b54c7ca1d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/da/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/da/thunderbird-140.10.2esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "41f1bb39b7c8b00c115041eb3b1fc7ba473b22209a05c77a9aedfd48d3fd5127"; + sha256 = "07e7ae74166e3e4fb9daaed68ab58040523899de90f7a2ba525646aa9dae476e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/de/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/de/thunderbird-140.10.2esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "f253fddfa7f60adaa71e3e4c130e386a06ef50e34fa6f80beed77472bb54c919"; + sha256 = "2750e2594fa3a62e6bc9f20388a8b8d3d7559c639c26df073f1159bcdced5b48"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/dsb/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/dsb/thunderbird-140.10.2esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "3d5e129633ad039dc84ab8193a88da686b54edf657d68c306a866986b3d0b5c5"; + sha256 = "455f5d19156d92545e674de9fa612ace5aa8a53692d2a2613b7b03deadc0a0e2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/el/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/el/thunderbird-140.10.2esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "bc8cd60dd557ff256a4dc82667b75b6443e0f7f21de1cd51800c8292c4451f34"; + sha256 = "991ede0e0bbb299e25f5b427f8fafd3469ebe232d01080ba8999e75ca193b7ff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/en-CA/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/en-CA/thunderbird-140.10.2esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "9ea28b2acc4f715ad5bd998a37714d16c575cdf5ff48f5d7cec1310cbbc0c43f"; + sha256 = "82379f4e9c3d96468b15287992b9c1bf828c5372945649a7c8e075737429caec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/en-GB/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/en-GB/thunderbird-140.10.2esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "f0daffd4127baa67960e744974700c129adc15bcb4c211eae8a35eaa4fcacc31"; + sha256 = "d7ed7bb071aaf4ae476fd62c0608e2c18d599cb28890c9a94d899c5e6d5ed5cb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/en-US/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/en-US/thunderbird-140.10.2esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "3d46659793e991d47fce8fb5ddd3b4426116eff7f41ba2f394add2164443468d"; + sha256 = "6503e6ea245a797ce4afcbd9d164fe6eac0c5767f6e2832e2e2fb7d3b4d86f41"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/es-AR/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/es-AR/thunderbird-140.10.2esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "9ebbd3a654ed4f5870a95b4f05c544154ec5752d72ea132ac5fadd3ea8b73820"; + sha256 = "d9a383986db1fff7e706addaa88e8e80e6221d24e535732ae23dde6b58db866c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/es-ES/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/es-ES/thunderbird-140.10.2esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "6d891493b59294cd6dee1b5cf5fd4a3032e94c4b917b5a674e68c194f535bb91"; + sha256 = "7a876d3b4cc474b3d424a5699ef4723cf1ffdc3d618bd350e2ab9e862458bcd0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/es-MX/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/es-MX/thunderbird-140.10.2esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "3ed5fe0e91105d61f46486761947075728d3c6f7d20bcc146c227997f73f634a"; + sha256 = "932006072dd9f608ce927af7472db5598bb53d2f678c3725773d84d99e5aa614"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/et/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/et/thunderbird-140.10.2esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "f9834aaad3eae7b280ae01540bbb311dc314e600c48b4ee8276df168e84f24e7"; + sha256 = "57ec23233ba80dc1dbb6e39db10fe841fed9e24d5e8e3a491d9bd00a96bf4eff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/eu/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/eu/thunderbird-140.10.2esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "60dc99e0f9d2f51b2edf0a488d6a366bd3b59198c0d6311e3cabd7ac0b2965e2"; + sha256 = "9e0a403b5ab3b707dc341b13ec9bba6bf839e4f83ec83b080509da61fe8c3057"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/fi/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/fi/thunderbird-140.10.2esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "33c5999b58e44d8c19f0907c1ed3882230fed5f3c1c51ef983e25cf5ba91532f"; + sha256 = "55642bd85b064d0766d9298dba64580279aa43ec22e79867e683b9065f56f6aa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/fr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/fr/thunderbird-140.10.2esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "9322e488041156207fef7a71cb3730d89bdce861683bdbd9d2c9735f192c758d"; + sha256 = "89ff322a014970399170717ae9b77d205bc5544d7899cb738cace1626ae1f915"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/fy-NL/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/fy-NL/thunderbird-140.10.2esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "07107a9f46e7007bfd6775d290d8e044848a27d309b18c6882973bb456c921da"; + sha256 = "d1879f3adf99c542b396fb366af49b9e9ffdcb7a3ca141d61a2ae854e764c754"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ga-IE/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ga-IE/thunderbird-140.10.2esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "11b0212ae19a5e5d951957d940bec06b4cc3f7cd351335b86716ed6fcc4629ae"; + sha256 = "42123241ebe15f183cc616b9eba8388d0db5c9842725a4f3e0c7912b8060dee5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/gd/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/gd/thunderbird-140.10.2esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "a3d2eb2cd76c6dd1901c8ec65df2876d4bf33834e76ba0f77253870bf09a3c91"; + sha256 = "57c7e813bdb618f7f0edc158ee693918ab4fcf34efc2fe50d7c4636cfa211f09"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/gl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/gl/thunderbird-140.10.2esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "492516e57553b1cdfc6ef256978f10997db0a581594bc39b83cb7fcbd57fb7a8"; + sha256 = "1c259532a4e2e03c2453445182c512b087ca20ff5e32b33f3363cd29a6481d42"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/he/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/he/thunderbird-140.10.2esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "f80e10fd0ab7ec8f4041aee1524e7dcf4f0d5f7b1ccfdbacb0c52c96fd1d2343"; + sha256 = "1594effae7220b7d8e104c0d8cb235fc166a56c7e77ddafd256a17c918702b85"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/hr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/hr/thunderbird-140.10.2esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "d368328604cd3aacdd35406bc9b4ec9b7d5281f34e2729a14d89de24a913e549"; + sha256 = "ed56a86f256e68ca0c80d3ac5fad4c1c0716ef885fa8ba43d70473e46eef21a8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/hsb/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/hsb/thunderbird-140.10.2esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "96b2d3c15caa66186e6e6d65d5209dad13db6b020977488285751b04cf150930"; + sha256 = "b95d68755b86d9e008bee5c4e36f08c2ac0cfb47b3475fc362376877e88ba59f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/hu/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/hu/thunderbird-140.10.2esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "2922c6b2b7678b0cfacdb9ff9bd9b57358d1c9669bfd0a9eb867b40c245b3d3d"; + sha256 = "378cba946a7353a23044b658d099729c22b2016ffb63a99ec0f83cfb3dda4d8f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/hy-AM/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/hy-AM/thunderbird-140.10.2esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "3dbe377142e90b8c286f32bd936ea0fbf550713d0bdd2fbdcba231504649aee2"; + sha256 = "ae4a019f342cc3c618b0c9e218e851abf35820249f98e32ec241f500a775db0c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/id/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/id/thunderbird-140.10.2esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "43230557e6e4d795b1ff7bd32f7328e84becb6d9b92b64cd35193ab5fa7c942a"; + sha256 = "e1ef73f45ac247f8ef31bb009e206cdb32591cb93333714de19efc069bd32b12"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/is/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/is/thunderbird-140.10.2esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "b2d857688f7f74053c4c3afc616d9be1b976672dfa73ef3a6b63ba6d43582b29"; + sha256 = "52b257335142dedcb8f51f1989080bd21f172601ba5708b686380a93cfea8b6e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/it/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/it/thunderbird-140.10.2esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "dbf84d3508c09caf3bd3a74f1ee04cbbb4b3210d5a88cc2d4be183081a0bf480"; + sha256 = "29ea851d26a8abb153ca90e331e71ada87d28adf6d01d8a22e9a146f099143b5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ja/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ja/thunderbird-140.10.2esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "46f95bd41ca7c9d2b070a1e2e6848cdcb1bb87ac7bbf1837a5fdab3e97c67eda"; + sha256 = "556041753194c3a85c70e74d6f4a0b0e0a6f7720eecb891dc0fef8b65ed2103d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ka/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ka/thunderbird-140.10.2esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "44f3ebb1f1e8c659235381d1b582a9efcd6e128e44549cbe92eb9d0baec88b07"; + sha256 = "0674dbd24a7093b3d5b73ff6d117af465d627864076522d945e71ca16849b3c4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/kab/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/kab/thunderbird-140.10.2esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "61306572d55f49463e37a42677b7f41cc3231606f4445db61e381c7749781690"; + sha256 = "f20f04965ca92d60923c6e198ceb1f430032dccfdf4963be9f9a98bbbf0b3d70"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/kk/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/kk/thunderbird-140.10.2esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "89e875e302238bf097eda777c5ba804849e0a0ca0e8bb50a2006ac0b5e7e971d"; + sha256 = "1df30ce8eb089b76e9129055ee8972f5601894f575ba6bbe8eca34fdbd0d07c1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ko/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ko/thunderbird-140.10.2esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "47e333e406ccf94d6a71f0ad7e30a6ed125258ebe6be5f0bfbc0182639bdac7d"; + sha256 = "26cb8cf51435752c52b17248b9b726082f900660b07447c989f98e65f8e95ed1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/lt/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/lt/thunderbird-140.10.2esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "0bb60b93dfc94efb9eb42ade76df77c780704e4f13b06da1b011008745e8609a"; + sha256 = "09dc0f85d8dd077c87fdb80a443ebe6e3828673d313eb1ea20119c727908be91"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/lv/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/lv/thunderbird-140.10.2esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "55fb5f7f3a2e69de35ad060b4126438484abce360c9e176ae7fca9f3fbb3e638"; + sha256 = "3f51447b12ff5c63e6086b826c740591314ce7e7485b71af5d01f3ee71ea0600"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ms/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ms/thunderbird-140.10.2esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "8befed7965e1e7f4573bf4d30d1f7a0a47359730e23f85a8a5aa9e886e1f8783"; + sha256 = "ee736e272933808bb340598a68989a80aa4b65e56aff906d7a62343e12aabf95"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/nb-NO/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/nb-NO/thunderbird-140.10.2esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d8beb86f5dcc5b2575f7f852f66030cc3b9c26ab4b5e4f68ee7d678abd931855"; + sha256 = "7eb3eb90779d1c90addd3d865c2d8f44846cfc616253683af27b3109fd7ee5e4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/nl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/nl/thunderbird-140.10.2esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "bb199aff8af56eb028910c5870599052f9e1cc3b35f7e8ffbb89f2e7f11769fc"; + sha256 = "9e243a15641b9faad9a9bbf4be3420ad67399ce794effec8817e89db2ae27760"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/nn-NO/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/nn-NO/thunderbird-140.10.2esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "7f1be5fe6cb355a49de9628ea0f1a306630f274606ecc158bc32e9e55938817f"; + sha256 = "375f101d449bb048ed819acb11a4a55409f34e151b20a8e5535fa8d180918c8e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/pa-IN/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/pa-IN/thunderbird-140.10.2esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "7c8f2e9a0aa75a7b967997628078fcdf486b7f395ad9f275231aa27814fc8b88"; + sha256 = "444d88dd81247d44a8ed00484a3aeb9388b9906a0cd1265e72b232a1ed104dc3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/pl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/pl/thunderbird-140.10.2esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "f57f36f12d337d4a91a9b096ea7844218a12d8c272b96b938b1b7aeaa57b73f4"; + sha256 = "0478bf5a657a670f758e450b08f583d9fc166bd161af65acc3a05a4688023ce1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/pt-BR/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/pt-BR/thunderbird-140.10.2esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "3b964fe7267830b423213daa8ad7f13b7e174fdae8e4d42d526537edee4a1109"; + sha256 = "534b45f409f632aeeb47a17a145c60072ad7f84d15e145828c115e9550063c71"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/pt-PT/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/pt-PT/thunderbird-140.10.2esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "7fb2122f7865431d93c927fc0e88f16454cfead9361bf86d3b5a92a7e0effbb7"; + sha256 = "e83e6aaf323a1ffd6133782445487c0f899438cdb56f185684b36dfe63094b93"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/rm/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/rm/thunderbird-140.10.2esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "30cb6e845abd1a05c5eeac21276b7f3d60819c016dc3d4e4bcc2b7d47b3ddcda"; + sha256 = "f93996b308ebd6dfaee865e19d843e2c31bcaa0c5f0ebf4f0b9e2d1105873298"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ro/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ro/thunderbird-140.10.2esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "8b20fc46fc8cada35e80d1a4a7f7c5d2150fcf916d764d7c7a886030e3b860af"; + sha256 = "0c15a1b19fa335d8d6147172ecd329fd49463cb0a6ca5ffafbd8425cc6c2f2c4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/ru/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/ru/thunderbird-140.10.2esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "1904b28766d3b9e5f39415fe7656cd8efb6ad344198aadbac53621dc7555f8c1"; + sha256 = "cbb2abe3f274ada62e75d12ad8c7a9261b721d7d3e6136d34199af0d5db3b6bd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/sk/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/sk/thunderbird-140.10.2esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "2053bcc4901c31f73c85d4ca0a6b738880c5ffde0ef0cb5b59d2ae29d638c7b0"; + sha256 = "6a616816577666964c53164f809c711e6499e0144e8dd3301814461fcf01f3eb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/sl/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/sl/thunderbird-140.10.2esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "fac6fddb7847d70c4c4cb59319814b87f5d2834290e4e273ac7e5455ef594af8"; + sha256 = "328f87c238c9e357a27a8ca5e1e3e95f13aa3a4db8b35e9781f4146d6e290051"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/sq/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/sq/thunderbird-140.10.2esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "58847c1500658ef58732fdf1c3bb8be0ec5290988f9059dc61aee46c2af9bfe5"; + sha256 = "30e6650819672e77b12946320df7a03b20142b9f57adcdd1a2563fe6ded98f15"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/sr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/sr/thunderbird-140.10.2esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "de6a55acc2db393afd199bb28c7ce71951a54b2e81cd14c77e2232bbea952f94"; + sha256 = "177d3f557072a536221c86bb4fbf2dafded306e265cdc2bf00c00434ce445fe3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/sv-SE/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/sv-SE/thunderbird-140.10.2esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "e4d36ecde61e76bc2e62394d51607951ba51c44a7c904b0a75f77de902ba935d"; + sha256 = "9d91a2a6a2659f93c0e1a3f7c18fbf34f3bd8003f9bc50b099a41b324677bc20"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/th/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/th/thunderbird-140.10.2esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "448f9b83de50ffc43fe38f34efccc74ed70974d9ae364aed3269cd2080acc160"; + sha256 = "804e27d230b5bcabff2d686c8282c6fb2c7c1769e3ce93d6dbc757e0b338f6cf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/tr/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/tr/thunderbird-140.10.2esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "7b887054733ce55989fcb15c3c4ec55204b585d3d65d117b53e5faee94474f97"; + sha256 = "08db4cb7bd8f9cae4af5791ceaf91753a0a91091b2511230c044abd643e234b1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/uk/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/uk/thunderbird-140.10.2esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "a634420e5ac42e1e9b8cd188ed282ab58d92d52fb5329b21d6b61e0eac3b5851"; + sha256 = "c723d8f8343547fe9f8b44a02be6f1fe13e0cfa8360acbabcf16637a6c1e1cb4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/uz/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/uz/thunderbird-140.10.2esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "385e9d52007e7c689a6b9229231456381d22210e227ebae70fe23106e711415d"; + sha256 = "8e33e3ed65e91558feac6d996409c853af7f8ef40e66eb472e3a3125a3943881"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/vi/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/vi/thunderbird-140.10.2esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "70e6a2ed4f29f19f3edec1f0653f981b5d2bff02f8bd7caa8558718dd99b6216"; + sha256 = "80244b5e767492ad4a6e1c8eba88275d8de894bb4db56794b3c6f5e07961144e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/zh-CN/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/zh-CN/thunderbird-140.10.2esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "133cdab1b98a6db06d786c8128896cc2a7a7c4dd9b6d10ab07265950aa56a73a"; + sha256 = "94157ff4abfbf0921e2a26cd8ad66344dcd76b4e45f46e527fb36970b079fdbc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/linux-i686/zh-TW/thunderbird-140.10.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/linux-i686/zh-TW/thunderbird-140.10.2esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "d4dbf2bf6f7a0c669eb05a53293c5dfd48a08ded47c7d4e03d4973878e3088a6"; + sha256 = "8d278e160b324c044b16659e7449644a2ade0c46536a63614d8df040d4139692"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/af/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/af/Thunderbird%20140.10.2esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "d4a105125d2d6a1fa7315df8c9e5c0b162c65628ced477ff0b55313f552d984e"; + sha256 = "3981a67e630191141910fdf6c393691e64fcc9ba73c1e09120bc074512fa1211"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ar/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ar/Thunderbird%20140.10.2esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "ef60336e90fef9bda1c98d2507640462b8f079a06b75534861f5f33892562d03"; + sha256 = "e3ba19cd9d0b7b8f0ea7afa383a8f872ed79bfe36c80a03adae758d742ab4e7f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ast/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ast/Thunderbird%20140.10.2esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "86f935d7216c359903c1e80b23374d2e5f9d171f12bf535f8238740b94a559d2"; + sha256 = "3dc4b4ae66685d062e4405b261a2c72627079751750eea2b04a915cb5a1c7218"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/be/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/be/Thunderbird%20140.10.2esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "e6c2f3ef7283621cf3572d0f37917c33a7040dfcc6f961fdec5d01ba1f5ac4ea"; + sha256 = "3010b2e2e79dbc3bf813a6a164317662557d26dbb72060a0ed1c22e44ca79b81"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/bg/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/bg/Thunderbird%20140.10.2esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "d6aa0859e7433e031b47924c07b5e400b195b2cb9de899b134358afc3d14131c"; + sha256 = "c49ff11b25614a7639cb893e38775a8a1528d80fdf87fddc42f612ea485544cf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/br/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/br/Thunderbird%20140.10.2esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "3575ab0c0e2d5d1deffde033fe076bc7c66b060b1b7557fbad84520cf72f3fd4"; + sha256 = "608d49dd6861ea242eacbd2342d94d0c2c9a6e4d4999cb11c5b29bf4f4ef22d5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ca/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ca/Thunderbird%20140.10.2esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "898293a810ef067ef7cbf850f9e682986ca3514c2138d471e53d8188eea25176"; + sha256 = "102d383a924d2fb81e7dc67b6e1c67bbd268bcc36e0c4a860a6f2adef2bc7a37"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/cak/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/cak/Thunderbird%20140.10.2esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "50441a1b2fcbcb82213e0152470097d632708d9765d3457d7d8d4ab88d7bb68d"; + sha256 = "b48a78ca4bf04450c864dc1306c7e9f30403e6acfbd15bcb9813374d7ee189fc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/cs/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/cs/Thunderbird%20140.10.2esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "c099c357d7a122d97995eab803102bc37fdd23344eaf7623354bae595f5ad749"; + sha256 = "66dcb37ff2a015ef1d11e9299dae64dc83e26cc2f901224a1f0e90b0959ee014"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/cy/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/cy/Thunderbird%20140.10.2esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "5f9a14af37baf6fe6b039c49f335b8d2ed2ae94ac13446af46d51a5da67df147"; + sha256 = "ac5ea27461ca7d03b976fe04b6e0c382dad7ee8505b02ba04d6c019153d70970"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/da/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/da/Thunderbird%20140.10.2esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "7facaf3bbcd87880534e1d4c6cfb84afbd7b3ab11509cc703bd8cb94b547a2fe"; + sha256 = "72a4792cee803f82ef1705da5835fb6fb4dd8dc1832859d22b1057170381791d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/de/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/de/Thunderbird%20140.10.2esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "5e0d3558fef53f8fa0c7f0d526dc060f98aac6ee2c1cceb80333f1a17594bc5a"; + sha256 = "79a314db7a5c65075605152deeea3be884d57a63aafe548f663284cbdf15b6ac"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/dsb/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/dsb/Thunderbird%20140.10.2esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "aa82eb06b2b3518562b185a22abb6cf3174bbe5c391b3e542994aa3d0f82128d"; + sha256 = "ec2dd15aee0d60d63c8eb75329894626ddd62fb6bb5f90fff2df1225eb447c57"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/el/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/el/Thunderbird%20140.10.2esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "0a108dd5bfaa1e45cdbdcea0ca240a83d6c1e932b5a66a5c01093950416387bf"; + sha256 = "efa370f13249afbd57884c565991a969f223e35cfb5941839ea74a78be2ff79a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/en-CA/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/en-CA/Thunderbird%20140.10.2esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "6f688da9241cd6079074ba78f870d969c6d487f58fb3148787fec593bce5e415"; + sha256 = "4cb05051e153254863eb9e5d8cdee92923776b0655a828243d6d415444b78e55"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/en-GB/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/en-GB/Thunderbird%20140.10.2esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "1922dc1ef2fdf039e3abdae3e4876fc2667962213c9341b5179b6770c7fdf5ca"; + sha256 = "ed881303074e766f7c359ffab62e9a1ff6384d09baa2a433af200fa2a6022a34"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/en-US/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/en-US/Thunderbird%20140.10.2esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "85eb354d0b51348028c4156d456ca28743580dc21c376a7f4f2d96c764398b9f"; + sha256 = "61be5918cfcf843aa36f6f23bf2aeb5b5c9c2212ef5688d9ae5fcf18486b8f16"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/es-AR/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/es-AR/Thunderbird%20140.10.2esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "51fe1507e0c0d283cbae36dfe947347628a24b29d282d0b9c6a17fdd9085f1d9"; + sha256 = "c2e35994fafee453847a7ad67c24193d9d5facb368df2de0f118786f2d7bf48d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/es-ES/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/es-ES/Thunderbird%20140.10.2esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "5e5e50ee61d47903c7738e75f61dfe473bc31304ee11a9d88849dd6ca90ef325"; + sha256 = "cf275018794e31734f857e4cef62c1879410bf6d0adcf769d5c9d70f29a8127c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/es-MX/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/es-MX/Thunderbird%20140.10.2esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "b6086821770fac217fc911271e99c8e14f99f41f37c5705172ee6de7307b8a52"; + sha256 = "45ab38e8752c0cf2661699fa1f53c94762189635a28180bcd3f1e118789d1d3d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/et/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/et/Thunderbird%20140.10.2esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "76df10b7a30a892cf4fc925a6497dd212f4c6457ba8cd3d986bf83f05d638c0f"; + sha256 = "2c62dc1a05fd06d834d125a02a9e70bc6bcd74ae047a4102492c5c65a3aa1c4a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/eu/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/eu/Thunderbird%20140.10.2esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "df71c88cbb68335e8305eb405a8ba1dbeb3c8dc7b1785d95c6d3514c021ac47c"; + sha256 = "2ecaafcf56a870ca39a1d2edbc28dfe6f896a63ba7872853624b55fbd0e7aa68"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/fi/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/fi/Thunderbird%20140.10.2esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "56a122e52e1cc85af46b765ee4121a75349e32bc22376b2aa65cdc18dbc079ee"; + sha256 = "a1667313979504d132dfe28755625fda063c71467bb2aba0f9d942e62e1aac04"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/fr/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/fr/Thunderbird%20140.10.2esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "66f27f0b1e423183be89e736cadbb27a44bdca466a8771fbbb0eaed9797683c3"; + sha256 = "b7bee4a84a222bc888e37ca72bfe6dd5eecdca821232615926e7cbfa0c3539d1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/fy-NL/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/fy-NL/Thunderbird%20140.10.2esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "da2b2374ca6082f39050cb8950abc0c31ff241ade57131b3570545259ba062b1"; + sha256 = "36730e552c21314d047212598b9f9d916fe5cf4485d6db66db5e2d9a328ccceb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ga-IE/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ga-IE/Thunderbird%20140.10.2esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "d01ef73a57b3bc19b78b71393d475b31fa18800797f8f6e6c77f6a9f9fdf8155"; + sha256 = "6fb14ae54956ec6e636f9bd8c9d7898089100686ee1b0cb46710f2e70cbc82e6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/gd/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/gd/Thunderbird%20140.10.2esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "0b80dbb88caf4f46906991de24a931f5162969af94e86b664ceb4d8e2e27f0a9"; + sha256 = "23d5bd69bbadd7614dc47c1ca8f4b5183e529a162577abbc0306a60fcb7c3d9d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/gl/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/gl/Thunderbird%20140.10.2esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "f7bc4557c3b0e7bac387871da16fdb89e11df205a92e4ae98c95fae6e1dfb104"; + sha256 = "f2109c44536e7bc50b97fb55b9f1d8476f1d3999800790def45bc1c8d30427a0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/he/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/he/Thunderbird%20140.10.2esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "53a4ae14eb148c15b319b19106f60184d758e92ec3d081ed90cef2541788ec2f"; + sha256 = "e9c78a853f4605d8895000279980f5faf3abcde2617dc07a250d501049e36b42"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/hr/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/hr/Thunderbird%20140.10.2esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "2285a08a6d12993d3c00f05ec8710429ef1c55a11af49c97f7b6813dde244d43"; + sha256 = "e42cbc70c4caa1f9b5ef301ffb9e2ef6f4ae086e72cdb3c2892741dd1091d8c0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/hsb/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/hsb/Thunderbird%20140.10.2esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "c33ac5f1ab1e47e0be9d23b2d98f30dc87156b0207209676203156843629036f"; + sha256 = "ca1cec58e2eecb8927222f10f952c8dd2818044b9cfb584261dffe04b0664567"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/hu/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/hu/Thunderbird%20140.10.2esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "adc138ac932c64aef2485fa564b46b8d177f5e1955b52b6eadcf167c9cf36da5"; + sha256 = "f151a231c92126f809a7bc4cc1b862eaebd0e27e70a87491c46ebf4146d00b2e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/hy-AM/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/hy-AM/Thunderbird%20140.10.2esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "c1343d4e39805474b12ec519feb6afadfddbcae23f9147ac3d292e9ffbff5fa0"; + sha256 = "02902edc3062a751d1256c148c6da9295e206cd780147071516aadaf724e279f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/id/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/id/Thunderbird%20140.10.2esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "c7f03142ddd51ce55dc01a4551857ccbbea2baf7df44281908ceadd52881592a"; + sha256 = "2abdda15b1a7599560dd154ebcd6b9e0f1ffe49af636fdf3c12f5fb73ac30043"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/is/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/is/Thunderbird%20140.10.2esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "e3e26a1b0eb83f46cc587e44d12a79a895528444fcab246662d30b7a93dc9c56"; + sha256 = "a455c87048289e5b94d712460c8a9d502b60f208f55c418b556ff688e7acefb6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/it/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/it/Thunderbird%20140.10.2esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "0562226de00f1e2942e3059183dcb141a22640ec07edf4f86ef9bf2750f2409a"; + sha256 = "00148eaef75e3d50eff28d66381f838c2bb1039b8ef630d02a4e743ad5657a5d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ja-JP-mac/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ja-JP-mac/Thunderbird%20140.10.2esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "ac552b8aa14d6a057e3bc056d40e1eb07e9a818113df68a155db8debf9f93b21"; + sha256 = "fa0197ad65c413c54c896cf763448fdfddd454f7d3dc77b0e789306bb9e4294b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ka/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ka/Thunderbird%20140.10.2esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "5160e855489797a68e425eb52c228eb269dd4d721df28e5099faea1921362c7e"; + sha256 = "357efd719b478376f7af8682799c1114c02317b05569f019abd4e72878214c70"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/kab/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/kab/Thunderbird%20140.10.2esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "09055d674ea390b692f58495ce4bd50a9f4549b25e56cdef7508de28dcf536c1"; + sha256 = "d4a3ac57bd6657914ed0a496d6fe45fffad33f6707e3e33948437bb04987a888"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/kk/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/kk/Thunderbird%20140.10.2esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "1a452257935ba1607892d7c42d97ecf4fa01f08515dc7b6db055e9b48eb5bc71"; + sha256 = "431ed23faf5afb4cfb8293033cc1cdc029acb3c1711dfdf3734e8dfdf326622e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ko/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ko/Thunderbird%20140.10.2esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "6f1c235cf052e5948c85a9571b514ea80d1253e491e4c7cca7d196776eca1315"; + sha256 = "cb9e0d99d1ed273bb2a09a36f7983bc44540aee05e4dbc0bed0a1c026d2a8de1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/lt/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/lt/Thunderbird%20140.10.2esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "3a794ad16c5d3f657eea5900d8e8bf6fcd1d5b3e588b4036ed923e4a96816335"; + sha256 = "730f67e6bbc3fbc005dd14ef66b6048ea57d9b25cb63e33f3f9bf47551d7fd45"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/lv/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/lv/Thunderbird%20140.10.2esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "aab5e71a823b339a874a7ba12c6892406bfa4d8a5f601bb29d1644e59ca8cea0"; + sha256 = "8d4de7a70364122bcc23d5d10675b417f8c27a72bebcd935010f3fc7e9da323e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ms/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ms/Thunderbird%20140.10.2esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "6b0bc6b83921d499bb1f8322710cb5627da7afba106ea486c5b90910a8544e37"; + sha256 = "3714a406f2d36b59e79b47c0f59e1eb78612bfd6af6ac94ddca3b0241122164b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/nb-NO/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/nb-NO/Thunderbird%20140.10.2esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "38e98b65fd06d5870a1f5185e1f25b7398a5bacddf011be8cc3e607bd3fc6037"; + sha256 = "d72de568be845462b073a1c0988c14b9e9133ff9a9c78a1a9247e7076acbe4af"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/nl/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/nl/Thunderbird%20140.10.2esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "e56f1944513ad22904d0e6c1cb366cf513710ed8bd195e91179ba918043f5c54"; + sha256 = "47db41fb8b748665385bdd6c599966501060fe60e6edfc78a288745e49d424ea"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/nn-NO/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/nn-NO/Thunderbird%20140.10.2esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "0e2280066a93f24c82e2899ff9d1254aab69c80c8b2108bd91b009ee7022781e"; + sha256 = "7de072252db26897e330f628547de3d5cc6c72c961e983e864d40d6faa8b2423"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/pa-IN/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/pa-IN/Thunderbird%20140.10.2esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "ef4c51d6708b36996850f719b0d02ab8fd14c6c3d055e3b7cbb0e2182a5fad4e"; + sha256 = "e5bd9c6c0ff7eeb73aa7e685a23cec1c23cb265df25ea4f2d589fcf0b59bba5c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/pl/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/pl/Thunderbird%20140.10.2esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "33fa8cd8f0dcce1f6b6439942ca9d9c026956fe94601375b8d8e19e167c578f7"; + sha256 = "c5dcbbdc79527988b505ff62ab0c7db0b2238fbed4b037a04910d9380e4bdc7b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/pt-BR/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/pt-BR/Thunderbird%20140.10.2esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "fab771f6fa17ab7761509c86df609e04621803d0967c4c660d45dfa17a2930a1"; + sha256 = "f6568e965c9489741724f41449a1b8bfea036e3996c700a4823c6eeacadad4a1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/pt-PT/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/pt-PT/Thunderbird%20140.10.2esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "a1eb9e4d84dc7082b5887914b9f67a475a9c6b0a73329fdbfd494b183987924e"; + sha256 = "c56430951b020fc53a4bf7dae4f6ab117a1d13f4a08e85983b2e16825b46ab48"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/rm/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/rm/Thunderbird%20140.10.2esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "8e77538997431e77b2a68e54ed4944a61e1ffa9c0672657d0b12aeb1ee3fab2e"; + sha256 = "0be6a21caf868e1cbe948c65fbfd6801c7d3a7eda26ca38dc581e45e6d435418"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ro/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ro/Thunderbird%20140.10.2esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "7ad8b4d7d26f265b9782cf21550914f92f1e55247c8ae35f33aff0f33f45c135"; + sha256 = "978dcca20bb6d6e68f260bbd9108759cb1746b5ad0696dc51ec4cbd92df48e63"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/ru/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/ru/Thunderbird%20140.10.2esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "e1bc87d5452358bc1e18979417504377c87cdd2f267327ff44fe37f3a5becebd"; + sha256 = "09095c10d02d7601fde8452b5e6b6e5bf7c2f87477a8d5353918fc8f257eaf4d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/sk/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/sk/Thunderbird%20140.10.2esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "ae3a555764efcb337d8c20a3c563d8e9e25a9c26f7852689dcfa7248fcb3c769"; + sha256 = "6d7957ef26fa390162bd700c5de961d5dbce53a4de431ac42312fdacf81cdd01"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/sl/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/sl/Thunderbird%20140.10.2esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "d419e699369af20e725cd48bbc6617e5ee03ca03cdf446df7214438ca7444f92"; + sha256 = "8a0e14d63557f4dba37e92820351165715c268a8b2323b84a624a90b200470cb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/sq/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/sq/Thunderbird%20140.10.2esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "0e9b6b78437cdb533c776539e5c9beb3c384c8b2b6b6f39eb4747bbc8477f40c"; + sha256 = "f9e9784a9d244ecfc6977258b2b90eda93bbdcd26abdf872f457da8a971e4b9c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/sr/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/sr/Thunderbird%20140.10.2esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "64ce41dabf4f5907288c66dacb082f22ce4ad79fa69f0b155937d3ffa9b5e559"; + sha256 = "49b8f7858e3c8206661bb9ca3dd678682122e7f9c3eb13fc7cc01e780f0fa8f9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/sv-SE/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/sv-SE/Thunderbird%20140.10.2esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "0a7b3f8c4bd3483af85c45ddd0088f92745ee80cfa74f59fa99b49ecb2bc0786"; + sha256 = "d21c9ad18ae0b9a72db220f504ce4c26637d572f249d52769c8e4ae2272716c7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/th/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/th/Thunderbird%20140.10.2esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "c52a7b1e1b05aba6fa2d8cf40404e1498524d09b91a5dab6a545db66127d13b9"; + sha256 = "7a359386dcafdc45ac921ccbdecb445f9219130b067ec469afeb913aacd7442f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/tr/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/tr/Thunderbird%20140.10.2esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "31fc0f4f388d0efb4f887e83b5942f91ef26b48c2a88a5a45c710573bd599ebb"; + sha256 = "f261edec26c3ed8b7ba182d33ba9523259184aeff1a76021c8f12948885b2b5a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/uk/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/uk/Thunderbird%20140.10.2esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "55a561fc82373a2914c3a5cb19f30c800635afe42e5be051e0fc0b5b2a7cbfd7"; + sha256 = "af19fb7d6a1018ced355ab4826565557a6a741c7859234eb06bfde7d2095a841"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/uz/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/uz/Thunderbird%20140.10.2esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "1fd2a961cdeb85bbcf5493c1924687b59489702f3e4eced60321650a604cdee4"; + sha256 = "37055dcb3c297c7f3e61a8176a221bc1708224cfafdebc2bd740686ed5f52d1d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/vi/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/vi/Thunderbird%20140.10.2esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "d386a344cb175dcedf427de04c725f51418a2e9d3652f26caca5ab9d5d9a30b9"; + sha256 = "f812ecfb342f248dcc93e4a69b696875e3fabea18b4c4c75deedeab6aa53eab5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/zh-CN/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/zh-CN/Thunderbird%20140.10.2esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "e3619b2ac05f87d582a19cac59dd2d3536a59f5859c744a6c5080d237bd43979"; + sha256 = "ae258a0592f7aa60e2b3e55f13404585349724733693c2b077d8c8b81c8200ff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.1esr/mac/zh-TW/Thunderbird%20140.10.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.10.2esr/mac/zh-TW/Thunderbird%20140.10.2esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "d193dbe8490942344d9e359b8b2a426532b846c1fbd1a6d2d19bab9f6631c8f6"; + sha256 = "79d2306cc3cf76d4d667264cace94fcc36daf679465f20ed70b944f958b964f2"; } ]; } From 4ebd3d12445c6a62c471678dc816a81ec50f5393 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 12 May 2026 11:23:45 +0000 Subject: [PATCH 016/260] python3Packages.cutlass: init at 0.4.0 --- .../python-modules/cutlass/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/cutlass/default.nix diff --git a/pkgs/development/python-modules/cutlass/default.nix b/pkgs/development/python-modules/cutlass/default.nix new file mode 100644 index 000000000000..aaa22047148f --- /dev/null +++ b/pkgs/development/python-modules/cutlass/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + + # build-system + setuptools, + + # dependencies + numpy, + pandas, + + # optional-dependencies + matplotlib, + + # tests + pytestCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "cutlass"; + version = "0.4.0"; + pyproject = true; + __structuredAttrs = true; + + # No tags on GitHub + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-+9Y7twguzeqGJP9813hAStzjLVlTeLD+JHrHndzA9AM="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + numpy + pandas + ]; + + optional-dependencies = { + plots = [ + matplotlib + ]; + }; + + pythonImportsCheck = [ "cutlass" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Rectified L1 logistic regression with CUTLASS critical range encoding"; + homepage = "https://github.com/jworender/cutlass"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40fa449d95c9..93360c36724f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3456,6 +3456,8 @@ self: super: with self; { cutie = callPackage ../development/python-modules/cutie { }; + cutlass = callPackage ../development/python-modules/cutlass { }; + cv2-enumerate-cameras = callPackage ../development/python-modules/cv2-enumerate-cameras { }; cvelib = callPackage ../development/python-modules/cvelib { }; From 5bd889b1705207b82d420d46042b12fc8338b2b8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:02 -0600 Subject: [PATCH 017/260] ocamlPackages.mirage-block-unix: migrate to finalAttrs --- .../development/ocaml-modules/mirage-block-unix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix index e82a2b4f8ef9..fec68d39cf89 100644 --- a/pkgs/development/ocaml-modules/mirage-block-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block-unix/default.nix @@ -11,12 +11,12 @@ uri, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-block-unix"; version = "2.14.2"; src = fetchurl { - url = "https://github.com/mirage/mirage-block-unix/releases/download/v${version}/mirage-block-unix-${version}.tbz"; + url = "https://github.com/mirage/mirage-block-unix/releases/download/v${finalAttrs.version}/mirage-block-unix-${finalAttrs.version}.tbz"; sha256 = "sha256-6ReAzd+pCd5ccmXOh6GlSxHo4GuEgptxLha62n+dBsE="; }; @@ -42,4 +42,4 @@ buildDunePackage rec { homepage = "https://github.com/mirage/mirage-block-unix"; license = lib.licenses.isc; }; -} +}) From cf849300e7dfadbee9edaf7e50d8ebf9c8c61949 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:06 -0600 Subject: [PATCH 018/260] ocamlPackages.mirage-block: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-block/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-block/default.nix b/pkgs/development/ocaml-modules/mirage-block/default.nix index 71ae282ffaca..2194f1183e38 100644 --- a/pkgs/development/ocaml-modules/mirage-block/default.nix +++ b/pkgs/development/ocaml-modules/mirage-block/default.nix @@ -7,14 +7,14 @@ fmt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-block"; version = "3.0.2"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-block/releases/download/v${version}/mirage-block-${version}.tbz"; + url = "https://github.com/mirage/mirage-block/releases/download/v${finalAttrs.version}/mirage-block-${finalAttrs.version}.tbz"; hash = "sha256-UALUfeL0G1mfSsLgAb/HpQ6OV12YtY+GUOYG6yhUwAI="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From ccecc3b826f912d5b5ac08f3b7e12820a6d3e7f9 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:07 -0600 Subject: [PATCH 019/260] ocamlPackages.mirage-bootvar-xen: migrate to finalAttrs --- .../ocaml-modules/mirage-bootvar-xen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix index dd612da48f3f..a43062fe1fea 100644 --- a/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-bootvar-xen/default.nix @@ -7,7 +7,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-bootvar-xen"; version = "0.8.0"; @@ -16,7 +16,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${version}/mirage-bootvar-xen-v${version}.tbz"; + url = "https://github.com/mirage/mirage-bootvar-xen/releases/download/v${finalAttrs.version}/mirage-bootvar-xen-v${finalAttrs.version}.tbz"; hash = "sha256:0nk80giq9ng3svbnm68fjby2f1dnarddm3lk7mw7w59av71q0rcv"; }; @@ -32,4 +32,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mirage/mirage-bootvar-xen"; }; -} +}) From decac3978cc60bdfa8a770156937ab429b4ee83b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:07 -0600 Subject: [PATCH 020/260] ocamlPackages.mirage-clock: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-clock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-clock/default.nix b/pkgs/development/ocaml-modules/mirage-clock/default.nix index 2cf12cec92ec..c6e86600620c 100644 --- a/pkgs/development/ocaml-modules/mirage-clock/default.nix +++ b/pkgs/development/ocaml-modules/mirage-clock/default.nix @@ -4,14 +4,14 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-clock"; version = "4.2.0"; minimalOCamlVersion = "4.06"; src = fetchurl { - url = "https://github.com/mirage/mirage-clock/releases/download/v${version}/mirage-clock-${version}.tbz"; + url = "https://github.com/mirage/mirage-clock/releases/download/v${finalAttrs.version}/mirage-clock-${finalAttrs.version}.tbz"; hash = "sha256-+hfRXVviPHm6dB9ffLiO1xEt4WpEEM6oHHG5gIaImEc="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From d98942a1bc7c7d9b43607017176a7ee755b3da20 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:08 -0600 Subject: [PATCH 021/260] ocamlPackages.mirage-console: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-console/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-console/default.nix b/pkgs/development/ocaml-modules/mirage-console/default.nix index c22bf4d287f2..21e7a1a279a7 100644 --- a/pkgs/development/ocaml-modules/mirage-console/default.nix +++ b/pkgs/development/ocaml-modules/mirage-console/default.nix @@ -6,7 +6,7 @@ mirage-flow, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-console"; version = "5.1.0"; @@ -14,7 +14,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-${version}.tbz"; + url = "https://github.com/mirage/mirage-console/releases/download/v${finalAttrs.version}/mirage-console-${finalAttrs.version}.tbz"; hash = "sha256-mjYRisbNOJbYoSuWaGoPueXakmqAwmWh0ATvLLsvpNM="; }; @@ -29,4 +29,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 507e857ac3bce6047b3fec2a52926cd7cc1155c8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:08 -0600 Subject: [PATCH 022/260] ocamlPackages.mirage-kv: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-kv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-kv/default.nix b/pkgs/development/ocaml-modules/mirage-kv/default.nix index cdcde9fee322..271dd924cf15 100644 --- a/pkgs/development/ocaml-modules/mirage-kv/default.nix +++ b/pkgs/development/ocaml-modules/mirage-kv/default.nix @@ -9,14 +9,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-kv"; version = "6.1.1"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/mirage-kv/releases/download/v${version}/mirage-kv-${version}.tbz"; + url = "https://github.com/mirage/mirage-kv/releases/download/v${finalAttrs.version}/mirage-kv-${finalAttrs.version}.tbz"; hash = "sha256-fNXNlaDpb5zUA2rTwi5h1j4v4LQmovxG+Am6u+1guPQ="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 8a8b61403853c6b444a1b600b7bba7af77812837 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:09 -0600 Subject: [PATCH 023/260] ocamlPackages.mirage-logs: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-logs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-logs/default.nix b/pkgs/development/ocaml-modules/mirage-logs/default.nix index c5200e186a7e..59bf3576d70c 100644 --- a/pkgs/development/ocaml-modules/mirage-logs/default.nix +++ b/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -11,14 +11,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-logs"; version = "2.1.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-${version}.tbz"; + url = "https://github.com/mirage/mirage-logs/releases/download/v${finalAttrs.version}/mirage-logs-${finalAttrs.version}.tbz"; hash = "sha256-rorCsgw7QCQmjotr465KShQGWdoUM88djpwgqwBGnLs="; }; @@ -42,4 +42,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 131e04cb4a319a75e3857c0d3729af49b9859411 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:09 -0600 Subject: [PATCH 024/260] ocamlPackages.mirage-nat: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-nat/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-nat/default.nix b/pkgs/development/ocaml-modules/mirage-nat/default.nix index 80dbbb0ab4f3..a4512ab3a48a 100644 --- a/pkgs/development/ocaml-modules/mirage-nat/default.nix +++ b/pkgs/development/ocaml-modules/mirage-nat/default.nix @@ -12,14 +12,14 @@ mirage-clock-unix, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-nat"; version = "3.0.2"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/mirage/mirage-nat/releases/download/v${finalAttrs.version}/mirage-nat-${finalAttrs.version}.tbz"; hash = "sha256-Z1g3qb26x/S6asYv6roTW77r41SHy7OGN7MoZJ/E8Is="; }; @@ -40,8 +40,8 @@ buildDunePackage rec { meta = { description = "Mirage-nat is a library for network address translation to be used with MirageOS"; - homepage = "https://github.com/mirage/${pname}"; + homepage = "https://github.com/mirage/mirage-nat"; license = lib.licenses.isc; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From 0d6bba8e3c2b75e5a602fcf0332d0c7354562e9d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:10 -0600 Subject: [PATCH 025/260] ocamlPackages.mirage-net: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-net/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-net/default.nix b/pkgs/development/ocaml-modules/mirage-net/default.nix index ef8aefa2db53..f02bd9fedd0f 100644 --- a/pkgs/development/ocaml-modules/mirage-net/default.nix +++ b/pkgs/development/ocaml-modules/mirage-net/default.nix @@ -9,14 +9,14 @@ mirage-device, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-net"; version = "4.0.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-net/releases/download/v${version}/mirage-net-v${version}.tbz"; + url = "https://github.com/mirage/mirage-net/releases/download/v${finalAttrs.version}/mirage-net-v${finalAttrs.version}.tbz"; hash = "sha256-Zo7/0Ye4GgqzJFCHDBXbuJ/5ETl/8ziolRgH4lDhlM4="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From cb7ae8da059cf09b1bac7bf2350d4174364ffcab Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:11 -0600 Subject: [PATCH 026/260] ocamlPackages.mirage-profile: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-profile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-profile/default.nix b/pkgs/development/ocaml-modules/mirage-profile/default.nix index ff7a539ece0d..e42c5448cc7c 100644 --- a/pkgs/development/ocaml-modules/mirage-profile/default.nix +++ b/pkgs/development/ocaml-modules/mirage-profile/default.nix @@ -8,14 +8,14 @@ lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-profile"; version = "0.9.1"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-profile/releases/download/v${version}/mirage-profile-v${version}.tbz"; + url = "https://github.com/mirage/mirage-profile/releases/download/v${finalAttrs.version}/mirage-profile-v${finalAttrs.version}.tbz"; sha256 = "0lh3591ad4v7nxpd410b75idmgdq668mqdilvkg4avrwqw1wzdib"; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From b35f00d2170102db125ba96d6a0b5086d1b6203e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:11 -0600 Subject: [PATCH 027/260] ocamlPackages.mirage-protocols: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-protocols/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-protocols/default.nix b/pkgs/development/ocaml-modules/mirage-protocols/default.nix index c0d375a3c627..e6b947751734 100644 --- a/pkgs/development/ocaml-modules/mirage-protocols/default.nix +++ b/pkgs/development/ocaml-modules/mirage-protocols/default.nix @@ -8,14 +8,14 @@ tcpip, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-protocols"; version = "8.0.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-protocols/releases/download/v${version}/mirage-protocols-v${version}.tbz"; + url = "https://github.com/mirage/mirage-protocols/releases/download/v${finalAttrs.version}/mirage-protocols-v${finalAttrs.version}.tbz"; hash = "sha256-UDCR4Jq3tw9P/Ilw7T4+3+yi9Q7VFqnHhXeSCvg9dyw="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 618ba6b080231330653c810663348f8efadac9fe Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:12 -0600 Subject: [PATCH 028/260] ocamlPackages.mirage-random-test: migrate to finalAttrs --- .../ocaml-modules/mirage-random-test/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-random-test/default.nix b/pkgs/development/ocaml-modules/mirage-random-test/default.nix index f058f4111b56..ecfa1ac78653 100644 --- a/pkgs/development/ocaml-modules/mirage-random-test/default.nix +++ b/pkgs/development/ocaml-modules/mirage-random-test/default.nix @@ -6,7 +6,7 @@ mirage-random, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-random-test"; version = "0.1.0"; @@ -15,7 +15,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + url = "https://github.com/mirage/mirage-random-test/releases/download/v${finalAttrs.version}/mirage-random-test-v${finalAttrs.version}.tbz"; sha256 = "1jmjyb9a4v7l0xxgdwpr9zshzr8xk3hybra6y2dp51anbwk8kv46"; }; @@ -30,4 +30,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From 578945fa2d09db8626085b5e10fcf8ca7cf6b42c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:12 -0600 Subject: [PATCH 029/260] ocamlPackages.mirage-random: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-random/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-random/default.nix b/pkgs/development/ocaml-modules/mirage-random/default.nix index e016f47cd0d5..87d0f45930b3 100644 --- a/pkgs/development/ocaml-modules/mirage-random/default.nix +++ b/pkgs/development/ocaml-modules/mirage-random/default.nix @@ -5,14 +5,14 @@ cstruct, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-random"; version = "3.0.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-random/releases/download/v${version}/mirage-random-v${version}.tbz"; + url = "https://github.com/mirage/mirage-random/releases/download/v${finalAttrs.version}/mirage-random-v${finalAttrs.version}.tbz"; sha256 = "sha256-Sf4/KB1kMMwXI+yr5H/JuOmynYPNXwlk9dAA+gFAZs8="; }; @@ -24,4 +24,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From e0e5a059046f5535445470b4c7d3efb41134963b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:13 -0600 Subject: [PATCH 030/260] ocamlPackages.mirage-time: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-time/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-time/default.nix b/pkgs/development/ocaml-modules/mirage-time/default.nix index 5453e46a1ef6..8b74175fe3b2 100644 --- a/pkgs/development/ocaml-modules/mirage-time/default.nix +++ b/pkgs/development/ocaml-modules/mirage-time/default.nix @@ -5,7 +5,7 @@ lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { minimalOCamlVersion = "4.08"; pname = "mirage-time"; @@ -14,7 +14,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz"; + url = "https://github.com/mirage/mirage-time/releases/download/v${finalAttrs.version}/mirage-time-v${finalAttrs.version}.tbz"; hash = "sha256-DUCUm1jix+i3YszIzgZjRQRiM8jJXQ49F6JC/yicvXw="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) From 7f27db9e30c1f2f66310c81c060425c9d4cf9737 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:14 -0600 Subject: [PATCH 031/260] ocamlPackages.mirage-unix: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-unix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-unix/default.nix b/pkgs/development/ocaml-modules/mirage-unix/default.nix index 836e721ee6d7..8c20a5e8ed9f 100644 --- a/pkgs/development/ocaml-modules/mirage-unix/default.nix +++ b/pkgs/development/ocaml-modules/mirage-unix/default.nix @@ -7,14 +7,14 @@ mirage-runtime, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-unix"; version = "5.0.1"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/mirage/mirage-unix/releases/download/v${finalAttrs.version}/mirage-unix-${finalAttrs.version}.tbz"; hash = "sha256-U1oLznUDBcJLcVygfSiyl5qRLDM27cm/WrjT0vSGhPg="; }; @@ -31,4 +31,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) From 61c15901fad351b506c1608b89ffc9790635f70c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:14 -0600 Subject: [PATCH 032/260] ocamlPackages.mirage-vnetif: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-vnetif/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix index ec097b2c8175..0372d575518c 100644 --- a/pkgs/development/ocaml-modules/mirage-vnetif/default.nix +++ b/pkgs/development/ocaml-modules/mirage-vnetif/default.nix @@ -11,14 +11,14 @@ logs, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-vnetif"; version = "0.6.2"; minimalOCamlVersion = "4.06"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/mirage/mirage-vnetif/releases/download/v${finalAttrs.version}/mirage-vnetif-${finalAttrs.version}.tbz"; hash = "sha256-SorcrPRhhCYhHasLQGHvTtLo229/3xVB6f7/XOlFRSI="; }; @@ -34,8 +34,8 @@ buildDunePackage rec { meta = { description = "Virtual network interface and software switch for Mirage"; - homepage = "https://github.com/mirage/${pname}"; + homepage = "https://github.com/mirage/mirage-vnetif"; license = lib.licenses.isc; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From dfc0b322b9cfc50a4ee6ac9ef58692e3d1f01837 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:15 -0600 Subject: [PATCH 033/260] ocamlPackages.mirage-xen: migrate to finalAttrs --- pkgs/development/ocaml-modules/mirage-xen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-xen/default.nix b/pkgs/development/ocaml-modules/mirage-xen/default.nix index 8079aa2cb7b4..eb801d8e001c 100644 --- a/pkgs/development/ocaml-modules/mirage-xen/default.nix +++ b/pkgs/development/ocaml-modules/mirage-xen/default.nix @@ -16,12 +16,12 @@ io-page, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mirage-xen"; version = "8.0.1"; src = fetchurl { - url = "https://github.com/mirage/mirage-xen/releases/download/v${version}/mirage-xen-${version}.tbz"; + url = "https://github.com/mirage/mirage-xen/releases/download/v${finalAttrs.version}/mirage-xen-${finalAttrs.version}.tbz"; hash = "sha256-x8i2Kbz0EcifZK/lbDIFa9Kwtl1/xzbYV9h9E+EtGP4="; }; @@ -49,4 +49,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mirage/mirage-xen"; }; -} +}) From 5ebb1fb432fca2ceba9761bf01d10d28a9467ddf Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:15 -0600 Subject: [PATCH 034/260] ocamlPackages.mldoc: migrate to finalAttrs --- pkgs/development/ocaml-modules/mldoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index db902e49e654..d3739062aeac 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -28,7 +28,7 @@ let }); uri' = uri.override { angstrom = angstrom'; }; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mldoc"; version = "1.5.8"; @@ -39,7 +39,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-7uuNUFMSQEgakTKfpYixp43gnfpQSW++snBzgr0Ni0Y="; }; @@ -67,4 +67,4 @@ buildDunePackage rec { license = lib.licenses.agpl3Only; maintainers = [ ]; }; -} +}) From def68ef356680500fb0732d003e2279d9fd5b0d3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:16 -0600 Subject: [PATCH 035/260] ocamlPackages.mm: migrate to finalAttrs --- pkgs/development/ocaml-modules/mm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mm/default.nix b/pkgs/development/ocaml-modules/mm/default.nix index 064a7ff4fba8..4d5f4e8ae706 100644 --- a/pkgs/development/ocaml-modules/mm/default.nix +++ b/pkgs/development/ocaml-modules/mm/default.nix @@ -10,7 +10,7 @@ theora, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mm"; version = "0.8.6"; @@ -21,7 +21,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-mm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-ME6Naza7OvZ/63zEjrPeKq5JwMoMfV2fpkCuZdtCZ/c="; }; @@ -40,4 +40,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 30cea1a590500db623d62477429a6c0ace3b206a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:16 -0600 Subject: [PATCH 036/260] ocamlPackages.mmap: migrate to finalAttrs --- pkgs/development/ocaml-modules/mmap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mmap/default.nix b/pkgs/development/ocaml-modules/mmap/default.nix index 7eb032aa3c59..f3453a9497fc 100644 --- a/pkgs/development/ocaml-modules/mmap/default.nix +++ b/pkgs/development/ocaml-modules/mmap/default.nix @@ -5,12 +5,12 @@ bigarray-compat, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mmap"; version = "1.2.0"; src = fetchurl { - url = "https://github.com/mirage/mmap/releases/download/v${version}/mmap-${version}.tbz"; + url = "https://github.com/mirage/mmap/releases/download/v${finalAttrs.version}/mmap-${finalAttrs.version}.tbz"; hash = "sha256-FgKoq8jiMvqUdxpS5UDleAtAwvJ2Lu5q+9koZQIRbds="; }; @@ -22,8 +22,8 @@ buildDunePackage rec { longDescription = '' This project provides a Mmap.map_file functions for mapping files in memory. ''; - changelog = "https://raw.githubusercontent.com/mirage/mmap/refs/tags/v${version}/CHANGES.md"; + changelog = "https://raw.githubusercontent.com/mirage/mmap/refs/tags/v${finalAttrs.version}/CHANGES.md"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From a73560ee5f88bf8621a0bb7ad91aa38899b9c283 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:17 -0600 Subject: [PATCH 037/260] ocamlPackages.mopsa: migrate to finalAttrs --- pkgs/development/ocaml-modules/mopsa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix index 3975ee9ec968..cdcc477feaf1 100644 --- a/pkgs/development/ocaml-modules/mopsa/default.nix +++ b/pkgs/development/ocaml-modules/mopsa/default.nix @@ -17,7 +17,7 @@ zarith, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mopsa"; version = "1.1"; @@ -26,7 +26,7 @@ buildDunePackage rec { src = fetchFromGitLab { owner = "mopsa"; repo = "mopsa-analyzer"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lO5dtGAl1dq8oJco/hPXrAbN05rKc62Zrci/8CLrQ0c="; }; @@ -79,4 +79,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 351d4648814501fd36f8dcc2ea5172fc7a97cc27 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:18 -0600 Subject: [PATCH 038/260] ocamlPackages.mrmime: migrate to finalAttrs --- pkgs/development/ocaml-modules/mrmime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mrmime/default.nix b/pkgs/development/ocaml-modules/mrmime/default.nix index c7fa461a364a..8148f5b99c88 100644 --- a/pkgs/development/ocaml-modules/mrmime/default.nix +++ b/pkgs/development/ocaml-modules/mrmime/default.nix @@ -24,12 +24,12 @@ uutf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mrmime"; version = "0.7.0"; src = fetchurl { - url = "https://github.com/mirage/mrmime/releases/download/v${version}/mrmime-${version}.tbz"; + url = "https://github.com/mirage/mrmime/releases/download/v${finalAttrs.version}/mrmime-${finalAttrs.version}.tbz"; hash = "sha256-w23xtro9WgyLLwqdwfqLMN/ZDqwpvFcEvurbsqnsJLc="; }; @@ -68,4 +68,4 @@ buildDunePackage rec { maintainers = [ ]; mainProgram = "mrmime.generate"; }; -} +}) From 1dc555d2b388c071f72e7e482b7c3b9700576ce9 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:19 -0600 Subject: [PATCH 039/260] ocamlPackages.msat: migrate to finalAttrs --- pkgs/development/ocaml-modules/msat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/msat/default.nix b/pkgs/development/ocaml-modules/msat/default.nix index 43d9d0e77694..e7bbe9b936ad 100644 --- a/pkgs/development/ocaml-modules/msat/default.nix +++ b/pkgs/development/ocaml-modules/msat/default.nix @@ -7,14 +7,14 @@ mdx, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "msat"; version = "0.9.1"; src = fetchFromGitHub { owner = "Gbury"; repo = "mSAT"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ER7ZUejW+Zy3l2HIoFDYbR8iaKMvLZWaeWrOAAYXjG4="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 58af940aa5ff64814a2368dd435b5f4319607808 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:19 -0600 Subject: [PATCH 040/260] ocamlPackages.msgpck: migrate to finalAttrs --- pkgs/development/ocaml-modules/msgpck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/msgpck/default.nix b/pkgs/development/ocaml-modules/msgpck/default.nix index bfee304681bb..c5a0451e9229 100644 --- a/pkgs/development/ocaml-modules/msgpck/default.nix +++ b/pkgs/development/ocaml-modules/msgpck/default.nix @@ -6,14 +6,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "msgpck"; version = "1.7"; src = fetchFromGitHub { owner = "vbmithr"; repo = "ocaml-msgpck"; - rev = "${version}"; + rev = "${finalAttrs.version}"; hash = "sha256-gBHIiicmk/5KBkKzRKyV0ymEH8dGCZG8vfE0mtpcDCM="; }; @@ -29,4 +29,4 @@ buildDunePackage rec { homepage = "https://github.com/vbmithr/ocaml-msgpck"; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 4d045f4b40545d1eb87208f23c15cc534e8d324a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:20 -0600 Subject: [PATCH 041/260] ocamlPackages.multicore-bench: migrate to finalAttrs --- pkgs/development/ocaml-modules/multicore-bench/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/multicore-bench/default.nix b/pkgs/development/ocaml-modules/multicore-bench/default.nix index 4e7ecf88a560..329008420495 100644 --- a/pkgs/development/ocaml-modules/multicore-bench/default.nix +++ b/pkgs/development/ocaml-modules/multicore-bench/default.nix @@ -9,12 +9,12 @@ yojson, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "multicore-bench"; version = "0.1.7"; src = fetchurl { - url = "https://github.com/ocaml-multicore/multicore-bench/releases/download/${version}/multicore-bench-${version}.tbz"; + url = "https://github.com/ocaml-multicore/multicore-bench/releases/download/${finalAttrs.version}/multicore-bench-${finalAttrs.version}.tbz"; hash = "sha256-vrp9yiuTwhijhYjeDKPFRGyh/5LeydKWJSyMLZRRXIM="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From a26ae6280458dd3a67494752e1076b2aa2bdcd28 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:21 -0600 Subject: [PATCH 042/260] ocamlPackages.multicore-magic: migrate to finalAttrs --- pkgs/development/ocaml-modules/multicore-magic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/multicore-magic/default.nix b/pkgs/development/ocaml-modules/multicore-magic/default.nix index c8bd30b95544..cf724cc983b8 100644 --- a/pkgs/development/ocaml-modules/multicore-magic/default.nix +++ b/pkgs/development/ocaml-modules/multicore-magic/default.nix @@ -8,12 +8,12 @@ js_of_ocaml, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "multicore-magic"; version = "2.3.2"; src = fetchurl { - url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${version}/multicore-magic-${version}.tbz"; + url = "https://github.com/ocaml-multicore/multicore-magic/releases/download/${finalAttrs.version}/multicore-magic-${finalAttrs.version}.tbz"; hash = "sha256-jY1wqCOq4c4EMDgIQqqIHErIONJFyvJ+0P8ld1CHF18="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-multicore/multicore-magic"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From ee8b9bbe5eb26d4a7ca191c29b2ee4d00586e711 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:21 -0600 Subject: [PATCH 043/260] ocamlPackages.multipart-form-data: migrate to finalAttrs --- .../ocaml-modules/multipart-form-data/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/multipart-form-data/default.nix b/pkgs/development/ocaml-modules/multipart-form-data/default.nix index fc5e9a0bbf6d..013efcc5bab4 100644 --- a/pkgs/development/ocaml-modules/multipart-form-data/default.nix +++ b/pkgs/development/ocaml-modules/multipart-form-data/default.nix @@ -8,14 +8,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "multipart-form-data"; version = "0.3.0"; src = fetchFromGitHub { owner = "cryptosense"; - repo = pname; - rev = version; + repo = "multipart-form-data"; + rev = finalAttrs.version; hash = "sha256-3MYJDvVbPIv/JDiB9nKcLRFC5Qa0afyEfz7hk8MWRII="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 5ac4ac91bc4115dba07b62824b05c095a9619661 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:22 -0600 Subject: [PATCH 044/260] ocamlPackages.mustache: migrate to finalAttrs --- pkgs/development/ocaml-modules/mustache/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/mustache/default.nix b/pkgs/development/ocaml-modules/mustache/default.nix index d2f6da48542c..981b5007f2cb 100644 --- a/pkgs/development/ocaml-modules/mustache/default.nix +++ b/pkgs/development/ocaml-modules/mustache/default.nix @@ -8,13 +8,13 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mustache"; version = "3.3.0"; src = fetchFromGitHub { owner = "rgrinberg"; repo = "ocaml-mustache"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7rdp7nrjc25/Nuj/cf78qxS3Qy4ufaNcKjSnYh4Ri8U="; }; @@ -31,6 +31,6 @@ buildDunePackage rec { description = "Mustache logic-less templates in OCaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) From 0e85f7e5036bb2eb9e7b05a762afa671f87279a4 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:23 -0600 Subject: [PATCH 045/260] ocamlPackages.netchannel: migrate to finalAttrs --- pkgs/development/ocaml-modules/netchannel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/netchannel/default.nix b/pkgs/development/ocaml-modules/netchannel/default.nix index 83df8ad0446d..29e0d68f84ef 100644 --- a/pkgs/development/ocaml-modules/netchannel/default.nix +++ b/pkgs/development/ocaml-modules/netchannel/default.nix @@ -18,7 +18,7 @@ result, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "netchannel"; version = "2.1.3"; @@ -26,7 +26,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/mirage-net-xen/releases/download/v${version}/mirage-net-xen-${version}.tbz"; + url = "https://github.com/mirage/mirage-net-xen/releases/download/v${finalAttrs.version}/mirage-net-xen-${finalAttrs.version}.tbz"; hash = "sha256-gOpzY4bn9L8wkbeViXy/XQmxKqqJfd99bcHQFitYFOE="; }; @@ -56,4 +56,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mirage/mirage-net-xen"; }; -} +}) From e959d709794f8b9d0a8340c40659c3bd6eb9760c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:24 -0600 Subject: [PATCH 046/260] ocamlPackages.nice_parser: migrate to finalAttrs --- pkgs/development/ocaml-modules/nice_parser/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/nice_parser/default.nix b/pkgs/development/ocaml-modules/nice_parser/default.nix index bb47fe25eb31..9a144efe2638 100644 --- a/pkgs/development/ocaml-modules/nice_parser/default.nix +++ b/pkgs/development/ocaml-modules/nice_parser/default.nix @@ -5,7 +5,7 @@ stdio, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "nice_parser"; version = "1.0.0"; minimalOCamlVersion = "4.07"; @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "smolkaj"; repo = "nice-parser"; - tag = version; + tag = finalAttrs.version; hash = "sha256-h1rqdv19tUH3CsL3OLsTmKir7YCYt4PaW19ymotEvIY="; }; @@ -22,9 +22,9 @@ buildDunePackage rec { ]; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Nice parsers without the boilerplate"; license = lib.licenses.mit; maintainers = [ lib.maintainers.tiferrei ]; }; -} +}) From e4937dd1d408db60c10844eb6d644e76cf3375d2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:24 -0600 Subject: [PATCH 047/260] ocamlPackages.notty: migrate to finalAttrs --- pkgs/development/ocaml-modules/notty/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/notty/default.nix b/pkgs/development/ocaml-modules/notty/default.nix index fb47a6f0bc9b..fd75593f41b8 100644 --- a/pkgs/development/ocaml-modules/notty/default.nix +++ b/pkgs/development/ocaml-modules/notty/default.nix @@ -8,14 +8,14 @@ lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "0.2.3"; pname = "notty"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/pqwy/notty/releases/download/v${version}/notty-${version}.tbz"; + url = "https://github.com/pqwy/notty/releases/download/v${finalAttrs.version}/notty-${finalAttrs.version}.tbz"; sha256 = "sha256-dGWfsUBz20Q4mJiRqyTyS++Bqkl9rBbZpn+aHJwgCCQ="; }; @@ -38,4 +38,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) From 06e78b9b16ea939237b2f317ac04a38cb06cc0d7 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:25 -0600 Subject: [PATCH 048/260] ocamlPackages.npy: migrate to finalAttrs --- pkgs/development/ocaml-modules/npy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/npy/default.nix b/pkgs/development/ocaml-modules/npy/default.nix index 763f159a20c3..b70b44363989 100644 --- a/pkgs/development/ocaml-modules/npy/default.nix +++ b/pkgs/development/ocaml-modules/npy/default.nix @@ -6,7 +6,7 @@ camlzip, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "npy"; version = "0.0.9"; @@ -16,8 +16,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "LaurentMazare"; - repo = "${pname}-ocaml"; - rev = version; + repo = "npy-ocaml"; + rev = finalAttrs.version; hash = "sha256:1fryglkm20h6kdqjl55b7065b34bdg3g3p6j0jv33zvd1m5888m1"; }; @@ -27,9 +27,9 @@ buildDunePackage rec { doCheck = true; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "OCaml implementation of the Npy format spec"; maintainers = [ lib.maintainers.bcdarwin ]; license = lib.licenses.asl20; }; -} +}) From ce0e3a57c005615fa3d2c4c70b5a2a5a024fe623 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:25 -0600 Subject: [PATCH 049/260] ocamlPackages.ocaml-lsp: migrate to finalAttrs --- .../ocaml-modules/ocaml-lsp/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index 83ca1daffd9e..04f8867cb0ad 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -53,7 +53,7 @@ let merlin-lib = merlin-lib_v; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-lsp-server"; inherit (lsp) version src preBuild; @@ -63,18 +63,18 @@ buildDunePackage rec { lsp re ] - ++ lib.optional (lib.versionAtLeast version "1.9") spawn - ++ lib.optionals (lib.versionAtLeast version "1.10") [ + ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.9") spawn + ++ lib.optionals (lib.versionAtLeast finalAttrs.version "1.10") [ fiber xdg ] - ++ lib.optional (lib.versionAtLeast version "1.14.2") ocamlc-loc - ++ lib.optionals (lib.versionAtLeast version "1.17.0") [ + ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.14.2") ocamlc-loc + ++ lib.optionals (lib.versionAtLeast finalAttrs.version "1.17.0") [ astring camlp-streams merlin-lib ] - ++ lib.optional (lib.versionAtLeast version "1.18.0") base; + ++ lib.optional (lib.versionAtLeast finalAttrs.version "1.18.0") base; nativeBuildInputs = [ makeWrapper ]; @@ -87,4 +87,4 @@ buildDunePackage rec { mainProgram = "ocamllsp"; broken = lib.versions.majorMinor ocaml.version == "4.13"; }; -} +}) From 0da5b64654aedafe05f2ec3d3cb1f2460601cc0b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:27 -0600 Subject: [PATCH 050/260] ocamlPackages.ocaml-migrate-parsetree: migrate to finalAttrs --- .../ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix index 725371018e08..8781250c7bdb 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix @@ -7,14 +7,14 @@ ppx_derivers, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-migrate-parsetree"; version = "1.8.0"; src = fetchFromGitHub { owner = "ocaml-ppx"; - repo = pname; - rev = "v${version}"; + repo = "ocaml-migrate-parsetree"; + rev = "v${finalAttrs.version}"; sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq"; }; @@ -27,7 +27,7 @@ buildDunePackage rec { description = "Convert OCaml parsetrees between different major versions"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; broken = lib.versionOlder "4.13" ocaml.version; }; -} +}) From 52581b0e377b422d0f6deeb108bf3019896813b7 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:28 -0600 Subject: [PATCH 051/260] ocamlPackages.ocaml-migrate-parsetree: migrate to finalAttrs --- .../ocaml-modules/ocaml-migrate-parsetree/2.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix index 129e2a9be198..53c5ade0eca1 100644 --- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix +++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix @@ -5,14 +5,14 @@ ocaml, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-migrate-parsetree"; version = "2.4.0"; minimalOCamlVersion = "4.02"; src = fetchurl { - url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz"; + url = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree/releases/download/${finalAttrs.version}/ocaml-migrate-parsetree-${finalAttrs.version}.tbz"; sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree"; broken = lib.versionAtLeast ocaml.version "5.1"; }; -} +}) From e25e675a8e984993e50a4ba462ad2d76285d7236 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:28 -0600 Subject: [PATCH 052/260] ocamlPackages.ocaml-monadic: migrate to finalAttrs --- .../ocaml-modules/ocaml-monadic/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix index fa28353f1082..0a9cbb464e38 100644 --- a/pkgs/development/ocaml-modules/ocaml-monadic/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-monadic/default.nix @@ -5,7 +5,7 @@ ppxlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-monadic"; version = "0.5.0"; @@ -13,17 +13,17 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "zepalmer"; - repo = pname; - rev = version; + repo = "ocaml-monadic"; + rev = finalAttrs.version; sha256 = "1ynv3yhdqmkhkgnz6c5kv6ryjcc934sdvw9rhh8rjg2dlzlffgbw"; }; buildInputs = [ ppxlib ]; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "PPX extension to provide an OCaml-friendly monadic syntax"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 24915109713df47428d91ce6ddfff64dc310a1a6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:29 -0600 Subject: [PATCH 053/260] ocamlPackages.ocaml-protoc-plugin: migrate to finalAttrs --- .../ocaml-modules/ocaml-protoc-plugin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix index 0de49d843861..3df839c0e2d2 100644 --- a/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-protoc-plugin/default.nix @@ -12,14 +12,14 @@ ppx_expect, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-protoc-plugin"; version = "4.5.0"; src = fetchFromGitHub { owner = "issuu"; repo = "ocaml-protoc-plugin"; - rev = version; + rev = finalAttrs.version; hash = "sha256-ZHeOi3y2X11MmkRuthmYFSjPLoGlGTO1pnRfk/XmgPU="; }; @@ -51,4 +51,4 @@ buildDunePackage rec { ''; maintainers = [ lib.maintainers.GirardR1006 ]; }; -} +}) From d1f41b214171146bd62eefd81ef439ea1aaa7b9d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:29 -0600 Subject: [PATCH 054/260] ocamlPackages.ocaml-r: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocaml-r/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix index a2e0bca7092f..9dc2aa7505be 100644 --- a/pkgs/development/ocaml-modules/ocaml-r/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -10,7 +10,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-r"; version = "0.6.0"; @@ -20,8 +20,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "pveber"; - repo = pname; - rev = "v${version}"; + repo = "ocaml-r"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-jPyVMxjeh9+xu0dD1gelAxcOhxouKczyvzVoKZ5oSrs="; }; @@ -48,9 +48,9 @@ buildDunePackage rec { meta = { description = "OCaml bindings for the R interpreter"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.bcdarwin ]; }; -} +}) From 20d2b7d8f4e5df5cf77e77d3442bf80b195597b1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:30 -0600 Subject: [PATCH 055/260] ocamlPackages.ocaml-result: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocaml-result/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index 710f1ede3e78..a59f1b0e3b8e 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -4,12 +4,12 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "result"; version = "1.5"; src = fetchurl { - url = "https://github.com/janestreet/result/releases/download/${version}/result-${version}.tbz"; + url = "https://github.com/janestreet/result/releases/download/${finalAttrs.version}/result-${finalAttrs.version}.tbz"; sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw"; }; @@ -23,4 +23,4 @@ buildDunePackage rec { ''; license = lib.licenses.bsd3; }; -} +}) From 30803288c98a51729a1ad1a339456e14e6ec053e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:31 -0600 Subject: [PATCH 056/260] ocamlPackages.ocaml-version: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocaml-version/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index 02824128b6bb..d13d997dcf4f 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -5,12 +5,12 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocaml-version"; version = "4.1.0"; src = fetchurl { - url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; + url = "https://github.com/ocurrent/ocaml-version/releases/download/v${finalAttrs.version}/ocaml-version-${finalAttrs.version}.tbz"; hash = "sha256-QTfVH6kNu4SkjAylM3ySyIkOYAXQFrffSFkZ2FojjgY="; }; @@ -27,4 +27,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 01917f3091427773b4c02be62bd98f6e66846935 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:32 -0600 Subject: [PATCH 057/260] ocamlPackages.ocamlfuse: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocamlfuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 9653f7192961..977bf64866e2 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -7,14 +7,14 @@ dune-configurator, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocamlfuse"; version = "2.7.1_cvs13"; src = fetchFromGitHub { owner = "astrada"; repo = "ocamlfuse"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-h1ExohTlr1gP2DwHKQW3PTwz6d3pust5gdeyTHJ2KBk="; }; @@ -37,4 +37,4 @@ buildDunePackage rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ bennofs ]; }; -} +}) From 6b6326ba26e8d342418d329f5363e404a605e303 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:32 -0600 Subject: [PATCH 058/260] ocamlPackages.ocamlgraph: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocamlgraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index 05be14040291..83227f590ea7 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -4,12 +4,12 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocamlgraph"; version = "2.2.0"; src = fetchurl { - url = "https://github.com/backtracking/ocamlgraph/releases/download/${version}/ocamlgraph-${version}.tbz"; + url = "https://github.com/backtracking/ocamlgraph/releases/download/${finalAttrs.version}/ocamlgraph-${finalAttrs.version}.tbz"; hash = "sha256-sJViEIY8wk9IAgO6PC7wbfrlV5U2oFdENk595YgisjA="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = [ ]; }; -} +}) From c32072bf19698555f86c78fb62f0333838f3f01d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:33 -0600 Subject: [PATCH 059/260] ocamlPackages.ocamline: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocamline/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocamline/default.nix b/pkgs/development/ocaml-modules/ocamline/default.nix index aaec4a22276c..7f5e1dd9197c 100644 --- a/pkgs/development/ocaml-modules/ocamline/default.nix +++ b/pkgs/development/ocaml-modules/ocamline/default.nix @@ -5,13 +5,13 @@ lib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocamline"; version = "1.2"; src = fetchFromGitHub { owner = "chrisnevers"; - repo = pname; - rev = version; + repo = "ocamline"; + rev = finalAttrs.version; sha256 = "Sljm/Bfr2Eo0d75tmJRuWUkkfHUYQ0g27+FzXBePnVg="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; }; -} +}) From 0c4d594f3378e296a07a9a9539c3e297eb007502 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:34 -0600 Subject: [PATCH 060/260] ocamlPackages.ocolor: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocolor/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocolor/default.nix b/pkgs/development/ocaml-modules/ocolor/default.nix index cd98527fe90e..ccf320053051 100644 --- a/pkgs/development/ocaml-modules/ocolor/default.nix +++ b/pkgs/development/ocaml-modules/ocolor/default.nix @@ -5,7 +5,7 @@ cppo, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocolor"; version = "1.3.1"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "marc-chevalier"; - repo = pname; - tag = version; + repo = "ocolor"; + tag = finalAttrs.version; sha256 = "osQTZGJp9yDoKNa6WoyhViNbRg1ukcD0Jxiu4VxqeUc="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { maintainers = with lib.maintainers; [ toastal ]; homepage = "https://github.com/marc-chevalier/ocolor"; }; -} +}) From 9821096d9821f02564690132fedde461bb44d56e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:34 -0600 Subject: [PATCH 061/260] ocamlPackages.ocplib-endian: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocplib-endian/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 2b54da6f27e1..4af7e8474b3e 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -6,14 +6,14 @@ cppo, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "1.2"; pname = "ocplib-endian"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocplib-endian"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-THTlhOfXAPaqTt1qBkht+D67bw6M175QLvXoUMgjks4="; }; @@ -33,4 +33,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 6a5c6d5e26501f54c43899f7cf3b30ce0a6afe0f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:35 -0600 Subject: [PATCH 062/260] ocamlPackages.ocplib-simplex: migrate to finalAttrs --- pkgs/development/ocaml-modules/ocplib-simplex/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index cb070c0a34b4..ac13f4b662f3 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -7,14 +7,14 @@ zarith, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ocplib-simplex"; version = "0.5.1"; src = fetchFromGitHub { owner = "OCamlPro"; - repo = pname; - rev = "v${version}"; + repo = "ocplib-simplex"; + rev = "v${finalAttrs.version}"; hash = "sha256-fLTht+TlyJIsIAsRLmmkFKsnbSeW3BgyAyURFdnGfko="; }; @@ -40,4 +40,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From bbad9e79e963d363bea853df1596be56f89acfb5 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:37 -0600 Subject: [PATCH 063/260] ocamlPackages.octavius: migrate to finalAttrs --- pkgs/development/ocaml-modules/octavius/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index 1242d52fa5b7..5d962a143887 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -4,14 +4,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "octavius"; version = "1.2.2"; src = fetchFromGitHub { owner = "ocaml-doc"; repo = "octavius"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/S6WpIo1c5J9uM3xgtAM/elhnsl0XimnIFsKy3ootbA="; }; @@ -25,4 +25,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 582281c4f46dfa7c4fd89795b2e8c12c6fd8edb6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:37 -0600 Subject: [PATCH 064/260] ocamlPackages.odate: migrate to finalAttrs --- pkgs/development/ocaml-modules/odate/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/odate/default.nix b/pkgs/development/ocaml-modules/odate/default.nix index c952882e7d0e..b8739e5fd346 100644 --- a/pkgs/development/ocaml-modules/odate/default.nix +++ b/pkgs/development/ocaml-modules/odate/default.nix @@ -5,7 +5,7 @@ menhir, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "odate"; version = "0.7"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hhugo"; - repo = pname; - rev = version; + repo = "odate"; + rev = finalAttrs.version; sha256 = "sha256-C11HpftrYOCVyWT31wrqo8FVZuP7mRUkRv5IDeAZ+To="; }; @@ -22,9 +22,9 @@ buildDunePackage rec { meta = { description = "Date and duration in OCaml"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From a2842ed6526421784c459c0edb4eb5533f5a06e0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:38 -0600 Subject: [PATCH 065/260] ocamlPackages.odds: migrate to finalAttrs --- pkgs/development/ocaml-modules/odds/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/odds/default.nix b/pkgs/development/ocaml-modules/odds/default.nix index 058afef3d8aa..3db10abc9855 100644 --- a/pkgs/development/ocaml-modules/odds/default.nix +++ b/pkgs/development/ocaml-modules/odds/default.nix @@ -5,7 +5,7 @@ menhir, cmdliner, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "odds"; version = "1.2"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "raphael-proust"; - repo = pname; - tag = version; + repo = "odds"; + tag = finalAttrs.version; hash = "sha256-tPDowkpsJQKCoeuXOb9zPORoudUvkRBZ3OzkH2QE2zg="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.Denommus ]; }; -} +}) From 2a09c4ae1828bf8e867f4fa8b35237e2b2f39b70 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:38 -0600 Subject: [PATCH 066/260] ocamlPackages.ogg: migrate to finalAttrs --- pkgs/development/ocaml-modules/ogg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ogg/default.nix b/pkgs/development/ocaml-modules/ogg/default.nix index 8b00e3c8850e..23b258476b34 100644 --- a/pkgs/development/ocaml-modules/ogg/default.nix +++ b/pkgs/development/ocaml-modules/ogg/default.nix @@ -6,14 +6,14 @@ libogg, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ogg"; version = "1.0.0"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-xiph"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-mVMuPPjQRfwtQqpoUaEtTilMcGO0MJ4xiOd0D7ucOEQ="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 63d8551747f3d563db0d3a0bf2dc45aec16a073f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:39 -0600 Subject: [PATCH 067/260] ocamlPackages.ohex: migrate to finalAttrs --- pkgs/development/ocaml-modules/ohex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ohex/default.nix b/pkgs/development/ocaml-modules/ohex/default.nix index 49bf6005c686..f61d204c14e5 100644 --- a/pkgs/development/ocaml-modules/ohex/default.nix +++ b/pkgs/development/ocaml-modules/ohex/default.nix @@ -5,12 +5,12 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ohex"; version = "0.2.0"; src = fetchurl { - url = "https://github.com/ocaml/opam-source-archives/raw/main/ohex-${version}.tar.gz"; + url = "https://github.com/ocaml/opam-source-archives/raw/main/ohex-${finalAttrs.version}.tar.gz"; hash = "sha256-prV7rbo0sAx3S2t4YtjniJEVq43uLXK8ZMsqoMzn2Ow="; }; @@ -22,4 +22,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 1cbe36d2b633aacf5de274c21bd938c965a334f0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:39 -0600 Subject: [PATCH 068/260] ocamlPackages.oidc: migrate to finalAttrs --- pkgs/development/ocaml-modules/oidc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/oidc/default.nix b/pkgs/development/ocaml-modules/oidc/default.nix index 45a739528262..3e33605156ef 100644 --- a/pkgs/development/ocaml-modules/oidc/default.nix +++ b/pkgs/development/ocaml-modules/oidc/default.nix @@ -7,12 +7,12 @@ junit_alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "oidc"; version = "0.2.0"; src = fetchurl { - url = "https://github.com/ulrikstrid/ocaml-oidc/releases/download/v${version}/${pname}-v${version}.tbz"; + url = "https://github.com/ulrikstrid/ocaml-oidc/releases/download/v${finalAttrs.version}/oidc-v${finalAttrs.version}.tbz"; hash = "sha256-NE/OW5BesVWhYfTmh3jP+A0TGML7m/Nw+tnafjMCIFo="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { marijanp ]; }; -} +}) From 41c3df1d217ec4df394212dbf1af81f49c0e84c5 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:40 -0600 Subject: [PATCH 069/260] ocamlPackages.omd: migrate to finalAttrs --- pkgs/development/ocaml-modules/omd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index cb0697188eb4..b4526e077c97 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -4,14 +4,14 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "omd"; version = "1.3.2"; minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/ocaml/omd/releases/download/${version}/omd-${version}.tbz"; + url = "https://github.com/ocaml/omd/releases/download/${finalAttrs.version}/omd-${finalAttrs.version}.tbz"; sha256 = "sha256-YCPhZCYx8I9njrVyWCCHnte7Wj/+53fN7evCjB+F+ts="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; mainProgram = "omd"; }; -} +}) From 0dd797fd46b278783e8defd8f31f6d6481e61238 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:41 -0600 Subject: [PATCH 070/260] ocamlPackages.optint: migrate to finalAttrs --- pkgs/development/ocaml-modules/optint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/optint/default.nix b/pkgs/development/ocaml-modules/optint/default.nix index 2726e0aae889..aa87256c746f 100644 --- a/pkgs/development/ocaml-modules/optint/default.nix +++ b/pkgs/development/ocaml-modules/optint/default.nix @@ -4,12 +4,12 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { minimalOCamlVersion = "4.07"; version = "0.3.0"; pname = "optint"; src = fetchurl { - url = "https://github.com/mirage/optint/releases/download/v${version}/optint-${version}.tbz"; + url = "https://github.com/mirage/optint/releases/download/v${finalAttrs.version}/optint-${finalAttrs.version}.tbz"; sha256 = "sha256-KVz/LBNLA4WxO6gdUAXZ+EG6QNSlAq7RDJl/I57xFHs="; }; @@ -19,4 +19,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 1ac5484e563101784ab29a0416be725d4de36406 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:41 -0600 Subject: [PATCH 071/260] ocamlPackages.oseq: migrate to finalAttrs --- pkgs/development/ocaml-modules/oseq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/oseq/default.nix b/pkgs/development/ocaml-modules/oseq/default.nix index 7d462b10c6a2..ff361fb10904 100644 --- a/pkgs/development/ocaml-modules/oseq/default.nix +++ b/pkgs/development/ocaml-modules/oseq/default.nix @@ -6,14 +6,14 @@ qcheck, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "0.5.1"; pname = "oseq"; src = fetchFromGitHub { owner = "c-cube"; - repo = pname; - rev = "v${version}"; + repo = "oseq"; + rev = "v${finalAttrs.version}"; hash = "sha256-fyr/OKlvvHBfovtdubSW4rd4OwQbMLKWXghyU3uBy/k="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 7cebe6c5c20f32d937a2fc5c776dc2bbe5db8800 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:42 -0600 Subject: [PATCH 072/260] ocamlPackages.otfed: migrate to finalAttrs --- pkgs/development/ocaml-modules/otfed/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/otfed/default.nix b/pkgs/development/ocaml-modules/otfed/default.nix index b33036380e17..319f7d7fad14 100644 --- a/pkgs/development/ocaml-modules/otfed/default.nix +++ b/pkgs/development/ocaml-modules/otfed/default.nix @@ -9,7 +9,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "otfed"; version = "0.3.1"; @@ -17,8 +17,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "gfngfn"; - repo = pname; - rev = version; + repo = "otfed"; + rev = finalAttrs.version; hash = "sha256-6QCom9nrz0B5vCmuBzqsM0zCs8tBLJC6peig+vCgMVA="; }; @@ -44,4 +44,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From dd47b8b1d66121ce6e6e285b1be542b72838b9a2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:43 -0600 Subject: [PATCH 073/260] ocamlPackages.otr: migrate to finalAttrs --- pkgs/development/ocaml-modules/otr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index efeb335cc489..5420a3dfd179 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -10,14 +10,14 @@ base64, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "otr"; version = "1.0.0"; minimalOCamlVersion = "4.13"; src = fetchurl { - url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-${version}.tbz"; + url = "https://github.com/hannesm/ocaml-otr/releases/download/v${finalAttrs.version}/otr-${finalAttrs.version}.tbz"; hash = "sha256-/CcVqLbdylB+LqpKNETkpvQ8SEAIcEFCO1MZqvdmJWU="; }; @@ -38,4 +38,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) From 3bf657dbc0c9eeb5acfab0cd28904e581409984c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:44 -0600 Subject: [PATCH 074/260] ocamlPackages.ounit2: migrate to finalAttrs --- pkgs/development/ocaml-modules/ounit2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ounit2/default.nix b/pkgs/development/ocaml-modules/ounit2/default.nix index 3980c3a521fd..5f29e70de234 100644 --- a/pkgs/development/ocaml-modules/ounit2/default.nix +++ b/pkgs/development/ocaml-modules/ounit2/default.nix @@ -6,14 +6,14 @@ stdlib-shims, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { minimalOCamlVersion = "4.08"; pname = "ounit2"; version = "2.2.7"; src = fetchurl { - url = "https://github.com/gildor478/ounit/releases/download/v${version}/ounit-${version}.tbz"; + url = "https://github.com/gildor478/ounit/releases/download/v${finalAttrs.version}/ounit-${finalAttrs.version}.tbz"; hash = "sha256-kPbmO9EkClHYubL3IgWb15zgC1J2vdYji49cYTwOc4g="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) From 113029d6a5f2f7661bf592f0a5b9742c4c08c189 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:44 -0600 Subject: [PATCH 075/260] ocamlPackages.owee: migrate to finalAttrs --- pkgs/development/ocaml-modules/owee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/owee/default.nix b/pkgs/development/ocaml-modules/owee/default.nix index 272f19066e11..cf5cfaafc3ac 100644 --- a/pkgs/development/ocaml-modules/owee/default.nix +++ b/pkgs/development/ocaml-modules/owee/default.nix @@ -4,13 +4,13 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { minimalOCamlVersion = "4.08"; pname = "owee"; version = "0.8"; src = fetchurl { - url = "https://github.com/let-def/owee/releases/download/v${version}/owee-${version}.tbz"; + url = "https://github.com/let-def/owee/releases/download/v${finalAttrs.version}/owee-${finalAttrs.version}.tbz"; hash = "sha256-Bk9iRfWZXV0vTx+cbSmS4v2+Pd4ygha67Hz6vUhXlA0="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { alizter ]; }; -} +}) From 4a4e515524e244faf69c00371fb67461c3f9f4ce Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:45 -0600 Subject: [PATCH 076/260] ocamlPackages.paf: migrate to finalAttrs --- pkgs/development/ocaml-modules/paf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/paf/default.nix b/pkgs/development/ocaml-modules/paf/default.nix index 47601a60b3c1..07a0f5a6b76c 100644 --- a/pkgs/development/ocaml-modules/paf/default.nix +++ b/pkgs/development/ocaml-modules/paf/default.nix @@ -21,12 +21,12 @@ cstruct, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "paf"; version = "0.8.0"; src = fetchurl { - url = "https://github.com/dinosaure/paf-le-chien/releases/download/${version}/paf-${version}.tbz"; + url = "https://github.com/dinosaure/paf-le-chien/releases/download/${finalAttrs.version}/paf-${finalAttrs.version}.tbz"; hash = "sha256-0q07gZpzUyDoWlA4m/P+EGSvvVKAZ7RwVkpOziqzG2M="; }; @@ -64,4 +64,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/dinosaure/paf-le-chien"; }; -} +}) From 791cb2da826fa8e5b6392e025ffa115532750294 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:45 -0600 Subject: [PATCH 077/260] ocamlPackages.parany: migrate to finalAttrs --- pkgs/development/ocaml-modules/parany/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/parany/default.nix b/pkgs/development/ocaml-modules/parany/default.nix index 621b4a39df70..e54460021e89 100644 --- a/pkgs/development/ocaml-modules/parany/default.nix +++ b/pkgs/development/ocaml-modules/parany/default.nix @@ -5,7 +5,7 @@ cpu, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "parany"; version = "14.0.1"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "UnixJunkie"; - repo = pname; - rev = "v${version}"; + repo = "parany"; + rev = "v${finalAttrs.version}"; hash = "sha256-QR3Rq30iKhft+9tVCgJLOq9bwJe7bcay/kMTXjjCLjE="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.bcdarwin ]; license = lib.licenses.lgpl2; }; -} +}) From 514b59e51034f758de7b091c356e0ec63e071e39 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:46 -0600 Subject: [PATCH 078/260] ocamlPackages.parmap: migrate to finalAttrs --- pkgs/development/ocaml-modules/parmap/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/parmap/default.nix b/pkgs/development/ocaml-modules/parmap/default.nix index feb3884e2fcf..703a2c7622f3 100644 --- a/pkgs/development/ocaml-modules/parmap/default.nix +++ b/pkgs/development/ocaml-modules/parmap/default.nix @@ -5,14 +5,14 @@ dune-configurator, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "parmap"; version = "1.2.5"; src = fetchFromGitHub { owner = "rdicosmo"; - repo = pname; - rev = version; + repo = "parmap"; + rev = finalAttrs.version; hash = "sha256-tBu7TGtDOe5FbxLZuz6nl+65aN9FHIngq/O4dJWzr3Q="; }; @@ -31,4 +31,4 @@ buildDunePackage rec { license = lib.licenses.lgpl2; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) From 697ce045783f8c74e3a748514de4fcf78c8b0a1b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:47 -0600 Subject: [PATCH 079/260] ocamlPackages.parse-argv: migrate to finalAttrs --- pkgs/development/ocaml-modules/parse-argv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/parse-argv/default.nix b/pkgs/development/ocaml-modules/parse-argv/default.nix index b59feac4fb40..2af0427210a4 100644 --- a/pkgs/development/ocaml-modules/parse-argv/default.nix +++ b/pkgs/development/ocaml-modules/parse-argv/default.nix @@ -7,14 +7,14 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "parse-argv"; version = "0.2.0"; minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/mirage/parse-argv/releases/download/v${version}/parse-argv-v${version}.tbz"; + url = "https://github.com/mirage/parse-argv/releases/download/v${finalAttrs.version}/parse-argv-v${finalAttrs.version}.tbz"; sha256 = "06dl04fcmwpkydzni2fzwrhk0bqypd55mgxfax9v82x65xrgj5gw"; }; @@ -29,4 +29,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From d1bb86680b105a7c85ea2f0ea6458d8bc4a4a189 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:47 -0600 Subject: [PATCH 080/260] ocamlPackages.patch: migrate to finalAttrs --- pkgs/development/ocaml-modules/patch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/patch/default.nix b/pkgs/development/ocaml-modules/patch/default.nix index bb64547e9cc3..87529d16d15d 100644 --- a/pkgs/development/ocaml-modules/patch/default.nix +++ b/pkgs/development/ocaml-modules/patch/default.nix @@ -7,7 +7,7 @@ crowbar, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "patch"; version = "3.0.0"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hannesm"; repo = "patch"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-WIleUxfGp8cvQHYAyRRI6S/MSP4u0BbEyAqlRxCb/To="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { maintainers = with lib.maintainers; [ r17x ]; license = lib.licenses.isc; }; -} +}) From 05f0e15386edaa1389cd4940dffa211f7c2232b7 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:48 -0600 Subject: [PATCH 081/260] ocamlPackages.patricia-tree: migrate to finalAttrs --- pkgs/development/ocaml-modules/patricia-tree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/patricia-tree/default.nix b/pkgs/development/ocaml-modules/patricia-tree/default.nix index a3f548664a5d..a407e578bf38 100644 --- a/pkgs/development/ocaml-modules/patricia-tree/default.nix +++ b/pkgs/development/ocaml-modules/patricia-tree/default.nix @@ -9,7 +9,7 @@ ppx_inline_test, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "patricia-tree"; version = "0.11.0"; @@ -23,7 +23,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "codex-semantics-library"; repo = "patricia-tree"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-lpmU0KhsyIHxPBiw38ssA7XFEMsRvOT03MByoJG88Xs="; }; @@ -43,8 +43,8 @@ buildDunePackage rec { description = "Patricia Tree data structure in OCaml"; homepage = "https://codex.top/api/patricia-tree/"; downloadPage = "https://github.com/codex-semantics-library/patricia-tree"; - changelog = "https://github.com/codex-semantics-library/patricia-tree/releases/tag/v${version}"; + changelog = "https://github.com/codex-semantics-library/patricia-tree/releases/tag/v${finalAttrs.version}"; license = lib.licenses.lgpl21Only; maintainers = [ lib.maintainers.ethancedwards8 ]; }; -} +}) From fe49ab4621d9862573466eb9c4149b25a4b08f95 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:48 -0600 Subject: [PATCH 082/260] ocamlPackages.pbkdf: migrate to finalAttrs --- pkgs/development/ocaml-modules/pbkdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pbkdf/default.nix b/pkgs/development/ocaml-modules/pbkdf/default.nix index b09fcdf56fad..f6f786fdcc11 100644 --- a/pkgs/development/ocaml-modules/pbkdf/default.nix +++ b/pkgs/development/ocaml-modules/pbkdf/default.nix @@ -8,12 +8,12 @@ ohex, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pbkdf"; version = "2.0.0"; src = fetchzip { - url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${version}.tar.gz"; + url = "https://github.com/abeaumont/ocaml-pbkdf/archive/${finalAttrs.version}.tar.gz"; hash = "sha256-D2dXpf1D/wsJrcajU3If37tuLYjahoA/+QoXZKr1vQs="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; homepage = "https://github.com/abeaumont/ocaml-pbkdf"; }; -} +}) From 682b92af2f0244d7566c2f6d358714eb0c74a27f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:49 -0600 Subject: [PATCH 083/260] ocamlPackages.pbrt: migrate to finalAttrs --- pkgs/development/ocaml-modules/pbrt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pbrt/default.nix b/pkgs/development/ocaml-modules/pbrt/default.nix index e1ba66ebc0c9..10df7382f287 100644 --- a/pkgs/development/ocaml-modules/pbrt/default.nix +++ b/pkgs/development/ocaml-modules/pbrt/default.nix @@ -4,7 +4,7 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pbrt"; version = "2.4"; @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "mransan"; repo = "ocaml-protoc"; - rev = "${version}.0"; + rev = "${finalAttrs.version}.0"; hash = "sha256-EXugdcjALukSjB31zAVG9WiN6GMGXi2jlhHWaZ+p+uM="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vyorkin ]; }; -} +}) From 16c164d9203c07f7b8f0dcaea32783a254d2ce48 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:50 -0600 Subject: [PATCH 084/260] ocamlPackages.pcap-format: migrate to finalAttrs --- pkgs/development/ocaml-modules/pcap-format/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pcap-format/default.nix b/pkgs/development/ocaml-modules/pcap-format/default.nix index b254dbf9af96..bffab81b4ee5 100644 --- a/pkgs/development/ocaml-modules/pcap-format/default.nix +++ b/pkgs/development/ocaml-modules/pcap-format/default.nix @@ -7,7 +7,7 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pcap-format"; version = "0.6.0"; @@ -15,7 +15,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-pcap/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/mirage/ocaml-pcap/releases/download/v${finalAttrs.version}/pcap-format-${finalAttrs.version}.tbz"; hash = "sha256-LUjy8Xm6VsnMq1FHKzmJg7uorkTv7cOTsoLwmtNHkaY="; }; @@ -38,4 +38,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From 2936fde4b40867805e47ba935d2d17dab85e97b6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:50 -0600 Subject: [PATCH 085/260] ocamlPackages.pecu: migrate to finalAttrs --- pkgs/development/ocaml-modules/pecu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pecu/default.nix b/pkgs/development/ocaml-modules/pecu/default.nix index a01ee07beca6..fdeff2e07cab 100644 --- a/pkgs/development/ocaml-modules/pecu/default.nix +++ b/pkgs/development/ocaml-modules/pecu/default.nix @@ -9,14 +9,14 @@ astring, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pecu"; version = "0.7"; minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/mirage/pecu/releases/download/v${version}/pecu-${version}.tbz"; + url = "https://github.com/mirage/pecu/releases/download/v${finalAttrs.version}/pecu-${finalAttrs.version}.tbz"; hash = "sha256-rXR3tbFkKNM8MkQAZ2hJU9lO+qQ/qvYghXkYus6f13g="; }; @@ -35,4 +35,4 @@ buildDunePackage rec { homepage = "https://github.com/mirage/pecu"; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From 0c9a9d280bdfd6824ca303c735d5e2339bbca96d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:51 -0600 Subject: [PATCH 086/260] ocamlPackages.pgocaml: migrate to finalAttrs --- pkgs/development/ocaml-modules/pgocaml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index bd9f7a09a8d8..ea8a52ae2348 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -13,13 +13,13 @@ sexplib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pgocaml"; version = "4.4.0"; src = fetchFromGitHub { owner = "darioteixeira"; repo = "pgocaml"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Mz3zVgXas1UivH/BVARx5kWClgr9v9YcGarwaD961tU="; }; @@ -43,4 +43,4 @@ buildDunePackage rec { license = lib.licenses.lgpl2Only; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 374e7c10930996b3bbb1ff166b56c387502fa928 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:51 -0600 Subject: [PATCH 087/260] ocamlPackages.phylogenetics: migrate to finalAttrs --- pkgs/development/ocaml-modules/phylogenetics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 7d88a0b10132..57502ac8356f 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -14,12 +14,12 @@ printbox-text, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "phylogenetics"; version = "0.3.0"; src = fetchurl { - url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/phylogenetics-${version}.tbz"; + url = "https://github.com/biocaml/phylogenetics/releases/download/v${finalAttrs.version}/phylogenetics-${finalAttrs.version}.tbz"; hash = "sha256-3oZ9fMAXqOQ02rQ+8W8PZJWXOJLNe2qERrGOeTk3BKg="; }; @@ -52,4 +52,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.bcdarwin ]; mainProgram = "phylosim"; }; -} +}) From 4cfc8d97a87b59b9887f7fa86df78a7f0569b687 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:52 -0600 Subject: [PATCH 088/260] ocamlPackages.piaf: migrate to finalAttrs --- pkgs/development/ocaml-modules/piaf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/piaf/default.nix b/pkgs/development/ocaml-modules/piaf/default.nix index dae4a95291d0..780b5c7ecc0b 100644 --- a/pkgs/development/ocaml-modules/piaf/default.nix +++ b/pkgs/development/ocaml-modules/piaf/default.nix @@ -21,12 +21,12 @@ eio_main, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "piaf"; version = "0.2.0"; src = fetchurl { - url = "https://github.com/anmonteiro/piaf/releases/download/${version}/piaf-${version}.tbz"; + url = "https://github.com/anmonteiro/piaf/releases/download/${finalAttrs.version}/piaf-${finalAttrs.version}.tbz"; hash = "sha256-B/qQCaUvrqrm2GEW51AH9SebGFx7x8laq5RV8hBzcPs="; }; @@ -60,4 +60,4 @@ buildDunePackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ anmonteiro ]; }; -} +}) From 17a49a4f324ae16a21957679570b4a92254fb23b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:53 -0600 Subject: [PATCH 089/260] ocamlPackages.polynomial: migrate to finalAttrs --- pkgs/development/ocaml-modules/polynomial/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/polynomial/default.nix b/pkgs/development/ocaml-modules/polynomial/default.nix index e2f77205e70d..c4b44c2c57a7 100644 --- a/pkgs/development/ocaml-modules/polynomial/default.nix +++ b/pkgs/development/ocaml-modules/polynomial/default.nix @@ -6,7 +6,7 @@ ff-sig, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "polynomial"; version = "0.4.0"; duneVersion = "3"; @@ -14,7 +14,7 @@ buildDunePackage rec { src = fetchFromGitLab { owner = "nomadic-labs"; repo = "cryptography/ocaml-polynomial"; - rev = version; + rev = finalAttrs.version; hash = "sha256-is/PrYLCwStHiQsNq5OVRCwHdXjO2K2Z7FrXgytRfAU="; }; @@ -31,4 +31,4 @@ buildDunePackage rec { homepage = "https://gitlab.com/nomadic-labs/ocaml-polynomial"; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 1d9dbafa875e0958d8bb9d05ba14adb63feabab1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:53 -0600 Subject: [PATCH 090/260] ocamlPackages.portaudio: migrate to finalAttrs --- pkgs/development/ocaml-modules/portaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/portaudio/default.nix b/pkgs/development/ocaml-modules/portaudio/default.nix index 07d32d55e6ef..01ecee3d399e 100644 --- a/pkgs/development/ocaml-modules/portaudio/default.nix +++ b/pkgs/development/ocaml-modules/portaudio/default.nix @@ -6,14 +6,14 @@ portaudio, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "portaudio"; version = "0.2.3"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-portaudio"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rMSE+ta7ughjjCnz4oho1D3VGaAsUlLtxizvxZT0/cQ="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 649014446d5ef75a3d0716142cd2c8b3e6f69c43 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:54 -0600 Subject: [PATCH 091/260] ocamlPackages.postgresql: migrate to finalAttrs --- pkgs/development/ocaml-modules/postgresql/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/postgresql/default.nix b/pkgs/development/ocaml-modules/postgresql/default.nix index 8b193e13ea90..a6eb3396d034 100644 --- a/pkgs/development/ocaml-modules/postgresql/default.nix +++ b/pkgs/development/ocaml-modules/postgresql/default.nix @@ -7,14 +7,14 @@ libpq, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "postgresql"; version = "5.2.0"; minimalOCamlVersion = "4.12"; src = fetchurl { - url = "https://github.com/mmottl/postgresql-ocaml/releases/download/${version}/postgresql-${version}.tbz"; + url = "https://github.com/mmottl/postgresql-ocaml/releases/download/${finalAttrs.version}/postgresql-${finalAttrs.version}.tbz"; hash = "sha256-uU/K7hvQljGnUzClPRdod32tpVAGd/sGqh3NqIygJ4A="; }; @@ -25,8 +25,8 @@ buildDunePackage rec { meta = { description = "Bindings to the PostgreSQL library"; license = lib.licenses.lgpl21Plus; - changelog = "https://raw.githubusercontent.com/mmottl/postgresql-ocaml/refs/tags/${version}/CHANGELOG.md"; + changelog = "https://raw.githubusercontent.com/mmottl/postgresql-ocaml/refs/tags/${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ bcc32 ]; homepage = "https://mmottl.github.io/postgresql-ocaml"; }; -} +}) From 4f50e9dda266511ef9a1c92833970e143ce438eb Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:55 -0600 Subject: [PATCH 092/260] ocamlPackages.pp: migrate to finalAttrs --- pkgs/development/ocaml-modules/pp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/pp/default.nix b/pkgs/development/ocaml-modules/pp/default.nix index 15d553de737e..d6b94c0a6e2e 100644 --- a/pkgs/development/ocaml-modules/pp/default.nix +++ b/pkgs/development/ocaml-modules/pp/default.nix @@ -6,18 +6,18 @@ version ? "2.0.0", }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pp"; inherit version; src = fetchurl { - url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; + url = "https://github.com/ocaml-dune/pp/releases/download/${finalAttrs.version}/pp-${finalAttrs.version}.tbz"; hash = { "2.0.0" = "sha256-hlE1FRiwkrSi3vTggXHCdhUvkvtqhKixm2uSnM20RBk="; "1.2.0" = "sha256-pegiVzxVr7Qtsp7FbqzR8qzY9lzy3yh44pHeN0zmkJw="; } - ."${version}"; + ."${finalAttrs.version}"; }; minimalOCamlVersion = "4.08"; @@ -31,4 +31,4 @@ buildDunePackage rec { platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) From 77e4bed685cdd55965cd1eb8f8e4e109d763fc57 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:55 -0600 Subject: [PATCH 093/260] ocamlPackages.pp_loc: migrate to finalAttrs --- pkgs/development/ocaml-modules/pp_loc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pp_loc/default.nix b/pkgs/development/ocaml-modules/pp_loc/default.nix index e6cd85d7cf89..757301803f2c 100644 --- a/pkgs/development/ocaml-modules/pp_loc/default.nix +++ b/pkgs/development/ocaml-modules/pp_loc/default.nix @@ -4,14 +4,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pp_loc"; version = "2.1.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/Armael/pp_loc/releases/download/v${version}/pp_loc-${version}.tbz"; + url = "https://github.com/Armael/pp_loc/releases/download/v${finalAttrs.version}/pp_loc-${finalAttrs.version}.tbz"; hash = "sha256-L3NlBdQx6BpP6FGtMQ/ynsTNIMj9N+8FDZ5vEFC6p8s="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; homepage = "https://armael.github.io/pp_loc/pp_loc/"; }; -} +}) From 6d3a9bc092e3eb6e7aa15e981f27ab25727dda64 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:56 -0600 Subject: [PATCH 094/260] ocamlPackages.pprint: migrate to finalAttrs --- pkgs/development/ocaml-modules/pprint/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index 0284d133d73d..369f075f8893 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -4,7 +4,7 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pprint"; version = "20230830"; @@ -12,15 +12,15 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "fpottier"; - repo = pname; - rev = version; + repo = "pprint"; + rev = finalAttrs.version; sha256 = "sha256-avf71vAgCL1MU8O7Q3FNN3wEdCDtbNZP0ipETnn8AqA="; }; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "OCaml library for pretty-printing textual documents"; license = lib.licenses.lgpl2Only; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 0ef77a609757f827a26bf5be20fc3574bf6afa2d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:57 -0600 Subject: [PATCH 095/260] ocamlPackages.ppx_bap: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppx_bap/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_bap/default.nix b/pkgs/development/ocaml-modules/ppx_bap/default.nix index 7d2b0af24d19..e8d4f8159e85 100644 --- a/pkgs/development/ocaml-modules/ppx_bap/default.nix +++ b/pkgs/development/ocaml-modules/ppx_bap/default.nix @@ -16,7 +16,7 @@ ppx_sexp_value ? null, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_bap"; version = "0.14"; @@ -24,8 +24,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; - repo = pname; - rev = "v${version}"; + repo = "ppx_bap"; + rev = "v${finalAttrs.version}"; sha256 = "1c6rcdp8bicdiwqc2mb59cl9l2vxlp3y8hmnr9x924fq7acly248"; }; @@ -54,9 +54,9 @@ buildDunePackage rec { meta = { description = "Set of ppx rewriters for BAP"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; mainProgram = "ppx-bap"; }; -} +}) From 12bd828fac4d3deef53adbfee14675b880470707 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:57 -0600 Subject: [PATCH 096/260] ocamlPackages.ppx_blob: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppx_blob/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 3ee11e13618c..1406eab9ba7b 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -7,14 +7,14 @@ ppxlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_blob"; version = "0.9.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/johnwhitington/${pname}/releases/download/${version}/ppx_blob-${version}.tbz"; + url = "https://github.com/johnwhitington/ppx_blob/releases/download/${finalAttrs.version}/ppx_blob-${finalAttrs.version}.tbz"; sha256 = "sha256-8RXpCl8Qdc7cnZMKuRJx+GcOzk3uENwRR6s5uK+1cOQ="; }; @@ -27,4 +27,4 @@ buildDunePackage rec { description = "OCaml ppx to include binary data from a file as a string"; license = lib.licenses.unlicense; }; -} +}) From 8933c5072b085839bb9570ce9e5878570e0830f0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:58 -0600 Subject: [PATCH 097/260] ocamlPackages.ppx_cstubs: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppx_cstubs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index 203dda6b99cc..46d7a6c140db 100644 --- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -14,7 +14,7 @@ findlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_cstubs"; version = "0.7.0"; @@ -32,7 +32,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "fdopen"; repo = "ppx_cstubs"; - rev = version; + rev = finalAttrs.version; hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs="; }; @@ -56,10 +56,10 @@ buildDunePackage rec { meta = { homepage = "https://github.com/fdopen/ppx_cstubs"; - changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; + changelog = "https://github.com/fdopen/ppx_cstubs/raw/${finalAttrs.version}/CHANGES.md"; description = "Preprocessor for easier stub generation with ocaml-ctypes"; license = lib.licenses.lgpl21Plus; maintainers = [ lib.maintainers.osener ]; broken = lib.versionAtLeast ocaml.version "5.2"; }; -} +}) From 50de546f145663c2829b1e2ef8a0d4e09c27ea92 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:58 -0600 Subject: [PATCH 098/260] ocamlPackages.ppx_derivers: migrate to finalAttrs --- .../development/ocaml-modules/ppx_derivers/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_derivers/default.nix b/pkgs/development/ocaml-modules/ppx_derivers/default.nix index e1208fe330e3..a66875c4096a 100644 --- a/pkgs/development/ocaml-modules/ppx_derivers/default.nix +++ b/pkgs/development/ocaml-modules/ppx_derivers/default.nix @@ -4,7 +4,7 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_derivers"; version = "1.2.1"; @@ -12,8 +12,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "diml"; - repo = pname; - rev = version; + repo = "ppx_derivers"; + rev = finalAttrs.version; sha256 = "0yqvqw58hbx1a61wcpbnl9j30n495k23qmyy2xwczqs63mn2nkpn"; }; @@ -21,6 +21,6 @@ buildDunePackage rec { description = "Shared [@@deriving] plugin registry"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) From 3184d53dc86314ba8e87f6cde09d5bbaa50403b7 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:08:59 -0600 Subject: [PATCH 099/260] ocamlPackages.ppx_deriving: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppx_deriving/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 3a7b4586bc72..c00f99dc84d5 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -36,12 +36,12 @@ let ."${version}"; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_deriving"; inherit version; src = fetchurl { - url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${version}/ppx_deriving-${lib.optionalString (lib.versionOlder version "6.0") "v"}${version}.${ + url = "https://github.com/ocaml-ppx/ppx_deriving/releases/download/v${finalAttrs.version}/ppx_deriving-${lib.optionalString (lib.versionOlder version "6.0") "v"}${finalAttrs.version}.${ if lib.versionAtLeast version "6.1.1" then "tar.gz" else "tbz" }"; inherit hash; @@ -71,4 +71,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.maurer ]; license = lib.licenses.mit; }; -} +}) From f21b4740df2d2e64f64a9b1ac62a23ca66332ac1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:00 -0600 Subject: [PATCH 100/260] ocamlPackages.ppx_deriving_cmdliner: migrate to finalAttrs --- .../ocaml-modules/ppx_deriving_cmdliner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix index 77b9cba4f679..46d0e729a6bd 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_cmdliner/default.nix @@ -11,7 +11,7 @@ gitUpdater, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_deriving_cmdliner"; version = "0.6.1"; @@ -19,8 +19,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hammerlab"; - repo = pname; - rev = "v${version}"; + repo = "ppx_deriving_cmdliner"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/22KLQnxu3e2ZSca6ZLxTJDfv/rsmgCUkJnZC0RwRi8"; }; @@ -54,4 +54,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.romildo ]; broken = lib.versionAtLeast ppxlib.version "0.36"; }; -} +}) From 49507a566ab195a228ea0075237ae703c7ce31c8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:00 -0600 Subject: [PATCH 101/260] ocamlPackages.ppx_deriving_protobuf: migrate to finalAttrs --- .../ocaml-modules/ppx_deriving_protobuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix index 54db24ea6290..06b733c6b958 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_protobuf/default.nix @@ -8,14 +8,14 @@ dune-configurator, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_deriving_protobuf"; version = "3.0.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${version}/ppx_deriving_protobuf-v${version}.tbz"; + url = "https://github.com/ocaml-ppx/ppx_deriving_protobuf/releases/download/v${finalAttrs.version}/ppx_deriving_protobuf-v${finalAttrs.version}.tbz"; sha256 = "1dc1vxnkd0cnrgac5v3zbaj2lq1d2w8118mp1cmsdxylp06yz1sj"; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vyorkin ]; }; -} +}) From a63cd29bae2b82dca1039f6ee137076bc87afa07 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:01 -0600 Subject: [PATCH 102/260] ocamlPackages.ppx_deriving_yaml: migrate to finalAttrs --- .../development/ocaml-modules/ppx_deriving_yaml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix index f2f4cc9d44e0..4f1fedbb9165 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yaml/default.nix @@ -24,7 +24,7 @@ let }; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_deriving_yaml"; inherit (param) version; @@ -37,7 +37,7 @@ buildDunePackage rec { }; src = fetchurl { - url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${version}/ppx_deriving_yaml-${version}.tbz"; + url = "https://github.com/patricoferris/ppx_deriving_yaml/releases/download/v${finalAttrs.version}/ppx_deriving_yaml-${finalAttrs.version}.tbz"; inherit (param) hash; }; @@ -60,4 +60,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ ]; }; -} +}) From 33d62f030f4b50ac9aeb49588f0ca7d0f9404a83 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:01 -0600 Subject: [PATCH 103/260] ocamlPackages.ppx_deriving_yojson: migrate to finalAttrs --- .../ocaml-modules/ppx_deriving_yojson/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix index c69bc6fdd15f..8849f608d201 100644 --- a/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix +++ b/pkgs/development/ocaml-modules/ppx_deriving_yojson/default.nix @@ -35,7 +35,7 @@ let }; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_deriving_yojson"; inherit (param) version; @@ -47,7 +47,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "ocaml-ppx"; repo = "ppx_deriving_yojson"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; inherit (param) sha256; }; @@ -63,8 +63,8 @@ buildDunePackage rec { meta = { description = "Yojson codec generator for OCaml >= 4.04"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From f33fc90c85e9fdce3974b0aee918968bce625a60 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:02 -0600 Subject: [PATCH 104/260] ocamlPackages.ppx_gen_rec: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppx_gen_rec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index 929ac87def60..f74ffe3fd795 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -5,12 +5,12 @@ ppxlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_gen_rec"; version = "2.0.0"; src = fetchurl { - url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; + url = "https://github.com/flowtype/ocaml-ppx_gen_rec/releases/download/v${finalAttrs.version}/ppx_gen_rec-v${finalAttrs.version}.tbz"; sha256 = "sha256-/mMj5UT22KQGVy1sjgEoOgPzyCYyeDPtWJYNDvQ9nlk="; }; @@ -25,4 +25,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ frontsideair ]; }; -} +}) From c82f9d289a01b5d1a316e1dae23d867fea782697 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:03 -0600 Subject: [PATCH 105/260] ocamlPackages.ppx_monad: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppx_monad/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_monad/default.nix b/pkgs/development/ocaml-modules/ppx_monad/default.nix index cb45f5233790..d68fb092328f 100644 --- a/pkgs/development/ocaml-modules/ppx_monad/default.nix +++ b/pkgs/development/ocaml-modules/ppx_monad/default.nix @@ -5,7 +5,7 @@ ppxlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_monad"; version = "0.2.0"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "niols"; - repo = pname; - rev = "v${version}"; + repo = "ppx_monad"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-cbguAddSlUxBK7pmT7vNmtJW9TrVZZjdSJRMT3lqxOA="; }; @@ -30,6 +30,6 @@ buildDunePackage rec { description = "OCaml Syntax Extension for all Monadic Syntaxes"; license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.niols ]; - homepage = "https://github.com/niols/${pname}"; + homepage = "https://github.com/niols/ppx_monad"; }; -} +}) From 3e687038c36f46be137dd1979e7190fe17d6cc54 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:03 -0600 Subject: [PATCH 106/260] ocamlPackages.ppx_show: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppx_show/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_show/default.nix b/pkgs/development/ocaml-modules/ppx_show/default.nix index 2df2ef6412b1..02a8b4baa3cb 100644 --- a/pkgs/development/ocaml-modules/ppx_show/default.nix +++ b/pkgs/development/ocaml-modules/ppx_show/default.nix @@ -6,14 +6,14 @@ ppxlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_show"; version = "0.2.1"; src = fetchFromGitHub { owner = "thierry-martinez"; - repo = pname; - rev = "v${version}"; + repo = "ppx_show"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-YwWAdOtb0zg2hqNkGRiigz/Pci8Jy/QD+WyUEohEsns="; }; @@ -23,9 +23,9 @@ buildDunePackage rec { ]; meta = { - homepage = "https://github.com/thierry-martinez/${pname}"; + homepage = "https://github.com/thierry-martinez/ppx_show"; description = "OCaml PPX deriver for deriving show based on ppxlib"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ niols ]; }; -} +}) From b290b7eafa6976dfa9cef23870ccac99a6724cf8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:04 -0600 Subject: [PATCH 107/260] ocamlPackages.ppx_tools_versioned: migrate to finalAttrs --- .../ocaml-modules/ppx_tools_versioned/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix index 728f95c0e7b6..5d4e4366e4d5 100644 --- a/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools_versioned/default.nix @@ -5,7 +5,7 @@ ocaml-migrate-parsetree, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_tools_versioned"; version = "5.4.0"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "ocaml-ppx"; - repo = pname; - rev = version; + repo = "ppx_tools_versioned"; + rev = finalAttrs.version; sha256 = "07lnj4yzwvwyh5fhpp1dxrys4ddih15jhgqjn59pmgxinbnddi66"; }; @@ -26,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.gpl2; maintainers = [ ]; }; -} +}) From 7a38bee08268378784deb5e7d08929dc1f7903f1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:04 -0600 Subject: [PATCH 108/260] ocamlPackages.ppx_yojson_conv_lib: migrate to finalAttrs --- .../ocaml-modules/ppx_yojson_conv_lib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix index 6ae5cbb1b2b8..54525ee999b5 100644 --- a/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix +++ b/pkgs/development/ocaml-modules/ppx_yojson_conv_lib/default.nix @@ -5,7 +5,7 @@ yojson, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_yojson_conv_lib"; version = "0.17.0"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "janestreet"; - repo = pname; - rev = "v${version}"; + repo = "ppx_yojson_conv_lib"; + rev = "v${finalAttrs.version}"; hash = "sha256-XGgpcAEemBNEagblBjpK+BiL0OUsU2JPqOq+heHbqVk="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { maintainers = [ ]; license = lib.licenses.mit; }; -} +}) From b138d633516f9d6e36eca476f20453c73a74f40a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:05 -0600 Subject: [PATCH 109/260] ocamlPackages.ppxlib: migrate to finalAttrs --- pkgs/development/ocaml-modules/ppxlib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index cee4f4c7c619..d7d9f95f2dc5 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -109,12 +109,12 @@ let ."${version}"; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppxlib"; inherit version; src = fetchurl { - url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz"; + url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${finalAttrs.version}/ppxlib-${finalAttrs.version}.tbz"; inherit (param) sha256; }; @@ -137,4 +137,4 @@ buildDunePackage rec { param ? max_version && lib.versionAtLeast ocaml.version param.max_version || param ? min_version && lib.versionOlder ocaml.version param.min_version; }; -} +}) From f6e1bb11db6d9d9bb66506a39e8ee76298f92fc2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:06 -0600 Subject: [PATCH 110/260] ocamlPackages.pratter: migrate to finalAttrs --- pkgs/development/ocaml-modules/pratter/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/pratter/default.nix b/pkgs/development/ocaml-modules/pratter/default.nix index 18ce52f9eb4d..c42a3ea74399 100644 --- a/pkgs/development/ocaml-modules/pratter/default.nix +++ b/pkgs/development/ocaml-modules/pratter/default.nix @@ -7,7 +7,7 @@ qcheck-alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "5.0.1"; pname = "pratter"; @@ -17,7 +17,7 @@ buildDunePackage rec { domain = "forge.tedomum.net"; owner = "koizel"; repo = "pratter"; - tag = version; + tag = finalAttrs.version; hash = "sha256-Ib7EplEvOuYcAS9cfzo5994SqCv2eiysLekYfH09IMw="; }; @@ -32,7 +32,7 @@ buildDunePackage rec { description = "Extended Pratt parser"; homepage = "https://github.com/gabrielhdt/pratter"; license = lib.licenses.bsd3; - changelog = "https://github.com/gabrielhdt/pratter/raw/${version}/CHANGELOG.md"; + changelog = "https://github.com/gabrielhdt/pratter/raw/${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) From 2576582185d62b2ac70fa6df2778f3145cdfa4ec Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:06 -0600 Subject: [PATCH 111/260] ocamlPackages.prelude: migrate to finalAttrs --- pkgs/development/ocaml-modules/prelude/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/prelude/default.nix b/pkgs/development/ocaml-modules/prelude/default.nix index 06424b840d1a..50f398958b26 100644 --- a/pkgs/development/ocaml-modules/prelude/default.nix +++ b/pkgs/development/ocaml-modules/prelude/default.nix @@ -4,7 +4,7 @@ fetchzip, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "prelude"; version = "0.5"; @@ -12,7 +12,7 @@ buildDunePackage rec { # upstream git repo is misconfigured and cannot be cloned src = fetchzip { - url = "https://git.zapashcanon.fr/zapashcanon/prelude/archive/${version}.tar.gz"; + url = "https://git.zapashcanon.fr/zapashcanon/prelude/archive/${finalAttrs.version}.tar.gz"; hash = "sha256-lti+q1U/eEasAXo0O5YEu4iw7947V9bdvSHA0IEMS8M="; }; @@ -22,8 +22,8 @@ buildDunePackage rec { description = "Library to enforce good stdlib practices"; homepage = "https://ocaml.org/p/prelude/"; downloadPage = "https://git.zapashcanon.fr/zapashcanon/prelude"; - changelog = "https://git.zapashcanon.fr/zapashcanon/prelude/src/tag/${version}/CHANGES.md"; + changelog = "https://git.zapashcanon.fr/zapashcanon/prelude/src/tag/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.ethancedwards8 ]; }; -} +}) From 53fd02e0777f2f62fa5b8346a1318ff7ccd2d2b6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:07 -0600 Subject: [PATCH 112/260] ocamlPackages.prettym: migrate to finalAttrs --- pkgs/development/ocaml-modules/prettym/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/prettym/default.nix b/pkgs/development/ocaml-modules/prettym/default.nix index a5e93870ff98..00dd19e2c19e 100644 --- a/pkgs/development/ocaml-modules/prettym/default.nix +++ b/pkgs/development/ocaml-modules/prettym/default.nix @@ -12,12 +12,12 @@ ptime, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "prettym"; version = "0.0.3"; src = fetchurl { - url = "https://github.com/dinosaure/prettym/releases/download/${version}/prettym-${version}.tbz"; + url = "https://github.com/dinosaure/prettym/releases/download/${finalAttrs.version}/prettym-${finalAttrs.version}.tbz"; hash = "sha256-kXDxoRref02YpYSlvlK7a5FBX5ccbnWJQzG0axi5jwk="; }; @@ -45,4 +45,4 @@ buildDunePackage rec { homepage = "https://github.com/dinosaure/prettym"; maintainers = [ ]; }; -} +}) From 966d0629f3658f87c9811705c68394486b3bfaef Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:07 -0600 Subject: [PATCH 113/260] ocamlPackages.printbox: migrate to finalAttrs --- pkgs/development/ocaml-modules/printbox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index d3e7673a5c27..3440313bcb1a 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -7,7 +7,7 @@ gitUpdater, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "printbox"; version = "0.12"; @@ -15,8 +15,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "c-cube"; - repo = pname; - rev = "v${version}"; + repo = "printbox"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-PQbr2sjASoWz0OHAMV6buAJERpnUJxVpLAigIVnADIc="; }; @@ -33,4 +33,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; }; -} +}) From 7e83fd4711f216fdcf0377fd48fedff9ed33a9e2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:08 -0600 Subject: [PATCH 114/260] ocamlPackages.processor: migrate to finalAttrs --- pkgs/development/ocaml-modules/processor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/processor/default.nix b/pkgs/development/ocaml-modules/processor/default.nix index d4eba003ea67..ce6d3736239b 100644 --- a/pkgs/development/ocaml-modules/processor/default.nix +++ b/pkgs/development/ocaml-modules/processor/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "processor"; version = "0.1-unstable-2024-07-23"; @@ -23,8 +23,8 @@ buildDunePackage rec { description = "CPU topology and affinity for ocaml-multicore"; homepage = "https://haesbaert.github.io/ocaml-processor/processor/index.html"; downloadPage = "https://github.com/haesbaert/ocaml-processor"; - changelog = "https://github.com/haesbaert/ocaml-processor/releases/tag/v${version}"; + changelog = "https://github.com/haesbaert/ocaml-processor/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; maintainers = [ lib.maintainers.ethancedwards8 ]; }; -} +}) From f85052e2d06e6f51c53d06a4bac8ea789a539393 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:09 -0600 Subject: [PATCH 115/260] ocamlPackages.promise_jsoo: migrate to finalAttrs --- pkgs/development/ocaml-modules/promise_jsoo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/promise_jsoo/default.nix b/pkgs/development/ocaml-modules/promise_jsoo/default.nix index d380fa1adb9a..91b88031a86b 100644 --- a/pkgs/development/ocaml-modules/promise_jsoo/default.nix +++ b/pkgs/development/ocaml-modules/promise_jsoo/default.nix @@ -9,14 +9,14 @@ ojs, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "promise_jsoo"; version = "0.3.1"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/mnxn/promise_jsoo/releases/download/v${version}/promise_jsoo-v${version}.tbz"; + url = "https://github.com/mnxn/promise_jsoo/releases/download/v${finalAttrs.version}/promise_jsoo-v${finalAttrs.version}.tbz"; sha256 = "00pjnsbv0yv3hhxbbl8dsljgr95kjgi9w8j1x46gjyxg9zayrxzl"; }; @@ -37,4 +37,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ jayesh-bhoot ]; }; -} +}) From a543758b97ff7830cbe504aaa2bf1e8da9de7f01 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:09 -0600 Subject: [PATCH 116/260] ocamlPackages.psmt2-frontend: migrate to finalAttrs --- .../ocaml-modules/psmt2-frontend/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix index 74798bc3d6fe..1d8408db5cf0 100644 --- a/pkgs/development/ocaml-modules/psmt2-frontend/default.nix +++ b/pkgs/development/ocaml-modules/psmt2-frontend/default.nix @@ -5,14 +5,14 @@ menhir, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "0.4.0"; pname = "psmt2-frontend"; src = fetchFromGitHub { owner = "ACoquereau"; - repo = pname; - rev = version; + repo = "psmt2-frontend"; + rev = finalAttrs.version; hash = "sha256-cYY9x7QZjH7pdJyHMqfMXgHZ3/zJLp/6ntY6OSIo6Vs="; }; @@ -24,7 +24,7 @@ buildDunePackage rec { description = "Simple parser and type-checker for polomorphic extension of the SMT-LIB 2 language"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) From 7ba2f554970b0c1d0e2fe4b8fa3734e9e99343d1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:10 -0600 Subject: [PATCH 117/260] ocamlPackages.psq: migrate to finalAttrs --- pkgs/development/ocaml-modules/psq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/psq/default.nix b/pkgs/development/ocaml-modules/psq/default.nix index e2349aed828a..e10af60b1d5d 100644 --- a/pkgs/development/ocaml-modules/psq/default.nix +++ b/pkgs/development/ocaml-modules/psq/default.nix @@ -7,7 +7,7 @@ qcheck-alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { minimalOCamlVersion = "4.03"; pname = "psq"; version = "0.2.1"; @@ -15,7 +15,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz"; + url = "https://github.com/pqwy/psq/releases/download/v${finalAttrs.version}/psq-${finalAttrs.version}.tbz"; hash = "sha256-QgBfUz6r50sXme4yuJBWVM1moivtSvK9Jmso2EYs00Q="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; license = lib.licenses.isc; }; -} +}) From 66426dd225357609a958ecf7d9593436b0c6b88f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:10 -0600 Subject: [PATCH 118/260] ocamlPackages.pulseaudio: migrate to finalAttrs --- pkgs/development/ocaml-modules/pulseaudio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pulseaudio/default.nix b/pkgs/development/ocaml-modules/pulseaudio/default.nix index 6ec1b4f0cf4d..e59705a095a0 100644 --- a/pkgs/development/ocaml-modules/pulseaudio/default.nix +++ b/pkgs/development/ocaml-modules/pulseaudio/default.nix @@ -7,14 +7,14 @@ pulseaudio, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pulseaudio"; version = "0.1.5"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-pulseaudio"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-eG2HS5g3ycDftRDyXGBwPJE7VRnLXNUgcEgNfVm//ds="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 4eadf9d4e9589084b27ae861b7f132ad18152494 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:11 -0600 Subject: [PATCH 119/260] ocamlPackages.pure-splitmix: migrate to finalAttrs --- pkgs/development/ocaml-modules/pure-splitmix/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/pure-splitmix/default.nix b/pkgs/development/ocaml-modules/pure-splitmix/default.nix index 99b8206b79c1..aa58f0dc6f43 100644 --- a/pkgs/development/ocaml-modules/pure-splitmix/default.nix +++ b/pkgs/development/ocaml-modules/pure-splitmix/default.nix @@ -4,14 +4,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pure-splitmix"; version = "0.3"; src = fetchFromGitHub { owner = "Lysxia"; - repo = pname; - rev = version; + repo = "pure-splitmix"; + rev = finalAttrs.version; sha256 = "RUnsAB4hMV87ItCyGhc47bHGY1iOwVv9kco2HxnzqbU="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From a49f6cc05e82d8a02d741fb0453609ac0e256ab0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:12 -0600 Subject: [PATCH 120/260] ocamlPackages.pyml: migrate to finalAttrs --- pkgs/development/ocaml-modules/pyml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/pyml/default.nix b/pkgs/development/ocaml-modules/pyml/default.nix index 23396eb6b437..dc7f13cbcb5a 100644 --- a/pkgs/development/ocaml-modules/pyml/default.nix +++ b/pkgs/development/ocaml-modules/pyml/default.nix @@ -7,14 +7,14 @@ stdcompat, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "pyml"; version = "20231101"; src = fetchFromGitHub { owner = "ocamllibs"; repo = "pyml"; - tag = version; + tag = finalAttrs.version; hash = "sha256-0Yy5T/S3Npwt0XJmEsdXGg5AXYi9vV9UG9nMSzz/CEc="; }; @@ -45,4 +45,4 @@ buildDunePackage rec { homepage = "https://github.com/ocamllibs/pyml"; license = lib.licenses.bsd2; }; -} +}) From 5947e1c9a62a79c8656cbc6748c469eebfe18caf Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:12 -0600 Subject: [PATCH 121/260] ocamlPackages.qcheck: migrate to finalAttrs --- .../ocaml-modules/qcheck/multicoretests-util.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix index f9466470cd3d..3e983b925e6f 100644 --- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix +++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix @@ -5,14 +5,14 @@ qcheck-core, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "qcheck-multicoretests-util"; version = "0.11"; src = fetchFromGitHub { owner = "ocaml-multicore"; repo = "multicoretests"; - rev = version; + rev = finalAttrs.version; hash = "sha256-QABh33C1k5AAYkOa5zDIExwwJFlhgdvSuxShJt4ESM8="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From a9fe8e7159b5ffbc71577e17a8cecd6ee9f30a33 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:13 -0600 Subject: [PATCH 122/260] ocamlPackages.qtest: migrate to finalAttrs --- pkgs/development/ocaml-modules/qtest/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index de1bbca4ef08..a9d71597d44a 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -5,14 +5,14 @@ qcheck, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "qtest"; version = "2.11.2"; src = fetchFromGitHub { owner = "vincent-hugot"; - repo = pname; - rev = "v${version}"; + repo = "qtest"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-VLY8+Nu6md0szW4RVxTFwlSQ9kyrgUqf7wQEA6GW8BE="; }; @@ -27,8 +27,8 @@ buildDunePackage rec { meta = { description = "Inline (Unit) Tests for OCaml"; mainProgram = "qtest"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; maintainers = with lib.maintainers; [ vbgl ]; license = lib.licenses.gpl3; }; -} +}) From 59a88a37ee04e77595fdae116e3202f30cf3742e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:13 -0600 Subject: [PATCH 123/260] ocamlPackages.randomconv: migrate to finalAttrs --- pkgs/development/ocaml-modules/randomconv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/randomconv/default.nix b/pkgs/development/ocaml-modules/randomconv/default.nix index 898318a00b21..82f9193256ae 100644 --- a/pkgs/development/ocaml-modules/randomconv/default.nix +++ b/pkgs/development/ocaml-modules/randomconv/default.nix @@ -4,14 +4,14 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "randomconv"; version = "0.2.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/hannesm/randomconv/releases/download/v${version}/randomconv-${version}.tbz"; + url = "https://github.com/hannesm/randomconv/releases/download/v${finalAttrs.version}/randomconv-${finalAttrs.version}.tbz"; hash = "sha256-sxce3wfjQaRGj5L/wh4qiGO4LtXDb3R3zJja8F1bY+o="; }; @@ -22,4 +22,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From abfba03d60ed85cb51ef0950ce53a92e5e22b9a3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:14 -0600 Subject: [PATCH 124/260] ocamlPackages.raylib: migrate to finalAttrs --- pkgs/development/ocaml-modules/raylib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/raylib/default.nix b/pkgs/development/ocaml-modules/raylib/default.nix index ec95db2aa769..97e7f3fe4ef4 100644 --- a/pkgs/development/ocaml-modules/raylib/default.nix +++ b/pkgs/development/ocaml-modules/raylib/default.nix @@ -15,12 +15,12 @@ libxrandr, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "raylib"; version = "1.4.0"; src = fetchurl { - url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raylib-${version}.tbz"; + url = "https://github.com/tjammer/raylib-ocaml/releases/download/${finalAttrs.version}/raylib-${finalAttrs.version}.tbz"; hash = "sha256-/SeKgQOrhsAgMNk6ODAZlopL0mL0lVfCTx1ugmV1P/s="; }; @@ -58,4 +58,4 @@ buildDunePackage rec { maintainers = with lib.maintainers; [ r17x ]; license = lib.licenses.mit; }; -} +}) From ea93cbd618c45b6e19136b6a5369df5445ff7c06 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:15 -0600 Subject: [PATCH 125/260] ocamlPackages.raylib: migrate to finalAttrs --- pkgs/development/ocaml-modules/raylib/raygui.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/raylib/raygui.nix b/pkgs/development/ocaml-modules/raylib/raygui.nix index 8f10576eae89..5f3748e16394 100644 --- a/pkgs/development/ocaml-modules/raylib/raygui.nix +++ b/pkgs/development/ocaml-modules/raylib/raygui.nix @@ -4,12 +4,12 @@ raylib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "raygui"; version = "1.4.0"; src = fetchurl { - url = "https://github.com/tjammer/raylib-ocaml/releases/download/${version}/raygui-${version}.tbz"; + url = "https://github.com/tjammer/raylib-ocaml/releases/download/${finalAttrs.version}/raygui-${finalAttrs.version}.tbz"; hash = "sha256-PQcVTAQKeTPkOOHk5w3O3Tz0n7jLvkIo3Urvrk66eMs="; }; @@ -22,4 +22,4 @@ buildDunePackage rec { meta = raylib.meta // { description = "OCaml bindings for raygui"; }; -} +}) From 8281d9b8551c341b5a42b5a604e700d4f54ca0f6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:15 -0600 Subject: [PATCH 126/260] ocamlPackages.rdbg: migrate to finalAttrs --- pkgs/development/ocaml-modules/rdbg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/rdbg/default.nix b/pkgs/development/ocaml-modules/rdbg/default.nix index ba7e71136957..dcb2a438fd4b 100644 --- a/pkgs/development/ocaml-modules/rdbg/default.nix +++ b/pkgs/development/ocaml-modules/rdbg/default.nix @@ -8,7 +8,7 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "rdbg"; version = "1.199.0"; @@ -24,7 +24,7 @@ buildDunePackage rec { }; src = fetchurl { - url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.v${version}.tgz"; + url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/rdbg.v${finalAttrs.version}.tgz"; hash = "sha512:6076eaa3608a313f8ac71a4f5aa4fcc64aeb0c646d581e5035110d4c80f94de34f2ba26f90a9a1e92a7f788c9e799f1f7b0e3728c853a21983ad732f0ee60352"; }; @@ -43,4 +43,4 @@ buildDunePackage rec { license = lib.licenses.cecill21; maintainers = [ lib.maintainers.delta ]; }; -} +}) From eea3eab2f6776644315abd3d14827a7195c4cbc5 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:16 -0600 Subject: [PATCH 127/260] ocamlPackages.re: migrate to finalAttrs --- pkgs/development/ocaml-modules/re/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 54bd7a664ae2..eff1957679eb 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -27,20 +27,20 @@ let }; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "re"; version = version_sha.version; minimalOCamlVersion = "4.02"; src = fetchurl { - url = "https://github.com/ocaml/ocaml-re/releases/download/${version}/re-${version}.tbz"; + url = "https://github.com/ocaml/ocaml-re/releases/download/${finalAttrs.version}/re-${finalAttrs.version}.tbz"; inherit (version_sha) hash; }; propagatedBuildInputs = [ seq ]; doCheck = lib.versionAtLeast ocaml.version "4.08"; - checkInputs = [ (if lib.versionAtLeast version "1.12" then ounit2 else ounit) ]; + checkInputs = [ (if lib.versionAtLeast finalAttrs.version "1.12" then ounit2 else ounit) ]; meta = { homepage = "https://github.com/ocaml/ocaml-re"; @@ -48,4 +48,4 @@ buildDunePackage rec { license = lib.licenses.lgpl2; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 9c02628f2e38cad733fa54948a01b41d9ed61c16 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:16 -0600 Subject: [PATCH 128/260] ocamlPackages.reactivedata: migrate to finalAttrs --- pkgs/development/ocaml-modules/reactivedata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 73e382d0a59d..2c9b1ac42c7a 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -5,7 +5,7 @@ react, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "reactiveData"; version = "0.3.1"; duneVersion = "3"; @@ -14,7 +14,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "ocsigen"; repo = "reactiveData"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-MO9WMe1k2QcC5RynE6uZHohmu3QlpTHvAkvQNgu3P90="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 6bf0fe8df9e08d5f9c573cb41c13bcbb7a5a683e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:17 -0600 Subject: [PATCH 129/260] ocamlPackages.redis: migrate to finalAttrs --- pkgs/development/ocaml-modules/redis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/redis/default.nix b/pkgs/development/ocaml-modules/redis/default.nix index e54e5b3e3cfb..86ee73743184 100644 --- a/pkgs/development/ocaml-modules/redis/default.nix +++ b/pkgs/development/ocaml-modules/redis/default.nix @@ -7,14 +7,14 @@ uuidm, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "redis"; version = "0.8"; minimalOCamlVersion = "4.03"; src = fetchurl { - url = "https://github.com/0xffea/ocaml-redis/releases/download/v${version}/redis-${version}.tbz"; + url = "https://github.com/0xffea/ocaml-redis/releases/download/v${finalAttrs.version}/redis-${finalAttrs.version}.tbz"; hash = "sha256-Cli30Elur3tL/0bWK6PBBy229TK4jsQnN/0oVQux01I="; }; @@ -31,4 +31,4 @@ buildDunePackage rec { license = lib.licenses.bsd3; homepage = "https://github.com/0xffea/ocaml-redis"; }; -} +}) From d8ca420393c06b872de4b98b4724f98c946746d4 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:17 -0600 Subject: [PATCH 130/260] ocamlPackages.res: migrate to finalAttrs --- pkgs/development/ocaml-modules/res/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/res/default.nix b/pkgs/development/ocaml-modules/res/default.nix index 5ae73c967c4b..4a0555b07033 100644 --- a/pkgs/development/ocaml-modules/res/default.nix +++ b/pkgs/development/ocaml-modules/res/default.nix @@ -4,14 +4,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "res"; version = "5.0.2"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mmottl/res/releases/download/${version}/res-${version}.tbz"; + url = "https://github.com/mmottl/res/releases/download/${finalAttrs.version}/res-${finalAttrs.version}.tbz"; hash = "sha256-hQxRETCYxy7ZHah5cg+XHtH3wCj/ofq1VHxsPHu91FU="; }; @@ -20,8 +20,8 @@ buildDunePackage rec { meta = { description = "Library for resizable, contiguous datastructures"; homepage = "https://github.com/mmottl/res"; - changelog = "https://github.com/mmottl/res/blob/${version}/CHANGES.md"; + changelog = "https://github.com/mmottl/res/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ sixstring982 ]; }; -} +}) From 6cb4d850e3decd8acd581f48661a112e11b5ea75 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:18 -0600 Subject: [PATCH 131/260] ocamlPackages.resource-pooling: migrate to finalAttrs --- .../ocaml-modules/resource-pooling/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/resource-pooling/default.nix b/pkgs/development/ocaml-modules/resource-pooling/default.nix index d98e8e8c47e9..aef730c92adf 100644 --- a/pkgs/development/ocaml-modules/resource-pooling/default.nix +++ b/pkgs/development/ocaml-modules/resource-pooling/default.nix @@ -5,7 +5,7 @@ lwt_log, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "1.2"; pname = "resource-pooling"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "ocsigen"; - repo = pname; - rev = version; + repo = "resource-pooling"; + rev = finalAttrs.version; sha256 = "sha256-GNYPxjMTo7y40y7aQdseuFyeVF/hSCZKXfEaH/WIO9w="; }; @@ -23,9 +23,9 @@ buildDunePackage rec { doCheck = true; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Library for pooling resources like connections, threads, or similar"; license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From a62e2f5503dfd595f07dccba42a81654f8a7e78a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:19 -0600 Subject: [PATCH 132/260] ocamlPackages.rfc7748: migrate to finalAttrs --- pkgs/development/ocaml-modules/rfc7748/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/rfc7748/default.nix b/pkgs/development/ocaml-modules/rfc7748/default.nix index 8adf46c3b384..392cf13e0e2c 100644 --- a/pkgs/development/ocaml-modules/rfc7748/default.nix +++ b/pkgs/development/ocaml-modules/rfc7748/default.nix @@ -9,14 +9,14 @@ zarith, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "rfc7748"; version = "1.0"; src = fetchFromGitHub { owner = "burgerdev"; repo = "ocaml-rfc7748"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4="; }; @@ -45,4 +45,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fufexan ]; }; -} +}) From d87fe9b01447fdd3be9807527139808b8691e775 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:19 -0600 Subject: [PATCH 133/260] ocamlPackages.ringo: migrate to finalAttrs --- pkgs/development/ocaml-modules/ringo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ringo/default.nix b/pkgs/development/ocaml-modules/ringo/default.nix index 4120d82cb295..06ef0791de53 100644 --- a/pkgs/development/ocaml-modules/ringo/default.nix +++ b/pkgs/development/ocaml-modules/ringo/default.nix @@ -4,13 +4,13 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ringo"; version = "1.1.0"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ringo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-8dThhY7TIjd0lLdCt6kxr0yhgVGDyN6ZMSx0Skfbcwk="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 67db0f2e73d68ede977710fa97c9c1a2e99e9939 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:20 -0600 Subject: [PATCH 134/260] ocamlPackages.rio: migrate to finalAttrs --- pkgs/development/ocaml-modules/rio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/rio/default.nix b/pkgs/development/ocaml-modules/rio/default.nix index e705007d570e..fa0dc3388311 100644 --- a/pkgs/development/ocaml-modules/rio/default.nix +++ b/pkgs/development/ocaml-modules/rio/default.nix @@ -5,14 +5,14 @@ cstruct, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "rio"; version = "0.0.8"; minimalOCamlVersion = "5.1"; src = fetchurl { - url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; + url = "https://github.com/leostera/riot/releases/download/${finalAttrs.version}/riot-${finalAttrs.version}.tbz"; hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE="; }; @@ -23,8 +23,8 @@ buildDunePackage rec { meta = { description = "Ergonomic, composable, efficient read/write streams"; homepage = "https://github.com/leostera/riot"; - changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; + changelog = "https://github.com/leostera/riot/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From 483eba44cd70f43d0bb9d318243790941b09d4c4 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:20 -0600 Subject: [PATCH 135/260] ocamlPackages.riot: migrate to finalAttrs --- pkgs/development/ocaml-modules/riot/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/riot/default.nix b/pkgs/development/ocaml-modules/riot/default.nix index d85f0738e4ba..b09a25b2e14d 100644 --- a/pkgs/development/ocaml-modules/riot/default.nix +++ b/pkgs/development/ocaml-modules/riot/default.nix @@ -12,14 +12,14 @@ tls, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "riot"; version = "0.0.8"; minimalOCamlVersion = "5.1"; src = fetchurl { - url = "https://github.com/leostera/riot/releases/download/${version}/riot-${version}.tbz"; + url = "https://github.com/leostera/riot/releases/download/${finalAttrs.version}/riot-${finalAttrs.version}.tbz"; hash = "sha256-SsiDz53b9bMIT9Q3IwDdB3WKy98WSd9fiieU41qZpeE="; }; @@ -45,9 +45,9 @@ buildDunePackage rec { meta = { description = "Actor-model multi-core scheduler for OCaml 5"; homepage = "https://github.com/leostera/riot"; - changelog = "https://github.com/leostera/riot/blob/${version}/CHANGES.md"; + changelog = "https://github.com/leostera/riot/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ ]; broken = true; # Not compatible with mirage-crypto ≥ 1.0 }; -} +}) From d7c2fc6f0d816cfd45c498a5847db52d80451227 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:21 -0600 Subject: [PATCH 136/260] ocamlPackages.rock: migrate to finalAttrs --- pkgs/development/ocaml-modules/rock/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/rock/default.nix b/pkgs/development/ocaml-modules/rock/default.nix index 4ac05b0150b2..f62e462f4443 100644 --- a/pkgs/development/ocaml-modules/rock/default.nix +++ b/pkgs/development/ocaml-modules/rock/default.nix @@ -9,14 +9,14 @@ sexplib0, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "rock"; version = "0.20.0"; minimalOCamlVersion = "4.08"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/rgrinberg/opium/releases/download/${version}/opium-${version}.tbz"; + url = "https://github.com/rgrinberg/opium/releases/download/${finalAttrs.version}/opium-${finalAttrs.version}.tbz"; hash = "sha256-MmuRhm3pC69TX4t9Sy/yPjnZUuVzwEs8E/EFS1n/L7Y="; }; @@ -35,4 +35,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 7435054aa53f240a374f9213297f23fd962c849c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:22 -0600 Subject: [PATCH 137/260] ocamlPackages.rosetta: migrate to finalAttrs --- pkgs/development/ocaml-modules/rosetta/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/rosetta/default.nix b/pkgs/development/ocaml-modules/rosetta/default.nix index f86715ff507c..78eaf6a01b71 100644 --- a/pkgs/development/ocaml-modules/rosetta/default.nix +++ b/pkgs/development/ocaml-modules/rosetta/default.nix @@ -7,12 +7,12 @@ uuuu, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "rosetta"; version = "0.3.0"; src = fetchzip { - url = "https://github.com/mirage/rosetta/releases/download/v${version}/rosetta-v${version}.tbz"; + url = "https://github.com/mirage/rosetta/releases/download/v${finalAttrs.version}/rosetta-v${finalAttrs.version}.tbz"; sha256 = "1gzp3fbk8qd207cm25dgj9kj7b44ldqpjs63pl6xqvi9hx60m3ij"; }; @@ -32,4 +32,4 @@ buildDunePackage rec { homepage = "https://github.com/mirage/rosetta"; maintainers = [ ]; }; -} +}) From 519a7c9b879478f69a21a662b84c49a60b427dca Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:22 -0600 Subject: [PATCH 138/260] ocamlPackages.routes: migrate to finalAttrs --- pkgs/development/ocaml-modules/routes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/routes/default.nix b/pkgs/development/ocaml-modules/routes/default.nix index 04ef6c1e94f1..cae997141db1 100644 --- a/pkgs/development/ocaml-modules/routes/default.nix +++ b/pkgs/development/ocaml-modules/routes/default.nix @@ -4,7 +4,7 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "routes"; version = "2.0.0"; @@ -12,7 +12,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.05"; src = fetchurl { - url = "https://github.com/anuragsoni/routes/releases/download/${version}/routes-${version}.tbz"; + url = "https://github.com/anuragsoni/routes/releases/download/${finalAttrs.version}/routes-${finalAttrs.version}.tbz"; hash = "sha256-O2KdaYwrAOUEwTtM14NUgGNxnc8BWAycP1EEuB6w1og="; }; @@ -25,4 +25,4 @@ buildDunePackage rec { anmonteiro ]; }; -} +}) From 42aa0b41a7488525886278ce29ca1f3ed901eed0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:23 -0600 Subject: [PATCH 139/260] ocamlPackages.rpclib: migrate to finalAttrs --- pkgs/development/ocaml-modules/rpclib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix index d65d94e97f30..d1578b7951d2 100644 --- a/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/pkgs/development/ocaml-modules/rpclib/default.nix @@ -10,7 +10,7 @@ yojson, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "rpclib"; version = "9.0.0"; @@ -18,7 +18,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/ocaml-rpc/releases/download/${version}/rpclib-${version}.tbz"; + url = "https://github.com/mirage/ocaml-rpc/releases/download/${finalAttrs.version}/rpclib-${finalAttrs.version}.tbz"; hash = "sha256-ziPrdWwCjZN0vRmCMpa923wjfT8FVFLTDRz30VIW6WM="; }; @@ -41,4 +41,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vyorkin ]; }; -} +}) From 7fd84df3e7ebcf33897df02b2037cdbbbc1384e3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:23 -0600 Subject: [PATCH 140/260] ocamlPackages.rusage: migrate to finalAttrs --- pkgs/development/ocaml-modules/rusage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/rusage/default.nix b/pkgs/development/ocaml-modules/rusage/default.nix index 8992d60368ca..14baa1f34aae 100644 --- a/pkgs/development/ocaml-modules/rusage/default.nix +++ b/pkgs/development/ocaml-modules/rusage/default.nix @@ -4,14 +4,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "rusage"; version = "1.0.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/CraigFe/ocaml-rusage/releases/download/${version}/rusage-${version}.tbz"; + url = "https://github.com/CraigFe/ocaml-rusage/releases/download/${finalAttrs.version}/rusage-${finalAttrs.version}.tbz"; hash = "sha256-OgYA2Fe1goqoaOS45Z6FBJNNYN/uq+KQoUwG8KSo6Fk="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From eda8a964b98e551c77166ada3cf1c14b6125d59b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:24 -0600 Subject: [PATCH 141/260] ocamlPackages.saturn: migrate to finalAttrs --- pkgs/development/ocaml-modules/saturn/lockfree.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/saturn/lockfree.nix b/pkgs/development/ocaml-modules/saturn/lockfree.nix index 538dfda5e838..bfa91f76f7ea 100644 --- a/pkgs/development/ocaml-modules/saturn/lockfree.nix +++ b/pkgs/development/ocaml-modules/saturn/lockfree.nix @@ -6,14 +6,14 @@ multicore-magic, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "saturn_lockfree"; version = "0.5.0"; minimalOCamlVersion = "4.13"; src = fetchurl { - url = "https://github.com/ocaml-multicore/saturn/releases/download/${version}/saturn-${version}.tbz"; + url = "https://github.com/ocaml-multicore/saturn/releases/download/${finalAttrs.version}/saturn-${finalAttrs.version}.tbz"; hash = "sha256-ZmmxwIe5PiPYTTdvOHbOjRbv2b/bb9y0IekByfREPjk="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 40dd883339b8f065ed02c7c6167631d984df8fd9 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:25 -0600 Subject: [PATCH 142/260] ocamlPackages.scfg: migrate to finalAttrs --- pkgs/development/ocaml-modules/scfg/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/scfg/default.nix b/pkgs/development/ocaml-modules/scfg/default.nix index aa1d39c64fd3..060c367cf0ef 100644 --- a/pkgs/development/ocaml-modules/scfg/default.nix +++ b/pkgs/development/ocaml-modules/scfg/default.nix @@ -13,13 +13,13 @@ writableTmpDirAsHomeHook, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "scfg"; version = "0.5"; # upstream git repo is misconfigured and cannot be cloned src = fetchzip { - url = "https://git.zapashcanon.fr/zapashcanon/scfg/archive/${version}.tar.gz"; + url = "https://git.zapashcanon.fr/zapashcanon/scfg/archive/${finalAttrs.version}.tar.gz"; hash = "sha256-XyNVmI0W0B1JqR+uuojpHe9L5KKLhyoH8vN8+9i7Xcg="; }; @@ -50,8 +50,8 @@ buildDunePackage rec { description = "Library to work with the scfg configuration file"; homepage = "https://ocaml.org/p/scfg/"; downloadPage = "https://git.zapashcanon.fr/zapashcanon/scfg"; - changelog = "https://git.zapashcanon.fr/zapashcanon/scfg/src/tag/${version}/CHANGES.md"; + changelog = "https://git.zapashcanon.fr/zapashcanon/scfg/src/tag/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = [ lib.maintainers.ethancedwards8 ]; }; -} +}) From 3f666107a79fbceef7407da6a4d0476f77fd5380 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:25 -0600 Subject: [PATCH 143/260] ocamlPackages.secp256k1-internal: migrate to finalAttrs --- .../ocaml-modules/secp256k1-internal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix index 5a57a79889e1..077cd46b44b3 100644 --- a/pkgs/development/ocaml-modules/secp256k1-internal/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1-internal/default.nix @@ -10,13 +10,13 @@ hex, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "secp256k1-internal"; version = "0.4"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "ocaml-secp256k1-internal"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-amVtp94cE1NxClWJgcJvRmilnQlC7z44mORUaxvPn00="; }; @@ -45,4 +45,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 25278990f0a944bc57f77c0bb5076664fa05d8c2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:26 -0600 Subject: [PATCH 144/260] ocamlPackages.sedlex: migrate to finalAttrs --- pkgs/development/ocaml-modules/sedlex/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 084a5d32b1c5..6b95fde03bf5 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -41,7 +41,7 @@ let }; atLeast31 = lib.versionAtLeast param.version "3.1"; in -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "sedlex"; inherit (param) version; @@ -50,7 +50,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "ocaml-community"; repo = "sedlex"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; inherit (param) sha256; }; @@ -79,9 +79,9 @@ buildDunePackage rec { meta = { homepage = "https://github.com/ocaml-community/sedlex"; - changelog = "https://github.com/ocaml-community/sedlex/raw/v${version}/CHANGES"; + changelog = "https://github.com/ocaml-community/sedlex/raw/v${finalAttrs.version}/CHANGES"; description = "OCaml lexer generator for Unicode"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From d8345bb3b61725d3cb010f5076560d59b839f3f4 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:26 -0600 Subject: [PATCH 145/260] ocamlPackages.sel: migrate to finalAttrs --- pkgs/development/ocaml-modules/sel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/sel/default.nix b/pkgs/development/ocaml-modules/sel/default.nix index 506e8bb89e04..85c456bb6173 100644 --- a/pkgs/development/ocaml-modules/sel/default.nix +++ b/pkgs/development/ocaml-modules/sel/default.nix @@ -6,14 +6,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "sel"; version = "0.8.0"; minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/gares/sel/releases/download/v${version}/sel-${version}.tbz"; + url = "https://github.com/gares/sel/releases/download/v${finalAttrs.version}/sel-${finalAttrs.version}.tbz"; hash = "sha256-jTAjWdaoioR5+G96qoOY+JXrJY00eF7y7WhGSiFwfqg="; }; @@ -31,4 +31,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 86725bc31573b11703953ff21cfddedb7f1a3225 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 12:09:27 -0600 Subject: [PATCH 146/260] ocamlPackages.semver: migrate to finalAttrs --- pkgs/development/ocaml-modules/semver/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/semver/default.nix b/pkgs/development/ocaml-modules/semver/default.nix index 3529f481c33f..2079462ed15d 100644 --- a/pkgs/development/ocaml-modules/semver/default.nix +++ b/pkgs/development/ocaml-modules/semver/default.nix @@ -6,11 +6,11 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "semver"; version = "0.2.1"; src = fetchurl { - url = "https://github.com/rgrinberg/ocaml-semver/releases/download/${version}/semver-${version}.tbz"; + url = "https://github.com/rgrinberg/ocaml-semver/releases/download/${finalAttrs.version}/semver-${finalAttrs.version}.tbz"; hash = "sha256-CjzDUtoe5Hvt6zImb+EqVIulRUUUQd9MmuJ4BH/2mLg="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 1dee60f5a01ebd7ff7da830360e889d22ea48799 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:36 -0600 Subject: [PATCH 147/260] ocamlPackages.genspio: migrate to finalAttrs --- pkgs/development/ocaml-modules/genspio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/genspio/default.nix b/pkgs/development/ocaml-modules/genspio/default.nix index 22b93c11ed49..80ceb2e643f0 100644 --- a/pkgs/development/ocaml-modules/genspio/default.nix +++ b/pkgs/development/ocaml-modules/genspio/default.nix @@ -6,7 +6,7 @@ fmt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "genspio"; version = "0.0.3"; @@ -14,8 +14,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "hammerlab"; - repo = pname; - rev = "${pname}.${version}"; + repo = "genspio"; + rev = "genspio.${finalAttrs.version}"; sha256 = "sha256:1788cnn10idp5i1hggg4pys7k0w8m3h2p4xa42jipfg4cpj7shaf"; }; @@ -35,4 +35,4 @@ buildDunePackage rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) From 46b7a34334f6bd0d97ab517c2eee074517d83077 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:40 -0600 Subject: [PATCH 148/260] ocamlPackages.get-activity: migrate to finalAttrs --- pkgs/development/ocaml-modules/get-activity/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/get-activity/default.nix b/pkgs/development/ocaml-modules/get-activity/default.nix index 5157b640aa09..10ccdbab9d0e 100644 --- a/pkgs/development/ocaml-modules/get-activity/default.nix +++ b/pkgs/development/ocaml-modules/get-activity/default.nix @@ -11,7 +11,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "get-activity"; inherit (get-activity-lib) version src; @@ -42,7 +42,7 @@ buildDunePackage rec { homepage = "https://github.com/tarides/get-activity"; description = "Collect activity and format as markdown for a journal"; license = lib.licenses.mit; - changelog = "https://github.com/tarides/get-activity/releases/tag/${version}"; + changelog = "https://github.com/tarides/get-activity/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ zazedd ]; }; -} +}) From 5f45dcfdb9ba1116eced0f1b259274c7c757090e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:41 -0600 Subject: [PATCH 149/260] ocamlPackages.get-activity-lib: migrate to finalAttrs --- pkgs/development/ocaml-modules/get-activity/lib.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/get-activity/lib.nix b/pkgs/development/ocaml-modules/get-activity/lib.nix index 352b75d27f4f..2cd2eea8a744 100644 --- a/pkgs/development/ocaml-modules/get-activity/lib.nix +++ b/pkgs/development/ocaml-modules/get-activity/lib.nix @@ -13,14 +13,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "get-activity-lib"; version = "2.0.1"; src = fetchFromGitHub { owner = "tarides"; repo = "get-activity"; - rev = version; + rev = finalAttrs.version; hash = "sha256-QU/LPIxcem5nFvSxcNApOuBu6UHqLHIXVSOJ2UT0eKA="; }; @@ -48,7 +48,7 @@ buildDunePackage rec { homepage = "https://github.com/tarides/get-activity"; description = "Collect activity and format as markdown for a journal (lib)"; license = lib.licenses.mit; - changelog = "https://github.com/tarides/get-activity/releases/tag/${version}"; + changelog = "https://github.com/tarides/get-activity/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ zazedd ]; }; -} +}) From 38be5fb1c76b2970217551ec322735f45c2a4824 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:41 -0600 Subject: [PATCH 150/260] ocamlPackages.getopt: migrate to finalAttrs --- pkgs/development/ocaml-modules/getopt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/getopt/default.nix b/pkgs/development/ocaml-modules/getopt/default.nix index 9de42e3d8bae..ad409c008a54 100644 --- a/pkgs/development/ocaml-modules/getopt/default.nix +++ b/pkgs/development/ocaml-modules/getopt/default.nix @@ -4,7 +4,7 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "getopt"; version = "20230213"; @@ -13,7 +13,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "scemama"; repo = "ocaml-getopt"; - rev = version; + rev = finalAttrs.version; hash = "sha256-oYDm945LgjIW+8x7UrO4FlbHywnu8480aiEVvnjBxc8="; }; @@ -25,4 +25,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 2ff654292a93a30fdf7f1606c8c9e31ced9820ea Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:42 -0600 Subject: [PATCH 151/260] ocamlPackages.git: migrate to finalAttrs --- pkgs/development/ocaml-modules/git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/git/default.nix b/pkgs/development/ocaml-modules/git/default.nix index 16580b8208bf..d6119aedfb76 100644 --- a/pkgs/development/ocaml-modules/git/default.nix +++ b/pkgs/development/ocaml-modules/git/default.nix @@ -37,14 +37,14 @@ cmdliner, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "git"; version = "3.18.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-git/releases/download/${version}/git-${version}.tbz"; + url = "https://github.com/mirage/ocaml-git/releases/download/${finalAttrs.version}/git-${finalAttrs.version}.tbz"; hash = "sha256-kleVYn5tquC0vRaqUGh53xHLIB5l/v446BN48Y1RfUs="; }; @@ -99,4 +99,4 @@ buildDunePackage rec { ]; homepage = "https://github.com/mirage/ocaml-git"; }; -} +}) From 878f36db8e82d962569c0cd56a3264511c50c2e0 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:42 -0600 Subject: [PATCH 152/260] ocamlPackages.github: migrate to finalAttrs --- pkgs/development/ocaml-modules/github/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/github/default.nix b/pkgs/development/ocaml-modules/github/default.nix index 28a5de55978c..102ee8fa1e63 100644 --- a/pkgs/development/ocaml-modules/github/default.nix +++ b/pkgs/development/ocaml-modules/github/default.nix @@ -11,14 +11,14 @@ stringext, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "github"; version = "4.5.1"; src = fetchFromGitHub { owner = "mirage"; repo = "ocaml-github"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-nxHXOdZAvFe5/lKNw7tTJmY86xzfdFT+fW+lnKioyPM="; }; @@ -40,4 +40,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ niols ]; }; -} +}) From d37761e92d2c08b48036120966af8d682e1286ac Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:43 -0600 Subject: [PATCH 153/260] ocamlPackages.gitlab: migrate to finalAttrs --- pkgs/development/ocaml-modules/gitlab/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/gitlab/default.nix b/pkgs/development/ocaml-modules/gitlab/default.nix index 3f0255d29ec0..c2f57e351a67 100644 --- a/pkgs/development/ocaml-modules/gitlab/default.nix +++ b/pkgs/development/ocaml-modules/gitlab/default.nix @@ -11,14 +11,14 @@ stringext, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gitlab"; version = "0.1.8"; src = fetchFromGitHub { owner = "tmcgilchrist"; repo = "ocaml-gitlab"; - rev = version; + rev = finalAttrs.version; hash = "sha256-7pUpH1SoP4eW8ild5j+Tcy+aTXq0+eSkhKUOXJ6Z30k="; }; @@ -46,7 +46,7 @@ buildDunePackage rec { homepage = "https://github.com/tmcgilchrist/ocaml-gitlab"; description = "Native OCaml bindings to Gitlab REST API v4"; license = lib.licenses.bsd3; - changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${version}"; + changelog = "https://github.com/tmcgilchrist/ocaml-gitlab/releases/tag/${finalAttrs.version}"; maintainers = with lib.maintainers; [ zazedd ]; }; -} +}) From a1e2a3b104157e6b5a2fca82c20202d31356119f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:44 -0600 Subject: [PATCH 154/260] ocamlPackages.gluon: migrate to finalAttrs --- pkgs/development/ocaml-modules/gluon/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/gluon/default.nix b/pkgs/development/ocaml-modules/gluon/default.nix index 9bc4408c28ab..49daf0af5034 100644 --- a/pkgs/development/ocaml-modules/gluon/default.nix +++ b/pkgs/development/ocaml-modules/gluon/default.nix @@ -10,14 +10,14 @@ uri, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gluon"; version = "0.0.9"; minimalOCamlVersion = "5.1"; src = fetchurl { - url = "https://github.com/riot-ml/gluon/releases/download/${version}/gluon-${version}.tbz"; + url = "https://github.com/riot-ml/gluon/releases/download/${finalAttrs.version}/gluon-${finalAttrs.version}.tbz"; hash = "sha256-YWJCPokY1A7TGqCGoxJl14oKDVeMNybEEB7KiK92WSo="; }; @@ -40,8 +40,8 @@ buildDunePackage rec { meta = { description = "Minimal, portable, and fast API on top of the operating-system's evented I/O API"; homepage = "https://github.com/riot-ml/gluon"; - changelog = "https://github.com/riot-ml/gluon/blob/${version}/CHANGES.md"; + changelog = "https://github.com/riot-ml/gluon/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From a06da2fa62082accad29a7c0cba424e942ac055d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:44 -0600 Subject: [PATCH 155/260] ocamlPackages.gluten: migrate to finalAttrs --- pkgs/development/ocaml-modules/gluten/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gluten/default.nix b/pkgs/development/ocaml-modules/gluten/default.nix index 689c7a05f659..17f5e2d12c5f 100644 --- a/pkgs/development/ocaml-modules/gluten/default.nix +++ b/pkgs/development/ocaml-modules/gluten/default.nix @@ -6,12 +6,12 @@ lib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gluten"; version = "0.5.2"; src = fetchurl { - url = "https://github.com/anmonteiro/gluten/releases/download/${version}/gluten-${version}.tbz"; + url = "https://github.com/anmonteiro/gluten/releases/download/${finalAttrs.version}/gluten-${finalAttrs.version}.tbz"; hash = "sha256-se7Yn59ggLtL0onMjSUsa88B8D05Vybmb6YGcgfnAV8="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { homepage = "https://github.com/anmonteiro/gluten"; maintainers = with lib.maintainers; [ anmonteiro ]; }; -} +}) From 9240dde9c0e7b63f30f3964f9e31d23246222d1f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:45 -0600 Subject: [PATCH 156/260] ocamlPackages.gmap: migrate to finalAttrs --- pkgs/development/ocaml-modules/gmap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gmap/default.nix b/pkgs/development/ocaml-modules/gmap/default.nix index 5b5fc7ecafff..23a9294185d5 100644 --- a/pkgs/development/ocaml-modules/gmap/default.nix +++ b/pkgs/development/ocaml-modules/gmap/default.nix @@ -7,14 +7,14 @@ fmt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gmap"; version = "0.3.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/hannesm/gmap/releases/download/${version}/gmap-${version}.tbz"; + url = "https://github.com/hannesm/gmap/releases/download/${finalAttrs.version}/gmap-${finalAttrs.version}.tbz"; sha256 = "073wa0lrb0jj706j87cwzf1a8d1ff14100mnrjs8z3xc4ri9xp84"; }; @@ -33,4 +33,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 894230db30a963d073c1e8332f2f250a60aec757 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:45 -0600 Subject: [PATCH 157/260] ocamlPackages.graphql-cohttp: migrate to finalAttrs --- pkgs/development/ocaml-modules/graphql/cohttp.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/graphql/cohttp.nix b/pkgs/development/ocaml-modules/graphql/cohttp.nix index c60745b23cd3..cd326bdde201 100644 --- a/pkgs/development/ocaml-modules/graphql/cohttp.nix +++ b/pkgs/development/ocaml-modules/graphql/cohttp.nix @@ -12,7 +12,7 @@ graphql-lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "graphql-cohttp"; inherit (graphql) version src; @@ -28,7 +28,7 @@ buildDunePackage rec { ocplib-endian ]; - checkInputs = lib.optionals doCheck [ + checkInputs = lib.optionals finalAttrs.doCheck [ alcotest cohttp-lwt-unix graphql-lwt @@ -45,4 +45,4 @@ buildDunePackage rec { description = "Run GraphQL servers with “cohttp”"; }; -} +}) From dfa9e59dd366bba6655e18713c1d5c8ca19d7a1e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:46 -0600 Subject: [PATCH 158/260] ocamlPackages.graphql: migrate to finalAttrs --- pkgs/development/ocaml-modules/graphql/parser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/graphql/parser.nix b/pkgs/development/ocaml-modules/graphql/parser.nix index 23fbd366f955..477c84004655 100644 --- a/pkgs/development/ocaml-modules/graphql/parser.nix +++ b/pkgs/development/ocaml-modules/graphql/parser.nix @@ -8,7 +8,7 @@ re, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "graphql_parser"; version = "0.14.0"; @@ -16,7 +16,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${version}/graphql-${version}.tbz"; + url = "https://github.com/andreas/ocaml-graphql-server/releases/download/${finalAttrs.version}/graphql-${finalAttrs.version}.tbz"; sha256 = "sha256-v4v1ueF+NV7LvYIVinaf4rE450Z1P9OiMAito6/NHAY="; }; @@ -37,4 +37,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From af0617c7b9aacee57050399bd6d258fed535bd72 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:46 -0600 Subject: [PATCH 159/260] ocamlPackages.gsl: migrate to finalAttrs --- pkgs/development/ocaml-modules/gsl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gsl/default.nix b/pkgs/development/ocaml-modules/gsl/default.nix index 5f30483439c6..c471a7680a7d 100644 --- a/pkgs/development/ocaml-modules/gsl/default.nix +++ b/pkgs/development/ocaml-modules/gsl/default.nix @@ -7,7 +7,7 @@ dune-configurator, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gsl"; version = "1.25.1"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "mmottl"; repo = "gsl-ocaml"; - rev = version; + rev = finalAttrs.version; hash = "sha256-h1jO2RheBBzxiBgig2yEPk4YyBaZxStt5f+KNZqHdBo="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From b363f01605540603d4a4279ec5ec83bb9372ee50 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:47 -0600 Subject: [PATCH 160/260] ocamlPackages.gstreamer: migrate to finalAttrs --- pkgs/development/ocaml-modules/gstreamer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/gstreamer/default.nix b/pkgs/development/ocaml-modules/gstreamer/default.nix index 14bf90552b7f..7f732905b60f 100644 --- a/pkgs/development/ocaml-modules/gstreamer/default.nix +++ b/pkgs/development/ocaml-modules/gstreamer/default.nix @@ -8,14 +8,14 @@ gst_all_1, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "gstreamer"; version = "0.3.1"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-gstreamer"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0y8xi1q0ld4hrk96bn6jfh9slyjrxmnlhm662ynacp3yzalp8jji"; }; @@ -40,4 +40,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From df88aab50e416a764d21c55f81d7a89289cbe651 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:48 -0600 Subject: [PATCH 161/260] ocamlPackages.hack_parallel: migrate to finalAttrs --- pkgs/development/ocaml-modules/hack_parallel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hack_parallel/default.nix b/pkgs/development/ocaml-modules/hack_parallel/default.nix index f7fb5ace45bc..34ca7bff9d31 100644 --- a/pkgs/development/ocaml-modules/hack_parallel/default.nix +++ b/pkgs/development/ocaml-modules/hack_parallel/default.nix @@ -7,7 +7,7 @@ pkg-config, sqlite, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hack_parallel"; version = "1.0.1"; minimalOCamlVersion = "4.08"; @@ -15,7 +15,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "rvantonder"; repo = "hack_parallel"; - rev = version; + rev = finalAttrs.version; sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629"; }; @@ -51,4 +51,4 @@ buildDunePackage rec { license = lib.licenses.mit; homepage = "https://github.com/rvantonder/hack_parallel"; }; -} +}) From 2b27ea54eabe640c3a25958febf121d6ae6f9f44 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:48 -0600 Subject: [PATCH 162/260] ocamlPackages.happy-eyeballs: migrate to finalAttrs --- pkgs/development/ocaml-modules/happy-eyeballs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix index 43df0a1cec74..e0686ed37fe3 100644 --- a/pkgs/development/ocaml-modules/happy-eyeballs/default.nix +++ b/pkgs/development/ocaml-modules/happy-eyeballs/default.nix @@ -9,14 +9,14 @@ logs, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "happy-eyeballs"; version = "2.0.1"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/roburio/happy-eyeballs/releases/download/v${version}/happy-eyeballs-${version}.tbz"; + url = "https://github.com/roburio/happy-eyeballs/releases/download/v${finalAttrs.version}/happy-eyeballs-${finalAttrs.version}.tbz"; hash = "sha256-slVFiDApMbqF4Yhh5hCjraeCNJbU1JoZXpU1VsNR0mk="; }; @@ -37,4 +37,4 @@ buildDunePackage rec { ulrikstrid ]; }; -} +}) From 4ec3c9ed2058e7835354f3cdb29a4005ed2ee6ab Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:49 -0600 Subject: [PATCH 163/260] ocamlPackages.hc: migrate to finalAttrs --- pkgs/development/ocaml-modules/hc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/hc/default.nix b/pkgs/development/ocaml-modules/hc/default.nix index 93c8e18ff2f7..32a578e505c7 100644 --- a/pkgs/development/ocaml-modules/hc/default.nix +++ b/pkgs/development/ocaml-modules/hc/default.nix @@ -4,7 +4,7 @@ fetchzip, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hc"; version = "0.5"; @@ -12,7 +12,7 @@ buildDunePackage rec { # upstream git server is misconfigured and cannot be cloned src = fetchzip { - url = "https://git.zapashcanon.fr/zapashcanon/hc/archive/${version}.tar.gz"; + url = "https://git.zapashcanon.fr/zapashcanon/hc/archive/${finalAttrs.version}.tar.gz"; hash = "sha256-oTomFi+e9aCgVpZ9EkxQ/dZz18cW2UcaV0ZIokeBoU0="; }; @@ -22,8 +22,8 @@ buildDunePackage rec { description = "Library for hash consing"; homepage = "https://ocaml.org/p/hc/"; downloadPage = "https://git.zapashcanon.fr/zapashcanon/hc"; - changelog = "https://git.zapashcanon.fr/zapashcanon/hc/src/tag/${version}/CHANGES.md"; + changelog = "https://git.zapashcanon.fr/zapashcanon/hc/src/tag/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = [ lib.maintainers.ethancedwards8 ]; }; -} +}) From 8ff305985bdd4a0da5aca9bccbbc7d4dbf5b17cf Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:49 -0600 Subject: [PATCH 164/260] ocamlPackages.hex: migrate to finalAttrs --- pkgs/development/ocaml-modules/hex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 1d7850b96b03..b6cc694d578c 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -5,7 +5,7 @@ cstruct, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hex"; version = "1.5.0"; @@ -13,7 +13,7 @@ buildDunePackage rec { minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/hex-${version}.tbz"; + url = "https://github.com/mirage/ocaml-hex/releases/download/v${finalAttrs.version}/hex-${finalAttrs.version}.tbz"; hash = "sha256-LmfuyhsDBJMHowgxtc1pS8stPn8qa0+1l/vbZHNRtNw="; }; @@ -26,4 +26,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From f65e7c62d7e65f9aa4a22f8a1ca107fba22fdbcc Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:50 -0600 Subject: [PATCH 165/260] ocamlPackages.hidapi: migrate to finalAttrs --- pkgs/development/ocaml-modules/hidapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix index 38e6d503b866..206ecaa86239 100644 --- a/pkgs/development/ocaml-modules/hidapi/default.nix +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -8,7 +8,7 @@ bigstring, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hidapi"; version = "1.2.1"; @@ -17,7 +17,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "vbmithr"; repo = "ocaml-hidapi"; - rev = version; + rev = finalAttrs.version; hash = "sha256-upygm5G46C65lxaiI6kBOzLrWxzW9qWb6efN/t58SRg="; }; @@ -39,4 +39,4 @@ buildDunePackage rec { maintainers = [ ]; mainProgram = "ocaml-hid-enumerate"; }; -} +}) From 272b19374df98c932c31d0d5c464b1b78dca0ecb Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:51 -0600 Subject: [PATCH 166/260] ocamlPackages.higlo: migrate to finalAttrs --- pkgs/development/ocaml-modules/higlo/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index f806dbb0be22..167cdf6ac5a1 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -6,7 +6,7 @@ xtmpl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "higlo"; version = "0.10.0"; @@ -14,7 +14,7 @@ buildDunePackage rec { domain = "framagit.org"; owner = "zoggy"; repo = "higlo"; - rev = version; + rev = finalAttrs.version; hash = "sha256-A5Su4+eBOq/WNdY/3EBQ3KqrRQuaCI1x25cEuoZp4Mo="; }; @@ -25,8 +25,8 @@ buildDunePackage rec { meta = { description = "OCaml library for syntax highlighting"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ regnat ]; }; -} +}) From d40c18f3116f2860be927812cc6acc332f5651fc Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:51 -0600 Subject: [PATCH 167/260] ocamlPackages.hkdf: migrate to finalAttrs --- pkgs/development/ocaml-modules/hkdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hkdf/default.nix b/pkgs/development/ocaml-modules/hkdf/default.nix index 095b88d91af3..57374d290587 100644 --- a/pkgs/development/ocaml-modules/hkdf/default.nix +++ b/pkgs/development/ocaml-modules/hkdf/default.nix @@ -7,14 +7,14 @@ ohex, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hkdf"; version = "2.0.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/hannesm/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/hannesm/ocaml-hkdf/releases/download/v${finalAttrs.version}/hkdf-${finalAttrs.version}.tbz"; hash = "sha256-VLBxJ5viTTn1nK0QNIAGq/8961x0/RGHZN/C/7ITWNM="; }; @@ -31,4 +31,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ sternenseemann ]; }; -} +}) From 22633701792fe54749ad658a7649d4d07fab8611 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:52 -0600 Subject: [PATCH 168/260] ocamlPackages.hpack: migrate to finalAttrs --- pkgs/development/ocaml-modules/hpack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hpack/default.nix b/pkgs/development/ocaml-modules/hpack/default.nix index 8a865415e338..ed0863275241 100644 --- a/pkgs/development/ocaml-modules/hpack/default.nix +++ b/pkgs/development/ocaml-modules/hpack/default.nix @@ -6,12 +6,12 @@ faraday, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hpack"; version = "0.13.0"; src = fetchurl { - url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${version}/h2-${version}.tbz"; + url = "https://github.com/anmonteiro/ocaml-h2/releases/download/${finalAttrs.version}/h2-${finalAttrs.version}.tbz"; hash = "sha256-DYm28XgXUpTnogciO+gdW4P8Mbl1Sb7DTwQyo7KoBw8="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { anmonteiro ]; }; -} +}) From 208141a6f1d985767c099b070abbe08dfdadc875 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:52 -0600 Subject: [PATCH 169/260] ocamlPackages.httpaf: migrate to finalAttrs --- pkgs/development/ocaml-modules/httpaf/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/httpaf/default.nix b/pkgs/development/ocaml-modules/httpaf/default.nix index ec39fd662995..c42cc1c36178 100644 --- a/pkgs/development/ocaml-modules/httpaf/default.nix +++ b/pkgs/development/ocaml-modules/httpaf/default.nix @@ -8,7 +8,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "httpaf"; version = "0.7.1"; @@ -16,8 +16,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "inhabitedtype"; - repo = pname; - rev = version; + repo = "httpaf"; + rev = finalAttrs.version; sha256 = "0zk78af3qyvf6w66mg8sxygr6ndayzqw5s3zfxibvn121xwni26z"; }; @@ -33,6 +33,6 @@ buildDunePackage rec { description = "High-performance, memory-efficient, and scalable web server for OCaml"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) From a29f846146f5ca7caf280fadb0c74cd0f53311d1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:53 -0600 Subject: [PATCH 170/260] ocamlPackages.httpun-ws: migrate to finalAttrs --- pkgs/development/ocaml-modules/httpun-ws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/httpun-ws/default.nix b/pkgs/development/ocaml-modules/httpun-ws/default.nix index 0e199d7168e7..7cea73e84fb8 100644 --- a/pkgs/development/ocaml-modules/httpun-ws/default.nix +++ b/pkgs/development/ocaml-modules/httpun-ws/default.nix @@ -11,12 +11,12 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "httpun-ws"; version = "0.2.0"; src = fetchurl { - url = "https://github.com/anmonteiro/httpun-ws/releases/download/${version}/httpun-ws-${version}.tbz"; + url = "https://github.com/anmonteiro/httpun-ws/releases/download/${finalAttrs.version}/httpun-ws-${finalAttrs.version}.tbz"; hash = "sha256-6uDNLg61tPyctthitxFqbw/IUDsuQ5BGvw5vTLLCl/0="; }; @@ -38,4 +38,4 @@ buildDunePackage rec { homepage = "https://github.com/anmonteiro/httpun-ws"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 45883af4e880b16297d4dcef6eae8c88accced79 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:54 -0600 Subject: [PATCH 171/260] ocamlPackages.httpun: migrate to finalAttrs --- pkgs/development/ocaml-modules/httpun/types.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/httpun/types.nix b/pkgs/development/ocaml-modules/httpun/types.nix index 260903504967..3d3584e92da9 100644 --- a/pkgs/development/ocaml-modules/httpun/types.nix +++ b/pkgs/development/ocaml-modules/httpun/types.nix @@ -5,12 +5,12 @@ faraday, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "httpun-types"; version = "0.2.0"; src = fetchurl { - url = "https://github.com/anmonteiro/httpun/releases/download/${version}/httpun-${version}.tbz"; + url = "https://github.com/anmonteiro/httpun/releases/download/${finalAttrs.version}/httpun-${finalAttrs.version}.tbz"; hash = "sha256-os4n70yFro4cEAjR49Xok9ayEbk0WGod0pQvfbaHvSw="; }; @@ -22,4 +22,4 @@ buildDunePackage rec { license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 118bd50e6e655a210c66f5d59d0548dea5538dde Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:54 -0600 Subject: [PATCH 172/260] ocamlPackages.hxd: migrate to finalAttrs --- pkgs/development/ocaml-modules/hxd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hxd/default.nix b/pkgs/development/ocaml-modules/hxd/default.nix index 343c757db5cc..9d965c50a226 100644 --- a/pkgs/development/ocaml-modules/hxd/default.nix +++ b/pkgs/development/ocaml-modules/hxd/default.nix @@ -8,14 +8,14 @@ withLwt ? true, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "hxd"; version = "0.4.0"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/dinosaure/hxd/releases/download/v${version}/hxd-${version}.tbz"; + url = "https://github.com/dinosaure/hxd/releases/download/v${finalAttrs.version}/hxd-${finalAttrs.version}.tbz"; sha256 = "sha256-EAMLciahdQRHGAmtWvwMIAchJkxcbdPVldJIBApxgFg="; }; @@ -39,4 +39,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.sternenseemann ]; mainProgram = "hxd.xxd"; }; -} +}) From 607371604eeaae450c4f721f162be94e0903145d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:55 -0600 Subject: [PATCH 173/260] ocamlPackages.imagelib: migrate to finalAttrs --- pkgs/development/ocaml-modules/imagelib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/imagelib/default.nix b/pkgs/development/ocaml-modules/imagelib/default.nix index d63ea0cd4dc5..7d7f7dec3b51 100644 --- a/pkgs/development/ocaml-modules/imagelib/default.nix +++ b/pkgs/development/ocaml-modules/imagelib/default.nix @@ -7,7 +7,7 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { minimalOCamlVersion = "4.08"; version = "20221222"; pname = "imagelib"; @@ -15,7 +15,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${version}/imagelib-${version}.tbz"; + url = "https://github.com/rlepigre/ocaml-imagelib/releases/download/${finalAttrs.version}/imagelib-${finalAttrs.version}.tbz"; hash = "sha256-BQ2TVxGlpc6temteK84TKXpx0MtHZSykL/TjKN9xGP0="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; mainProgram = "imagetool"; }; -} +}) From 744484752681a0382a3f7e22f481676518d447bb Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:55 -0600 Subject: [PATCH 174/260] ocamlPackages.index: migrate to finalAttrs --- pkgs/development/ocaml-modules/index/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/index/default.nix b/pkgs/development/ocaml-modules/index/default.nix index 6fcf7bcf639f..0425601f4bbf 100644 --- a/pkgs/development/ocaml-modules/index/default.nix +++ b/pkgs/development/ocaml-modules/index/default.nix @@ -19,12 +19,12 @@ lru, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "index"; version = "1.6.2"; src = fetchurl { - url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz"; + url = "https://github.com/mirage/index/releases/download/${finalAttrs.version}/index-${finalAttrs.version}.tbz"; hash = "sha256-k4iDUJik7UTuztBw7YaFXASd8SqYMR1JgLm3JOyriGA="; }; @@ -73,4 +73,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 5710219cbc63e897e1a23abb158d3529df44767d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:56 -0600 Subject: [PATCH 175/260] ocamlPackages.inotify: migrate to finalAttrs --- pkgs/development/ocaml-modules/inotify/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/inotify/default.nix b/pkgs/development/ocaml-modules/inotify/default.nix index 900f60e7c774..d8d01a0614f1 100644 --- a/pkgs/development/ocaml-modules/inotify/default.nix +++ b/pkgs/development/ocaml-modules/inotify/default.nix @@ -7,14 +7,14 @@ fileutils, # only for tests }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "2.6"; pname = "inotify"; src = fetchFromGitHub { owner = "whitequark"; repo = "ocaml-inotify"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-Vg9uVIx6/OMS1WoJIHwZbSt5ZyFy+Xgw5167FJWGslg="; }; @@ -31,7 +31,7 @@ buildDunePackage rec { description = "Bindings for Linux’s filesystem monitoring interface, inotify"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; platforms = lib.platforms.linux; }; -} +}) From dc3698d7e2bb3d0c1c09f69e5b081cd456d3f558 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:57 -0600 Subject: [PATCH 176/260] ocamlPackages.integers: migrate to finalAttrs --- pkgs/development/ocaml-modules/integers/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index 104438eeab50..ffcbd6fb3130 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -5,14 +5,14 @@ stdlib-shims, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "integers"; version = "0.7.0"; src = fetchFromGitHub { owner = "ocamllabs"; repo = "ocaml-integers"; - rev = version; + rev = finalAttrs.version; sha256 = "sha256-zuUgP1jOiVT0q6GisGpkqx7nybWbARgnAcU8NYqvCzA="; }; @@ -22,7 +22,7 @@ buildDunePackage rec { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; homepage = "https://github.com/ocamllabs/ocaml-integers"; - changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${version}/CHANGES.md"; + changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${finalAttrs.version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 4637d8eafa4d0410a4c9573ada3a1c2271a7bf63 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:57 -0600 Subject: [PATCH 177/260] ocamlPackages.integers_stubs_js: migrate to finalAttrs --- .../ocaml-modules/integers_stubs_js/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix index 1ab3dbb25407..6456e37ec3b7 100644 --- a/pkgs/development/ocaml-modules/integers_stubs_js/default.nix +++ b/pkgs/development/ocaml-modules/integers_stubs_js/default.nix @@ -5,7 +5,7 @@ zarith_stubs_js ? null, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "integers_stubs_js"; version = "1.0"; @@ -14,8 +14,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "o1-labs"; - repo = pname; - rev = version; + repo = "integers_stubs_js"; + rev = finalAttrs.version; sha256 = "sha256-lg5cX9/LQlVmR42XcI17b6KaatnFO2L9A9ZXfID8mTY="; }; @@ -26,6 +26,6 @@ buildDunePackage rec { description = "Javascript stubs for the integers library in js_of_ocaml"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bezmuth ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) From 755e3b65d04e30b6aa95f98dc5084037461dfdae Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:58 -0600 Subject: [PATCH 178/260] ocamlPackages.io-page: migrate to finalAttrs --- pkgs/development/ocaml-modules/io-page/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index 7860ecd68154..4da13c8470ce 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -8,7 +8,7 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "io-page"; version = "3.0.0"; @@ -16,7 +16,7 @@ buildDunePackage rec { duneVersion = "3"; src = fetchurl { - url = "https://github.com/mirage/${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/mirage/io-page/releases/download/v${finalAttrs.version}/io-page-${finalAttrs.version}.tbz"; hash = "sha256-DjbKdNkFa6YQgJDLmLsuvyrweb4/TNvqAiggcj/3hu4="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { description = "IO memory page library for Mirage backends"; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From 5669c1de399d6bdc23dfea5a505fad40668e8f69 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:58 -0600 Subject: [PATCH 179/260] ocamlPackages.iomux: migrate to finalAttrs --- pkgs/development/ocaml-modules/iomux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/iomux/default.nix b/pkgs/development/ocaml-modules/iomux/default.nix index 25b7c07ddad8..6f4535e3ec7f 100644 --- a/pkgs/development/ocaml-modules/iomux/default.nix +++ b/pkgs/development/ocaml-modules/iomux/default.nix @@ -6,14 +6,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "iomux"; version = "0.4"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/haesbaert/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/haesbaert/ocaml-iomux/releases/download/v${finalAttrs.version}/iomux-${finalAttrs.version}.tbz"; hash = "sha256-Hjk/rlWUdoSMXHBSUHaxEHDoBqVJ7rrghLBGqXcrqzU="; }; @@ -26,9 +26,9 @@ buildDunePackage rec { ]; meta = { - homepage = "https://github.com/haesbaert/ocaml-${pname}"; + homepage = "https://github.com/haesbaert/ocaml-iomux"; description = "IO Multiplexers for OCaml"; license = with lib.licenses; [ isc ]; maintainers = with lib.maintainers; [ toastal ]; }; -} +}) From a29c8d9f73fecaed36df0f9c40ff1a30ac33aac1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:59 -0600 Subject: [PATCH 180/260] ocamlPackages.iri: migrate to finalAttrs --- pkgs/development/ocaml-modules/iri/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/iri/default.nix b/pkgs/development/ocaml-modules/iri/default.nix index 106e62e630b0..49dfc5d5b2b5 100644 --- a/pkgs/development/ocaml-modules/iri/default.nix +++ b/pkgs/development/ocaml-modules/iri/default.nix @@ -7,7 +7,7 @@ uutf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "iri"; version = "1.1.0"; @@ -17,7 +17,7 @@ buildDunePackage rec { domain = "framagit.org"; owner = "zoggy"; repo = "ocaml-iri"; - rev = version; + rev = finalAttrs.version; hash = "sha256-fh5+0CWplDdGXCotZL2UzjOGil2LR4NppttaquO/ndE="; }; @@ -31,6 +31,6 @@ buildDunePackage rec { description = "IRI (RFC3987) native OCaml implementation"; license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) From dc23a702312837eacb08566649f4a5750e46ece1 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:13:59 -0600 Subject: [PATCH 181/260] ocamlPackages.irmin: migrate to finalAttrs --- pkgs/development/ocaml-modules/irmin/ppx.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/irmin/ppx.nix b/pkgs/development/ocaml-modules/irmin/ppx.nix index 49c6033695be..7e602b2408dd 100644 --- a/pkgs/development/ocaml-modules/irmin/ppx.nix +++ b/pkgs/development/ocaml-modules/irmin/ppx.nix @@ -7,12 +7,12 @@ logs, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ppx_irmin"; version = "3.11.0"; src = fetchurl { - url = "https://github.com/mirage/irmin/releases/download/${version}/irmin-${version}.tbz"; + url = "https://github.com/mirage/irmin/releases/download/${finalAttrs.version}/irmin-${finalAttrs.version}.tbz"; hash = "sha256-CZlvvMLEPhF6m9jpAoxjXoHMyyZNXgLUJauLBrus29s="; }; @@ -33,4 +33,4 @@ buildDunePackage rec { sternenseemann ]; }; -} +}) From 856d04eef953da7405623b259248fd092e8d599d Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:00 -0600 Subject: [PATCH 182/260] ocamlPackages.iter: migrate to finalAttrs --- pkgs/development/ocaml-modules/iter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 5ad0a1e1e32d..ed1f44a3b0fc 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -7,14 +7,14 @@ qcheck-core, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "iter"; version = "1.9"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/c-cube/iter/releases/download/v${version}/iter-${version}.tbz"; + url = "https://github.com/c-cube/iter/releases/download/v${finalAttrs.version}/iter-${finalAttrs.version}.tbz"; hash = "sha256-26nluxUuDQ2wBUw2sqlHZ0eihKdzjxXxGVo+IDXH6Wg="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { ''; license = lib.licenses.bsd2; }; -} +}) From 1b2516b9229a24fead168b275f3a43c56d54086b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:01 -0600 Subject: [PATCH 183/260] ocamlPackages.jose: migrate to finalAttrs --- pkgs/development/ocaml-modules/jose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/jose/default.nix b/pkgs/development/ocaml-modules/jose/default.nix index 6e6a59e0dbe5..a32201228299 100644 --- a/pkgs/development/ocaml-modules/jose/default.nix +++ b/pkgs/development/ocaml-modules/jose/default.nix @@ -11,12 +11,12 @@ zarith, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "jose"; version = "0.10.0"; src = fetchurl { - url = "https://github.com/ulrikstrid/ocaml-jose/releases/download/v${version}/${pname}-${version}.tbz"; + url = "https://github.com/ulrikstrid/ocaml-jose/releases/download/v${finalAttrs.version}/jose-${finalAttrs.version}.tbz"; hash = "sha256-F6Odq5JXTkAxdqV3HQusoF+9rvt4BZytslKnsIjJLI8="; }; @@ -44,4 +44,4 @@ buildDunePackage rec { marijanp ]; }; -} +}) From ffdb7651ed420a29c3027ff18c816c76b79d2964 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:02 -0600 Subject: [PATCH 184/260] ocamlPackages.json-data-encoding: migrate to finalAttrs --- .../ocaml-modules/json-data-encoding/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/json-data-encoding/default.nix b/pkgs/development/ocaml-modules/json-data-encoding/default.nix index 3c21d451d81b..7540cca08982 100644 --- a/pkgs/development/ocaml-modules/json-data-encoding/default.nix +++ b/pkgs/development/ocaml-modules/json-data-encoding/default.nix @@ -6,14 +6,14 @@ uri, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "json-data-encoding"; version = "1.0.1"; minimalOCamlVersion = "4.10"; src = fetchFromGitLab { owner = "nomadic-labs"; repo = "data-encoding"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-KoA4xX4tNyi6bX5kso/Wof1LA7431EXJ34eD5X4jnd8="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From b8e16f46e5838a4d9c929d3909101953fc6d525c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:02 -0600 Subject: [PATCH 185/260] ocamlPackages.junit: migrate to finalAttrs --- pkgs/development/ocaml-modules/junit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix index 59a6404ecac9..aaae36cf8d10 100644 --- a/pkgs/development/ocaml-modules/junit/default.nix +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -6,12 +6,12 @@ tyxml, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "junit"; version = "2.3.0"; src = fetchurl { - url = "https://github.com/Khady/ocaml-junit/releases/download/${version}/junit-${version}.tbz"; + url = "https://github.com/Khady/ocaml-junit/releases/download/${finalAttrs.version}/junit-${finalAttrs.version}.tbz"; hash = "sha256-j+4lfuQEWq8z8ik/zfA5phWqv8km+tGEzqG/63cbhTM="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { maintainers = [ ]; homepage = "https://github.com/Khady/ocaml-junit"; }; -} +}) From 07d10aee7878624ea6eb9198d5ca557e8797c7b3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:03 -0600 Subject: [PATCH 186/260] ocamlPackages.jwto: migrate to finalAttrs --- pkgs/development/ocaml-modules/jwto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/jwto/default.nix b/pkgs/development/ocaml-modules/jwto/default.nix index 6c73b06213ac..5645ff5e8369 100644 --- a/pkgs/development/ocaml-modules/jwto/default.nix +++ b/pkgs/development/ocaml-modules/jwto/default.nix @@ -12,7 +12,7 @@ ppx_deriving, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "jwto"; version = "0.4.0"; @@ -23,7 +23,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "sporto"; repo = "jwto"; - rev = version; + rev = finalAttrs.version; hash = "sha256-TOWwNyrOqboCm8Y4mM6GgtmxGO3NmyDdAX7m8CifA7Y="; }; @@ -51,4 +51,4 @@ buildDunePackage rec { jtcoolen ]; }; -} +}) From c273b87d0d23cfefdc406d4b9e31543291242a02 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:04 -0600 Subject: [PATCH 187/260] ocamlPackages.kafka: migrate to finalAttrs --- pkgs/development/ocaml-modules/kafka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index eb39fcba38e4..d855161cd59e 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -7,12 +7,12 @@ zlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "kafka"; version = "0.5"; src = fetchurl { - url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz"; + url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${finalAttrs.version}/kafka-${finalAttrs.version}.tbz"; sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy"; }; @@ -28,4 +28,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; broken = lib.versionAtLeast ocaml.version "5.0"; }; -} +}) From b998e69227c75e5895a3b86880d84dad4f690266 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:04 -0600 Subject: [PATCH 188/260] ocamlPackages.kcas: migrate to finalAttrs --- pkgs/development/ocaml-modules/kcas/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/kcas/default.nix b/pkgs/development/ocaml-modules/kcas/default.nix index 35a54b7a0cb3..c2e01340021f 100644 --- a/pkgs/development/ocaml-modules/kcas/default.nix +++ b/pkgs/development/ocaml-modules/kcas/default.nix @@ -12,12 +12,12 @@ mdx, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "kcas"; version = "0.7.0"; src = fetchurl { - url = "https://github.com/ocaml-multicore/kcas/releases/download/${version}/kcas-${version}.tbz"; + url = "https://github.com/ocaml-multicore/kcas/releases/download/${finalAttrs.version}/kcas-${finalAttrs.version}.tbz"; hash = "sha256-mo/otnkB79QdyVgLw1sZFfkR/Z/l15cRVfEYPPd6H5E="; }; @@ -42,8 +42,8 @@ buildDunePackage rec { longDescription = '' A software transactional memory (STM) implementation based on an atomic lock-free multi-word compare-and-set (MCAS) algorithm enhanced with read-only compare operations and ability to block awaiting for changes. ''; - changelog = "https://raw.githubusercontent.com/ocaml-multicore/kcas/refs/tags/${version}/CHANGES.md"; + changelog = "https://raw.githubusercontent.com/ocaml-multicore/kcas/refs/tags/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 49612f26bb1964dbf1bef9a7f0193c070a10e937 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:05 -0600 Subject: [PATCH 189/260] ocamlPackages.kdf: migrate to finalAttrs --- pkgs/development/ocaml-modules/kdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/kdf/default.nix b/pkgs/development/ocaml-modules/kdf/default.nix index cb5c091e3d77..6f3f762e7049 100644 --- a/pkgs/development/ocaml-modules/kdf/default.nix +++ b/pkgs/development/ocaml-modules/kdf/default.nix @@ -8,12 +8,12 @@ ohex, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "kdf"; version = "1.0.0"; src = fetchurl { - url = "https://github.com/robur-coop/kdf/releases/download/v${version}/kdf-${version}.tbz"; + url = "https://github.com/robur-coop/kdf/releases/download/v${finalAttrs.version}/kdf-${finalAttrs.version}.tbz"; hash = "sha256-0WFYKw7+ZtlY3WuMnCEGjp9kVM4hg3fWz4eCPexi4M4="; }; @@ -34,4 +34,4 @@ buildDunePackage rec { license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From f08e44bd8a53c8bd07c18426b49a53078dac7c1c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:05 -0600 Subject: [PATCH 190/260] ocamlPackages.kdl: migrate to finalAttrs --- pkgs/development/ocaml-modules/kdl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/kdl/default.nix b/pkgs/development/ocaml-modules/kdl/default.nix index bd30bc8c8747..cb6c926c21a1 100644 --- a/pkgs/development/ocaml-modules/kdl/default.nix +++ b/pkgs/development/ocaml-modules/kdl/default.nix @@ -9,7 +9,7 @@ zarith, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "kdl"; version = "0.2.0"; @@ -34,7 +34,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "eilvelia"; repo = "ocaml-kdl"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-0MiJe0XbWAlS2NvGxLplsgVfCNaA/7iCMx4+F+6FAtM="; }; @@ -44,4 +44,4 @@ buildDunePackage rec { maintainers = with lib.maintainers; [ toastal ]; homepage = "https://github.com/eilvelia/ocaml-kdl"; }; -} +}) From edf3c80a1a7dc4cb0ab5158bac0a32a58283c1ea Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:06 -0600 Subject: [PATCH 191/260] ocamlPackages.ke: migrate to finalAttrs --- pkgs/development/ocaml-modules/ke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/ke/default.nix b/pkgs/development/ocaml-modules/ke/default.nix index 14b984f4b811..21a8536afd51 100644 --- a/pkgs/development/ocaml-modules/ke/default.nix +++ b/pkgs/development/ocaml-modules/ke/default.nix @@ -7,12 +7,12 @@ bigstringaf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "ke"; version = "0.6"; src = fetchurl { - url = "https://github.com/mirage/ke/releases/download/v${version}/ke-${version}.tbz"; + url = "https://github.com/mirage/ke/releases/download/v${finalAttrs.version}/ke-${finalAttrs.version}.tbz"; sha256 = "sha256-YSFyB+IgCwSxd1lzZhD/kggmmmR/hUy1rnLNrA1nIwU="; }; @@ -33,4 +33,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 7b869043f446e887adf40f48648014c1d0ddd419 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:07 -0600 Subject: [PATCH 192/260] ocamlPackages.kicadsch: migrate to finalAttrs --- pkgs/development/ocaml-modules/kicadsch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/kicadsch/default.nix b/pkgs/development/ocaml-modules/kicadsch/default.nix index 92066bf56ed9..79c6cefa5c57 100644 --- a/pkgs/development/ocaml-modules/kicadsch/default.nix +++ b/pkgs/development/ocaml-modules/kicadsch/default.nix @@ -4,14 +4,14 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "kicadsch"; version = "0.9.0"; minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/jnavila/plotkicadsch/releases/download/v${version}/plotkicadsch-${version}.tbz"; + url = "https://github.com/jnavila/plotkicadsch/releases/download/v${finalAttrs.version}/plotkicadsch-${finalAttrs.version}.tbz"; sha256 = "sha256-B+vnEPyd3SUzviTdNoyvYk0p7Hrg/XTJm8KxsY8A4jQ="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ leungbk ]; }; -} +}) From 7cab79975341d4351a52a51daa533a8ad1c3dafa Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:07 -0600 Subject: [PATCH 193/260] ocamlPackages.kqueue: migrate to finalAttrs --- pkgs/development/ocaml-modules/kqueue/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/kqueue/default.nix b/pkgs/development/ocaml-modules/kqueue/default.nix index 07d4921b704c..768e8ae25746 100644 --- a/pkgs/development/ocaml-modules/kqueue/default.nix +++ b/pkgs/development/ocaml-modules/kqueue/default.nix @@ -7,14 +7,14 @@ ppx_optcomp, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "kqueue"; version = "0.4.0"; minimalOCamlVersion = "4.12"; src = fetchurl { - url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${version}/kqueue-${version}.tbz"; + url = "https://github.com/anuragsoni/kqueue-ml/releases/download/${finalAttrs.version}/kqueue-${finalAttrs.version}.tbz"; hash = "sha256-fJHhmAp0EFzR9JH93a+EHy1auwSBKZV/XcBQLCedJLc="; }; @@ -32,8 +32,8 @@ buildDunePackage rec { meta = { description = "OCaml bindings for kqueue event notification interface"; homepage = "https://github.com/anuragsoni/kqueue-ml"; - changelog = "https://github.com/anuragsoni/kqueue-ml/blob/${version}/CHANGES.md"; + changelog = "https://github.com/anuragsoni/kqueue-ml/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sixstring982 ]; }; -} +}) From a7eeb65fe023d6d7847a6e65dad43cfcd1e46ad8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:08 -0600 Subject: [PATCH 194/260] ocamlPackages.lablgtk3: migrate to finalAttrs --- pkgs/development/ocaml-modules/lablgtk3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk3/default.nix b/pkgs/development/ocaml-modules/lablgtk3/default.nix index 872da0e0d113..79aa69b65ae6 100644 --- a/pkgs/development/ocaml-modules/lablgtk3/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk3/default.nix @@ -9,14 +9,14 @@ camlp-streams, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { version = "3.1.5"; pname = "lablgtk3"; minimalOCamlVersion = "4.06"; src = fetchurl { - url = "https://github.com/garrigue/lablgtk/releases/download/${version}/lablgtk3-${version}.tbz"; + url = "https://github.com/garrigue/lablgtk/releases/download/${finalAttrs.version}/lablgtk3-${finalAttrs.version}.tbz"; hash = "sha256-1IIc2+zzrjdPIDF9Y+Q/5YAww7qWV7UaLoPmUhl+jqw="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From df0dd0a0983a19d1defb5a75f6b6a247e356ae0f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:08 -0600 Subject: [PATCH 195/260] ocamlPackages.lambdapi: migrate to finalAttrs --- pkgs/development/ocaml-modules/lambdapi/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambdapi/default.nix b/pkgs/development/ocaml-modules/lambdapi/default.nix index 0ec480007239..23d1053d963c 100644 --- a/pkgs/development/ocaml-modules/lambdapi/default.nix +++ b/pkgs/development/ocaml-modules/lambdapi/default.nix @@ -18,14 +18,14 @@ yojson, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lambdapi"; version = "3.0.0"; minimalOCamlVersion = "4.14"; src = fetchurl { - url = "https://github.com/Deducteam/lambdapi/releases/download/${version}/lambdapi-${version}.tbz"; + url = "https://github.com/Deducteam/lambdapi/releases/download/${finalAttrs.version}/lambdapi-${finalAttrs.version}.tbz"; hash = "sha256-EGau0mGP2OakAMUUfb9V6pd86NP+LlGKxnhcZ3WhuL4="; }; @@ -64,7 +64,7 @@ buildDunePackage rec { homepage = "https://github.com/Deducteam/lambdapi"; description = "Proof assistant based on the λΠ-calculus modulo rewriting"; license = lib.licenses.cecill21; - changelog = "https://github.com/Deducteam/lambdapi/raw/${version}/CHANGES.md"; + changelog = "https://github.com/Deducteam/lambdapi/raw/${finalAttrs.version}/CHANGES.md"; maintainers = with lib.maintainers; [ bcdarwin ]; }; -} +}) From bccc889a0f09e48a99396088e642e337aeb183dc Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:09 -0600 Subject: [PATCH 196/260] ocamlPackages.lambdasoup: migrate to finalAttrs --- pkgs/development/ocaml-modules/lambdasoup/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/lambdasoup/default.nix b/pkgs/development/ocaml-modules/lambdasoup/default.nix index ea4b3512c16d..63c1bf7a9131 100644 --- a/pkgs/development/ocaml-modules/lambdasoup/default.nix +++ b/pkgs/development/ocaml-modules/lambdasoup/default.nix @@ -8,7 +8,7 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lambdasoup"; version = "1.1.1"; @@ -16,8 +16,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "aantron"; - repo = pname; - rev = version; + repo = "lambdasoup"; + rev = finalAttrs.version; hash = "sha256-+d1JPU7OyQgt8pDTlwZraqPHH+OBQD1ycsELKpHT95Y="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From c4c08c9931a20d76c84d01582e2259495f2b13c4 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:10 -0600 Subject: [PATCH 197/260] ocamlPackages.lame: migrate to finalAttrs --- pkgs/development/ocaml-modules/lame/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lame/default.nix b/pkgs/development/ocaml-modules/lame/default.nix index f0db47138606..0e1c15c227f1 100644 --- a/pkgs/development/ocaml-modules/lame/default.nix +++ b/pkgs/development/ocaml-modules/lame/default.nix @@ -7,7 +7,7 @@ lame, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lame"; version = "0.3.7"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-lame"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-/ZzoGFQQrBf17TaBPSFDQ1yHaQnva56YLmscOacrKBI="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 5dd15df9873da25a645c57f1a2ebf120e6e79729 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:10 -0600 Subject: [PATCH 198/260] ocamlPackages.landmarks: migrate to finalAttrs --- pkgs/development/ocaml-modules/landmarks/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/landmarks/default.nix b/pkgs/development/ocaml-modules/landmarks/default.nix index 40375794fd0c..757417c82f23 100644 --- a/pkgs/development/ocaml-modules/landmarks/default.nix +++ b/pkgs/development/ocaml-modules/landmarks/default.nix @@ -5,7 +5,7 @@ ocaml, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "landmarks"; version = "1.5"; minimalOCamlVersion = "4.08"; @@ -13,14 +13,14 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "LexiFi"; repo = "landmarks"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-eIq02D19OzDOrMDHE1Ecrgk+T6s9vj2X6B2HY+z+K8Q="; }; doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder ocaml.version "5.0"; meta = { - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; description = "Simple Profiling Library for OCaml"; longDescription = '' Landmarks is a simple profiling library for OCaml. It provides @@ -28,8 +28,8 @@ buildDunePackage rec { instrumentation of the code may either done by hand, automatically or semi-automatically using the ppx pepreprocessor (see landmarks-ppx package). ''; - changelog = "https://raw.githubusercontent.com/LexiFi/landmarks/refs/tags/v${version}/CHANGES.md"; + changelog = "https://raw.githubusercontent.com/LexiFi/landmarks/refs/tags/v${finalAttrs.version}/CHANGES.md"; maintainers = with lib.maintainers; [ kenran ]; license = lib.licenses.mit; }; -} +}) From 811e56f6b3c8a595256533ddbc143f8ebc043657 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:11 -0600 Subject: [PATCH 199/260] ocamlPackages.lastfm: migrate to finalAttrs --- pkgs/development/ocaml-modules/lastfm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lastfm/default.nix b/pkgs/development/ocaml-modules/lastfm/default.nix index 88d23138d571..85d077a31758 100644 --- a/pkgs/development/ocaml-modules/lastfm/default.nix +++ b/pkgs/development/ocaml-modules/lastfm/default.nix @@ -6,7 +6,7 @@ xmlplaylist, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lastfm"; version = "0.3.4"; @@ -15,7 +15,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-lastfm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-1te9B2+sUmkT/i2K5ueswWAWpvJf9rXob0zR4CMOJlg="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 8cbc1fa865b0e6a4085c29167b73bd14b420e5ad Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:11 -0600 Subject: [PATCH 200/260] ocamlPackages.lens: migrate to finalAttrs --- pkgs/development/ocaml-modules/lens/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix index e0d1a0febd2a..a45e1c3074f4 100644 --- a/pkgs/development/ocaml-modules/lens/default.nix +++ b/pkgs/development/ocaml-modules/lens/default.nix @@ -7,7 +7,7 @@ ounit, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lens"; version = "1.2.5"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "pdonadeo"; repo = "ocaml-lens"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "1k23n7pa945fk6nbaq6nlkag5kg97wsw045ghz4gqp8b9i2im3vn"; }; @@ -37,4 +37,4 @@ buildDunePackage rec { kazcw ]; }; -} +}) From a5c0f24f161c75d802300172f857aa79f38e8af6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:12 -0600 Subject: [PATCH 201/260] ocamlPackages.letsencrypt: migrate to finalAttrs --- pkgs/development/ocaml-modules/letsencrypt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/letsencrypt/default.nix b/pkgs/development/ocaml-modules/letsencrypt/default.nix index dd61aa9373ff..0966928123fd 100644 --- a/pkgs/development/ocaml-modules/letsencrypt/default.nix +++ b/pkgs/development/ocaml-modules/letsencrypt/default.nix @@ -18,12 +18,12 @@ domain-name, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "letsencrypt"; version = "1.1.0"; src = fetchurl { - url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${version}/letsencrypt-${version}.tbz"; + url = "https://github.com/mmaker/ocaml-letsencrypt/releases/download/v${finalAttrs.version}/letsencrypt-${finalAttrs.version}.tbz"; hash = "sha256-Iw55GffyG5tWA49hao1z9BX6p4N2+EKuhLIoOwG8EKM="; }; @@ -57,4 +57,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.sternenseemann ]; homepage = "https://github.com/mmaker/ocaml-letsencrypt"; }; -} +}) From f3b04c66743257afe0839ac55783a2de56bab1c3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:13 -0600 Subject: [PATCH 202/260] ocamlPackages.libc: migrate to finalAttrs --- pkgs/development/ocaml-modules/libc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/libc/default.nix b/pkgs/development/ocaml-modules/libc/default.nix index cd2501325ab9..0d51c6101b1b 100644 --- a/pkgs/development/ocaml-modules/libc/default.nix +++ b/pkgs/development/ocaml-modules/libc/default.nix @@ -5,12 +5,12 @@ config, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "libc"; version = "0.0.1"; src = fetchurl { - url = "https://github.com/ocaml-sys/libc.ml/releases/download/${version}/libc-${version}.tbz"; + url = "https://github.com/ocaml-sys/libc.ml/releases/download/${finalAttrs.version}/libc-${finalAttrs.version}.tbz"; hash = "sha256-e5x5Yae7V6qOpq+aLZaV+6L9ldy9qDqd9Kc8nkAsENg="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { homepage = "https://github.com/ocaml-sys/libc.ml"; license = lib.licenses.mit; }; -} +}) From fbb1f576d32a9473478dea1332ed2b9e111ddf9f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:13 -0600 Subject: [PATCH 203/260] ocamlPackages.lilv: migrate to finalAttrs --- pkgs/development/ocaml-modules/lilv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lilv/default.nix b/pkgs/development/ocaml-modules/lilv/default.nix index dbb2d71c1aa3..8d17d5230bf0 100644 --- a/pkgs/development/ocaml-modules/lilv/default.nix +++ b/pkgs/development/ocaml-modules/lilv/default.nix @@ -8,14 +8,14 @@ lilv, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lilv"; version = "0.1.0"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-lilv"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "080ja8c4sxprk5qnldpfzxriag57m9603vny3b4bnwh5xm1id08c"; }; @@ -34,4 +34,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Only; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From ddbacd27ed3387438cc2411776b1a22b5ca8a227 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:14 -0600 Subject: [PATCH 204/260] ocamlPackages.linenoise: migrate to finalAttrs --- pkgs/development/ocaml-modules/linenoise/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index 05596866b070..2ee7401e59af 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -5,7 +5,7 @@ result, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "linenoise"; version = "1.5.1"; @@ -13,8 +13,8 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "fxfactorial"; - repo = "ocaml-${pname}"; - rev = "v${version}"; + repo = "ocaml-linenoise"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-yWBWMbk1anXaF4hIakTOcRZFCYmxI0xG3bHFFOAyEDA="; }; @@ -24,6 +24,6 @@ buildDunePackage rec { description = "OCaml bindings to linenoise"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; }; -} +}) From 1d9de6ec2096980f8b7fc20112e73ea1dbcadc2e Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:14 -0600 Subject: [PATCH 205/260] ocamlPackages.lo: migrate to finalAttrs --- pkgs/development/ocaml-modules/lo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lo/default.nix b/pkgs/development/ocaml-modules/lo/default.nix index f5ee5cfecc2d..3c5f33194cf8 100644 --- a/pkgs/development/ocaml-modules/lo/default.nix +++ b/pkgs/development/ocaml-modules/lo/default.nix @@ -7,7 +7,7 @@ liblo, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lo"; version = "0.2.0"; @@ -16,7 +16,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-lo"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "0mi8h6f6syxjkxz493l5c3l270pvxx33pz0k3v5465wqjsnppar2"; }; @@ -36,4 +36,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From 51bbe94fad853d6ca1764046141a569a1003bac6 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:15 -0600 Subject: [PATCH 206/260] ocamlPackages.lru: migrate to finalAttrs --- pkgs/development/ocaml-modules/lru/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lru/default.nix b/pkgs/development/ocaml-modules/lru/default.nix index 74bb6c07f524..710c855619f2 100644 --- a/pkgs/development/ocaml-modules/lru/default.nix +++ b/pkgs/development/ocaml-modules/lru/default.nix @@ -7,14 +7,14 @@ qcheck-alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lru"; version = "0.3.1"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz"; + url = "https://github.com/pqwy/lru/releases/download/v${finalAttrs.version}/lru-${finalAttrs.version}.tbz"; hash = "sha256-bL4j0np9WyRPhpwLiBQNR/cPQTpkYu81wACTJdSyNv0="; }; @@ -29,4 +29,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; license = lib.licenses.isc; }; -} +}) From e05f54e36c241d49269259386a7b664482009422 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:15 -0600 Subject: [PATCH 207/260] ocamlPackages.lua-ml: migrate to finalAttrs --- pkgs/development/ocaml-modules/lua-ml/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 45c0637e5de3..d358a7baf44e 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -3,7 +3,7 @@ fetchFromGitHub, buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lua-ml"; version = "0.9.4"; @@ -12,14 +12,14 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "lindig"; repo = "lua-ml"; - tag = version; + tag = finalAttrs.version; hash = "sha256-kMBTHzmlrRWNpWwG321jYcM61rE1J3YQkygSrfnZ6Wc="; }; meta = { description = "Embeddable Lua 2.5 interpreter implemented in OCaml"; - inherit (src.meta) homepage; + inherit (finalAttrs.src.meta) homepage; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From ec5e4a8503a3a13ab0b6c6fff48ba272f68520f2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:16 -0600 Subject: [PATCH 208/260] ocamlPackages.lun: migrate to finalAttrs --- pkgs/development/ocaml-modules/lun/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lun/default.nix b/pkgs/development/ocaml-modules/lun/default.nix index 4bf1820920b4..7e6c615f1663 100644 --- a/pkgs/development/ocaml-modules/lun/default.nix +++ b/pkgs/development/ocaml-modules/lun/default.nix @@ -4,14 +4,14 @@ fetchurl, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lun"; version = "0.0.2"; minimalOCamlVersion = "4.12.0"; src = fetchurl { - url = "https://github.com/robur-coop/lun/releases/download/v${version}/lun-${version}.tbz"; + url = "https://github.com/robur-coop/lun/releases/download/v${finalAttrs.version}/lun-${finalAttrs.version}.tbz"; hash = "sha256-1oqjTXY+/jJT1uQOV6iiK9qV9DAmERYsL2BtentmB8I="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ ]; }; -} +}) From 914064d1bcc110f7001e0994f1efd14ed710ad61 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:17 -0600 Subject: [PATCH 209/260] ocamlPackages.lustre-v6: migrate to finalAttrs --- pkgs/development/ocaml-modules/lustre-v6/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lustre-v6/default.nix b/pkgs/development/ocaml-modules/lustre-v6/default.nix index 0ec69ec356a8..1feee8346625 100644 --- a/pkgs/development/ocaml-modules/lustre-v6/default.nix +++ b/pkgs/development/ocaml-modules/lustre-v6/default.nix @@ -8,14 +8,14 @@ yaml, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lustre-v6"; version = "6.107.4"; minimalOCamlVersion = "4.12"; src = fetchurl { - url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${version}.tgz"; + url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lustre-v6.v${finalAttrs.version}.tgz"; hash = "sha256-baT5ZJtg5oFoJ5eHb3ISsmY6G31UG10KlNXC+ta+M1c="; }; @@ -36,4 +36,4 @@ buildDunePackage rec { ]; mainProgram = "lv6"; }; -} +}) From f7586a37de5512e34560ce55f6c9d143d7dc24ec Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:17 -0600 Subject: [PATCH 210/260] ocamlPackages.lutils: migrate to finalAttrs --- pkgs/development/ocaml-modules/lutils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/lutils/default.nix b/pkgs/development/ocaml-modules/lutils/default.nix index 318d209a91d1..7091ae899f44 100644 --- a/pkgs/development/ocaml-modules/lutils/default.nix +++ b/pkgs/development/ocaml-modules/lutils/default.nix @@ -6,14 +6,14 @@ num, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lutils"; version = "1.54.1"; minimalOCamlVersion = "4.02"; src = fetchurl { - url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${version}.tgz"; + url = "https://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/pool/lutils.v${finalAttrs.version}.tgz"; hash = "sha512:d3c3b80286b1aa236ba922d9e18a133721fc80126c8b89520fb811dce9400e217aaa75b5d49e03988be7f6bf5f2e1a391d02ceeaa5ec0a0cd5ce218083a29514"; }; @@ -25,8 +25,8 @@ buildDunePackage rec { meta = { homepage = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/"; description = "Tools and libs shared by Verimag/synchronous tools (lustre, lutin, rdbg)"; - changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${version}"; + changelog = "https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/lutils/-/releases/v${finalAttrs.version}"; license = lib.licenses.cecill21; mainProgram = "gnuplot-rif"; }; -} +}) From f3281bb0aeb963bd418c19bde7cda27c586af521 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:18 -0600 Subject: [PATCH 211/260] ocamlPackages.luv: migrate to finalAttrs --- pkgs/development/ocaml-modules/luv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/luv/default.nix b/pkgs/development/ocaml-modules/luv/default.nix index 193edadb4b09..3360f9077a1c 100644 --- a/pkgs/development/ocaml-modules/luv/default.nix +++ b/pkgs/development/ocaml-modules/luv/default.nix @@ -14,12 +14,12 @@ let version, sha256, }: - buildDunePackage rec { + buildDunePackage (finalAttrs: { pname = "luv"; inherit version; src = fetchurl { - url = "https://github.com/aantron/luv/releases/download/${version}/luv-${version}.tar.gz"; + url = "https://github.com/aantron/luv/releases/download/${finalAttrs.version}/luv-${finalAttrs.version}.tar.gz"; inherit sha256; }; @@ -52,7 +52,7 @@ let sternenseemann ]; }; - }; + }); in { luv-0-5-12 = generic { From 3498fdb8b7ef77d7569d664f2638aa6b19aa4287 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:19 -0600 Subject: [PATCH 212/260] ocamlPackages.lwt_eio: migrate to finalAttrs --- pkgs/development/ocaml-modules/lwt_eio/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/lwt_eio/default.nix b/pkgs/development/ocaml-modules/lwt_eio/default.nix index d7bc05f2b648..8372d456cc1b 100644 --- a/pkgs/development/ocaml-modules/lwt_eio/default.nix +++ b/pkgs/development/ocaml-modules/lwt_eio/default.nix @@ -5,7 +5,6 @@ eio, lwt, }: - buildDunePackage (finalAttrs: { pname = "lwt_eio"; version = if lib.versionAtLeast lwt.version "6.0.0" then "0.6" else "0.5.1"; From 8cffc04b3ecdf7ff30b6b538b3665cd5654e3175 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:20 -0600 Subject: [PATCH 213/260] ocamlPackages.lwt_ssl: migrate to finalAttrs --- pkgs/development/ocaml-modules/lwt_ssl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt_ssl/default.nix b/pkgs/development/ocaml-modules/lwt_ssl/default.nix index ec4ea72c53b5..d246011ba61c 100644 --- a/pkgs/development/ocaml-modules/lwt_ssl/default.nix +++ b/pkgs/development/ocaml-modules/lwt_ssl/default.nix @@ -6,14 +6,14 @@ lwt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "lwt_ssl"; version = "1.2.0"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/ocsigen/lwt_ssl/releases/download/${version}/lwt_ssl-${version}.tbz"; + url = "https://github.com/ocsigen/lwt_ssl/releases/download/${finalAttrs.version}/lwt_ssl-${finalAttrs.version}.tbz"; hash = "sha256-swIK0nrs83fhw/J0Cgizbcu6mR+EMGZRE1dBBUiImnc="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 8c854899311d11e1d36d92bdff8a29f19a98833c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:21 -0600 Subject: [PATCH 214/260] ocamlPackages.macaddr: migrate to finalAttrs --- pkgs/development/ocaml-modules/macaddr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 7de7d60b912c..aab3c3a79568 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -7,14 +7,14 @@ ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "macaddr"; version = "5.6.2"; minimalOCamlVersion = "4.04"; src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${version}/ipaddr-${version}.tbz"; + url = "https://github.com/mirage/ocaml-ipaddr/releases/download/v${finalAttrs.version}/ipaddr-${finalAttrs.version}.tbz"; hash = "sha256-CKP6bmQRSQtmYeWxAinqnsa4w3OOn2slWFmxPxRb4TY="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = [ ]; }; -} +}) From d10ee51bd02d7815cf1b2371ca69e2b1b610883c Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:21 -0600 Subject: [PATCH 215/260] ocamlPackages.mad: migrate to finalAttrs --- pkgs/development/ocaml-modules/mad/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mad/default.nix b/pkgs/development/ocaml-modules/mad/default.nix index 172d10b4452b..a619c84fb9ca 100644 --- a/pkgs/development/ocaml-modules/mad/default.nix +++ b/pkgs/development/ocaml-modules/mad/default.nix @@ -6,7 +6,7 @@ libmad, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mad"; version = "0.5.3"; @@ -15,7 +15,7 @@ buildDunePackage rec { src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-mad"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-rSFzWyUYTrGL7GvVsY5qKdCXqY/XJQkuBerexG838jc="; }; @@ -28,4 +28,4 @@ buildDunePackage rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From f338dfad733732590e13007a45bf4b41c38bfa01 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:22 -0600 Subject: [PATCH 216/260] ocamlPackages.magic-mime: migrate to finalAttrs --- pkgs/development/ocaml-modules/magic-mime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 9f2af3cea2f1..1ff4253ee077 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -4,12 +4,12 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "magic-mime"; version = "1.3.1"; src = fetchurl { - url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${version}/magic-mime-${version}.tbz"; + url = "https://github.com/mirage/ocaml-magic-mime/releases/download/v${finalAttrs.version}/magic-mime-${finalAttrs.version}.tbz"; hash = "sha256-4CNNA2Jduh76xY5X44dnLXWl6aYh/0ms/g9gnADxOwg="; }; @@ -21,4 +21,4 @@ buildDunePackage rec { license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; }; -} +}) From cc903b8e2a81d526fda376754176b221a080f822 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:23 -0600 Subject: [PATCH 217/260] ocamlPackages.mccs: migrate to finalAttrs --- pkgs/development/ocaml-modules/mccs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mccs/default.nix b/pkgs/development/ocaml-modules/mccs/default.nix index 00e27fd13e96..900d63944c58 100644 --- a/pkgs/development/ocaml-modules/mccs/default.nix +++ b/pkgs/development/ocaml-modules/mccs/default.nix @@ -5,14 +5,14 @@ cudf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mccs"; version = "1.1+19"; src = fetchFromGitHub { owner = "AltGr"; repo = "ocaml-mccs"; - rev = version; + rev = finalAttrs.version; hash = "sha256-xvcqPXyzVGXXFYRVdFPaCfieFEguWffWVB04ImEuPvQ="; }; @@ -32,4 +32,4 @@ buildDunePackage rec { ]; maintainers = [ ]; }; -} +}) From cbf5b74112ddad777f7a4a88984f83d3fab7e1a3 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:23 -0600 Subject: [PATCH 218/260] ocamlPackages.mec: migrate to finalAttrs --- pkgs/development/ocaml-modules/mec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mec/default.nix b/pkgs/development/ocaml-modules/mec/default.nix index 29ed1fc0e862..5e5f5dab15a9 100644 --- a/pkgs/development/ocaml-modules/mec/default.nix +++ b/pkgs/development/ocaml-modules/mec/default.nix @@ -12,11 +12,11 @@ bisect_ppx, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mec"; version = "0.1.0"; src = fetchzip { - url = "https://gitlab.com/nomadic-labs/cryptography/ocaml-ec/-/archive/${version}/ocaml-ec-${version}.tar.bz2"; + url = "https://gitlab.com/nomadic-labs/cryptography/ocaml-ec/-/archive/${finalAttrs.version}/ocaml-ec-${finalAttrs.version}.tar.bz2"; sha256 = "sha256-uIcGj/exSfuuzsv6C/bnJXpYRu3OY3dcKMW/7+qwi2U="; }; @@ -48,4 +48,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.ulrikstrid ]; }; -} +}) From 3e3ca38c835b37b17a845941ef9490988fb3d7fb Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:24 -0600 Subject: [PATCH 219/260] ocamlPackages.melange-json: migrate to finalAttrs --- pkgs/development/ocaml-modules/melange-json/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/melange-json/default.nix b/pkgs/development/ocaml-modules/melange-json/default.nix index aa4df6c9ca33..1f0fc5ef4f2a 100644 --- a/pkgs/development/ocaml-modules/melange-json/default.nix +++ b/pkgs/development/ocaml-modules/melange-json/default.nix @@ -7,13 +7,13 @@ ppxlib, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "melange-json"; version = "2.0.0"; src = fetchFromGitHub { owner = "melange-community"; repo = "melange-json"; - tag = version; + tag = finalAttrs.version; hash = "sha256-vgcvPRc2vEHE1AtHyttvs1T0LcoeTOFfmPUCz95goT0="; }; @@ -29,4 +29,4 @@ buildDunePackage rec { lib.maintainers.vog ]; }; -} +}) From a4e3a5223be0c13378bf179a42fd053b10fd3c0f Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:24 -0600 Subject: [PATCH 220/260] ocamlPackages.mem_usage: migrate to finalAttrs --- pkgs/development/ocaml-modules/mem_usage/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mem_usage/default.nix b/pkgs/development/ocaml-modules/mem_usage/default.nix index 613edfe0377f..b85cbff15636 100644 --- a/pkgs/development/ocaml-modules/mem_usage/default.nix +++ b/pkgs/development/ocaml-modules/mem_usage/default.nix @@ -4,14 +4,14 @@ buildDunePackage, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mem_usage"; version = "0.1.2"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-mem_usage"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-5tQNsqbiU9oJvKHUjeTo/ST4A0Axc95gdJISLaa9VRM="; }; @@ -25,4 +25,4 @@ buildDunePackage rec { description = "Cross-platform memory usage information"; maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From 1ca0bf03f4f6680c44ed25c8166a540ba9f767af Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:25 -0600 Subject: [PATCH 221/260] ocamlPackages.memprof-limits: migrate to finalAttrs --- pkgs/development/ocaml-modules/memprof-limits/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix index b250c6be3853..66af6ba1810f 100644 --- a/pkgs/development/ocaml-modules/memprof-limits/default.nix +++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix @@ -5,14 +5,14 @@ ocaml, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "memprof-limits"; version = "0.2.1"; src = fetchFromGitLab { owner = "gadmm"; - repo = pname; - rev = "v${version}"; + repo = "memprof-limits"; + rev = "v${finalAttrs.version}"; hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc="; }; @@ -25,4 +25,4 @@ buildDunePackage rec { maintainers = with lib.maintainers; [ alizter ]; broken = !(lib.versionOlder ocaml.version "5.0.0"); }; -} +}) From 183709c8462acefbff276ad5c1680a8a8279f3f7 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:26 -0600 Subject: [PATCH 222/260] ocamlPackages.memtrace: migrate to finalAttrs --- pkgs/development/ocaml-modules/memtrace/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/memtrace/default.nix b/pkgs/development/ocaml-modules/memtrace/default.nix index 8b50cf0712dd..783da4401b77 100644 --- a/pkgs/development/ocaml-modules/memtrace/default.nix +++ b/pkgs/development/ocaml-modules/memtrace/default.nix @@ -4,23 +4,23 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "memtrace"; version = "0.2.3"; src = fetchFromGitHub { owner = "janestreet"; - repo = pname; - rev = "v${version}"; + repo = "memtrace"; + rev = "v${finalAttrs.version}"; hash = "sha256-dWkTrN8ZgNUz7BW7Aut8mfx8o4n8f6UZaDv/7rbbwNs="; }; minimalOCamlVersion = "4.11"; meta = { - homepage = "https://github.com/janestreet/${pname}"; + homepage = "https://github.com/janestreet/memtrace"; description = "Streaming client for OCaml's Memprof"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ niols ]; }; -} +}) From 4dc830660032c118699a71e128fb76da2b3cd6c2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:26 -0600 Subject: [PATCH 223/260] ocamlPackages.merlin-extend: migrate to finalAttrs --- pkgs/development/ocaml-modules/merlin-extend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/merlin-extend/default.nix b/pkgs/development/ocaml-modules/merlin-extend/default.nix index 7bc7f39005bf..4e9dd4ca48bf 100644 --- a/pkgs/development/ocaml-modules/merlin-extend/default.nix +++ b/pkgs/development/ocaml-modules/merlin-extend/default.nix @@ -5,12 +5,12 @@ cppo, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "merlin-extend"; version = "0.6.2"; src = fetchurl { - url = "https://github.com/let-def/merlin-extend/releases/download/v${version}/merlin-extend-${version}.tbz"; + url = "https://github.com/let-def/merlin-extend/releases/download/v${finalAttrs.version}/merlin-extend-${finalAttrs.version}.tbz"; hash = "sha256-R1WOfzC2RGLyucgvt/eHEzrPoNUTJFK2rXhI4LD013k="; }; @@ -22,4 +22,4 @@ buildDunePackage rec { license = lib.licenses.mit; maintainers = [ ]; }; -} +}) From f54d106e6362b7ad9af4740cc88a74e6686dd3a2 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:27 -0600 Subject: [PATCH 224/260] ocamlPackages.metadata: migrate to finalAttrs --- pkgs/development/ocaml-modules/metadata/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/metadata/default.nix b/pkgs/development/ocaml-modules/metadata/default.nix index 1262f54cfafb..12f3d4d52584 100644 --- a/pkgs/development/ocaml-modules/metadata/default.nix +++ b/pkgs/development/ocaml-modules/metadata/default.nix @@ -4,14 +4,14 @@ fetchFromGitHub, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "metadata"; version = "0.3.2"; src = fetchFromGitHub { owner = "savonet"; repo = "ocaml-metadata"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-g76R1ziRv3VDl0IEJOm626m/ywDz+qgHtQg0uPb0MCU="; }; @@ -23,4 +23,4 @@ buildDunePackage rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dandellion ]; }; -} +}) From f8066c3efa1e5f734200c809ffb883350a617fc8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:27 -0600 Subject: [PATCH 225/260] ocamlPackages.metrics: migrate to finalAttrs --- pkgs/development/ocaml-modules/metrics/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/metrics/default.nix b/pkgs/development/ocaml-modules/metrics/default.nix index 421f7b6e911a..4b9fa941dbea 100644 --- a/pkgs/development/ocaml-modules/metrics/default.nix +++ b/pkgs/development/ocaml-modules/metrics/default.nix @@ -6,14 +6,14 @@ fmt, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "metrics"; version = "0.5.0"; minimalOCamlVersion = "4.04"; src = fetchurl { - url = "https://github.com/mirage/metrics/releases/download/v${version}/metrics-${version}.tbz"; + url = "https://github.com/mirage/metrics/releases/download/v${finalAttrs.version}/metrics-${finalAttrs.version}.tbz"; sha256 = "sha256-3zVjgJCdBkYbzQl+9gY8qfPFE2X0dqeXwDZktTwFcV0="; }; @@ -30,4 +30,4 @@ buildDunePackage rec { maintainers = [ lib.maintainers.vbgl ]; }; -} +}) From a197a460ff8cf5b44191ad3ef3523f0620edd401 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:28 -0600 Subject: [PATCH 226/260] ocamlPackages.middleware: migrate to finalAttrs --- pkgs/development/ocaml-modules/middleware/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/middleware/default.nix b/pkgs/development/ocaml-modules/middleware/default.nix index 13371ab50e30..736b4a6ec0c1 100644 --- a/pkgs/development/ocaml-modules/middleware/default.nix +++ b/pkgs/development/ocaml-modules/middleware/default.nix @@ -5,14 +5,14 @@ alcotest, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "middleware"; version = "0.0.1"; minimalOCamlVersion = "4.14.0"; src = fetchurl { - url = "https://github.com/skolemlabs/middleware/releases/download/${version}/${pname}-${version}.tbz"; + url = "https://github.com/skolemlabs/middleware/releases/download/${finalAttrs.version}/middleware-${finalAttrs.version}.tbz"; hash = "sha256-zhLEGvyZiKrdBKWcEbB4PHvYzBlkrp1Ldnon0mP2Ypg="; }; @@ -25,8 +25,8 @@ buildDunePackage rec { meta = { description = "Composable stacked functions, which can respond to inner calls"; homepage = "https://github.com/skolemlabs/middleware"; - changelog = "https://github.com/skolemlabs/middleware/blob/${version}/CHANGES.md"; + changelog = "https://github.com/skolemlabs/middleware/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sixstring982 ]; }; -} +}) From cab561198facd36aa0326d6b3ca3ab6eb627d3ef Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:29 -0600 Subject: [PATCH 227/260] ocamlPackages.mimic: migrate to finalAttrs --- pkgs/development/ocaml-modules/mimic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/mimic/default.nix b/pkgs/development/ocaml-modules/mimic/default.nix index a17efdc45e42..fe351d2ddf94 100644 --- a/pkgs/development/ocaml-modules/mimic/default.nix +++ b/pkgs/development/ocaml-modules/mimic/default.nix @@ -12,14 +12,14 @@ bigstringaf, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "mimic"; version = "0.0.9"; minimalOCamlVersion = "4.08"; src = fetchurl { - url = "https://github.com/dinosaure/mimic/releases/download/${version}/mimic-${version}.tbz"; + url = "https://github.com/dinosaure/mimic/releases/download/${finalAttrs.version}/mimic-${finalAttrs.version}.tbz"; hash = "sha256-lU3xzrVIqSKnhUQIhaXRamr39zXWw3DtNdM5EUtp4p8="; }; @@ -44,4 +44,4 @@ buildDunePackage rec { homepage = "https://github.com/mirage/ocaml-git"; maintainers = [ lib.maintainers.sternenseemann ]; }; -} +}) From 10bf0cd38b56ac2e2472ecca19777bdfe8469bd8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Thu, 22 Jan 2026 10:14:29 -0600 Subject: [PATCH 228/260] ocamlPackages.minttea: migrate to finalAttrs --- pkgs/development/ocaml-modules/minttea/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/minttea/default.nix b/pkgs/development/ocaml-modules/minttea/default.nix index 3685f2d459b4..0d6bf937993d 100644 --- a/pkgs/development/ocaml-modules/minttea/default.nix +++ b/pkgs/development/ocaml-modules/minttea/default.nix @@ -6,14 +6,14 @@ tty, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "minttea"; version = "0.0.3"; minimalOCamlVersion = "5.1"; src = fetchurl { - url = "https://github.com/leostera/minttea/releases/download/${version}/minttea-${version}.tbz"; + url = "https://github.com/leostera/minttea/releases/download/${finalAttrs.version}/minttea-${finalAttrs.version}.tbz"; hash = "sha256-WEaJVCCvsmKcF8+yzovljt8dGWaIv4UmAr74jq6Vo9M="; }; @@ -25,8 +25,8 @@ buildDunePackage rec { meta = { description = "Fun, functional, and stateful way to build terminal apps in OCaml heavily inspired by Go's BubbleTea"; homepage = "https://github.com/leostera/minttea"; - changelog = "https://github.com/leostera/minttea/blob/${version}/CHANGES.md"; + changelog = "https://github.com/leostera/minttea/blob/${finalAttrs.version}/CHANGES.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ sixstring982 ]; }; -} +}) From 1a3c982b49783fd58cacff40fe206f39e6a16197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 20:13:28 +0000 Subject: [PATCH 229/260] claude-agent-acp: 0.32.0 -> 0.33.1 --- pkgs/by-name/cl/claude-agent-acp/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/cl/claude-agent-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix index 1674d26ac144..65ce9132aba6 100644 --- a/pkgs/by-name/cl/claude-agent-acp/package.nix +++ b/pkgs/by-name/cl/claude-agent-acp/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "claude-agent-acp"; - version = "0.32.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "claude-agent-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-egYGwkN8iexw42EIhUgKb+QuAKfH4lKts0lftzfHAiY="; + hash = "sha256-FwcIJf/tfH6prDFKtOo7X1mTocibf4Ne6JHOS9ITG8U="; }; - npmDepsHash = "sha256-sUB/S3EycM3FGibAaZMA1T7tCyDu2XfkSg86qcABmYk="; + npmDepsHash = "sha256-y795LyNjSJjTpIqtA5bC/AgeFLghM0yU5xQRD3m+Ajs="; nativeBuildInputs = [ makeWrapper ]; From 62d1d730fb8ece0d8cd13bfd38d10ff1624f5e5a Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Tue, 12 May 2026 22:49:43 +0200 Subject: [PATCH 230/260] linuxKernel.kernels.linux_zen: 7.0.5-zen1 -> 7.0.6-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index ca2ca6fbb412..fbb01f03780e 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -18,7 +18,7 @@ in buildLinux ( args // rec { - version = "7.0.5"; + version = "7.0.6"; pname = "linux-zen"; modDirVersion = lib.versions.pad 3 "${version}-${suffix}"; isZen = true; @@ -27,7 +27,7 @@ buildLinux ( owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "1xnxjknlsx4fr6jf62ncvnad7r7nxkjpkaj9fdj0fqq8h4bpkhh1"; + sha256 = "10kmw6nrcvgxmwz9mp6bjqs72ld2717zdvi7mgy4940q6rfz802f"; }; # This is based on the following source: From 9a80d8958a322fcfa4f450f638b288a91fb6b507 Mon Sep 17 00:00:00 2001 From: poz Date: Mon, 12 Jan 2026 02:33:56 +0100 Subject: [PATCH 231/260] everforest-gtk-theme: 0-unstable-2025-10-15 -> 0-unstable-2025-10-23 --- .../fix-install-script.patch | 34 +++++++++++++++++ .../ev/everforest-gtk-theme/package.nix | 37 +++++++++++++++++-- 2 files changed, 67 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch diff --git a/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch b/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch new file mode 100644 index 000000000000..75634c5eb77a --- /dev/null +++ b/pkgs/by-name/ev/everforest-gtk-theme/fix-install-script.patch @@ -0,0 +1,34 @@ +From f9be45b024e29efa6082cdfe6f47ca6b1110f20a Mon Sep 17 00:00:00 2001 +From: poz +Date: Fri, 9 Jan 2026 03:25:01 +0100 +Subject: [PATCH] fix install script + +--- + themes/install.sh | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/themes/install.sh b/themes/install.sh +index 1dc573f1..b1657b62 100755 +--- a/themes/install.sh ++++ b/themes/install.sh +@@ -130,6 +130,7 @@ install() { + ln -s assets/no-events.svg no-events.svg + ln -s assets/process-working.svg process-working.svg + ln -s assets/no-notifications.svg no-notifications.svg ++ cd - > /dev/null + + # GTK2 Themes + mkdir -p "${THEME_DIR}/gtk-2.0" +@@ -166,7 +167,11 @@ install() { + cp -r "${SRC_DIR}/main/metacity-1/metacity-theme-3${window}${color}.xml" "${THEME_DIR}/metacity-1/metacity-theme-3.xml" + cp -r "${SRC_DIR}/assets/metacity-1/assets${window}" "${THEME_DIR}/metacity-1/assets" + cp -r "${SRC_DIR}/assets/metacity-1/thumbnail${ELSE_DARK:-}.png" "${THEME_DIR}/metacity-1/thumbnail.png" +- cd "${THEME_DIR}/metacity-1" && ln -s metacity-theme-3.xml metacity-theme-1.xml && ln -s metacity-theme-3.xml metacity-theme-2.xml ++ ++ cd "${THEME_DIR}/metacity-1" ++ ln -s metacity-theme-3.xml metacity-theme-1.xml ++ ln -s metacity-theme-3.xml metacity-theme-2.xml ++ cd - > /dev/null + + # XFWM4 Themes + mkdir -p "${THEME_DIR}/xfwm4" diff --git a/pkgs/by-name/ev/everforest-gtk-theme/package.nix b/pkgs/by-name/ev/everforest-gtk-theme/package.nix index 7bb210b045fc..fb5e6f71769f 100644 --- a/pkgs/by-name/ev/everforest-gtk-theme/package.nix +++ b/pkgs/by-name/ev/everforest-gtk-theme/package.nix @@ -4,19 +4,27 @@ fetchFromGitHub, gnome-themes-extra, gtk-engine-murrine, + gtk3, + sassc, }: stdenvNoCC.mkDerivation { pname = "everforest-gtk-theme"; - version = "0-unstable-2025-10-15"; + version = "0-unstable-2025-10-23"; src = fetchFromGitHub { owner = "Fausto-Korpsvart"; repo = "Everforest-GTK-Theme"; - rev = "930a5dc57f7a06e8c6538d531544e41c56dbb27a"; - hash = "sha256-mlJE7gVElWUjJIZnAL5ztchphmaU82llol+YdKqnSxg="; + rev = "9b8be4d6648ae9eaae3dd550105081f8c9054825"; + hash = "sha256-XHO6NoXJwwZ8gBzZV/hJnVq5BvkEKYWvqLBQT00dGdE="; }; + patches = [ + # remove when merged + # https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/34 + ./fix-install-script.patch + ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -25,13 +33,34 @@ stdenvNoCC.mkDerivation { gnome-themes-extra ]; + nativeBuildInputs = [ + gtk3 + sassc + ]; + dontBuild = true; + dontFixup = true; + dontDropIconThemeCache = true; + + postPatch = '' + patchShebangs themes/install.sh + ''; installPhase = '' runHook preInstall + mkdir -p "$out/share/"{themes,icons} + cp -a icons/* "$out/share/icons/" - cp -a themes/* "$out/share/themes/" + + for theme in "$out/share/icons/"*; do + gtk-update-icon-cache "$theme" + done + + cd themes + ./install.sh --name Everforest --theme all --dest "$out/share/themes" + cd .. + runHook postInstall ''; From 6df4e29e1581b30190fc360e8b9cc72cd83781a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 12 May 2026 21:56:32 +0000 Subject: [PATCH 232/260] libretro.dosbox-pure: 0-unstable-2026-04-17 -> 0-unstable-2026-05-12 --- pkgs/applications/emulators/libretro/cores/dosbox-pure.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index 2a5ccc785be4..7064951fc79d 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2026-04-17"; + version = "0-unstable-2026-05-12"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "93cf48bb22b30a9bc657511658cf4dbcd9a727eb"; - hash = "sha256-QW1wIE4uuyCiI7eJjHsKh6PJd6QJwrBUQa4wkhPyRSE="; + rev = "3a5222c97456e8df90983eb546f4d866b0feb848"; + hash = "sha256-FeT1VPOJsZaC9SZbJwbiC0fkVV/WOJ+rOcwf8g+wdeM="; }; hardeningDisable = [ "format" ]; From 025c5a333438a39b5ae9a5392b26b0ab5f46cf0b Mon Sep 17 00:00:00 2001 From: squat Date: Tue, 12 May 2026 22:29:04 +0200 Subject: [PATCH 233/260] litellm: 1.83.7 -> 1.83.14 Bump LiteLLM to fix #508886. The [GitHub advisory](https://github.com/advisories/GHSA-wxxx-gvqv-xp7p) states that the vulnerability has been patched in 1.83.10. Between .7 and .14 LiteLLM switched their build-system to uv-build, which has some effects on the derivation; notably, uv-build is configured to put the `enterprise` dir into another uv "workspace", meaning it's no longer accessible for us in the postFixup for symlinking. This is just as well, because the enterprise directory is under a separate license and from what I can see, all imports for litellm_enterprise are guarded with a try/catch anyways. Signed-off-by: squat --- pkgs/by-name/li/litellm/package.nix | 3 +- .../python-modules/litellm/default.nix | 63 ++++++++++++++----- 2 files changed, 48 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/li/litellm/package.nix b/pkgs/by-name/li/litellm/package.nix index f9e21ee0dc6f..015ba536f137 100644 --- a/pkgs/by-name/li/litellm/package.nix +++ b/pkgs/by-name/li/litellm/package.nix @@ -8,6 +8,7 @@ python3Packages.toPythonApplication ( dependencies = (oldAttrs.dependencies or [ ]) ++ litellm.optional-dependencies.proxy - ++ litellm.optional-dependencies.extra_proxy; + ++ litellm.optional-dependencies.extra_proxy + ++ litellm.optional-dependencies.proxy-runtime; }) ) diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix index 4c7a10963b3d..4720f405d2b8 100644 --- a/pkgs/development/python-modules/litellm/default.nix +++ b/pkgs/development/python-modules/litellm/default.nix @@ -1,10 +1,13 @@ { lib, + a2a-sdk, aiohttp, + anthropic, apscheduler, azure-identity, azure-keyvault-secrets, azure-storage-blob, + azure-storage-file-datalake, backoff, boto3, buildPythonPackage, @@ -16,33 +19,42 @@ fetchFromGitHub, google-cloud-iam, google-cloud-kms, + google-genai, + grpcio, gunicorn, httpx, importlib-metadata, jinja2, jsonschema, + langfuse, mcp, openai, + opentelemetry-api, + opentelemetry-exporter-otlp, + opentelemetry-sdk, orjson, - poetry-core, polars, prisma, + prometheus-client, pydantic, pyjwt, pynacl, - python, + pypdf, python-dotenv, python-multipart, pyyaml, requests, resend, + restrictedpython, rich, rq, + sentry-sdk, soundfile, tiktoken, tokenizers, - uvloop, + uv-build, uvicorn, + uvloop, websockets, nixosTests, nix-update-script, @@ -50,17 +62,22 @@ buildPythonPackage rec { pname = "litellm"; - version = "1.83.7"; + version = "1.83.14"; pyproject = true; src = fetchFromGitHub { owner = "BerriAI"; repo = "litellm"; tag = "v${version}-stable"; - hash = "sha256-oVQ0FHZmXDY7HU4AMEQ9xcl10mIbqja9/j2mdunTWI4="; + hash = "sha256-SZow0qof9DRlohWjT3J/NHtmhe96OLLcdHt55RQ7Zmw="; }; - build-system = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "uv_build==0.10.7" "uv_build" + ''; + + build-system = [ uv-build ]; dependencies = [ aiohttp @@ -98,6 +115,7 @@ buildPythonPackage rec { pynacl python-multipart pyyaml + restrictedpython rich rq soundfile @@ -107,6 +125,7 @@ buildPythonPackage rec { ]; extra_proxy = [ + a2a-sdk azure-identity azure-keyvault-secrets google-cloud-iam @@ -115,12 +134,29 @@ buildPythonPackage rec { # FIXME package redisvl resend ]; + + proxy-runtime = [ + anthropic + # FIXME package azure-ai-contentsafety + azure-storage-file-datalake + # FIXME package ddtrace + # FIXME package detect-secrets + # FIXME package google-cloud-aiplatform + google-genai + grpcio + langfuse + # FIXME package mangum + opentelemetry-api + opentelemetry-exporter-otlp + opentelemetry-sdk + # FIXME package llm-sandbox + prometheus-client + pypdf + sentry-sdk + ]; }; - pythonImportsCheck = [ - "litellm" - "litellm_enterprise" - ]; + pythonImportsCheck = [ "litellm" ]; pythonRelaxDeps = [ "aiohttp" @@ -134,13 +170,6 @@ buildPythonPackage rec { # access network doCheck = false; - postFixup = '' - # Symlink litellm_enterprise to make it discoverable - pushd $out/lib/python${python.pythonVersion}/site-packages - ln -s enterprise/litellm_enterprise litellm_enterprise - popd - ''; - passthru = { tests = { inherit (nixosTests) litellm; }; updateScript = nix-update-script { From ed15584ddc744c3070c60ef8958f79e952dd8614 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 01:49:26 +0000 Subject: [PATCH 234/260] ledger-live-desktop: 4.2.0 -> 4.2.2 --- pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index f18b6425b766..e1c0b7755445 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "4.2.0"; + version = "4.2.2"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-gJ/5/bCNBkNmKgsIxoOvkbE1FLY9KX6TFVOQe/wAVGM="; + hash = "sha256-pDSLP+YN13iRLeQ3RWYZ8AwU1VqzbVw+oazPp4NdXNU="; }; appimageContents = appimageTools.extractType2 { From 6059be87c3e968d6cfe7f894d91cf5a71febf5dc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 01:51:43 +0000 Subject: [PATCH 235/260] sogo: 5.12.7 -> 5.12.8 --- pkgs/by-name/so/sogo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix index 0c3a45ba5c00..0979a2c8245e 100644 --- a/pkgs/by-name/so/sogo/package.nix +++ b/pkgs/by-name/so/sogo/package.nix @@ -25,14 +25,14 @@ clangStdenv.mkDerivation rec { pname = "sogo"; - version = "5.12.7"; + version = "5.12.8"; # always update the sope package as well, when updating sogo src = fetchFromGitHub { owner = "Alinto"; repo = "sogo"; rev = "SOGo-${version}"; - hash = "sha256-HMnJQTC9P6gOVP1hViRtshIS0oWj0AKoRkeNr/udlso="; + hash = "sha256-UkqXOInp6z5x8HzIqD9YOuD1oqXIdTEzC+paf6FDkIg="; }; nativeBuildInputs = [ From 67e62fb6ad94ab8a3967a6dace0ebf8adf5f79c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 02:50:56 +0000 Subject: [PATCH 236/260] home-assistant-custom-components.solax_modbus: 2026.04.5 -> 2026.05.1 --- .../home-assistant/custom-components/solax_modbus/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix index 1ae0a0204e23..64207bd91170 100644 --- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix +++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "wills106"; domain = "solax_modbus"; - version = "2026.04.5"; + version = "2026.05.1"; src = fetchFromGitHub { owner = "wills106"; repo = "homeassistant-solax-modbus"; tag = version; - hash = "sha256-HsitTtf0CQFjF4Xq3pcGrPQzQtcCgE9sr4S4kwRM6ko="; + hash = "sha256-x6XvN0EDh5GHZy+ye4arw8RJOixszW9G7AKS9OHEZLk="; }; dependencies = [ pymodbus ]; From e4d361674d02200d22582d7b907d2ff77e32bd35 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 03:17:27 +0000 Subject: [PATCH 237/260] clojure: 1.12.4.1629 -> 1.12.5.1638 --- pkgs/by-name/cl/clojure/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clojure/package.nix b/pkgs/by-name/cl/clojure/package.nix index 8e8bcc40b292..2cbafb4bc8c8 100644 --- a/pkgs/by-name/cl/clojure/package.nix +++ b/pkgs/by-name/cl/clojure/package.nix @@ -13,12 +13,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clojure"; - version = "1.12.4.1629"; + version = "1.12.5.1638"; src = fetchurl { # https://github.com/clojure/brew-install/releases url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz"; - hash = "sha256-swBF0lh+vAvPHKKoXHXXHcVtfHTefu5tx/3vwl93KM4="; + hash = "sha256-eAfhA0RByuQ8IdigJsHYotIPY/kDmLgDRHCw4uHzF5E="; }; nativeBuildInputs = [ From 4930f9af9b5dbf667a8160e275ad0f7f461db8a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 04:04:28 +0000 Subject: [PATCH 238/260] typescript-go: 0-unstable-2026-05-02 -> 0-unstable-2026-05-12 --- pkgs/by-name/ty/typescript-go/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix index ea3f8d7faf69..6f4824a37932 100644 --- a/pkgs/by-name/ty/typescript-go/package.nix +++ b/pkgs/by-name/ty/typescript-go/package.nix @@ -15,13 +15,13 @@ let in buildGoModule { pname = "typescript-go"; - version = "0-unstable-2026-05-02"; + version = "0-unstable-2026-05-12"; src = fetchFromGitHub { owner = "microsoft"; repo = "typescript-go"; - rev = "2f6504c1b0efb1750abf948fe277981b50214093"; - hash = "sha256-PU4euqJAkBvzFzn0UemiFRfDciIi62KejRgcjbi5paQ="; + rev = "01cc06960f62a508d26232175e0fcfd16846ed4f"; + hash = "sha256-0xga15jY472BrOJmuWBaGoqThwhG8Bh4CoV+6Zm7ubk="; fetchSubmodules = false; }; From b6280b948df7624e54d256944b413a76b18a09af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 05:35:59 +0000 Subject: [PATCH 239/260] pykickstart: 3.66 -> 3.72 --- pkgs/by-name/py/pykickstart/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pykickstart/package.nix b/pkgs/by-name/py/pykickstart/package.nix index af02af1fd610..2d44f5a3d38a 100644 --- a/pkgs/by-name/py/pykickstart/package.nix +++ b/pkgs/by-name/py/pykickstart/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "pykickstart"; - version = "3.66"; + version = "3.72"; pyproject = true; src = fetchFromGitHub { owner = "pykickstart"; repo = "pykickstart"; tag = "r${finalAttrs.version}"; - hash = "sha256-2PC8QHJGy+7IwRA5u+Kw6LYxkWV9uZ87sB8nd/7t9sw="; + hash = "sha256-wNwCWl+aYMaaESE2HMnFNu9HjQB7MW+2ymSCNr3edis="; }; build-system = with python3Packages; [ From 7f372392f7661b3f3882ae349024853af7b2e024 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 05:39:40 +0000 Subject: [PATCH 240/260] libretro.play: 0-unstable-2026-04-23 -> 0-unstable-2026-05-11 --- pkgs/applications/emulators/libretro/cores/play.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index a176ee898542..1617d2c29e8a 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2026-04-23"; + version = "0-unstable-2026-05-11"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "158ec0cbdadc8778093016c9acbec9af45a9aab4"; - hash = "sha256-UXvFsFwymGqk7GfI4qMyxEy71PqHLitV9E+C2iavud4="; + rev = "7a2b8d6058c7b89548283be5d380accc85e310a0"; + hash = "sha256-AA6l4t+TDz2g/qQM4bVbSnJXsamEXzUqTL7VnvQ1mgc="; fetchSubmodules = true; }; From 20b16b0ae32ff91bcd18b958491a05e46e080104 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 06:20:07 +0000 Subject: [PATCH 241/260] python3Packages.qdrant-client: 1.17.1 -> 1.18.0 --- pkgs/development/python-modules/qdrant-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 590d3e240d06..a777bab164bb 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.17.1"; + version = "1.18.0"; pyproject = true; src = fetchFromGitHub { owner = "qdrant"; repo = "qdrant-client"; tag = "v${version}"; - hash = "sha256-HGBvd8sjs52qiVf7VJupH7qcGnr3N/n2WP8kM1crvIY="; + hash = "sha256-ZBP1D67u+KZmBi614nuToauI+xhdH1PKD3g6xRfFQxk="; }; build-system = [ poetry-core ]; From 241a0b3cbcd2f6c996365f043143f9968d43856d Mon Sep 17 00:00:00 2001 From: Jan Christoph Ebersbach Date: Wed, 13 May 2026 08:38:45 +0200 Subject: [PATCH 242/260] sope: 5.12.7 -> 5.12.8 --- pkgs/by-name/so/sope/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index 06f8c9fd1134..3ef83e1fe6ab 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -14,7 +14,7 @@ clangStdenv.mkDerivation rec { pname = "sope"; - version = "5.12.7"; + version = "5.12.8"; src = fetchFromGitHub { owner = "Alinto"; From 88bc5dadf1577d56ab1d19064e473e32982ee038 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 17 Apr 2026 12:36:12 +0200 Subject: [PATCH 243/260] libsolv: 0.7.35 -> 0.7.36 Signed-off-by: Paul Meyer --- pkgs/by-name/li/libsolv/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index 8edd4a0832da..32a17dfcf222 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -18,14 +18,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.7.35"; + version = "0.7.36"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = finalAttrs.version; - hash = "sha256-DHECjda7s12hSysbaXK2+wM/nXpAOpTn+eSf9XGC3z0="; + hash = "sha256-7a/vAdgW7ma2GHqv1LaQNFA7w1Hmzm6Q/HriNN6hlpE="; }; cmakeFlags = [ From 00533dbc05365e36dff10d8fc73f8b6fc4f2f744 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 17 Apr 2026 12:36:33 +0200 Subject: [PATCH 244/260] libpkgmanifest: init at 0.5.9 Signed-off-by: Paul Meyer --- pkgs/by-name/li/libpkgmanifest/package.nix | 50 ++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/li/libpkgmanifest/package.nix diff --git a/pkgs/by-name/li/libpkgmanifest/package.nix b/pkgs/by-name/li/libpkgmanifest/package.nix new file mode 100644 index 000000000000..5d81e5fd64b3 --- /dev/null +++ b/pkgs/by-name/li/libpkgmanifest/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + yaml-cpp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libpkgmanifest"; + version = "0.5.9"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = "libpkgmanifest"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NWuUu1By7MORITgqac09cOMYrVB91xqiUgxN+7sDPMw="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + yaml-cpp + ]; + + cmakeFlags = [ + (lib.cmakeBool "WITH_DOCS" false) + (lib.cmakeBool "WITH_PYTHON" false) + (lib.cmakeBool "WITH_TESTS" false) + (lib.cmakeBool "WITH_CODE_COVERAGE" false) + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + ]; + + meta = { + description = "Library for working with RPM manifests"; + homepage = "https://github.com/rpm-software-management/libpkgmanifest"; + license = lib.licenses.lgpl21Only; + maintainers = with lib.maintainers; [ katexochen ]; + mainProgram = "libpkgmanifest"; + platforms = lib.platforms.all; + }; +}) From ce0681e47b5acd307234e3fc539b9fd0dcd99bda Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Fri, 17 Apr 2026 12:36:51 +0200 Subject: [PATCH 245/260] dnf5: 5.2.18.0 -> 5.4.1.0 Signed-off-by: Paul Meyer --- pkgs/by-name/dn/dnf5/package.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/dn/dnf5/package.nix b/pkgs/by-name/dn/dnf5/package.nix index 2f6680b7b7e3..af75caef3538 100644 --- a/pkgs/by-name/dn/dnf5/package.nix +++ b/pkgs/by-name/dn/dnf5/package.nix @@ -19,6 +19,8 @@ libsolv, libxml2, libyaml, + libpkgmanifest, + acl, pcre2, rpm, sdbus-cpp_2, @@ -33,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.2.18.0"; + version = "5.4.1.0"; outputs = [ "out" @@ -44,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; tag = finalAttrs.version; - hash = "sha256-VTuGHHNNdoDfbJ86GOR4a+Fy2s+NSXPH337+AZpLKuo="; + hash = "sha256-wvWOQyY7K9fCds2am8gYpjw9mPl7IbOdHT92b8pwonc="; }; nativeBuildInputs = [ @@ -71,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: { librepo util-linux libsolv + libpkgmanifest + acl libxml2 libyaml pcre2.dev @@ -86,16 +90,16 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-restrict -Wno-maybe-uninitialized"; cmakeFlags = [ - "-DWITH_PERL5=OFF" - "-DWITH_PYTHON3=OFF" - "-DWITH_RUBY=OFF" - "-DWITH_SYSTEMD=OFF" - "-DWITH_PLUGIN_RHSM=OFF" # Red Hat Subscription Manager plugin + (lib.cmakeBool "WITH_PERL5" false) + (lib.cmakeBool "WITH_PYTHON3" false) + (lib.cmakeBool "WITH_RUBY" false) + (lib.cmakeBool "WITH_SYSTEMD" false) + (lib.cmakeBool "WITH_PLUGIN_RHSM" false) # Red Hat Subscription Manager plugin # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly # (setting it to an absolute path causes include files to go to $out/$out/include, # because the absolute path is interpreted with root at $out). - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") ]; postBuild = '' From 3ba92e101a2cc2333384371af11f179774970940 Mon Sep 17 00:00:00 2001 From: XYenon Date: Wed, 13 May 2026 15:48:04 +0800 Subject: [PATCH 246/260] yj: add xyenon as maintainer --- pkgs/by-name/yj/yj/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/yj/yj/package.nix b/pkgs/by-name/yj/yj/package.nix index 5ad7e7aefaf4..e315b1d09157 100644 --- a/pkgs/by-name/yj/yj/package.nix +++ b/pkgs/by-name/yj/yj/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { description = "Convert YAML <=> TOML <=> JSON <=> HCL"; license = lib.licenses.asl20; mainProgram = "yj"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ xyenon ]; homepage = "https://github.com/sclevine/yj"; }; }) From ef008508b82706d88280e654edeca2f7463472a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 08:22:29 +0000 Subject: [PATCH 247/260] zapzap: 6.4.0 -> 6.4.1 --- pkgs/by-name/za/zapzap/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix index eed208d6579a..f774842044ef 100644 --- a/pkgs/by-name/za/zapzap/package.nix +++ b/pkgs/by-name/za/zapzap/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "zapzap"; - version = "6.4.0"; + version = "6.4.1"; pyproject = true; src = fetchFromGitHub { owner = "rafatosta"; repo = "zapzap"; tag = finalAttrs.version; - hash = "sha256-3iFuJdiye0yt/6b6N1etS1YK+/QDS2p0eYXXtpPQDdE="; + hash = "sha256-GYt7MDj4JCdapZUEXIFGGpt7JpsjW2ZC+lhwyK2yj4c="; }; nativeBuildInputs = [ From 59d7078680db2dfbd286edccb77f58960a39cda6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 13 May 2026 10:35:19 +0200 Subject: [PATCH 248/260] wlroots_0_18: drop The libinput update in PR #493438 broke the build, and we don't seem to need it anymore. --- pkgs/by-name/ga/gamescope/package.nix | 4 ++-- pkgs/development/libraries/wlroots/default.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index fe65994b2373..b47b12849218 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -42,7 +42,7 @@ glslang, hwdata, stb, - wlroots_0_18, + wlroots_0_19, libdecor, lcms, lib, @@ -159,7 +159,7 @@ stdenv.mkDerivation (finalAttrs: { vulkan-headers ] ++ lib.optionals enableExecutable ( - wlroots_0_18.buildInputs + wlroots_0_19.buildInputs ++ [ # gamescope uses a custom wlroots branch libxcomposite diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index 57b0bc594df3..2970b864faa2 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -162,11 +162,6 @@ let in { - wlroots_0_18 = generic { - version = "0.18.3"; - hash = "sha256-D8RapSeH+5JpTtq+OU8PyVZubLhjcebbCBPuSO5Q7kU="; - }; - wlroots_0_19 = generic { version = "0.19.3"; hash = "sha256-J+wSVUtuizaCyCn523chFbE8VtbPjyu5XYv5eLT+GM0="; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c2ad87e8d135..c09af1ec3ca1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -2208,6 +2208,7 @@ mapAliases { wireshark-qt = warnAlias "'wireshark-qt' has been renamed to/replaced by 'wireshark'" wireshark; # Added 2026-01-23 wkhtmltopdf-bin = throw "'wkhtmltopdf-bin' has been renamed to/replaced by 'wkhtmltopdf'"; # Converted to throw 2025-10-27 wlroots_0_17 = throw "'wlroots_0_17' has been removed in favor of newer versions"; # Added 2026-03-07 + wlroots_0_18 = throw "'wlroots_0_18' has been removed in favor of newer versions"; # Added 2026-05-13 wlx-overlay-s = throw "'wlx-overlay-s' and 'wayvr-dashboard' have been merged into a single application. Please switch to 'wayvr'"; # Added 2026-01-09 wmii_hg = throw "'wmii_hg' has been renamed to/replaced by 'wmii'"; # Converted to throw 2025-10-27 wolfssl = throw "'wolfssl' has been removed because it has an unclear licensing situation and no remaining users in Nixpkgs"; # Added 2026-04-03 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a61bae6dc97..a736f6b5bd05 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9498,7 +9498,6 @@ with pkgs; ; inherit (callPackages ../development/libraries/wlroots { }) - wlroots_0_18 wlroots_0_19 wlroots_0_20 ; From 08a58123df925c602122e19d25607ddf423fe2a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 09:03:21 +0000 Subject: [PATCH 249/260] complgen: 0.9.1 -> 0.10.0 --- pkgs/by-name/co/complgen/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix index 7127a0ebe96a..1aa7d1d84ce6 100644 --- a/pkgs/by-name/co/complgen/package.nix +++ b/pkgs/by-name/co/complgen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "complgen"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "adaszko"; repo = "complgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-qBn3e0SRu+JTNzBNy3pmtRUESXhFBr+V+2Wb2GFZBGY="; + hash = "sha256-JlHePqZv50mvA5EAfkW11T+fcJaFw2OHFarOMqgs/wA="; }; - cargoHash = "sha256-1clMiilBCZCU05AgoWkEbwWQV+9WWxgKHuOlbGquY4g="; + cargoHash = "sha256-XvjA8SvzgK1FDjCg6tBcfVKMurHejQBGdNeYhedQGK8="; meta = { changelog = "https://github.com/adaszko/complgen/blob/v${finalAttrs.version}/CHANGELOG.md"; From c3e3c347a3aabc339468eb39d2853f84a484f6db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 09:04:56 +0000 Subject: [PATCH 250/260] terraform-providers.hetznercloud_hcloud: 1.62.0 -> 1.63.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e99c7f8db7ea..11a64d29bcf0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -706,13 +706,13 @@ "vendorHash": null }, "hetznercloud_hcloud": { - "hash": "sha256-2dKJLOhOkCKsAgjapmF0NvupszhILt+1lSH9TRqH44s=", + "hash": "sha256-oU5XdhAl8/YEIEOF6TxpNEyffLYMrOgWv1D6oJNzJ8Q=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.62.0", + "rev": "v1.63.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-fWnf2l9a7bzXtofA+Aow6F17K+slpMpXEYZPuqDNwfg=" + "vendorHash": "sha256-L+T14UUCEUDbpd8UzKAsDzhpXKTmeUwC1XMnwWK4Z8Y=" }, "huaweicloud_huaweicloud": { "hash": "sha256-CtqPtXccE6I+yDj/7XbjbACMwCGMv+pSEIa5DVh+AGo=", From 6516262d4c65930fb05a5f53b995e15b197f3e0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 09:18:32 +0000 Subject: [PATCH 251/260] terraform-providers.aminueza_minio: 3.33.1 -> 3.35.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e99c7f8db7ea..be2387856f60 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -54,13 +54,13 @@ "vendorHash": "sha256-1cvxBtsehwAhF48d/i8qTi6XJxxYMAeq1MAInuUE3Sw=" }, "aminueza_minio": { - "hash": "sha256-UvuHbb8aeh1pKFY9VLUdxwYZVYLRVEFCZrL/NrmpnGc=", + "hash": "sha256-u3kCxgZ0Mg63TinXnncopP2nKpjnmXTUQYTN7g4DIRA=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.33.1", + "rev": "v3.35.1", "spdx": "AGPL-3.0", - "vendorHash": "sha256-4Jsi6YkjWakH53Ub/CALDYfL1UC/xWRBvAmJTpHTVtk=" + "vendorHash": "sha256-auzaaTEJAluuLdhR3auGH5uCguXO2zQahEVdA6ooOUg=" }, "argoproj-labs_argocd": { "hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=", From 22abfb08e2668e7efc9dbde0b7b47101bee233ab Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 13 May 2026 10:46:18 +0100 Subject: [PATCH 252/260] pyradio: 0.9.3.11.30 -> 0.9.3.11.31 Release: https://github.com/coderholic/pyradio/releases/tag/0.9.3.11.31 Diff: https://github.com/coderholic/pyradio/compare/0.9.3.11.30...0.9.3.11.31 --- pkgs/by-name/py/pyradio/package.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index c50a251d5a4c..1bb120b6d112 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "pyradio"; - version = "0.9.3.11.30"; + version = "0.9.3.11.31"; pyproject = true; src = fetchFromGitHub { owner = "coderholic"; repo = "pyradio"; tag = finalAttrs.version; - hash = "sha256-b4Euo9rD/A7PjROOaigx2ITel1uA7fa6S6bNi76FeUw="; + hash = "sha256-DZ/HffM53uBYpucIq9UEIIzkIeF/WxXCnC1tB++LD9c="; }; nativeBuildInputs = [ @@ -28,6 +28,7 @@ python3Packages.buildPythonApplication (finalAttrs: { netifaces psutil python-dateutil + rapidfuzz requests rich ]; From 688c2e1e6ec9af0c9cd320bd887be0dd46b379a4 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Wed, 13 May 2026 10:47:41 +0100 Subject: [PATCH 253/260] pyradio: update homepage The prior homepage was last indexed by the Internet Archive on the 6th of December 2024 and it is no longer reachable. --- pkgs/by-name/py/pyradio/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix index 1bb120b6d112..04b3419a2418 100644 --- a/pkgs/by-name/py/pyradio/package.nix +++ b/pkgs/by-name/py/pyradio/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; meta = { - homepage = "http://www.coderholic.com/pyradio/"; + homepage = "https://github.com/coderholic/pyradio"; description = "Curses based internet radio player"; mainProgram = "pyradio"; changelog = "https://github.com/coderholic/pyradio/releases/tag/${finalAttrs.src.tag}"; From 8cc4f14be4595c1e40c8222002e2705b887f4c20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 10:01:57 +0000 Subject: [PATCH 254/260] terraform-providers.cloudscale-ch_cloudscale: 5.0.2 -> 5.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e99c7f8db7ea..dddd022db143 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -228,13 +228,13 @@ "vendorHash": "sha256-F4vFlhpPQUa1q7cFfjRooK4krISfpPxdj8uhvDmZQuY=" }, "cloudscale-ch_cloudscale": { - "hash": "sha256-Ynuyn0L5B7d81WXEHoTI03zFzlEP3LGY4yQIl/WBr/8=", + "hash": "sha256-eVJPfiQAJ3cFgZksO4Fc7X3xVbSKlQKgiK5UeIGwWk8=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v5.0.2", + "rev": "v5.1.0", "spdx": "MIT", - "vendorHash": "sha256-WnVdJk74nrCHeP+Y6xdZZTDdfVIyk9TDan5cUU2O//8=" + "vendorHash": "sha256-KFax77RX487buIewsrUpe4cFJiCguoahuYhHJqH6edE=" }, "constellix_constellix": { "deleteVendor": true, From e079fbe351d723dbd7c355f98e851a853ddbd2e0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 10:07:39 +0000 Subject: [PATCH 255/260] python3Packages.bidsschematools: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/bidsschematools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix index ad6ee3c4fe9b..0f6cc8044e15 100644 --- a/pkgs/development/python-modules/bidsschematools/default.nix +++ b/pkgs/development/python-modules/bidsschematools/default.nix @@ -10,14 +10,14 @@ buildPythonPackage (finalAttrs: { pname = "bidsschematools"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; src = fetchFromGitHub { owner = "bids-standard"; repo = "bids-specification"; tag = "schema-${finalAttrs.version}"; - hash = "sha256-6s5j+aHMiLzDK5X48sD6hVzXpGYWSRX9J3sljt4iqZw="; + hash = "sha256-R8tpQcoAPbyWzEHbgQr8ASH+hSR9PA8bbcbk7QE3HSs="; }; sourceRoot = "${finalAttrs.src.name}/tools/schemacode"; From dd02ce20cc42124751e5e1a88d71dfa35416698e Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Wed, 11 Feb 2026 23:33:59 +0100 Subject: [PATCH 256/260] nsd: fix withSystemd = false config Without this, when setting 'withSystemd = false' on x86_64-linux, the configure step fails: > checking for SSL_CTX_set_security_level... yes > checking for ERR_load_SSL_strings... yes > checking if ERR_load_SSL_strings is deprecated... no > checking for pkg-config... no > configure: error: pkg-config not found --- pkgs/by-name/ns/nsd/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ns/nsd/package.nix b/pkgs/by-name/ns/nsd/package.nix index 46f17f508721..b6cf8db8ed3c 100644 --- a/pkgs/by-name/ns/nsd/package.nix +++ b/pkgs/by-name/ns/nsd/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+ezCz3m6UFgPLfYpGO/EQAhMW/EQV9tEwZqpZDzUteg="; }; - nativeBuildInputs = lib.optionals withSystemd [ + nativeBuildInputs = [ pkg-config ]; From 27fec7746ed916b4977d8cf64e2b97ea95a3e24f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 13 May 2026 10:35:35 +0000 Subject: [PATCH 257/260] libretro.pcsx2: 0-unstable-2026-05-01 -> 0-unstable-2026-05-13 --- pkgs/applications/emulators/libretro/cores/pcsx2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/applications/emulators/libretro/cores/pcsx2.nix index 9e30fa3e8da3..3c0ea798da93 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx2.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx2.nix @@ -11,13 +11,13 @@ }: mkLibretroCore { core = "pcsx2"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-05-13"; src = fetchFromGitHub { owner = "libretro"; repo = "ps2"; - rev = "1b048a1783263a0584e3f663fe46b1a6fd163ff9"; - hash = "sha256-5me+ETLmJrVmpkGi1TJ5LWiPp+AKiwHPl7AlG0cp+8o="; + rev = "2b9768b58e743b2e7586051e28896c98dc05fa4e"; + hash = "sha256-Du+Z0gF5y5a91/bCfSY7ohubSn4JaaWxB3fkO4aE6e8="; fetchSubmodules = true; }; From 21edf1617253c6c23337d1521713a2d23717ad24 Mon Sep 17 00:00:00 2001 From: Ruud van Asseldonk Date: Wed, 13 May 2026 12:36:52 +0200 Subject: [PATCH 258/260] nsd: add ruuda as maintainer I depend on this package in production, I'm willing to maintain it. --- pkgs/by-name/ns/nsd/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ns/nsd/package.nix b/pkgs/by-name/ns/nsd/package.nix index b6cf8db8ed3c..e60228f1b7ce 100644 --- a/pkgs/by-name/ns/nsd/package.nix +++ b/pkgs/by-name/ns/nsd/package.nix @@ -90,5 +90,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Authoritative only, high performance, simple and open source name server"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ ruuda ]; }; }) From 60fd06dbd366f9adb0494d9274784338568a6837 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 May 2026 13:45:20 +0200 Subject: [PATCH 259/260] python3Packages.pydantic-graph: 1.94.0 -> 1.95.0 https://github.com/pydantic/pydantic-ai/compare/v1.94.0...v1.95.0 --- pkgs/development/python-modules/pydantic-graph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-graph/default.nix b/pkgs/development/python-modules/pydantic-graph/default.nix index a57132bf811d..206dac229f87 100644 --- a/pkgs/development/python-modules/pydantic-graph/default.nix +++ b/pkgs/development/python-modules/pydantic-graph/default.nix @@ -16,14 +16,14 @@ buildPythonPackage (finalAttrs: { pname = "pydantic-graph"; - version = "1.94.0"; + version = "1.95.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-7bFlAJiJVxZWNcP/LbLQO97KRXIcG3xy12m1HEji1Rs="; + hash = "sha256-K4Cgssa7RFOTXnCiGwx0sFu7EypTX4GpIQAnom2JVZw="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_graph"; From 44b4098ec56a8cca348a5a27e74252cde7a618bb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 13 May 2026 13:46:30 +0200 Subject: [PATCH 260/260] python3Packages.pydantic-ai-slim: 1.94.0 -> 1.95.0 https://github.com/pydantic/pydantic-ai/compare/v1.94.0...v1.95.0 --- pkgs/development/python-modules/pydantic-ai-slim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydantic-ai-slim/default.nix b/pkgs/development/python-modules/pydantic-ai-slim/default.nix index c4bf75525c04..e216f972d654 100644 --- a/pkgs/development/python-modules/pydantic-ai-slim/default.nix +++ b/pkgs/development/python-modules/pydantic-ai-slim/default.nix @@ -20,14 +20,14 @@ buildPythonPackage (finalAttrs: { pname = "pydantic-ai-slim"; - version = "1.94.0"; + version = "1.95.0"; pyproject = true; src = fetchFromGitHub { owner = "pydantic"; repo = "pydantic-ai"; tag = "v${finalAttrs.version}"; - hash = "sha256-7bFlAJiJVxZWNcP/LbLQO97KRXIcG3xy12m1HEji1Rs="; + hash = "sha256-K4Cgssa7RFOTXnCiGwx0sFu7EypTX4GpIQAnom2JVZw="; }; sourceRoot = "${finalAttrs.src.name}/pydantic_ai_slim";