From 1515dbf962d7a7d045f0706e8525266d6e92b140 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 9 Oct 2014 14:51:22 -0500 Subject: [PATCH] haskell-hakyll: Allow it to build again --- .../libraries/haskell/hakyll/default.nix | 8 ++++-- .../libraries/haskell/hakyll/deps.patch | 20 +++++++++++++ .../libraries/haskell/pandoc-citeproc/0.4.nix | 28 +++++++++++++++++++ .../libraries/haskell/pandoc-citeproc/0.5.nix | 28 +++++++++++++++++++ .../libraries/haskell/pandoc-citeproc/0.6.nix | 28 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 9 ++++-- 6 files changed, 116 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/haskell/hakyll/deps.patch create mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix create mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix create mode 100644 pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index d8ac50c85a0f..b5fc3115142d 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -15,6 +15,8 @@ cabal.mkDerivation (self: { sha256 = "1igna446dsidlq3f9myclgcdawgvyyjxjk3r3icjra6zgdqd6j4l"; isLibrary = true; isExecutable = true; + patches = [ ./deps.patch ]; + doCheck = !self.stdenv.isDarwin; buildDepends = [ binary blazeHtml blazeMarkup cmdargs cryptohash dataDefault deepseq filepath fsnotify httpConduit httpTypes lrucache mtl network @@ -26,14 +28,14 @@ cabal.mkDerivation (self: { filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network networkUri pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa snapCore snapServer systemFilepath tagsoup testFramework - testFrameworkHunit testFrameworkQuickcheck2 text time utillinux - ]; + testFrameworkHunit testFrameworkQuickcheck2 text time + ] ++ (self.stdenv.lib.optional self.stdenv.isLinux utillinux); 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; + broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; }; }) diff --git a/pkgs/development/libraries/haskell/hakyll/deps.patch b/pkgs/development/libraries/haskell/hakyll/deps.patch new file mode 100644 index 000000000000..873d3159f9ab --- /dev/null +++ b/pkgs/development/libraries/haskell/hakyll/deps.patch @@ -0,0 +1,20 @@ +--- 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, diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix new file mode 100644 index 000000000000..e567bd82059b --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat +, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb +, tagsoup, temporary, text, time, vector, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.4.0.1"; + sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc + pandocTypes parsec rfc5051 split syb tagsoup temporary text time + vector yaml + ]; + testDepends = [ + aeson filepath pandoc pandocTypes temporary text yaml + ]; + doCheck = false; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix new file mode 100644 index 000000000000..17a2a42f612e --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, filepath, hexpat +, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb +, tagsoup, temporary, text, time, vector, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.5"; + sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3"; + isLibrary = true; + isExecutable = true; + doCheck = false; + buildDepends = [ + aeson aesonPretty attoparsec filepath hexpat hsBibutils mtl pandoc + pandocTypes parsec rfc5051 split syb tagsoup temporary text time + vector yaml + ]; + testDepends = [ + aeson filepath pandoc pandocTypes temporary text yaml + ]; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix new file mode 100644 index 000000000000..b36fc5dcdba2 --- /dev/null +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix @@ -0,0 +1,28 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, aesonPretty, attoparsec, dataDefault, filepath +, hsBibutils, mtl, pandoc, pandocTypes, parsec, rfc5051, split, syb +, tagsoup, temporary, text, time, vector, xmlConduit, yaml +}: + +cabal.mkDerivation (self: { + pname = "pandoc-citeproc"; + version = "0.6"; + sha256 = "1whi8mrbhfi8wr3qbj1lkgc1pngn8151jjri409hshl1mng4aq5b"; + isLibrary = true; + isExecutable = true; + doCheck = false; + buildDepends = [ + aeson aesonPretty attoparsec dataDefault filepath hsBibutils mtl + pandoc pandocTypes parsec rfc5051 split syb tagsoup temporary text + time vector xmlConduit yaml + ]; + testDepends = [ + aeson filepath pandoc pandocTypes temporary text yaml + ]; + meta = { + description = "Supports using pandoc with citeproc"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3d3d2408eefa..821bc3e9614e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1041,7 +1041,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in groupoids = callPackage ../development/libraries/haskell/groupoids {}; - hakyll = callPackage ../development/libraries/haskell/hakyll {}; + hakyll = callPackage ../development/libraries/haskell/hakyll { + pandocCiteproc = self.pandocCiteproc_0_4; + }; hamlet = callPackage ../development/libraries/haskell/hamlet {}; @@ -1843,7 +1845,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pandoc = callPackage ../development/libraries/haskell/pandoc {}; - pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; + pandocCiteproc_0_4 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.4.nix {}; + pandocCiteproc_0_5 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.5.nix {}; + pandocCiteproc_0_6 = callPackage ../development/libraries/haskell/pandoc-citeproc/0.6.nix {}; + pandocCiteproc = self.pandocCiteproc_0_6; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {};