diff options
| author | Peter Simons <simons@cryp.to> | 2012-02-23 11:33:39 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2012-02-23 11:33:39 +0000 |
| commit | 23f9485c945c612fe7af2d3cad4af0dc49418248 (patch) | |
| tree | 2610cd89979dc87abcff5a90a6f7b25dbaf4387a /pkgs | |
| parent | 54939ca86c4c15738b43409c4ab19fe502c592da (diff) | |
| download | nixpkgs-23f9485c945c612fe7af2d3cad4af0dc49418248.tar nixpkgs-23f9485c945c612fe7af2d3cad4af0dc49418248.tar.gz nixpkgs-23f9485c945c612fe7af2d3cad4af0dc49418248.tar.bz2 nixpkgs-23f9485c945c612fe7af2d3cad4af0dc49418248.tar.lz nixpkgs-23f9485c945c612fe7af2d3cad4af0dc49418248.tar.xz nixpkgs-23f9485c945c612fe7af2d3cad4af0dc49418248.tar.zst nixpkgs-23f9485c945c612fe7af2d3cad4af0dc49418248.zip | |
haskell-mathblog: added version 0.4
svn path=/nixpkgs/trunk/; revision=32511
Diffstat (limited to 'pkgs')
3 files changed, 70 insertions, 0 deletions
diff --git a/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch b/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch new file mode 100644 index 00000000000..bf524dc957d --- /dev/null +++ b/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch @@ -0,0 +1,41 @@ +From 0fbc8097f98481439e68aeb095a8d7e106924bbe Mon Sep 17 00:00:00 2001 +From: Jonathan Daugherty <jtd@galois.com> +Date: Tue, 21 Feb 2012 11:06:57 -0800 +Subject: [PATCH 6/8] Loosen dependencies on SHA, HUnit, and test-framework + +--- + mathblog.cabal | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/mathblog.cabal b/mathblog.cabal +index ea5498c..371dd12 100644 +--- a/mathblog.cabal ++++ b/mathblog.cabal +@@ -44,7 +44,7 @@ Executable mb + process >= 1.0, + time >= 1.1, + old-locale >= 1.0, +- SHA >= 1.4 && < 1.5, ++ SHA >= 1.4 && < 1.6, + bytestring >= 0.9 && < 1.0, + HStringTemplate >= 0.6 && < 0.7, + ConfigFile >= 1.1 && < 1.2 +@@ -79,12 +79,12 @@ Executable mb-tests + process >= 1.0 && < 1.1, + time >= 1.1, + old-locale >= 1.0 && < 1.1, +- SHA >= 1.4 && < 1.5, ++ SHA >= 1.4 && < 1.6, + bytestring >= 0.9 && < 1.0, + HStringTemplate >= 0.6 && < 0.7, + ConfigFile >= 1.1 && < 1.2, +- HUnit >= 1.2.2 && < 1.2.3, +- test-framework >= 0.3.3 && < 0.4, ++ HUnit >= 1.2.2 && < 1.2.5, ++ test-framework >= 0.3.3 && < 0.6, + test-framework-hunit >= 0.2.6 && < 0.3 + + GHC-Options: -Wall +-- +1.7.8 + diff --git a/pkgs/applications/misc/mathblog/default.nix b/pkgs/applications/misc/mathblog/default.nix new file mode 100644 index 00000000000..fa9dec04960 --- /dev/null +++ b/pkgs/applications/misc/mathblog/default.nix @@ -0,0 +1,27 @@ +{ cabal, ConfigFile, filepath, HStringTemplate, HUnit, pandoc +, pandocTypes, SHA, testFramework, testFrameworkHunit, time +}: + +cabal.mkDerivation (self: { + pname = "mathblog"; + version = "0.4"; + sha256 = "0kpawik74hp9k56b858idnlkla3iaalys8mas6c4gf4jfw2w0r3j"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + ConfigFile filepath HStringTemplate HUnit pandoc pandocTypes SHA + testFramework testFrameworkHunit time + ]; + patches = [ + ./0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch + ]; + meta = { + description = "A program for creating and managing a static weblog with LaTeX math and function graphs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 85f76d42787..fa4c6ac4d9b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1622,6 +1622,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); leksah = callPackage ../applications/editors/leksah {}; + mathblog = callPackage ../applications/misc/mathblog {}; + xmobar = callPackage ../applications/misc/xmobar { parsec = self.parsec3; }; |