haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-27 06:31:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for MusicBrainz and nettle

Browse Source 
Pinging @clinty
This commit is contained in:
Michael Snoyman 2014-06-30 16:10:24 +03:00
parent cd43fe1c2c
commit 6d192674a6
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian-bootstrap.sh
View File

@ -7,7 +7,7 @@
# wget -O - https://raw.github.com/fpco/stackage/master/debian-bootstrap.sh | bash -ex # wget -O - https://raw.github.com/fpco/stackage/master/debian-bootstrap.sh | bash -ex
sudo apt-get update sudo apt-get update
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 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
wget http://www.haskell.org/ghc/dist/7.4.2/ghc-7.4.2-x86_64-unknown-linux.tar.bz2 wget http://www.haskell.org/ghc/dist/7.4.2/ghc-7.4.2-x86_64-unknown-linux.tar.bz2
tar jxfv ghc-7.4.2-x86_64-unknown-linux.tar.bz2 tar jxfv ghc-7.4.2-x86_64-unknown-linux.tar.bz2
cd ghc-7.4.2 cd ghc-7.4.2

28
patching/patches/MusicBrainz-0.2.1.patch Normal file
View File

@ -0,0 +1,28 @@
diff -ru orig/MusicBrainz.cabal new/MusicBrainz.cabal
--- orig/MusicBrainz.cabal 2014-06-30 16:08:08.987902131 +0300
+++ new/MusicBrainz.cabal 2014-06-30 16:08:08.000000000 +0300
@@ -23,8 +23,10 @@
, monad-control ==0.3.*
, bytestring
, conduit >= 1.0.0
+ , conduit-extra >= 1.0.0
, text
, time
+ , resourcet
, vector >=0.9
, xml-types ==0.3.*
, http-conduit >= 1.8.8
diff -ru orig/Network/Protocol/MusicBrainz/XML2/WebService.hs new/Network/Protocol/MusicBrainz/XML2/WebService.hs
--- orig/Network/Protocol/MusicBrainz/XML2/WebService.hs 2014-06-30 16:08:08.987902131 +0300
+++ new/Network/Protocol/MusicBrainz/XML2/WebService.hs 2014-06-30 16:08:08.000000000 +0300
@@ -11,8 +11,9 @@
import Control.Applicative (liftA2, (<|>))
import Control.Monad.IO.Class (MonadIO)
import Control.Monad.Trans.Control (MonadBaseControl)
+import Control.Monad.Trans.Resource (MonadThrow, runResourceT)
import qualified Data.ByteString.Lazy as BL
-import Data.Conduit (Consumer, ($=), ($$), MonadThrow, runResourceT)
+import Data.Conduit (Consumer, ($=), ($$))
import Data.Conduit.Binary (sourceLbs)
import Data.List (intercalate)
import Data.Maybe (fromMaybe)