about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2012-02-27 10:11:56 +0000
committerPeter Simons <simons@cryp.to>2012-02-27 10:11:56 +0000
commit617614d220086e2aba6d96633ec2bd7cefd463c0 (patch)
tree8dbbbd06404e8d8bf4bd896e79b2f785c1f9f5c6 /pkgs/applications
parente6fa414b6426ee9fe610f79c51bd28c80bd5e569 (diff)
haskell-mathblog: updated to version 0.5
svn path=/nixpkgs/trunk/; revision=32615
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch41
-rw-r--r--pkgs/applications/misc/mathblog/default.nix7
2 files changed, 2 insertions, 46 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
deleted file mode 100644
index bf524dc957d03..0000000000000
--- a/pkgs/applications/misc/mathblog/0006-Loosen-dependencies-on-SHA-HUnit-and-test-framework.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
index fa9dec0496002..2944df496f235 100644
--- a/pkgs/applications/misc/mathblog/default.nix
+++ b/pkgs/applications/misc/mathblog/default.nix
@@ -4,17 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "mathblog";
-  version = "0.4";
-  sha256 = "0kpawik74hp9k56b858idnlkla3iaalys8mas6c4gf4jfw2w0r3j";
+  version = "0.5";
+  sha256 = "01iyzrwscqirhcr4622d0n16mr4p54qbvg5m2a0ns36j59xfd79g";
   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;