Merge branch 'master' into nightly

This commit is contained in:
Jens Petersen 2017-03-31 17:51:43 +09:00
commit 82656b82cb
2 changed files with 85 additions and 8 deletions

View File

@ -6,13 +6,73 @@ packages:
- tibetan-utils - tibetan-utils
"Henning Thielemann <stackage@henning-thielemann.de> @thielema": "Henning Thielemann <stackage@henning-thielemann.de> @thielema":
- numeric-prelude # - accelerate-arithmetic # via accelerate: bounds: base
- non-negative # - accelerate-fftw # via accelerate: bounds: base
# - accelerate-fourier # via accelerate: bounds: base
# - accelerate-utility # via accelerate: bounds: base
- apportionment
- audacity
- bibtex
# - board-games # https://github.com/fpco/stackage/pull/2390
- buffer-pipe
- calendar-recycling
- comfort-graph
- concurrent-split
- cutter
- data-accessor
- data-accessor-mtl
- data-accessor-template
- data-accessor-transformers
- data-ref
- dsp
- enumset
- equal-files
- event-list
- explicit-exception
- fixed-length
- gnuplot
- group-by-date
- iff
- interpolation
- latex
- lazyio
- markov-chain
- midi
- midi-music-box
- mbox-utility
- non-empty - non-empty
- non-negative
- numeric-prelude
- pathtype
- pooled-io
- probability
- sample-frame
- sample-frame-np
- set-cover
- sound-collage
- sox
- split-record
- spreadsheet
- stm-split
- storable-record - storable-record
- storablevector
- synthesizer-core
- synthesizer-dimensional
- synthesizer-midi
- tagchup
- tfp
- unicode
- unsafe
- utility-ht - utility-ht
- xml-basic
- youtube
- prelude-compat - prelude-compat
- fft
- carray
# Not a maintainer
- ix-shapable
"Jeremy Barisch-Rooney <barischj@tcd.ie> @barischj": "Jeremy Barisch-Rooney <barischj@tcd.ie> @barischj":
- threepenny-gui-flexbox - threepenny-gui-flexbox
@ -74,6 +134,7 @@ packages:
- word24 - word24
- mysql-haskell - mysql-haskell
- mysql-haskell-openssl - mysql-haskell-openssl
- data-has
"Harendra Kumar <harendra.kumar@gmail.com> @harendra-kumar": "Harendra Kumar <harendra.kumar@gmail.com> @harendra-kumar":
- unicode-transforms - unicode-transforms
@ -414,6 +475,7 @@ packages:
- streams - streams
- tagged - tagged
- trifecta - trifecta
- unique
- vector-instances - vector-instances
- void - void
- wl-pprint-extras - wl-pprint-extras
@ -881,6 +943,7 @@ packages:
- cases - cases
- focus - focus
- hasql - hasql
- hasql-pool
- list-t - list-t
- mtl-prelude - mtl-prelude
- neat-interpolation - neat-interpolation
@ -888,6 +951,7 @@ packages:
- postgresql-binary - postgresql-binary
- slave-thread - slave-thread
- stm-containers - stm-containers
- refined
"Iustin Pop <iustin@k1024.org> @iustin": "Iustin Pop <iustin@k1024.org> @iustin":
- prefix-units - prefix-units
@ -1086,6 +1150,8 @@ packages:
- http-link-header - http-link-header
- microformats2-parser - microformats2-parser
- hspec-expectations-pretty-diff - hspec-expectations-pretty-diff
- wai-cli
- magicbane
"Francesco Mazzoli <f@mazzo.li> @bitonic": "Francesco Mazzoli <f@mazzo.li> @bitonic":
- language-c-quote - language-c-quote
@ -1122,6 +1188,8 @@ packages:
- servant-yaml - servant-yaml
- singleton-bool - singleton-bool
- spdx - spdx
- tdigest
- tdigest-Chart
- these - these
- time-parsers - time-parsers
- waitra - waitra
@ -1143,11 +1211,6 @@ packages:
- recursion-schemes - recursion-schemes
- unordered-containers - unordered-containers
- fft
- carray
- ix-shapable
- fft
# Regex packages by Chris Kuklewicz # Regex packages by Chris Kuklewicz
- regex-base - regex-base
- regex-compat - regex-compat
@ -1571,6 +1634,7 @@ packages:
"Justin Le <justin@jle.im> @mstksg": "Justin Le <justin@jle.im> @mstksg":
- auto - auto
- backprop
- configurator-export - configurator-export
- hamilton - hamilton
- prompt - prompt
@ -1722,7 +1786,7 @@ packages:
- type-spec - type-spec
- pretty-types - pretty-types
- mediabus - mediabus
#- mediabus-fdk-aac # needs non-free libfdk-aac-dev - mediabus-fdk-aac
- mediabus-rtp - mediabus-rtp
# "Will Thompson <will@willthompson.co.uk> @wjt": # "Will Thompson <will@willthompson.co.uk> @wjt":
@ -2728,6 +2792,7 @@ packages:
- picedit - picedit
- mathexpr - mathexpr
- sibe - sibe
- termcolor
"Alexis Williams <sasinestro@gmail.com> @typedrat": "Alexis Williams <sasinestro@gmail.com> @typedrat":
# - stb-image-redux # bounds: vector # - stb-image-redux # bounds: vector
@ -2898,6 +2963,9 @@ packages:
- proto-lens-arbitrary - proto-lens-arbitrary
- proto-lens-optparse - proto-lens-optparse
"Christof Schramm <christof.schramm@campus.lmu.de>":
- mnist-idx
# If you stop maintaining a package you can move it here. # If you stop maintaining a package you can move it here.
# It will then be disabled if it starts causing problems. # It will then be disabled if it starts causing problems.
# See https://github.com/fpco/stackage/issues/1056 # See https://github.com/fpco/stackage/issues/1056
@ -2978,6 +3046,9 @@ packages:
# Package flags are applied to individual packages, and override the values of # Package flags are applied to individual packages, and override the values of
# global-flags # global-flags
package-flags: package-flags:
pathtype:
old-time: false
brick: brick:
demos: true demos: true

View File

@ -92,6 +92,7 @@ apt-get install -y \
libsdl2-ttf-dev \ libsdl2-ttf-dev \
libsnappy-dev \ libsnappy-dev \
libsndfile1-dev \ libsndfile1-dev \
libsox-dev \
libsqlite3-dev \ libsqlite3-dev \
libssl-dev \ libssl-dev \
libsystemd-dev \ libsystemd-dev \
@ -181,3 +182,8 @@ wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \ && add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" \
&& apt-get update \ && apt-get update \
&& apt-get install -y llvm-4.0 && apt-get install -y llvm-4.0
# non-free repo
apt-add-repository multiverse
&& apt-get update
&& apt-get install -y libfdk-aac-dev