Author: simons
Date: Thu Feb 23 11:33:39 2012
New Revision: 32511
URL: https://nixos.org/websvn/nix/?rev=32511&sc=1
Log:
haskell-mathblog: added version 0.4
Added:
nixpkgs/trunk/pkgs/applications/misc/mathblog/
nixpkgs/trunk/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
nixpkgs/trunk/pkgs/applications/misc/mathblog/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
Thu Feb 23 11:33:39 2012 (r32511)
@@ -0,0 +1,41 @@
+From 0fbc8097f98481439e68aeb095a8d7e106924bbe Mon Sep 17 00:00:00 2001
+From: Jonathan Daugherty <[email protected]>
+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
+
Added: nixpkgs/trunk/pkgs/applications/misc/mathblog/default.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/trunk/pkgs/applications/misc/mathblog/default.nix Thu Feb 23
11:33:39 2012 (r32511)
@@ -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
+ ];
+ };
+})
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Feb 23 11:33:36
2012 (r32510)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Feb 23 11:33:39
2012 (r32511)
@@ -1622,6 +1622,8 @@
leksah = callPackage ../applications/editors/leksah {};
+ mathblog = callPackage ../applications/misc/mathblog {};
+
xmobar = callPackage ../applications/misc/xmobar {
parsec = self.parsec3;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
