on master help sign in
Merge pull request #3 from erikd/master

Couple of minor fixes

commitb8e0450cbd3e65879ad9adae6191eec2d78f7665 authorHuw Campbell <huw.campbell@gmail.com> dateTue 28 Jun 2016, 22:33 (10 years ago) parent7e23f9f3fda2d0
3 files changed+22−14
.gitmodules+5−5 grenade.cabal+5−5 mafia+12−4
.gitmodules+5−5
@@ -1,15 +1,15 @@
11[submodule "lib/disorder"]
22 path = lib/disorder
3− url = git@github.com:ambiata/disorder.hs
3+ url = https://github.com/ambiata/disorder.hs
44[submodule "lib/x"]
55 path = lib/x
6− url = git@github.com:ambiata/x.git
6+ url = https://github.com/ambiata/x.git
77[submodule "lib/p"]
88 path = lib/p
9− url = git@github.com:ambiata/p.git
9+ url = https://github.com/ambiata/p.git
1010[submodule "lib/disorder.hs"]
1111 path = lib/disorder.hs
12− url = git@github.com:ambiata/disorder.hs.git
12+ url = https://github.com/ambiata/disorder.hs.git
1313[submodule "lib/hmatrix"]
1414 path = lib/hmatrix
15− url = git@github.com:albertoruiz/hmatrix.git
15+ url = https://github.com/albertoruiz/hmatrix.git
grenade.cabal+5−5
@@ -1,6 +1,6 @@
11name: grenade
22version: 0.0.1
3−license: BSD
3+license: BSD2
44author: Huw Campbell <huw.campbell@gmail.com>
55maintainer: Huw Campbell <huw.campbell@gmail.com>
66copyright: (c) 2015 Huw Campbell.
@@ -21,7 +21,7 @@ library
2121 , mtl >= 2.2.1 && < 2.3
2222 , parallel == 3.2.*
2323 , primitive
24− , text >= 1.2
24+ , text == 1.2.*
2525 , transformers
2626 , singletons
2727
@@ -57,7 +57,7 @@ executable feedforward
5757 , attoparsec
5858 , either
5959 , optparse-applicative == 0.12.*
60− , text
60+ , text == 1.2.*
6161 , mtl >= 2.2.1 && < 2.3
6262 , hmatrix
6363 , transformers
@@ -72,7 +72,7 @@ executable mnist
7272 , attoparsec
7373 , either
7474 , optparse-applicative == 0.12.*
75− , text
75+ , text == 1.2.*
7676 , mtl >= 2.2.1 && < 2.3
7777 , hmatrix
7878 , transformers
@@ -96,6 +96,6 @@ test-suite test
9696 , ambiata-disorder-core
9797 , hmatrix
9898 , mtl
99− , text
99+ , text == 1.2.*
100100 , QuickCheck == 2.7.*
101101 , quickcheck-instances == 0.3.*
mafia+12−4
@@ -67,11 +67,9 @@ exec_mafia () {
6767
6868 # Create a temporary file in MAFIA_BIN so we can do an atomic copy/move dance.
6969 mkdir -p $MAFIA_BIN
70− MAFIA_PATH_TEMP=$(mktemp --tmpdir=$MAFIA_BIN $MAFIA_FILE-XXXXXX 2>/dev/null || TMPDIR=$MAFIA_BIN mktemp -t $MAFIA_FILE)
7170
7271 clean_up () {
7372 rm -rf "$MAFIA_TEMP"
74− rm -f "$MAFIA_PATH_TEMP"
7573 }
7674
7775 trap clean_up EXIT
@@ -87,9 +85,19 @@ exec_mafia () {
8785
8886 bin/bootstrap ) || exit $?
8987
88+ MAFIA_PATH_TEMP=$(mktemp --tmpdir=$MAFIA_BIN $MAFIA_FILE-XXXXXX 2>/dev/null || TMPDIR=$MAFIA_BIN mktemp -t $MAFIA_FILE)
89+
90+ clean_up_temp () {
91+ clean_up
92+ rm -f "$MAFIA_PATH_TEMP"
93+ }
94+ trap clean_up_temp EXIT
95+
9096 cp "$MAFIA_TEMP/mafia/.cabal-sandbox/bin/mafia" "$MAFIA_PATH_TEMP"
91− chmod +x "$MAFIA_PATH_TEMP"
97+ chmod 755 "$MAFIA_PATH_TEMP"
9298 mv "$MAFIA_PATH_TEMP" "$MAFIA_PATH"
99+
100+ clean_up_temp
93101 }
94102
95103 exec $MAFIA_PATH "$@"
@@ -110,4 +118,4 @@ case "$MODE" in
110118upgrade) shift; run_upgrade "$@" ;;
111119*) exec_mafia "$@"
112120esac
113−# Version: d64cd4f4ab42c1431752d7c84e355b7d001778f8
121+# Version: dbbe635d8f98be1815130f04465c155f414985bf