From 335ee0ff7bfe289c767b49537607a9c764ba8879 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Oct 2025 18:22:17 +0200 Subject: [PATCH 1/2] haskellPackages: regenerate package set based on current config (generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh) --- pkgs/development/haskell-modules/hackage-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7f055e85f69f..e806894c7baa 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -400804,7 +400804,10 @@ self: { description = "Advanced keyboard remapping utility"; license = lib.licenses.mit; mainProgram = "kmonad"; - maintainers = [ lib.maintainers.slotThe ]; + maintainers = [ + lib.maintainers.auscyber + lib.maintainers.slotThe + ]; } ) { }; From 5260d68085b8f76ade477f310a01b8d2236391f5 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 13 Oct 2025 18:19:32 +0200 Subject: [PATCH 2/2] haskellPackages.mason: unbreak --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 816222eed545..d6bd8bc4302a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -544,6 +544,10 @@ with haskellLib; # https://github.com/essandess/adblock2privoxy/pull/43 adblock2privoxy = doJailbreak super.adblock2privoxy; + # 2025-07-15: Relax version constraints (network < 3.2) + # Fixed upstream, but unreleased: https://github.com/fumieval/mason/pull/14 + mason = (warnAfterVersion "0.2.6") (doJailbreak super.mason); + # Missing test file https://gitlab.com/dpwiz/hs-jpeg-turbo/-/issues/1 jpeg-turbo = dontCheck super.jpeg-turbo; JuicyPixels-jpeg-turbo = dontCheck super.JuicyPixels-jpeg-turbo; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 858fdec167ff..eda038782976 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3914,7 +3914,6 @@ broken-packages: - marshal-contt # failure in job https://hydra.nixos.org/build/233231755 at 2023-09-02 - marvin-interpolate # failure in job https://hydra.nixos.org/build/233201000 at 2023-09-02 - MASMGen # failure in job https://hydra.nixos.org/build/233213454 at 2023-09-02 - - mason # failure in job https://hydra.nixos.org/build/295095242 at 2025-04-22 - massiv-scheduler # failure in job https://hydra.nixos.org/build/233196778 at 2023-09-02 - massiv-serialise # failure in job https://hydra.nixos.org/build/233242284 at 2023-09-02 - master-plan # failure in job https://hydra.nixos.org/build/233208718 at 2023-09-02 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e806894c7baa..258b2c2343f9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -437632,8 +437632,6 @@ self: { ]; description = "Fast and extensible bytestring builder"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; } ) { };