diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix | 29 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix | 29 | ||||
-rw-r--r-- | pkgs/development/libraries/haskell/pandoc-citeproc/default.nix (renamed from pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 9 |
4 files changed, 2 insertions, 65 deletions
diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix deleted file mode 100644 index c4706634eccd..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.4.nix +++ /dev/null @@ -1,29 +0,0 @@ -# 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; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix deleted file mode 100644 index c6dc859ed8df..000000000000 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.5.nix +++ /dev/null @@ -1,29 +0,0 @@ -# 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; - }; -}) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix index feb273fbdeb7..feb273fbdeb7 100644 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/0.6.nix +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2e74ce184fd1..3029fd4cd9dd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1040,9 +1040,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in groupoids = callPackage ../development/libraries/haskell/groupoids {}; - hakyll = callPackage ../development/libraries/haskell/hakyll { - pandocCiteproc = self.pandocCiteproc_0_4; - }; + hakyll = callPackage ../development/libraries/haskell/hakyll {}; hamlet = callPackage ../development/libraries/haskell/hamlet {}; @@ -1825,10 +1823,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pandoc = callPackage ../development/libraries/haskell/pandoc {}; - 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; + pandocCiteproc = callPackage ../development/libraries/haskell/pandoc-citeproc {}; pandocTypes = callPackage ../development/libraries/haskell/pandoc-types {}; |