From 22057fdadb79eb4907b91ce6250cfb1185fd6fe5 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 26 Sep 2025 13:43:41 +0200 Subject: [PATCH] haskellPackages: disable remaining dependents on libsoup_2_4 --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ .../haskell-modules/configuration-hackage2nix/main.yaml | 4 ++-- pkgs/development/haskell-modules/hackage-packages.nix | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ff2889ed4bc9..dc8b2773dcfe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1739,6 +1739,12 @@ with haskellLib; unmarkBroken ]; + # Requires jsaddle-webkit2gtk to build outside of pkgsCross.ghcjs + # which requires a version of libsoup that's marked as insecure + reflex-dom = dontDistribute super.reflex-dom; + reflex-localize-dom = dontDistribute super.reflex-localize-dom; + trasa-reflex = dontDistribute super.trasa-reflex; + # https://github.com/ghcjs/jsaddle/pull/160/ jsaddle = appendPatch (fetchpatch { name = "fix-on-firefox.patch"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index d424d3f3d8ee..bc775150e3a6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -143,14 +143,12 @@ package-maintainers: - generics-sop - ghcjs-base - ghcjs-dom - - ghcjs-dom-hello - ghcjs-dom-javascript - ghcjs-dom-jsaddle - haveibeenpwned - jsaddle - jsaddle-clib - jsaddle-dom - - jsaddle-hello - jsaddle-warp - jsaddle-wkwebview - json-sop @@ -934,7 +932,9 @@ dont-distribute-packages: - yices-painless # These packages don’t build because they use deprecated libsoup 2.4 versions. + - jsaddle-hello - jsaddle-webkit2gtk + - ghcjs-dom-hello - gi-javascriptcore4 - gi-soup2 - gi-webkit2 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8fd345d9d9db..687a0e3d4547 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -261842,7 +261842,7 @@ self: { ]; description = "GHCJS DOM Hello World, an example package"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.alexfmpe ]; + hydraPlatforms = lib.platforms.none; } ) { }; @@ -390512,7 +390512,7 @@ self: { ]; description = "JSaddle Hello World, an example package"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.alexfmpe ]; + hydraPlatforms = lib.platforms.none; } ) { };