From 8766168f361300aa48ae7468293b111806feb2cb Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 10 Jun 2023 09:53:47 +0200 Subject: [PATCH 1/3] haskellPackages.threadscope: Fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 44c301ea360f..74db7abe620e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/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. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e6f98ce6f576..1ab65af75ec9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5364,7 +5364,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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 991c1a5c1e45..4ddc9a67d8b6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -293601,9 +293601,7 @@ self: { ]; description = "A graphical tool for profiling parallel Haskell programs"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "threadscope"; - broken = true; }) {}; "threefish" = callPackage From 21674281ace70505b82812c1d0f15c79ef9d928e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 10 Jun 2023 09:54:02 +0200 Subject: [PATCH 2/3] haskellPackages.threadscope: enable separate bin output --- pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9624b28e1159..505c75f0a04f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/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; From 054ef603cc67c82b2586b14dbf1504fa683a5387 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 10 Jun 2023 09:59:04 +0200 Subject: [PATCH 3/3] haskellPackages.threadscope: add maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e3a00fc09b12..b6049884138c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -310,6 +310,7 @@ package-maintainers: - streamly - streamly-bytestring - taskwarrior + - threadscope - tz - weeder - witch diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4ddc9a67d8b6..19ff3c2e236a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -293602,6 +293602,7 @@ self: { description = "A graphical tool for profiling parallel Haskell programs"; license = lib.licenses.bsd3; mainProgram = "threadscope"; + maintainers = [ lib.maintainers.maralorn ]; }) {}; "threefish" = callPackage