summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEllie Hermaszewska <git@monoid.al>2022-01-19 10:32:40 +0800
committerGitHub <noreply@github.com>2022-01-19 10:32:40 +0800
commitce12b79e8321d0da73a5ac2b1bab6b684d0378fc (patch)
treeda7cb84784faddfb3ce01368249acbe158c034a5 /pkgs
parent6b635d4a21b4a83f8df8cf7ca212501275ab9d7b (diff)
parent3ac0d71f3c8e47ee88e68991926e48cd4073b82b (diff)
downloadnixpkgs-ce12b79e8321d0da73a5ac2b1bab6b684d0378fc.tar
nixpkgs-ce12b79e8321d0da73a5ac2b1bab6b684d0378fc.tar.gz
nixpkgs-ce12b79e8321d0da73a5ac2b1bab6b684d0378fc.tar.bz2
nixpkgs-ce12b79e8321d0da73a5ac2b1bab6b684d0378fc.tar.lz
nixpkgs-ce12b79e8321d0da73a5ac2b1bab6b684d0378fc.tar.xz
nixpkgs-ce12b79e8321d0da73a5ac2b1bab6b684d0378fc.tar.zst
nixpkgs-ce12b79e8321d0da73a5ac2b1bab6b684d0378fc.zip
Merge pull request #155520 from ulysses4ever/hs-speedscope-jailbreak
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix2
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml1
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix1
3 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1b765bee00b..8d020807513 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1745,6 +1745,8 @@ self: super: {
   # Too strict version bounds on ghc-events
   # https://github.com/haskell/ThreadScope/issues/118
   threadscope = doJailbreak super.threadscope;
+  # https://github.com/mpickering/hs-speedscope/issues/16
+  hs-speedscope = doJailbreak super.hs-speedscope;
 
   # Too strict version bounds on tasty
   # Can likely be removed next week (2021-04-09) when 1.1.1.1 is released.
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index dc3670fa2c5..edd11c04ba5 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -2404,7 +2404,6 @@ broken-packages:
   - hsseccomp
   - hssh
   - hs-snowtify
-  - hs-speedscope
   - hsSqlite3
   - hssqlppp
   - HsSVN
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 361cfe2f02e..054d2c6ae6b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -141884,7 +141884,6 @@ self: {
        description = "Convert an eventlog into the speedscope json format";
        license = lib.licenses.bsd3;
        hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hs-swisstable-hashtables-class" = callPackage