From a18f7e07e1b1af054e192c8de4447de71a0b9e30 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 7 May 2026 23:50:12 +0000 Subject: [PATCH 01/15] python3Packages.eliot: 1.17.5 -> 1.18.0 Diff: https://github.com/itamarst/eliot/compare/1.17.5...1.18.0 Changelog: https://github.com/itamarst/eliot/blob/1.18.0/docs/source/news.rst --- .../python-modules/eliot/default.nix | 16 +++++++------ .../python-modules/eliot/python-3.14.patch | 23 ------------------- 2 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 pkgs/development/python-modules/eliot/python-3.14.patch diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix index 5412f8ca4d3e..07fc87bbb1e4 100644 --- a/pkgs/development/python-modules/eliot/default.nix +++ b/pkgs/development/python-modules/eliot/default.nix @@ -6,6 +6,8 @@ # build-system setuptools, + setuptools-scm, + versioneer, # dependencies boltons, @@ -27,23 +29,23 @@ buildPythonPackage (finalAttrs: { pname = "eliot"; - version = "1.17.5"; + version = "1.18.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "itamarst"; repo = "eliot"; tag = finalAttrs.version; - hash = "sha256-x6zonKL6Ys1fyUjyOgVgucAN64Dt6dCzdBrxRZa+VDQ="; + hash = "sha256-YUvHdnpWtsy2NlrVLaaewcUPKGLfdfX/zvowV0jcXuw="; }; - patches = [ - # Upstream PR: https://github.com/itamarst/eliot/pull/520 - ./python-3.14.patch + build-system = [ + setuptools + setuptools-scm + versioneer ]; - build-system = [ setuptools ]; - dependencies = [ boltons orjson diff --git a/pkgs/development/python-modules/eliot/python-3.14.patch b/pkgs/development/python-modules/eliot/python-3.14.patch deleted file mode 100644 index af34f0db80f1..000000000000 --- a/pkgs/development/python-modules/eliot/python-3.14.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a5fc2936e8e13ebb73de4254234ca4d6ead15d1e Mon Sep 17 00:00:00 2001 -From: Itamar Turner-Trauring -Date: Sun, 18 Jan 2026 14:15:02 -0500 -Subject: [PATCH] Pass tests for 3.14. - ---- - eliot/tests/test_coroutines.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/eliot/tests/test_coroutines.py b/eliot/tests/test_coroutines.py -index 39c5496c..cb2c1b13 100644 ---- a/eliot/tests/test_coroutines.py -+++ b/eliot/tests/test_coroutines.py -@@ -34,7 +34,8 @@ def run_coroutines(*async_functions): - """ - Run a coroutine until it finishes. - """ -- loop = asyncio.get_event_loop() -+ loop = asyncio.new_event_loop() -+ asyncio.set_event_loop(loop) - futures = [asyncio.ensure_future(f()) for f in async_functions] - - async def wait_for_futures(): From 0b48e9b410b39d0cc8874a576890a7848e3bc2c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 00:32:13 +0000 Subject: [PATCH 02/15] feh: 3.12.1 -> 3.12.2 --- pkgs/by-name/fe/feh/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fe/feh/package.nix b/pkgs/by-name/fe/feh/package.nix index 1a6d2957145a..72931f20abdb 100644 --- a/pkgs/by-name/fe/feh/package.nix +++ b/pkgs/by-name/fe/feh/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "feh"; - version = "3.12.1"; + version = "3.12.2"; src = fetchFromGitHub { owner = "derf"; repo = "feh"; rev = finalAttrs.version; - hash = "sha256-cjfP/jnVWIGXTihtjVANE1T31R9ZFj8g5H8W3F+JrQk="; + hash = "sha256-YAVj4ZD4WchMalIUyqnw4sZTTTnLouv9VDwqK6q3SAE="; }; outputs = [ From c3a94bfc3b219fdbd67ae173617499306ce65f04 Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Mon, 20 Apr 2026 02:24:09 -0600 Subject: [PATCH 03/15] wrangler: 4.62.0 -> 4.90.0 https://github.com/cloudflare/workers-sdk/releases/tag/wrangler@4.90.0 Diff: https://github.com/cloudflare/workers-sdk/compare/wrangler@4.62.0...wrangler@4.90.0 --- pkgs/by-name/wr/wrangler/package.nix | 40 +++++++++++++++++----------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix index 2d5dae6dfae2..5107acca95ff 100644 --- a/pkgs/by-name/wr/wrangler/package.nix +++ b/pkgs/by-name/wr/wrangler/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, makeWrapper, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, autoPatchelfHook, @@ -19,13 +19,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "wrangler"; - version = "4.62.0"; + version = "4.90.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "workers-sdk"; rev = "wrangler@${finalAttrs.version}"; - hash = "sha256-o6ARRNObHtRqAD71j7L2HkpIalPwGWR+PyQQuHJBKZE="; + hash = "sha256-M2m8dRhTjAYof3S7lVaFYP61p38LvXFSTxantCsUHtE="; }; pnpmDeps = fetchPnpmDeps { @@ -35,9 +35,9 @@ stdenv.mkDerivation (finalAttrs: { src postPatch ; - pnpm = pnpm_9; - fetcherVersion = 2; - hash = "sha256-Crtjchu17OFPWqd3L0AYCpA76YRN4jJc+vLVLo1WLe4="; + pnpm = pnpm_10; + fetcherVersion = 3; + hash = "sha256-Bo9V3MJaDnKR7TZO4u0mDy9223n7/En8aAdYOgHyYxE="; }; # pnpm packageManager version in workers-sdk root package.json may not match nixpkgs postPatch = '' @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper nodejs pnpmConfigHook - pnpm_9 + pnpm_10 jq moreutils ] @@ -73,15 +73,25 @@ stdenv.mkDerivation (finalAttrs: { # @cloudflare/vitest-pool-workers wanted to run a server as part of the build process # so I simply removed it - postBuild = '' - mv packages/vitest-pool-workers packages/~vitest-pool-workers + postBuild = + let + extraDeps = [ + "unenv-preset" + "workers-utils" + "local-explorer-ui" + "codemod" + "cli-shared-helpers" + "miniflare" + "wrangler" + ]; + in + '' + mv packages/vitest-pool-workers packages/~vitest-pool-workers - NODE_ENV="production" pnpm --filter unenv-preset run build - NODE_ENV="production" pnpm --filter workers-utils run build - NODE_ENV="production" pnpm --filter workers-shared run build - NODE_ENV="production" pnpm --filter miniflare run build - NODE_ENV="production" pnpm --filter wrangler run build - ''; + for pkg in ${toString extraDeps}; do + NODE_ENV="production" pnpm --filter "$pkg" run build + done + ''; # I'm sure this is suboptimal but it seems to work. Points: # - when build is run in the original repo, no specific executable seems to be generated; you run the resulting build with pnpm run start From 94a009f821ea0440435e0bc1fc560e9c5acac2ff Mon Sep 17 00:00:00 2001 From: Ryan Omasta Date: Thu, 7 May 2026 21:05:54 -0600 Subject: [PATCH 04/15] nixos/limine: fix option_from_config to use yes/no values --- nixos/modules/system/boot/loader/limine/limine-install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 366d1285a74c..7b2e263e401e 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -395,7 +395,7 @@ def option_from_config(name: str, config_path: List[str]) -> str: return "" if isinstance(value, bool): value = bool_to_yes_no(value) - return f"{name}: {config(*config_path)}\n" + return f"{name}: {value}\n" def install_bootloader() -> None: From 7eae1128f3781de5d8bc7122a59740fc4ff70604 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 04:34:01 +0000 Subject: [PATCH 05/15] projclean: 0.8.0 -> 0.9.0 --- pkgs/by-name/pr/projclean/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pr/projclean/package.nix b/pkgs/by-name/pr/projclean/package.nix index 221b34554dae..a6322a294b15 100644 --- a/pkgs/by-name/pr/projclean/package.nix +++ b/pkgs/by-name/pr/projclean/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "projclean"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "projclean"; tag = "v${finalAttrs.version}"; - hash = "sha256-EScezOsfiirg8YbhteFxuVTodeup8tUzZdcrWveJxWE="; + hash = "sha256-lVXqaN8zaJ/T9ot2ONKjOJfejWjsHLNG3d3o8sdaYQM="; }; - cargoHash = "sha256-9atTgWg1iYCeXsRLLMOR87CbpIezD3ozMMOgumRNKAg="; + cargoHash = "sha256-jVONodcFCdjKOt7GkIUlWw+4yisDNJ/srqqP99gdsAc="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; From 4fce81f970e1dc84742561761dc442908bf29544 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 05:00:37 +0000 Subject: [PATCH 06/15] simplex-chat-desktop: 6.4.11 -> 6.5.1 --- pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix index 008c17992d87..b371758d3073 100644 --- a/pkgs/by-name/si/simplex-chat-desktop/package.nix +++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix @@ -8,7 +8,7 @@ let pname = "simplex-chat-desktop"; - version = "6.4.11"; + version = "6.5.1"; sources = { "aarch64-linux" = fetchurl { @@ -17,7 +17,7 @@ let }; "x86_64-linux" = fetchurl { url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage"; - hash = "sha256-0b88H6eMYO+EgRnWzd9x/MUCr7CE/AHDZnKILQJS1DQ="; + hash = "sha256-xRHMdHaV+ppxAm1BDOP743N53oDnVPt8b7H+cRqzuZE="; }; }; From ffcadfe15d03f92a08f4e06b3279105c61d7292c Mon Sep 17 00:00:00 2001 From: Harinn Date: Fri, 8 May 2026 15:24:35 +0700 Subject: [PATCH 07/15] soundtracker: fix build with gcc 15 --- pkgs/by-name/so/soundtracker/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/so/soundtracker/package.nix b/pkgs/by-name/so/soundtracker/package.nix index ff844e72587c..8fb4b6820388 100644 --- a/pkgs/by-name/so/soundtracker/package.nix +++ b/pkgs/by-name/so/soundtracker/package.nix @@ -55,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: { "--disable-alsa" ]; + env.NIX_CFLAGS_COMPILE = "-std=gnu17"; + enableParallelBuilding = true; strictDeps = true; From f8cf2751d3fd3a7de6d379851745dd12ea95d49a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 09:12:49 +0000 Subject: [PATCH 08/15] bruijn: 0-unstable-2025-12-07 -> 0-unstable-2026-05-02 --- pkgs/by-name/br/bruijn/generated.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix index e1111044faf4..ee0fd9289b90 100644 --- a/pkgs/by-name/br/bruijn/generated.nix +++ b/pkgs/by-name/br/bruijn/generated.nix @@ -22,10 +22,10 @@ }: mkDerivation { pname = "bruijn"; - version = "0-unstable-2025-12-07"; + version = "0-unstable-2026-05-02"; src = fetchzip { - url = "https://github.com/marvinborner/bruijn/archive/3f329f0299c944205293eceec72be25418fd9f0b.tar.gz"; - sha256 = "0qx7x50bz0yw0iwg4ymxipzqbh7ki729rbfwxrmijnwbxijlsr01"; + url = "https://github.com/marvinborner/bruijn/archive/8a88445d1f0d970c88cdb0e1b97a04ba02019a94.tar.gz"; + sha256 = "12s2sa9zg6sxia36mm0z8fq7f3kd86g96gcwd8xnb8dl49x8qbd5"; }; isLibrary = true; isExecutable = true; From 39580796fdd875d3789dfd9db08df467502768d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 May 2026 09:19:04 +0000 Subject: [PATCH 09/15] terraform-providers.bpg_proxmox: 0.104.0 -> 0.106.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 4444852e4c81..ce3165a90f40 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -110,13 +110,13 @@ "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-nQIpxNiWYFHYgmiLjva+3tyOVdjrap35Zmy1nRWwpH4=", + "hash": "sha256-RgyPVv3CWHgArDjmcz46j578hgleHFQ81MJ5OUWXnBk=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.104.0", + "rev": "v0.106.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-pgFHrO71UGfH/w4Du7ocy437FNtptoDTWHmARQG/5A0=" + "vendorHash": "sha256-AxXZRn2D6iEIG6p00KGQi1kMkt2F/ZyeBsXHR345wag=" }, "brightbox_brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", From 8126962ba565c0a64101a916ea6477e3706b411a Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 25 Apr 2026 01:40:31 +0100 Subject: [PATCH 10/15] libdbusmenu: enable on darwin --- pkgs/by-name/li/libdbusmenu/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libdbusmenu/package.nix b/pkgs/by-name/li/libdbusmenu/package.nix index 7193271c5bfa..e7b5f05a0352 100644 --- a/pkgs/by-name/li/libdbusmenu/package.nix +++ b/pkgs/by-name/li/libdbusmenu/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { "dbusmenu-jsonloader-0.4" ] ++ lib.optional (gtkVersion == "3") "dbusmenu-gtk${gtkVersion}-0.4"; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; maintainers = [ lib.maintainers.msteen ]; }; }) From 6dc592daed4ac25104623b348384852fd0f6ecd1 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 25 Apr 2026 01:40:45 +0100 Subject: [PATCH 11/15] libgit2-glib: enable on darwin --- pkgs/by-name/li/libgit2-glib/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/libgit2-glib/package.nix b/pkgs/by-name/li/libgit2-glib/package.nix index 8af2905f5df5..44ef51b291b5 100644 --- a/pkgs/by-name/li/libgit2-glib/package.nix +++ b/pkgs/by-name/li/libgit2-glib/package.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.gnome.org/GNOME/libgit2-glib"; license = lib.licenses.lgpl21Plus; teams = [ lib.teams.gnome ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; }; }) From 22a0875c6df59c643e5a44555e1a596c0c583903 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 25 Apr 2026 01:52:45 +0100 Subject: [PATCH 12/15] haskellPackages.*: unmark a few packages as broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 3 --- .../configuration-hackage2nix/transitive-broken.yaml | 2 -- pkgs/development/haskell-modules/hackage-packages.nix | 8 -------- 3 files changed, 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 91efaecae918..08a76ba92b10 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5571,7 +5571,6 @@ broken-packages: - sdl2-compositor # failure in job https://hydra.nixos.org/build/233198910 at 2023-09-02 - sdl2-fps # failure in job https://hydra.nixos.org/build/233195346 at 2023-09-02 - sdl2-image # failure in job https://hydra.nixos.org/build/233216837 at 2023-09-02 - - sdl2-mixer # failure in job https://hydra.nixos.org/build/233228951 at 2023-09-02 - sdp # failure in job https://hydra.nixos.org/build/233246702 at 2023-09-02 - sdr # failure in job https://hydra.nixos.org/build/243807383 at 2024-01-01 - seacat # failure in job https://hydra.nixos.org/build/233229959 at 2023-09-02 @@ -7120,7 +7119,6 @@ broken-packages: - vty-examples # failure in job https://hydra.nixos.org/build/233235872 at 2023-09-02 - vty-menu # failure in job https://hydra.nixos.org/build/233232391 at 2023-09-02 - vty-ui # failure in job https://hydra.nixos.org/build/233200900 at 2023-09-02 - - vulkan-utils # failure in job https://hydra.nixos.org/build/307522991 at 2025-09-19 - wacom-daemon # failure in job https://hydra.nixos.org/build/233213077 at 2023-09-02 - waddle # failure in job https://hydra.nixos.org/build/233239973 at 2023-09-02 - wai-control # failure in job https://hydra.nixos.org/build/295098171 at 2025-04-22 @@ -7309,7 +7307,6 @@ broken-packages: - xenstore # failure in job https://hydra.nixos.org/build/233234469 at 2023-09-02 - xfconf # failure in job https://hydra.nixos.org/build/233234800 at 2023-09-02 - xformat # failure in job https://hydra.nixos.org/build/233211918 at 2023-09-02 - - xgboost-haskell # failure in job https://hydra.nixos.org/build/295098374 at 2025-04-22 - xhaskell-library # failure in job https://hydra.nixos.org/build/233221178 at 2023-09-02 - xhb # failure in job https://hydra.nixos.org/build/233204853 at 2023-09-02 - xilinx-lava # failure in job https://hydra.nixos.org/build/233247659 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 585b490011b6..2368b6cc750c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1204,7 +1204,6 @@ dont-distribute-packages: - graphicstools - graphtype - greencard-lib - - grid-proto - gridbounds - gridland - gross @@ -3250,7 +3249,6 @@ dont-distribute-packages: - source-code-server - SourceGraph - SpacePrivateers - - spade - sparkle - sparrow - sparsebit diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 957f39e6a76c..a2175623dd44 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -289742,7 +289742,6 @@ self: { description = "Game engine for Prototyping on a Grid"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; } ) { }; @@ -607053,8 +607052,6 @@ self: { description = "Haskell bindings to SDL2_mixer"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { inherit (pkgs) SDL2_mixer; }; @@ -642413,7 +642410,6 @@ self: { description = "A simple programming and debugging environment"; license = lib.meta.getLicenseFromSpdxId "GPL-3.0-only"; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "spade"; } ) { }; @@ -735069,8 +735065,6 @@ self: { description = "Utils for the vulkan package"; license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { }; @@ -755001,9 +754995,7 @@ self: { "armv7l-linux" ] ++ lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; mainProgram = "xgb-agaricus"; - broken = true; } ) { inherit (pkgs) xgboost; }; From d14c80e68e023ac9aaefbd269a6dacf97d34a6cc Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Sat, 25 Apr 2026 01:42:47 +0100 Subject: [PATCH 13/15] haskellPackages.*: enable packages that build on aarch64-darwin --- .../haskell-modules/configuration-darwin.nix | 2 - .../configuration-hackage2nix/main.yaml | 39 +++-------------- .../haskell-modules/hackage-packages.nix | 42 +++---------------- 3 files changed, 12 insertions(+), 71 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 0c6c30554097..665bd415ca4f 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -134,8 +134,6 @@ self: super: + (oldAttrs.preCompileBuildDriver or ""); }) super.llvm-hs; - sym = markBroken super.sym; - yesod-core = super.yesod-core.overrideAttrs (drv: { # Allow access to local networking when the Darwin sandbox is enabled, so yesod-core can # run tests that access localhost. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 56bb238acddc..68ca53264ba3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -670,7 +670,6 @@ unsupported-platforms: Allure: [ platforms.darwin ] bdcs-api: [ platforms.darwin ] bindings-directfb: [ platforms.darwin ] - bindings-sane: [ platforms.darwin ] bustle: [ platforms.darwin ] # uses glibc-specific ptsname_r bytelog: [ platforms.darwin ] # due to posix-api camfort: [ aarch64-linux ] @@ -684,27 +683,18 @@ unsupported-platforms: Euterpea: [ platforms.darwin ] follow-file: [ platforms.darwin ] freenect: [ platforms.darwin ] - FTGL: [ platforms.darwin ] fuzzytime: [ platforms.darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2 ghc-gc-hook: [ platforms.darwin ] # requires C11 threads which Apple doesn't support - gi-adwaita: [ platforms.darwin ] - gi-dbusmenu: [ platforms.darwin ] - gi-dbusmenugtk3: [ platforms.darwin ] - gi-ggit: [ platforms.darwin ] gi-gtk-layer-shell: [ platforms.darwin ] # depends on gtk-layer-shell which is not supported on darwin gi-ibus: [ platforms.darwin ] gi-javascriptcore: [ platforms.darwin ] # webkitgtk marked broken on darwin gi-ostree: [ platforms.darwin ] - gi-vte: [ platforms.darwin ] gi-webkit2: [ platforms.darwin ] # webkitgtk marked broken on darwin gi-webkit2webextension: [ platforms.darwin ] # webkitgtk marked broken on darwin gi-wnck: [ platforms.darwin ] - gl: [ platforms.darwin ] # depends on mesa GLHUI: [ platforms.darwin ] # depends on mesa - gnome-keyring: [ platforms.darwin ] grid-proto: [ platforms.darwin ] gtk-sni-tray: [ platforms.darwin ] - h-raylib: [ platforms.darwin ] # depends on mesa haskell-snake: [ platforms.darwin ] hcwiid: [ platforms.darwin ] HDRUtils: [ platforms.darwin ] @@ -717,7 +707,6 @@ unsupported-platforms: jsaddle-webkit2gtk: [ platforms.darwin ] Kulitta: [ platforms.darwin ] # depends on Euterpea LambdaHack: [ platforms.darwin ] - libmodbus: [ platforms.darwin ] libsystemd-journal: [ platforms.darwin ] libtelnet: [ platforms.darwin ] libvirt-hs: [ platforms.darwin ] # spidermonkey is not supported on darwin @@ -726,18 +715,16 @@ unsupported-platforms: lio-fs: [ platforms.darwin ] logging-facade-journald: [ platforms.darwin ] longshot: [ aarch64-linux ] - mpi-hs-binary: [ aarch64-linux, platforms.darwin ] - mpi-hs-cereal: [ aarch64-linux, platforms.darwin ] + mpi-hs-binary: [ aarch64-linux ] + mpi-hs-cereal: [ aarch64-linux ] mpi-hs-store: [ aarch64-linux, platforms.darwin ] - mpi-hs: [ aarch64-linux, platforms.darwin ] + mpi-hs: [ aarch64-linux ] mplayer-spot: [ aarch64-linux, platforms.darwin ] mptcp-pm: [ platforms.darwin ] netlink: [ platforms.darwin ] network-unexceptional: [ platforms.darwin ] # depends on posix-api - notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu oculus: [ platforms.darwin ] ostree-pin: [ platforms.darwin ] # depends on gi-ostree - pam: [ platforms.darwin ] parport: [ platforms.darwin ] persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128 piyo: [ platforms.darwin ] @@ -749,14 +736,8 @@ unsupported-platforms: reactive-balsa: [ platforms.darwin ] # depends on alsa-core reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ] reflex-localize-dom: [ platforms.darwin, aarch64-linux ] - rtlsdr: [ platforms.darwin ] rubberband: [ platforms.darwin ] - SDL-mixer: [ platforms.darwin ] # depends on mesa - SDL-mpeg: [ platforms.darwin ] # depends on mesa - sdl2-mixer: [ platforms.darwin ] - sdl2-ttf: [ platforms.darwin ] sdr: [ platforms.darwin ] # depends on rtlsdr - sensei: [ platforms.darwin ] sockets: [ platforms.darwin ] # depends on posix-api spade: [ platforms.darwin ] # depends on sdl2-mixer, which doesn't work on darwin synthesizer-alsa: [ platforms.darwin ] @@ -766,14 +747,12 @@ unsupported-platforms: twirl: [ platforms.darwin ] # depends on sdl2-mixer Unixutils-shadow: [ platforms.darwin ] verifiable-expressions: [ aarch64-linux ] - vrpn: [ platforms.darwin ] - vulkan-utils: [ platforms.darwin ] - vulkan: [ i686-linux, armv7l-linux, platforms.darwin ] - VulkanMemoryAllocator: [ i686-linux, armv7l-linux, platforms.darwin ] + vulkan: [ i686-linux, armv7l-linux ] + VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] webkit2gtk3-javascriptcore: [ platforms.darwin ] wiringPi: [ aarch64-darwin ] xattr: [ platforms.darwin ] - xgboost-haskell: [ aarch64-linux, armv7l-linux, platforms.darwin ] + xgboost-haskell: [ aarch64-linux, armv7l-linux ] xmobar: [ platforms.darwin ] xmonad-extras: [ platforms.darwin ] xmonad-volume: [ platforms.darwin ] @@ -791,9 +770,6 @@ supported-platforms: blake3: [ platforms.x86 ] # uses x86 intrinsics btrfs: [ platforms.linux ] # depends on linux bytepatch: [ platforms.x86 ] # due to blake3 - cpuid: [ platforms.x86 ] # needs to be i386 compatible (IA-32) - cpython: [ platforms.x86 ] # c2hs errors on glibc headers - crc32c: [ platforms.x86 ] # uses x86 intrinsics d3d11binding: [ platforms.windows ] DirectSound: [ platforms.windows ] dx9base: [ platforms.windows ] @@ -804,8 +780,6 @@ supported-platforms: evdev: [ platforms.linux ] geomancy-layout: [ platforms.x86 ] # x86 intrinsics geomancy: [ platforms.x86 ] # x86 intrinsics - ghcjs-base: [ javascript-ghcjs ] - ghcjs-dom-javascript: [ javascript-ghcjs ] gi-gtkosxapplication: [ platforms.darwin ] gtk-mac-integration: [ platforms.darwin ] gtk3-mac-integration: [ platforms.darwin ] @@ -841,7 +815,6 @@ supported-platforms: midi-alsa: [ platforms.linux ] # alsa-core only supported on linux midisurface: [ platforms.linux ] # alsa-core only supported on linux miso-action-logger: [ javascript-ghcjs ] # https://github.com/Lermex/miso-action-logger/issues/1 - miso-examples: [ javascript-ghcjs ] OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 reactivity: [ platforms.windows ] reflex-libtelnet: [ platforms.linux ] # pkgs.libtelnet only supports linux diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a2175623dd44..c2f9546d3270 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12647,7 +12647,6 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) ftgl; }; @@ -39157,7 +39156,6 @@ self: { librarySystemDepends = [ SDL_mixer ]; description = "Binding to libSDL_mixer"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) SDL_mixer; }; @@ -39180,7 +39178,6 @@ self: { librarySystemDepends = [ smpeg ]; description = "Binding to the SMPEG library"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) smpeg; }; @@ -46378,8 +46375,7 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" - ] - ++ lib.platforms.darwin; + ]; } ) { }; @@ -106984,7 +106980,6 @@ self: { libraryPkgconfigDepends = [ sane-backends ]; description = "FFI bindings to libsane"; license = lib.licenses.lgpl3Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) sane-backends; }; @@ -168010,7 +168005,6 @@ self: { ]; description = "Binding for the cpuid machine instruction on x86 compatible processors"; license = lib.meta.getLicenseFromSpdxId "GPL-2.0-only"; - platforms = lib.platforms.x86; } ) { }; @@ -168090,7 +168084,6 @@ self: { testPkgconfigDepends = [ python3 ]; description = "Bindings for libpython"; license = lib.licenses.gpl3Only; - platforms = lib.platforms.x86; maintainers = [ lib.maintainers.sheepforce ]; } ) { inherit (pkgs) python3; }; @@ -169368,7 +169361,6 @@ self: { ]; description = "crc32c"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - platforms = lib.platforms.x86; } ) { }; @@ -268293,7 +268285,6 @@ self: { sha256 = "081w3234jramsmafnl86v37lwbckr2vc93gr9pdwc31yzni9kbml"; description = "base library for GHCJS"; license = lib.meta.getLicenseFromSpdxId "MIT"; - platforms = [ "javascript-ghcjs" ]; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -268425,7 +268416,6 @@ self: { sha256 = "1k62w5czg544ias8q2kvhp8qnlafzisgx1p0gq8d2kh662w99kcg"; description = "DOM library using JSFFI and GHCJS"; license = lib.meta.getLicenseFromSpdxId "MIT"; - platforms = [ "javascript-ghcjs" ]; maintainers = [ lib.maintainers.alexfmpe ]; } ) { }; @@ -269237,7 +269227,6 @@ self: { libraryPkgconfigDepends = [ libadwaita ]; description = "Adwaita bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libadwaita; }; @@ -269730,7 +269719,6 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libdbusmenu; }; @@ -269797,7 +269785,6 @@ self: { ]; description = "DbusmenuGtk bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { @@ -270279,7 +270266,6 @@ self: { libraryPkgconfigDepends = [ libgit2-glib ]; description = "libgit2-glib bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libgit2-glib; }; @@ -272720,7 +272706,6 @@ self: { libraryPkgconfigDepends = [ vte ]; description = "Vte bindings"; license = lib.licenses.lgpl21Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) vte; }; @@ -277451,7 +277436,6 @@ self: { librarySystemDepends = [ libGL ]; description = "Complete OpenGL raw bindings"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libGL; }; @@ -280411,7 +280395,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = lib.licenses.gpl3Only; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) libgnome-keyring; }; @@ -293637,7 +293620,6 @@ self: { ]; description = "Raylib bindings for Haskell"; license = lib.meta.getLicenseFromSpdxId "Apache-2.0"; - badPlatforms = lib.platforms.darwin; } ) { @@ -426728,7 +426710,6 @@ self: { librarySystemDepends = [ modbus ]; description = "Haskell bindings to the C modbus library"; license = lib.licenses.bsd2; - badPlatforms = lib.platforms.darwin; } ) { modbus = null; }; @@ -461409,7 +461390,6 @@ self: { isExecutable = true; description = "A tasty Haskell front-end web framework"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - platforms = [ "javascript-ghcjs" ]; } ) { }; @@ -472640,7 +472620,7 @@ self: { testPkgconfigDepends = [ ompi ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; - badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + badPlatforms = [ "aarch64-linux" ]; maintainers = [ lib.maintainers.sheepforce ]; } ) { ompi = null; }; @@ -472674,7 +472654,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; - badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + badPlatforms = [ "aarch64-linux" ]; maintainers = [ lib.maintainers.sheepforce ]; } ) { }; @@ -472708,7 +472688,7 @@ self: { testHaskellDepends = [ base ]; description = "MPI bindings for Haskell"; license = lib.licenses.asl20; - badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin; + badPlatforms = [ "aarch64-linux" ]; maintainers = [ lib.maintainers.sheepforce ]; } ) { }; @@ -494180,7 +494160,6 @@ self: { tuple ]; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; mainProgram = "notifications-tray-icon"; broken = true; @@ -512385,7 +512364,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) pam; }; @@ -596285,7 +596263,6 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings to librtlsdr"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) rtl-sdr; }; @@ -607051,7 +607028,6 @@ self: { executablePkgconfigDepends = [ SDL2_mixer ]; description = "Haskell bindings to SDL2_mixer"; license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; - badPlatforms = lib.platforms.darwin; } ) { inherit (pkgs) SDL2_mixer; }; @@ -607129,7 +607105,6 @@ self: { ]; description = "Bindings to SDL2_ttf"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { @@ -609930,7 +609905,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Automatically run Hspec tests on file modifications"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; maintainers = [ lib.maintainers.libjared ]; } ) { }; @@ -734322,7 +734296,6 @@ self: { ]; description = "Bindings to VRPN"; license = lib.licenses.mit; - badPlatforms = lib.platforms.darwin; mainProgram = "test-vrpn"; } ) @@ -734989,8 +734962,7 @@ self: { badPlatforms = [ "i686-linux" "armv7l-linux" - ] - ++ lib.platforms.darwin; + ]; } ) { inherit (pkgs) vulkan-loader; }; @@ -735064,7 +735036,6 @@ self: { ]; description = "Utils for the vulkan package"; license = lib.licenses.bsd3; - badPlatforms = lib.platforms.darwin; } ) { }; @@ -754993,8 +754964,7 @@ self: { badPlatforms = [ "aarch64-linux" "armv7l-linux" - ] - ++ lib.platforms.darwin; + ]; mainProgram = "xgb-agaricus"; } ) { inherit (pkgs) xgboost; }; From 0eca22677c0c5df6137456fab5a593ecfd066d5d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 10 Apr 2026 22:43:07 +0100 Subject: [PATCH 14/15] diffoscope: 316 -> 318 Changes: - https://diffoscope.org/news/diffoscope-317-released/ - https://diffoscope.org/news/diffoscope-318-released/ --- pkgs/by-name/di/diffoscope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index b2a90f6a34be..20e30df4e5ea 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -108,12 +108,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "316"; + version = "318"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-6YLeNNWVMbvL2xymsdsxUPnknOScqGc1egl8VKtWXz4="; + hash = "sha256-rvZxd0mFDzmMFg2QYihkfizYGwiK1QQB9flyYn1uESM="; }; outputs = [ From 613d413c93f666ba58c10c8f0707c18c36b6ab3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Thu, 7 May 2026 13:13:51 +0200 Subject: [PATCH 15/15] mcporter: 0.8.1 -> 0.10.1 --- pkgs/by-name/mc/mcporter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix index c500aecc8bee..5f740a4ab921 100644 --- a/pkgs/by-name/mc/mcporter/package.nix +++ b/pkgs/by-name/mc/mcporter/package.nix @@ -13,19 +13,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "mcporter"; - version = "0.8.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "steipete"; repo = "mcporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-I7UqHsi4pw4wQB4bb8XObo4aUOVtYpF17aYzEHzgCrg="; + hash = "sha256-MaIduY59Q2zVZheN1IYhAWBklQ3n6iJV3KiTMHCML2U="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; fetcherVersion = 3; - hash = "sha256-aYBd1+QkME+q2LkZRnlxHEbIQz38k+N64YSS+NOu0QU="; + hash = "sha256-jqHEu86dNjJuYBVKDeDlre+KlFEqx55YXZ5K81AK+uY="; }; nativeBuildInputs = [