philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

haskell-hakyll: update to version 4.5.5.1

Browse source 
Jailbreak to fix build with random 1.1.

https://github.com/jaspervdj/hakyll/issues/307
This commit is contained in:
Peter Simons 2014-10-26 19:37:12 +01:00
parent aab8a22dd1
commit 67aa9b723e
2 changed files with 5 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/development/libraries/haskell/hakyll/default.nix
View file

@ -11,12 +11,10 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hakyll"; pname = "hakyll";
version = "4.5.5.0"; version = "4.5.5.1";
sha256 = "1igna446dsidlq3f9myclgcdawgvyyjxjk3r3icjra6zgdqd6j4l"; sha256 = "060wcak242p2gja616bdair4sg2k04s8cld5nlk8p3b6an2isld9";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
patches = [ ./deps.patch ];
doCheck = !self.stdenv.isDarwin;
buildDepends = [ buildDepends = [
binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq
filepath fsnotify httpConduit httpTypes lrucache mtl network filepath fsnotify httpConduit httpTypes lrucache mtl network
@ -28,14 +26,14 @@ cabal.mkDerivation (self: {
filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network
networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase
regexTdfa snapCore snapServer systemFilepath tagsoup testFramework regexTdfa snapCore snapServer systemFilepath tagsoup testFramework
testFrameworkHunit testFrameworkQuickcheck2 text time testFrameworkHunit testFrameworkQuickcheck2 text time utillinux
] ++ (self.stdenv.lib.optional self.stdenv.isLinux utillinux); ];
jailbreak = true;
meta = { meta = {
homepage = "http://jaspervdj.be/hakyll"; homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library"; description = "A static website compiler library";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ];
broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version;
}; };
}) })

20
pkgs/development/libraries/haskell/hakyll/deps.patch
View file

@ -1,20 +0,0 @@
--- a/hakyll.cabal.orig 2014-10-16 17:34:22.000000000 -0500
+++ b/hakyll.cabal 2014-10-16 17:34:30.000000000 -0500
@@ -163,7 +163,7 @@
pandoc-citeproc >= 0.4 && < 0.5,
parsec >= 3.0 && < 3.2,
process >= 1.0 && < 1.3,
- random >= 1.0 && < 1.1,
+ random >= 1.0 && < 1.2,
regex-base >= 0.93 && < 0.94,
regex-tdfa >= 1.1 && < 1.3,
tagsoup >= 0.13.1 && < 0.14,
@@ -250,7 +250,7 @@
pandoc-citeproc >= 0.4 && < 0.5,
parsec >= 3.0 && < 3.2,
process >= 1.0 && < 1.3,
- random >= 1.0 && < 1.1,
+ random >= 1.0 && < 1.2,
regex-base >= 0.93 && < 0.94,
regex-tdfa >= 1.1 && < 1.3,
tagsoup >= 0.13.1 && < 0.14,