git.iko.soy/stackage
on master help sign in
Fixes for MusicBrainz and nettle
6d19267Michael Snoyman
debian-bootstrap.sh+1−1
compare with master
unifiedsplit
@@ -7,7 +7,7 @@
7# wget -O - https://raw.github.com/fpco/stackage/master/debian-bootstrap.sh | bash -ex
7# wget -O - https://raw.github.com/fpco/stackage/master/debian-bootstrap.sh | bash -ex
8
8
9sudo apt-get update
9sudo apt-get update
10−sudo apt-get install -y build-essential libncurses-dev git libgmp3c2 libgmp3-dev zlib1g-dev libedit2 libedit-dev freeglut3-dev libglu1-mesa-dev libglib2.0-dev libcairo2-dev libpango1.0-dev libgtk2.0-dev zip libdevil-dev llvm libbz2-dev libjudy-dev libmysqlclient-dev libpq-dev libicu-dev libssl-dev
10+sudo apt-get install -y build-essential libncurses-dev git libgmp3c2 libgmp3-dev zlib1g-dev libedit2 libedit-dev freeglut3-dev libglu1-mesa-dev libglib2.0-dev libcairo2-dev libpango1.0-dev libgtk2.0-dev zip libdevil-dev llvm libbz2-dev libjudy-dev libmysqlclient-dev libpq-dev libicu-dev libssl-dev nettle-dev
11wget http://www.haskell.org/ghc/dist/7.4.2/ghc-7.4.2-x86_64-unknown-linux.tar.bz2
11wget http://www.haskell.org/ghc/dist/7.4.2/ghc-7.4.2-x86_64-unknown-linux.tar.bz2
12tar jxfv ghc-7.4.2-x86_64-unknown-linux.tar.bz2
12tar jxfv ghc-7.4.2-x86_64-unknown-linux.tar.bz2
13cd ghc-7.4.2
13cd ghc-7.4.2
patching/patches/MusicBrainz-0.2.1.patchnew file+28
@@ -0,0 +1,28 @@
1+diff -ru orig/MusicBrainz.cabal new/MusicBrainz.cabal
2+--- orig/MusicBrainz.cabal 2014-06-30 16:08:08.987902131 +0300
3++++ new/MusicBrainz.cabal 2014-06-30 16:08:08.000000000 +0300
4+@@ -23,8 +23,10 @@
5+ , monad-control ==0.3.*
6+ , bytestring
7+ , conduit >= 1.0.0
8++ , conduit-extra >= 1.0.0
9+ , text
10+ , time
11++ , resourcet
12+ , vector >=0.9
13+ , xml-types ==0.3.*
14+ , http-conduit >= 1.8.8
15+diff -ru orig/Network/Protocol/MusicBrainz/XML2/WebService.hs new/Network/Protocol/MusicBrainz/XML2/WebService.hs
16+--- orig/Network/Protocol/MusicBrainz/XML2/WebService.hs 2014-06-30 16:08:08.987902131 +0300
17++++ new/Network/Protocol/MusicBrainz/XML2/WebService.hs 2014-06-30 16:08:08.000000000 +0300
18+@@ -11,8 +11,9 @@
19+ import Control.Applicative (liftA2, (<|>))
20+ import Control.Monad.IO.Class (MonadIO)
21+ import Control.Monad.Trans.Control (MonadBaseControl)
22++import Control.Monad.Trans.Resource (MonadThrow, runResourceT)
23+ import qualified Data.ByteString.Lazy as BL
24+-import Data.Conduit (Consumer, ($=), ($$), MonadThrow, runResourceT)
25++import Data.Conduit (Consumer, ($=), ($$))
26+ import Data.Conduit.Binary (sourceLbs)
27+ import Data.List (intercalate)
28+ import Data.Maybe (fromMaybe)