Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (9f8b4d2dbf34da3f669414c8a08650e72f4aa0fa)
  • Date: Sat, 8 Aug 2015 12:14:55 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 3 ++
haskell/FUNCTIONS | 25 +++++++++++----------
haskell/happy/BUILD | 1
haskell/happy/DEPENDS | 3 --
haskell/happy/DETAILS | 32
++++++----------------------
haskell/happy/DOWNLOAD | 1
haskell/happy/HISTORY | 3 ++
haskell/happy/INSTALL | 1
haskell/happy/PRE_BUILD | 1
haskell/happy/TRIGGERS | 1
haskell/haskell-aeson/DEPENDS | 9 +++++--
haskell/haskell-aeson/HISTORY | 5 ++++
haskell/haskell-happy/CONFLICTS | 1
haskell/haskell-happy/DEPENDS | 2 +
haskell/haskell-happy/DETAILS | 25 +++++++++++++++++++++
haskell/haskell-happy/HISTORY | 21 ++++++++++++++++++
haskell/haskell-iproute/DEPENDS | 5 +++-
haskell/haskell-iproute/HISTORY | 4 +++
haskell/haskell-language-c/DEPENDS | 2 -
haskell/haskell-language-javascript/DEPENDS | 2 -
20 files changed, 102 insertions(+), 45 deletions(-)

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

haskell/FUNCTIONS: abort execution if something goes wrong

commit 0a9e3bf79434a192582bae9d565acf5120c508be
Author: Florian Franzmann <siflfran AT hawo.net>
Commit: Florian Franzmann <siflfran AT hawo.net>

haskell/haskell-iproute: add missing dependencies

commit 0a07514164663147f6c0a5080a48ec0d2bf5ccbd
Author: Florian Franzmann <siflfran AT hawo.net>
Commit: Florian Franzmann <siflfran AT hawo.net>

haskell/haskell-aeson: add missing dependencies

commit d6c8f42e805808bc1339916ab09c2681b11a49ed
Author: Florian Franzmann <siflfran AT hawo.net>
Commit: Florian Franzmann <siflfran AT hawo.net>

haskell/happy: renamed to haskell/haskell-happy

