git.iko.soy/grenade
on master help sign in
Merge pull request #3 from erikd/master
b8e0450Huw Campbell
.gitmodules+5−5
compare with master
unifiedsplit
@@ -1,15 +1,15 @@
1[submodule "lib/disorder"]
1[submodule "lib/disorder"]
2 path = lib/disorder
2 path = lib/disorder
3− url = git@github.com:ambiata/disorder.hs
3+ url = https://github.com/ambiata/disorder.hs
4[submodule "lib/x"]
4[submodule "lib/x"]
5 path = lib/x
5 path = lib/x
6− url = git@github.com:ambiata/x.git
6+ url = https://github.com/ambiata/x.git
7[submodule "lib/p"]
7[submodule "lib/p"]
8 path = lib/p
8 path = lib/p
9− url = git@github.com:ambiata/p.git
9+ url = https://github.com/ambiata/p.git
10[submodule "lib/disorder.hs"]
10[submodule "lib/disorder.hs"]
11 path = lib/disorder.hs
11 path = lib/disorder.hs
12− url = git@github.com:ambiata/disorder.hs.git
12+ url = https://github.com/ambiata/disorder.hs.git
13[submodule "lib/hmatrix"]
13[submodule "lib/hmatrix"]
14 path = lib/hmatrix
14 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 @@
1name: grenade
1name: grenade
2version: 0.0.1
2version: 0.0.1
3−license: BSD
3+license: BSD2
4author: Huw Campbell <huw.campbell@gmail.com>
4author: Huw Campbell <huw.campbell@gmail.com>
5maintainer: Huw Campbell <huw.campbell@gmail.com>
5maintainer: Huw Campbell <huw.campbell@gmail.com>
6copyright: (c) 2015 Huw Campbell.
6copyright: (c) 2015 Huw Campbell.
@@ -21,7 +21,7 @@ library
21 , mtl >= 2.2.1 && < 2.3
21 , mtl >= 2.2.1 && < 2.3
22 , parallel == 3.2.*
22 , parallel == 3.2.*
23 , primitive
23 , primitive
24− , text >= 1.2
24+ , text == 1.2.*
25 , transformers
25 , transformers
26 , singletons
26 , singletons
27
27
@@ -57,7 +57,7 @@ executable feedforward
57 , attoparsec
57 , attoparsec
58 , either
58 , either
59 , optparse-applicative == 0.12.*
59 , optparse-applicative == 0.12.*
60− , text
60+ , text == 1.2.*
61 , mtl >= 2.2.1 && < 2.3
61 , mtl >= 2.2.1 && < 2.3
62 , hmatrix
62 , hmatrix
63 , transformers
63 , transformers
@@ -72,7 +72,7 @@ executable mnist
72 , attoparsec
72 , attoparsec
73 , either
73 , either
74 , optparse-applicative == 0.12.*
74 , optparse-applicative == 0.12.*
75− , text
75+ , text == 1.2.*
76 , mtl >= 2.2.1 && < 2.3
76 , mtl >= 2.2.1 && < 2.3
77 , hmatrix
77 , hmatrix
78 , transformers
78 , transformers
@@ -96,6 +96,6 @@ test-suite test
96 , ambiata-disorder-core
96 , ambiata-disorder-core
97 , hmatrix
97 , hmatrix
98 , mtl
98 , mtl
99− , text
99+ , text == 1.2.*
100 , QuickCheck == 2.7.*
100 , QuickCheck == 2.7.*
101 , quickcheck-instances == 0.3.*
101 , quickcheck-instances == 0.3.*
mafia+12−4
@@ -67,11 +67,9 @@ exec_mafia () {
67
67
68 # Create a temporary file in MAFIA_BIN so we can do an atomic copy/move dance.
68 # Create a temporary file in MAFIA_BIN so we can do an atomic copy/move dance.
69 mkdir -p $MAFIA_BIN
69 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)
71
70
72 clean_up () {
71 clean_up () {
73 rm -rf "$MAFIA_TEMP"
72 rm -rf "$MAFIA_TEMP"
74− rm -f "$MAFIA_PATH_TEMP"
75 }
73 }
76
74
77 trap clean_up EXIT
75 trap clean_up EXIT
@@ -87,9 +85,19 @@ exec_mafia () {
87
85
88 bin/bootstrap ) || exit $?
86 bin/bootstrap ) || exit $?
89
87
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+
90 cp "$MAFIA_TEMP/mafia/.cabal-sandbox/bin/mafia" "$MAFIA_PATH_TEMP"
96 cp "$MAFIA_TEMP/mafia/.cabal-sandbox/bin/mafia" "$MAFIA_PATH_TEMP"
91− chmod +x "$MAFIA_PATH_TEMP"
97+ chmod 755 "$MAFIA_PATH_TEMP"
92 mv "$MAFIA_PATH_TEMP" "$MAFIA_PATH"
98 mv "$MAFIA_PATH_TEMP" "$MAFIA_PATH"
99+
100+ clean_up_temp
93 }
101 }
94
102
95 exec $MAFIA_PATH "$@"
103 exec $MAFIA_PATH "$@"
@@ -110,4 +118,4 @@ case "$MODE" in
110upgrade) shift; run_upgrade "$@" ;;
118upgrade) shift; run_upgrade "$@" ;;
111*) exec_mafia "$@"
119*) exec_mafia "$@"
112esac
120esac
113−# Version: d64cd4f4ab42c1431752d7c84e355b7d001778f8
121+# Version: dbbe635d8f98be1815130f04465c155f414985bf