diff options
author | Thomas Strobel <ts468@cam.ac.uk> | 2014-09-15 12:15:11 +0200 |
---|---|---|
committer | Thomas Strobel <ts468@cam.ac.uk> | 2014-09-15 12:15:11 +0200 |
commit | 6366509e5456cf1d5960d3f0b93a8eb0624f5133 (patch) | |
tree | 91c3090c7137f057e81f7931eb6c875b5bf1f8c3 /pkgs/development/libraries/haskell/hakyll/default.nix | |
parent | 66dbde4002b8ee64dd060ab06f9ecfbff9f2dd13 (diff) | |
parent | 5c80997ebdea1572234925fb609cd89f7e0f9c6a (diff) | |
download | nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.gz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.bz2 nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.lz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.xz nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.tar.zst nixpkgs-6366509e5456cf1d5960d3f0b93a8eb0624f5133.zip |
Merge branch 'upstream' into pam_mount
Conflicts: pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/haskell/hakyll/default.nix')
-rw-r--r-- | pkgs/development/libraries/haskell/hakyll/default.nix | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 7ebc0de734a..d8ac50c85a0 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -2,39 +2,38 @@ { 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"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + broken = true; }; }) |