diff --git a/pkgs/development/libraries/haskell/ghc-events/default.nix b/pkgs/development/libraries/haskell/ghc-events/default.nix index 23af9bfa7fe..9ebe3e94041 100644 --- a/pkgs/development/libraries/haskell/ghc-events/default.nix +++ b/pkgs/development/libraries/haskell/ghc-events/default.nix @@ -1,13 +1,12 @@ -{cabal, binary, mtl}: +{ cabal, binary, mtl }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "ghc-events"; - version = "0.2.0.1"; - sha256 = "18cb82ebe143f58a25bf32ee88118a8bfb333b67a53285c2550e866f2afebbc6"; - propagatedBuildInputs = [binary mtl]; - preConfigure = '' - sed -i 's|\(containers.*\) && < 0.4|\1|' ${self.pname}.cabal - ''; + version = "0.3.0.1"; + sha256 = "08jnri6cwybg8b2f53rn8y1xzcpz32r0svahcw01g837p07mcpla"; + isLibrary = true; + isExecutable = true; + buildDepends = [ binary mtl ]; meta = { description = "Library and tool for parsing .eventlog files from GHC"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/threadscope/default.nix b/pkgs/development/tools/haskell/threadscope/default.nix index 7787ea203ee..35b3dec9c86 100644 --- a/pkgs/development/tools/haskell/threadscope/default.nix +++ b/pkgs/development/tools/haskell/threadscope/default.nix @@ -1,15 +1,15 @@ -{ cabal, binary, cairo, ghcEvents, glade, gtk, mtl }: +{ cabal, binary, cairo, ghcEvents, glib, gtk, mtl, pango }: cabal.mkDerivation (self: { pname = "threadscope"; - version = "0.1.3"; - sha256 = "1vak3624vrnkfvwxzfw5hkc0552v213jb874f6q536g5vhjjxpih"; + version = "0.2.0"; + sha256 = "0b8lc8han4d90wgzliy80l1gbkm09gg6qxsn37blj41wzl6yzr9k"; isLibrary = false; isExecutable = true; - buildDepends = [ binary cairo ghcEvents glade gtk mtl ]; + buildDepends = [ binary cairo ghcEvents glib gtk mtl pango ]; configureFlags = "--ghc-options=-rtsopts"; meta = { - description = "A graphical thread profiler"; + description = "A graphical tool for profiling parallel Haskell programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = [