Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4b19e63797baceb6f43c5d48f708b43180dc79a1)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (4b19e63797baceb6f43c5d48f708b43180dc79a1)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4b19e63797baceb6f43c5d48f708b43180dc79a1)
  • Date: Wed, 1 Jan 2014 08:23:29 -0600
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

haskell/haskell-async/DETAILS | 16 ++++++++
haskell/haskell-async/HISTORY | 6 +++
haskell/haskell-git-annex/0001-add-dependency-on-stm.patch | 25
+++++++++++++
haskell/haskell-git-annex/DETAILS | 4 +-
haskell/haskell-git-annex/HISTORY | 5 ++
haskell/haskell-git-annex/PRE_BUILD | 3 +
haskell/haskell-stm/DETAILS | 4 +-
haskell/haskell-stm/HISTORY | 3 +
8 files changed, 62 insertions(+), 4 deletions(-)

New commits:
commit 4b19e63797baceb6f43c5d48f708b43180dc79a1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-git-annex: version 5.20131230

commit fbb9822545e8bcc7a28e09faf99e23dfa619a475
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-async: version 2.0.1.5

commit 56f13ee1fbfac840fc80e368c7be5dec4f1d2c90
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

haskell/haskell-stm: version 2.4.2

diff --git a/haskell/haskell-async/DETAILS b/haskell/haskell-async/DETAILS
new file mode 100755
index 0000000..4e826a0
--- /dev/null
+++ b/haskell/haskell-async/DETAILS
@@ -0,0 +1,16 @@
+ SPELL=haskell-async
+ VERSION=2.0.1.5
+ SOURCE="async-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/package/async-${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:58004930b12bd6aafc09db56dcbdd1071b94bdfea1c55f1ba0854c17b61054e272aa8c3edac05bcf34ee39c63318ffca26680215748994e8ae604b600b0563fc
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/async-${VERSION}"
+ WEB_SITE="http://hackage.haskell.org/package/async";
+ LICENSE[0]=BSD
+ ENTERED=20131025
+ SHORT="a higher-level interface over threads"
+cat << EOF
+This package provides a higher-level interface over threads, in which an
Async
+a is a concurrent thread that will eventually deliver a value of type a. The
+package provides ways to create Async computations, wait for their results,
+and cancel them.
+EOF
diff --git a/haskell/haskell-async/HISTORY b/haskell/haskell-async/HISTORY
new file mode 100644
index 0000000..2d28697
--- /dev/null
+++ b/haskell/haskell-async/HISTORY
@@ -0,0 +1,6 @@
+2014-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.0.1.5
+
+2013-10-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
b/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
new file mode 100644
index 0000000..34f7aef
--- /dev/null
+++ b/haskell/haskell-git-annex/0001-add-dependency-on-stm.patch
@@ -0,0 +1,25 @@
+From 5bfd934170589f547a2ab2b19a22c479df8deec5 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+Date: Wed, 1 Jan 2014 15:11:45 +0100
+Subject: [PATCH] add dependency on stm
+
+---
+ git-annex.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/git-annex.cabal b/git-annex.cabal
+index 8dccfed..6cfcb03 100644
+--- a/git-annex.cabal
++++ b/git-annex.cabal
+@@ -90,7 +90,7 @@ Executable git-annex
+ extensible-exceptions, dataenc, SHA, process, json,
+ base (>= 4.5 && < 4.9), monad-control, MonadCatchIO-transformers,
+ IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance, process,
+- SafeSemaphore, uuid, random, dlist, unix-compat, async
++ SafeSemaphore, uuid, random, dlist, unix-compat, async, stm (>= 2.3)
+ CC-Options: -Wall
+ GHC-Options: -Wall
+ Extensions: PackageImports
+--
+1.8.5.2
+
diff --git a/haskell/haskell-git-annex/DETAILS
b/haskell/haskell-git-annex/DETAILS
index 6c3489f..8db9877 100755
--- a/haskell/haskell-git-annex/DETAILS
+++ b/haskell/haskell-git-annex/DETAILS
@@ -1,9 +1,9 @@
SPELL=haskell-git-annex
XSPELL=git-annex
- VERSION=5.20131221
+ VERSION=5.20131230
SOURCE="${XSPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${XSPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:271b3aa94c29cf77957770b33c3ab51b2b0f7008f233c06574f565a3569e1b7d2fd963c9db0934b4cef186825cfff1129833445a2e91f27dd1587335d42e1154
+
SOURCE_HASH=sha512:bd22341d6e28de1e15c0b60bf6b5dca2365673d44fbb58baa7d2a20d5c0b23dba5d0e728564c4b8cceabe57ce0fed03a76571085e26b033c646c1874f44fdc6d
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${XSPELL}-${VERSION}"
WEB_SITE="Homepage: http://git-annex.branchable.com/";
LICENSE[0]=License: GPL-3
diff --git a/haskell/haskell-git-annex/HISTORY
b/haskell/haskell-git-annex/HISTORY
index 2981279..7b14dc6 100644
--- a/haskell/haskell-git-annex/HISTORY
+++ b/haskell/haskell-git-annex/HISTORY
@@ -1,3 +1,8 @@
+2013-12-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.20131230
+ * PRE_BUILD, 0001-add-dependency-on-stm.patch: fix dependency
+ on stm
+
2013-12-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.20131221

diff --git a/haskell/haskell-git-annex/PRE_BUILD
b/haskell/haskell-git-annex/PRE_BUILD
new file mode 100755
index 0000000..9ab0b08
--- /dev/null
+++ b/haskell/haskell-git-annex/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < $SPELL_DIRECTORY/0001-add-dependency-on-stm.patch
diff --git a/haskell/haskell-stm/DETAILS b/haskell/haskell-stm/DETAILS
index 47098a6..10a38f3 100755
--- a/haskell/haskell-stm/DETAILS
+++ b/haskell/haskell-stm/DETAILS
@@ -1,8 +1,8 @@
SPELL=haskell-stm
- VERSION=2.2.0.1
+ VERSION=2.4.2
SOURCE="stm-${VERSION}.tar.gz"

SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/stm/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:0ac83afadd2e1b13e56fc971dd933e96af8e46ff26ffdec29c9ce5a14b3eb1fcbcc41fcdc0f904c933ab1ffa952ef76afa2d1e6c679ddbc856f42e1e063ae204
+
SOURCE_HASH=sha512:ed1f58f7b08262d4afa683fde16ad79670bb111f0cfc22fdce81614358e903698e6b1bd410428661b1c7d5af50b10dbcf688d8ce5e7ddae86cc55d6d1c5598da
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/stm-${VERSION}"

WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/stm";
LICENSE[0]=BSD3
diff --git a/haskell/haskell-stm/HISTORY b/haskell/haskell-stm/HISTORY
index 3697e2b..aeb09be 100644
--- a/haskell/haskell-stm/HISTORY
+++ b/haskell/haskell-stm/HISTORY
@@ -1,3 +1,6 @@
+2014-01-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.4.2
+
2011-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.2.0.1



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (4b19e63797baceb6f43c5d48f708b43180dc79a1), Florian Franzmann, 01/01/2014

Archive powered by MHonArc 2.6.24.

Top of Page