cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #236991 from maralorn/haskell-updates

Browse source 
haskellPackages.threadscope: fix, bin output, maintain
This commit is contained in:
maralorn 2023-06-11 14:10:44 +02:00 committed by GitHub
commit 366e46b0b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -245,6 +245,9 @@ self: super: {
ghc-datasize = disableLibraryProfiling super.ghc-datasize; ghc-datasize = disableLibraryProfiling super.ghc-datasize;
ghc-vis = disableLibraryProfiling super.ghc-vis; 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 # patat main branch has an unreleased commit that fixes the build by
# relaxing restrictive upper boundaries. This can be removed once there's a # relaxing restrictive upper boundaries. This can be removed once there's a
# new release following version 0.8.8.0. # new release following version 0.8.8.0.

1
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

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

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

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

2
pkgs/development/haskell-modules/configuration-nix.nix
View file

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

3
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

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