colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"

Browse Source 
This reverts commit d3b2c3f46c.

@peti I'm reverting this commit until a resolution is found that allows
Hakyll to build.  I've confirmed that reverting it here fixes the build
error.
This commit is contained in:
John Wiegley 2014-11-11 12:49:33 -06:00
parent ded8797d0f
commit dddea7f0d1
4 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix Normal file
View File

@ -0,0 +1,29 @@
# 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;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

29
pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix Normal file
View File

@ -0,0 +1,29 @@
# 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;
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;
hydraPlatforms = self.stdenv.lib.platforms.none;
};
})

0
pkgs/development/libraries/haskell/pandoc-citeproc/default.nix → pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix
View File

9
pkgs/top-level/haskell-packages.nix
View File

@ -1040,7 +1040,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 {};
@ -1823,7 +1825,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 {};