diff --git a/ChangeLog b/ChangeLog
index 9e469bc..6804220 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * haskell/happy: spell deprecated [renamed to haskell-happy]
+
2015-08-06 Vlad Glagolev <stealth AT sourcemage.org>
* pureftpd.gpg: added, BA709FE1 public key (Frank Denis
(Jedi/Sector One) <0daydigest AT pureftpd.org>)
diff --git a/haskell/FUNCTIONS b/haskell/FUNCTIONS
index eef8953..49e6b77 100755
--- a/haskell/FUNCTIONS
+++ b/haskell/FUNCTIONS
@@ -16,26 +16,27 @@ function detect_setup_file() {
## Section-default build script.
#-------------------------------------------------------------------------
function default_build_haskell() {
- local setup_file
+ local setup_file &&

- setup_file=$(detect_setup_file)
- runhaskell $setup_file configure --prefix=${INSTALL_ROOT}/usr $OPTS
- runhaskell $setup_file build -j${MAKE_NJOBS}
+ setup_file=$(detect_setup_file) &&
+ runhaskell $setup_file configure --prefix=${INSTALL_ROOT}/usr $OPTS &&
+ runhaskell $setup_file build -j${MAKE_NJOBS} ||
+ runhaskell $setup_file build
}

#-------------------------------------------------------------------------
## Section-default install script.
#-------------------------------------------------------------------------
function default_install_haskell() {
- local setup_file
- local cabal_file
- local share_dir
+ local setup_file &&
+ local cabal_file &&
+ local share_dir &&

- setup_file=$(detect_setup_file)
- runhaskell $setup_file install
- cabal_file=$(ls *.cabal)
- share_dir=${INSTALL_ROOT}/usr/share/${SPELL}
- mkdir -vp $share_dir
+ setup_file=$(detect_setup_file) &&
+ runhaskell $setup_file install &&
+ cabal_file=$(ls *.cabal) &&
+ share_dir=${INSTALL_ROOT}/usr/share/${SPELL} &&
+ mkdir -vp $share_dir &&
cp -v $cabal_file $share_dir
}

diff --git a/haskell/happy/BUILD b/haskell/happy/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/haskell/happy/BUILD
@@ -0,0 +1 @@
+true
diff --git a/haskell/happy/DEPENDS b/haskell/happy/DEPENDS
index 93ca2fe..eb50ae0 100755
--- a/haskell/happy/DEPENDS
+++ b/haskell/happy/DEPENDS
@@ -1,2 +1 @@
-depends haskell-mtl &&
-depends ghc
+depends haskell-happy
diff --git a/haskell/happy/DETAILS b/haskell/happy/DETAILS
index afe67c2..6c4f995 100755
--- a/haskell/happy/DETAILS
+++ b/haskell/happy/DETAILS
@@ -1,25 +1,7 @@
- SPELL=happy
- VERSION=1.19.5
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:7b43ef5236bdfba82bbddedb7edc7a8094990a389c0d3f5f848cb6208c3577e7b394cb290e51a2b2eebca25c97978a85ee932e74bbf6a792e261e5b5bff25a2b
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://www.haskell.org/happy/";
- LICENSE[0]=BSD3
- ENTERED=20110326
- SHORT="Happy is a parser generator for Haskell"
-cat << EOF
-Happy is a parser generator system for Haskell, similar to the tool 'yacc'
-for C. Like 'yacc', it takes a file containing an annotated BNF specification
-of a grammar and produces a Haskell module containing a parser for the
grammar.
-
-Happy is flexible: you can have several Happy parsers in the same program,
-and several entry points to a single grammar. Happy can work in conjunction
-with a lexical analyser supplied by the user (either hand-written or
generated
-by another program), or it can parse a stream of characters directly (but
-this isn't practical in most cases).
-
-As of version 1.5, Happy is capable of parsing full Haskell. We have a
-Haskell parser that uses Happy, which will shortly be part of the library
-collection distributed with GHC.
-EOF
+ SPELL=happy
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by haskell-happy]
+ EOF
diff --git a/haskell/happy/DOWNLOAD b/haskell/happy/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/haskell/happy/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/haskell/happy/HISTORY b/haskell/happy/HISTORY
index c567a37..e145162 100644
--- a/haskell/happy/HISTORY
+++ b/haskell/happy/HISTORY
@@ -1,3 +1,6 @@
+2015-07-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated in favour of haskell-happy
+
2015-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.19.5

diff --git a/haskell/happy/INSTALL b/haskell/happy/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/haskell/happy/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/haskell/happy/PRE_BUILD b/haskell/happy/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/haskell/happy/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/haskell/happy/TRIGGERS b/haskell/happy/TRIGGERS
new file mode 100755
index 0000000..d8b726f
--- /dev/null
+++ b/haskell/happy/TRIGGERS
@@ -0,0 +1 @@
+on_cast happy dispel_self
diff --git a/haskell/haskell-aeson/DEPENDS b/haskell/haskell-aeson/DEPENDS
index 5cc7a5e..6272eb7 100755
--- a/haskell/haskell-aeson/DEPENDS
+++ b/haskell/haskell-aeson/DEPENDS
@@ -1,11 +1,14 @@
depends ghc &&
depends haskell-attoparsec &&
depends haskell-blaze-builder &&
+depends haskell-deepseq &&
+depends haskell-dlist &&
depends haskell-hashable &&
depends haskell-mtl &&
+depends haskell-scientific &&
depends haskell-syb &&
+depends haskell-template-haskell &&
depends haskell-text "--flags=new-bytestring-builder" &&
+depends haskell-transformers &&
depends haskell-unordered-containers &&
-depends haskell-vector &&
-depends haskell-scientific &&
-depends haskell-dlist
+depends haskell-vector
diff --git a/haskell/haskell-aeson/HISTORY b/haskell/haskell-aeson/HISTORY
index c58cc49..429ce4b 100644
--- a/haskell/haskell-aeson/HISTORY
+++ b/haskell/haskell-aeson/HISTORY
@@ -1,5 +1,10 @@
+2015-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependencies on haskell-deepseq,
+ haskell-template-haskell, haskell-transformers
+
2015-07-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: depend on haskell-dlist
+
2015-06-26 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 0.9.0.1

diff --git a/haskell/haskell-happy/CONFLICTS b/haskell/haskell-happy/CONFLICTS
new file mode 100755
index 0000000..468e806
--- /dev/null
+++ b/haskell/haskell-happy/CONFLICTS
@@ -0,0 +1 @@
+conflicts happy y
diff --git a/haskell/haskell-happy/DEPENDS b/haskell/haskell-happy/DEPENDS
new file mode 100755
index 0000000..93ca2fe
--- /dev/null
+++ b/haskell/haskell-happy/DEPENDS
@@ -0,0 +1,2 @@
+depends haskell-mtl &&
+depends ghc
diff --git a/haskell/haskell-happy/DETAILS b/haskell/haskell-happy/DETAILS
new file mode 100755
index 0000000..afe67c2
--- /dev/null
+++ b/haskell/haskell-happy/DETAILS
@@ -0,0 +1,25 @@
+ SPELL=happy
+ VERSION=1.19.5
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:7b43ef5236bdfba82bbddedb7edc7a8094990a389c0d3f5f848cb6208c3577e7b394cb290e51a2b2eebca25c97978a85ee932e74bbf6a792e261e5b5bff25a2b
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.haskell.org/happy/";
+ LICENSE[0]=BSD3
+ ENTERED=20110326
+ SHORT="Happy is a parser generator for Haskell"
+cat << EOF
+Happy is a parser generator system for Haskell, similar to the tool 'yacc'
+for C. Like 'yacc', it takes a file containing an annotated BNF specification
+of a grammar and produces a Haskell module containing a parser for the
grammar.
+
+Happy is flexible: you can have several Happy parsers in the same program,
+and several entry points to a single grammar. Happy can work in conjunction
+with a lexical analyser supplied by the user (either hand-written or
generated
+by another program), or it can parse a stream of characters directly (but
+this isn't practical in most cases).
+
+As of version 1.5, Happy is capable of parsing full Haskell. We have a
+Haskell parser that uses Happy, which will shortly be part of the library
+collection distributed with GHC.
+EOF
diff --git a/haskell/haskell-happy/HISTORY b/haskell/haskell-happy/HISTORY
new file mode 100644
index 0000000..c47a277
--- /dev/null
+++ b/haskell/haskell-happy/HISTORY
@@ -0,0 +1,21 @@
+2015-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell renamed happy -> haskell-happy
+
+2015-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.19.5
+
+2014-05-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.19.3
+
+2013-03-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.18.10
+
+2012-02-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.18.9
+
+2011-10-15 Bor Kraljič <pyrobor AT ver.si>
+ * DETAILS: fixed long description
+
+2011-03-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-iproute/DEPENDS b/haskell/haskell-iproute/DEPENDS
index 2707095..a527bde 100755
--- a/haskell/haskell-iproute/DEPENDS
+++ b/haskell/haskell-iproute/DEPENDS
@@ -1,3 +1,6 @@
depends ghc &&
depends haskell-appar &&
-depends haskell-network
+depends haskell-byteorder &&
+depends haskell-network &&
+depends haskell-quickcheck &&
+depends haskell-safe
diff --git a/haskell/haskell-iproute/HISTORY b/haskell/haskell-iproute/HISTORY
index 9818925..27ac5aa 100644
--- a/haskell/haskell-iproute/HISTORY
+++ b/haskell/haskell-iproute/HISTORY
@@ -1,3 +1,7 @@
+2015-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependencies on haskell-byteorder, haskell-quickcheck,
+ haskell-safe
+
2015-08-02 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/haskell/haskell-language-c/DEPENDS
b/haskell/haskell-language-c/DEPENDS
index 329483e..e81ff8a 100755
--- a/haskell/haskell-language-c/DEPENDS
+++ b/haskell/haskell-language-c/DEPENDS
@@ -1,5 +1,5 @@
depends ghc &&
-depends happy &&
+depends haskell-happy &&
depends haskell-pretty &&
depends haskell-alex &&
depends haskell-syb
diff --git a/haskell/haskell-language-javascript/DEPENDS
b/haskell/haskell-language-javascript/DEPENDS
index 6bc9487..e43fee2 100755
--- a/haskell/haskell-language-javascript/DEPENDS
+++ b/haskell/haskell-language-javascript/DEPENDS
@@ -1,5 +1,5 @@
depends ghc &&
-depends happy &&
+depends haskell-happy &&

depends haskell-blaze-builder &&
depends haskell-mtl &&



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (9f8b4d2dbf34da3f669414c8a08650e72f4aa0fa), Florian Franzmann, 08/08/2015

Archive powered by MHonArc 2.6.24.

Top of Page