Merge pull request #236991 from maralorn/haskell-updates

haskellPackages.threadscope: fix, bin output, maintain

pkgs/development/haskell-modules/configuration-common.nix

@@ -245,6 +245,9 @@ self: super: {
   ghc-datasize = disableLibraryProfiling super.ghc-datasize;
   ghc-vis = disableLibraryProfiling super.ghc-vis;
 
+  # 2023-06-10: Too strict version bound on https://github.com/haskell/ThreadScope/issues/118
+  threadscope = doJailbreak super.threadscope;
+
   # patat main branch has an unreleased commit that fixes the build by
   # relaxing restrictive upper boundaries. This can be removed once there's a
   # new release following version 0.8.8.0.

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -5363,7 +5363,6 @@ broken-packages:
   - thorn
   - th-pprint
   - threadmanager
-  - threadscope
   - thread-supervisor # test failure in job https://hydra.nixos.org/build/214156434 at 2023-03-29
   - threepenny-editors
   - threepenny-gui-contextmenu

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -310,6 +310,7 @@ package-maintainers:
     - streamly
     - streamly-bytestring
     - taskwarrior
+    - threadscope
     - tz
     - weeder
     - witch

pkgs/development/haskell-modules/configuration-nix.nix

@@ -192,6 +192,8 @@ self: super: builtins.intersectAttrs super {
   # Link the proper version.
   zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; };
 
+  threadscope = enableSeparateBinOutput super.threadscope;
+
   # Use the default version of mysql to build this package (which is actually mariadb).
   # test phase requires networking
   mysql = dontCheck super.mysql;

pkgs/development/haskell-modules/hackage-packages.nix

@@ -293599,9 +293599,8 @@ self: {
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "threadscope";
-       broken = true;
+       maintainers = [ lib.maintainers.maralorn ];
      }) {};
 
   "threefish" = callPackage