From 8db9e77d7822b98779025e9369edb0ddc0858d3d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 16 Aug 2014 04:02:41 +0100 Subject: [PATCH 1/2] haskell-ghc-heap-view: mark as broken for 7.8.3 --- .../libraries/haskell/ghc-heap-view/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix index 1df6885280c..704c820797e 100644 --- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix +++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix @@ -8,13 +8,16 @@ cabal.mkDerivation (self: { sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n"; buildDepends = [ binary transformers ]; postInstall = '' - mkdir -p "$out/share/ghci" + ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" ''; meta = { description = "Extract the heap representation of Haskell values and thunks"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; + }; }) From 9b68de6ba0c0b7eb6181d52cb48ce338e081d177 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 16 Aug 2014 04:22:50 +0100 Subject: [PATCH 2/2] haskell-ghc-vis: don't build on Hydra (broken dep) --- pkgs/development/libraries/haskell/ghc-vis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix index 2a4badd91e3..741523011ec 100644 --- a/pkgs/development/libraries/haskell/ghc-vis/default.nix +++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix @@ -12,9 +12,8 @@ cabal.mkDerivation (self: { cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text transformers xdot ]; - jailbreak = true; postInstall = '' - mkdir -p "$out/share/ghci" + ensureDir "$out/share/ghci" ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname" ''; meta = { @@ -22,6 +21,7 @@ cabal.mkDerivation (self: { description = "Live visualization of data structures in GHCi"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; + hydraPlatforms = self.stdenv.lib.platforms.none; }; })