diff --git a/pkgs/applications/graphics/hoodle/default.nix b/pkgs/applications/graphics/hoodle/default.nix index 635e8bf31046..a7a8f93b13f5 100644 --- a/pkgs/applications/graphics/hoodle/default.nix +++ b/pkgs/applications/graphics/hoodle/default.nix @@ -1,17 +1,14 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - { cabal, cmdargs, configurator, dyre, filepath, hoodleCore, mtl }: cabal.mkDerivation (self: { pname = "hoodle"; - version = "0.2.2.1"; - sha256 = "1qkyyzfmprhniwarnq6cdmv1r6605b3h2lsc1rlalxhq6jh5gamd"; + version = "0.3"; + sha256 = "01wz7bwdr3i43ikaiaq8vpn6b0clxjnjyaw6nl6zaq489dhj6fv5"; isLibrary = true; isExecutable = true; buildDepends = [ cmdargs configurator dyre filepath hoodleCore mtl ]; - jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Executable for hoodle"; diff --git a/pkgs/development/libraries/haskell/hoodle-builder/default.nix b/pkgs/development/libraries/haskell/hoodle-builder/default.nix index 3221bff8100f..6d3aef50cc31 100644 --- a/pkgs/development/libraries/haskell/hoodle-builder/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-builder/default.nix @@ -1,16 +1,14 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - { cabal, blazeBuilder, doubleConversion, hoodleTypes, lens, strict +, text }: cabal.mkDerivation (self: { pname = "hoodle-builder"; - version = "0.2.2.0"; - sha256 = "0p123jpm39ggbjn1757nfygcgi324knin62cyggbq1hhhglkfxa2"; + version = "0.3"; + sha256 = "0mj58g7kfr5hpqv6idjb24d3gdh25z5x2ym62c6ckm5g3f4x3jm9"; buildDepends = [ - blazeBuilder doubleConversion hoodleTypes lens strict + blazeBuilder doubleConversion hoodleTypes lens strict text ]; - jailbreak = true; meta = { description = "text builder for hoodle file format"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/hoodle-core/default.nix b/pkgs/development/libraries/haskell/hoodle-core/default.nix index c25096ff4cf5..88b7c67d3783 100644 --- a/pkgs/development/libraries/haskell/hoodle-core/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-core/default.nix @@ -1,28 +1,27 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, attoparsec, base64Bytestring, binary, cairo, cereal -, configurator, coroutineObject, dbus, Diff, dyre, either, errors -, filepath, fsnotify, gd, gtk, hoodleBuilder, hoodleParser -, hoodleRender, hoodleTypes, lens, libX11, libXi, monadLoops, mtl -, network, networkInfo, networkSimple, pango, poppler, pureMD5, stm -, strict, svgcairo, systemFilepath, text, time, transformers -, transformersFree, uuid, xournalParser +{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary +, cairo, cereal, configurator, coroutineObject, dbus, Diff, dyre +, either, errors, filepath, fsnotify, gd, gtk, hoodleBuilder +, hoodleParser, hoodleRender, hoodleTypes, lens, libX11, libXi +, monadLoops, mtl, network, networkInfo, networkSimple, pango +, poppler, pureMD5, stm, strict, svgcairo, systemFilepath, text +, time, transformers, transformersFree, unorderedContainers, uuid +, vector, xournalParser }: cabal.mkDerivation (self: { pname = "hoodle-core"; - version = "0.13.0.0"; - sha256 = "1krq7i7kvymjhj9kar2rpy4qkbak8p4n1ifswdnk9r1dw7fr8vdx"; + version = "0.14"; + sha256 = "1njkjxcbnwh9b7mg0xcqkc0clfz64n5h9jqf3323npyw8bhw34b8"; buildDepends = [ - attoparsec base64Bytestring binary cairo cereal configurator - coroutineObject dbus Diff dyre either errors filepath fsnotify gd - gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes lens - monadLoops mtl network networkInfo networkSimple pango poppler + aeson aesonPretty attoparsec base64Bytestring binary cairo cereal + configurator coroutineObject dbus Diff dyre either errors filepath + fsnotify gd gtk hoodleBuilder hoodleParser hoodleRender hoodleTypes + lens monadLoops mtl network networkInfo networkSimple pango poppler pureMD5 stm strict svgcairo systemFilepath text time transformers - transformersFree uuid xournalParser + transformersFree unorderedContainers uuid vector xournalParser ]; extraLibraries = [ libX11 libXi ]; - jailbreak = true; + noHaddock = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Core library for hoodle"; diff --git a/pkgs/development/libraries/haskell/hoodle-extra/default.nix b/pkgs/development/libraries/haskell/hoodle-extra/default.nix new file mode 100644 index 000000000000..7b7bd976c8f7 --- /dev/null +++ b/pkgs/development/libraries/haskell/hoodle-extra/default.nix @@ -0,0 +1,27 @@ +{ cabal, aeson, aesonPretty, attoparsec, base64Bytestring, binary +, cmdargs, conduit, either, filepath, hoodleParser, hoodleTypes +, httpConduit, lens, monadLoops, mtl, networkSimple, pureMD5 +, resourcet, text, time, transformers, unorderedContainers +, xournalParser +}: + +cabal.mkDerivation (self: { + pname = "hoodle-extra"; + version = "0.1"; + sha256 = "1mqx4qia457n8v4pdyd8mc8h7ybzx5asxm2d4p9ws5g2q4ybmshy"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + aeson aesonPretty attoparsec base64Bytestring binary cmdargs + conduit either filepath hoodleParser hoodleTypes httpConduit lens + monadLoops mtl networkSimple pureMD5 resourcet text time + transformers unorderedContainers xournalParser + ]; + meta = { + homepage = "http://ianwookim.org/hoodle"; + description = "extra hoodle tools"; + license = self.stdenv.lib.licenses.gpl3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hoodle-parser/default.nix b/pkgs/development/libraries/haskell/hoodle-parser/default.nix index 62e0b8b1f9a3..67a62c05cd53 100644 --- a/pkgs/development/libraries/haskell/hoodle-parser/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-parser/default.nix @@ -1,18 +1,15 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - { cabal, attoparsec, either, hoodleTypes, lens, mtl, strict, text , transformers, xournalTypes }: cabal.mkDerivation (self: { pname = "hoodle-parser"; - version = "0.2.2"; - sha256 = "1m0jf7820hkdq69866hwqd1cc6rv331jrar8ayr28692h09j02rm"; + version = "0.3"; + sha256 = "1ihpmkhjzsf8w4ygljx2agx31xblc0ch4y8m9pwj7rnnjj1sw15i"; buildDepends = [ attoparsec either hoodleTypes lens mtl strict text transformers xournalTypes ]; - jailbreak = true; meta = { homepage = "http://ianwookim.org/hoodle"; description = "Hoodle file parser"; diff --git a/pkgs/development/libraries/haskell/hoodle-render/default.nix b/pkgs/development/libraries/haskell/hoodle-render/default.nix index adc7031b717c..e2a468d84458 100644 --- a/pkgs/development/libraries/haskell/hoodle-render/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-render/default.nix @@ -1,21 +1,20 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, base64Bytestring, cairo, filepath, gd, hoodleTypes, lens -, monadLoops, mtl, poppler, strict, svgcairo, uuid +{ cabal, base64Bytestring, cairo, filepath, gd, gtk, hoodleTypes +, lens, monadLoops, mtl, poppler, stm, strict, svgcairo +, transformers, unorderedContainers, uuid }: cabal.mkDerivation (self: { pname = "hoodle-render"; - version = "0.3.2"; - sha256 = "1mmx27g1vqpndk26nz2hy7rckcgg68clvr5x31cqz9f8sifd8rsg"; + version = "0.4"; + sha256 = "06ds0fzw11a10m927y2jvmgbsjy7cxdpppb6ifxkg173csp92a2d"; buildDepends = [ - base64Bytestring cairo filepath gd hoodleTypes lens monadLoops mtl - poppler strict svgcairo uuid + base64Bytestring cairo filepath gd gtk hoodleTypes lens monadLoops + mtl poppler stm strict svgcairo transformers unorderedContainers + uuid ]; - jailbreak = true; meta = { description = "Hoodle file renderer"; - license = self.stdenv.lib.licenses.bsd3; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = [ self.stdenv.lib.maintainers.ianwookim ]; }; diff --git a/pkgs/development/libraries/haskell/hoodle-types/default.nix b/pkgs/development/libraries/haskell/hoodle-types/default.nix index cd71d7250cd0..1323b52b4bd5 100644 --- a/pkgs/development/libraries/haskell/hoodle-types/default.nix +++ b/pkgs/development/libraries/haskell/hoodle-types/default.nix @@ -1,13 +1,10 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, cereal, lens, mtl, strict, uuid }: +{ cabal, cereal, lens, mtl, strict, text, uuid }: cabal.mkDerivation (self: { pname = "hoodle-types"; - version = "0.2.2"; - sha256 = "0dw2ji676nq3idb7izzzfnxzhyngf84wkapc0la43g4w4hzv1zxz"; - buildDepends = [ cereal lens mtl strict uuid ]; - jailbreak = true; + version = "0.3"; + sha256 = "0n9plj6hhsc5482pl7sw4gw7py8r6cn0cl7hg35g2qxdxnzapifm"; + buildDepends = [ cereal lens mtl strict text uuid ]; meta = { description = "Data types for programs for hoodle file format"; license = self.stdenv.lib.licenses.bsd3;