From e809aabffe47d336c9b9e9bb620e19571ae26172 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Sep 2014 20:40:05 +0200 Subject: haskell-hakyll: update to version 4.5.5.0 --- .../libraries/haskell/hakyll/default.nix | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'pkgs/development/libraries/haskell/hakyll/default.nix') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 7ebc0de734a..767f10b33f6 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -2,34 +2,32 @@ { cabal, binary, blazeHtml, blazeMarkup, cmdargs, cryptohash , dataDefault, deepseq, filepath, fsnotify, httpConduit, httpTypes -, HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec -, QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer -, systemFilepath, tagsoup, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time, utillinux +, HUnit, lrucache, mtl, network, networkUri, pandoc, pandocCiteproc +, parsec, QuickCheck, random, regexBase, regexTdfa, snapCore +, snapServer, systemFilepath, tagsoup, testFramework +, testFrameworkHunit, testFrameworkQuickcheck2, text, time +, utillinux }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.5.4.0"; - sha256 = "16srkm2fxjw1xg7zaikn49zz4xsz9awddnjm6ibv522k3xf3l24c"; + version = "4.5.5.0"; + sha256 = "1igna446dsidlq3f9myclgcdawgvyyjxjk3r3icjra6zgdqd6j4l"; isLibrary = true; isExecutable = true; buildDepends = [ binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq - filepath fsnotify httpConduit httpTypes lrucache mtl network pandoc - pandocCiteproc parsec random regexBase regexTdfa snapCore - snapServer systemFilepath tagsoup text time + filepath fsnotify httpConduit httpTypes lrucache mtl network + networkUri pandoc pandocCiteproc parsec random regexBase regexTdfa + snapCore snapServer systemFilepath tagsoup text time ]; testDepends = [ binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network - pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa - snapCore snapServer systemFilepath tagsoup testFramework + networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase + regexTdfa snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time utillinux ]; - patchPhase = '' - sed -i -e 's|pandoc-citeproc .*,|pandoc-citeproc,|' hakyll.cabal - ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; -- cgit 1.4.1 From 8e4c563b145064b51bb4a7b9ed8165c96fc27ee8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 13 Sep 2014 21:26:24 +0200 Subject: haskell-hakyll: broken by recent updates Hakyll requires network 2.6.x, which is newer than what we have, and pandoc-citeproc 0.4.x, which is older than what we have. --- pkgs/development/libraries/haskell/hakyll/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/development/libraries/haskell/hakyll/default.nix') diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 767f10b33f6..d8ac50c85a0 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -34,5 +34,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + broken = true; }; }) -- cgit 1.4.1