on master help sign in
Merge branch 'master' into nightly
186c7bbJens Petersen
build-constraints.yaml+44−48
@@ -179,7 +179,7 @@ packages:
179 - executable-path
179 - executable-path
180 - foreign-store
180 - foreign-store
181 - formatting
181 - formatting
182− # - gtk2hs-buildtools # via hashtables: bounds: vector
182+ - gtk2hs-buildtools
183 - happy
183 - happy
184 - hybrid-vectors
184 - hybrid-vectors
185 - indents
185 - indents
@@ -332,7 +332,7 @@ packages:
332 - hostname-validate
332 - hostname-validate
333 - ini
333 - ini
334 - lucid
334 - lucid
335− # - osdkeys # via libnotify: via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
335+ - osdkeys # via libnotify
336 - pdfinfo
336 - pdfinfo
337 # - present # compilation failure against haskell-src-exts
337 # - present # compilation failure against haskell-src-exts
338 - pure-io
338 - pure-io
@@ -348,13 +348,13 @@ packages:
348 # - structured-haskell-mode # bounds: haskell-src-exts # via: applicative-quoters
348 # - structured-haskell-mode # bounds: haskell-src-exts # via: applicative-quoters
349
349
350 "Alberto G. Corona <agocorona@gmail.com> @agocorona":
350 "Alberto G. Corona <agocorona@gmail.com> @agocorona":
351− # - RefSerialize # via hashtables: bounds: vector
351+ - RefSerialize
352− # - TCache # via hashtables: bounds: vector
352+ - TCache
353− # - Workflow # via RefSerialize: via hashtables: bounds: vector
353+ - Workflow
354− # - MFlow # via RefSerialize: via hashtables: bounds: vector
354+ - MFlow
355 - transient
355 - transient
356− # - transient-universe # via TCache: via hashtables: bounds: vector
356+ - transient-universe
357− # - ghcjs-hplay # via transient-universe: via TCache: via hashtables: bounds: vector
357+ - ghcjs-hplay
358
358
359 "Edward Kmett <ekmett@gmail.com> @ekmett":
359 "Edward Kmett <ekmett@gmail.com> @ekmett":
360 - ad
360 - ad
@@ -389,7 +389,7 @@ packages:
389 - lca
389 - lca
390 - lens
390 - lens
391 - linear
391 - linear
392− # - linear-accelerate # via accelerate: via hashtables: bounds: vector
392+ - linear-accelerate
393 # - log-domain # via safecopy: bounds: vector
393 # - log-domain # via safecopy: bounds: vector
394 - machines
394 - machines
395 - monadic-arrays
395 - monadic-arrays
@@ -453,10 +453,10 @@ packages:
453 - diagrams
453 - diagrams
454 - diagrams-builder
454 - diagrams-builder
455 # - diagrams-haddock # BLOCKED directory 1.3 via cautious-file
455 # - diagrams-haddock # BLOCKED directory 1.3 via cautious-file
456− # - diagrams-cairo # bounds: vector
456+ - diagrams-cairo # bounds: vector
457 - diagrams-contrib
457 - diagrams-contrib
458 - diagrams-core
458 - diagrams-core
459− # - diagrams-gtk # via diagrams-cairo: bounds: vector
459+ - diagrams-gtk
460 - diagrams-lib
460 - diagrams-lib
461 - diagrams-postscript
461 - diagrams-postscript
462 - diagrams-rasterific
462 - diagrams-rasterific
@@ -508,8 +508,7 @@ packages:
508 - ChannelT
508 - ChannelT
509
509
510 "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell":
510 "Trevor L. McDonell <tmcdonell@cse.unsw.edu.au> @tmcdonell":
511− []
512− # - accelerate # via hashtables: bounds: vector
511+ - accelerate
513
512
514 "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
513 "Liam O'Connor <liamoc@cse.unsw.edu.au> @liamoc":
515 []
514 []
@@ -764,11 +763,11 @@ packages:
764
763
765 "Simon Michael <simon@joyful.com> @simonmichael":
764 "Simon Michael <simon@joyful.com> @simonmichael":
766 - darcs
765 - darcs
767− # - hledger # via hledger-lib: via hashtables: bounds: vector
766+ - hledger
768− # - hledger-lib # via hashtables: bounds: vector
767+ - hledger-lib
769− # - hledger-ui # via hledger-lib: via hashtables: bounds: vector
768+ - hledger-ui
770− # - hledger-web # via hledger-lib: via hashtables: bounds: vector
769+ - hledger-web
771− # - hledger-api # via hledger-lib: via hashtables: bounds: vector
770+ - hledger-api
772 # - shelltestrunner # bounds: Diff, HUnit
771 # - shelltestrunner # bounds: Diff, HUnit
773 - quickbench
772 - quickbench
774 - regex-compat-tdfa
773 - regex-compat-tdfa
@@ -866,7 +865,7 @@ packages:
866 - multimap
865 - multimap
867 - parallel-io
866 - parallel-io
868 - text-binary
867 - text-binary
869− # - Chart-cairo # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
868+ - Chart-cairo
870 - ghc-events
869 - ghc-events
871 - monad-extras
870 - monad-extras
872 # - stack < 9.9.9 # bounds: ghc, template-haskell
871 # - stack < 9.9.9 # bounds: ghc, template-haskell
@@ -881,7 +880,7 @@ packages:
881 - base-prelude
880 - base-prelude
882 - cases
881 - cases
883 - focus
882 - focus
884− # - hasql # via hashtables: bounds: vector
883+ - hasql
885 - list-t
884 - list-t
886 - mtl-prelude
885 - mtl-prelude
887 - neat-interpolation
886 - neat-interpolation
@@ -1005,15 +1004,15 @@ packages:
1005 - xmonad-contrib
1004 - xmonad-contrib
1006 - shelly
1005 - shelly
1007
1006
1008− # - cairo # via gtk2hs-buildtools: via hashtables: bounds: vector
1007+ - cairo
1009− # - gio # via gtk2hs-buildtools: via hashtables: bounds: vector
1008+ - gio
1010− # - glib # via gtk2hs-buildtools: via hashtables: bounds: vector
1009+ - glib
1011− # - gtk # via gtk2hs-buildtools: via hashtables: bounds: vector
1010+ - gtk
1012− # - gtk3 # via gtk2hs-buildtools: via hashtables: bounds: vector
1011+ - gtk3
1013− # - gtksourceview3 # via gtk2hs-buildtools: via hashtables: bounds: vector
1012+ - gtksourceview3
1014− # - pango # via gtk2hs-buildtools: via hashtables: bounds: vector
1013+ - pango
1015− # - webkitgtk3 # via gtk2hs-buildtools: via hashtables: bounds: vector
1014+ - webkitgtk3
1016− # - webkitgtk3-javascriptcore # via gtk2hs-buildtools: via hashtables: bounds: vector
1015+ - webkitgtk3-javascriptcore
1017
1016
1018 - ghcjs-codemirror
1017 - ghcjs-codemirror
1019 # - ghcjs-dom # via: ghcjs-dom-jsaddle # https://github.com/fpco/stackage/issues/1569
1018 # - ghcjs-dom # via: ghcjs-dom-jsaddle # https://github.com/fpco/stackage/issues/1569
@@ -1399,9 +1398,9 @@ packages:
1399 - hmatrix-gsl-stats
1398 - hmatrix-gsl-stats
1400 - hsignal
1399 - hsignal
1401 - hstatistics
1400 - hstatistics
1402− # - plot # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
1401+ - plot
1403− # - plot-gtk # via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
1402+ - plot-gtk
1404− # - plot-gtk3 # via gtk3: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
1403+ - plot-gtk3
1405 - vector-buffer
1404 - vector-buffer
1406 # - hmatrix-repa # via repa: bounds: vector
1405 # - hmatrix-repa # via repa: bounds: vector
1407
1406
@@ -1478,7 +1477,7 @@ packages:
1478 - elm-export
1477 - elm-export
1479 - elm-export-persistent
1478 - elm-export-persistent
1480 # - pipes-csv # via cassava: bounds: vector
1479 # - pipes-csv # via cassava: bounds: vector
1481− # - pipes-mongodb # via mongoDB: via hashtables: bounds: vector
1480+ - pipes-mongodb # via mongoDB
1482 - servant-elm
1481 - servant-elm
1483 - skeletons
1482 - skeletons
1484 - streaming-wai
1483 - streaming-wai
@@ -1538,8 +1537,8 @@ packages:
1538 - triesn
1537 - triesn
1539 - path-extra
1538 - path-extra
1540 # - pred-trie # via poly-arity
1539 # - pred-trie # via poly-arity
1541− # - pred-set # via hashtables: bounds: vector
1540+ - pred-set
1542− # - HSet # via hashtables: bounds: vector
1541+ - HSet
1543
1542
1544 "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":
1543 "Fumiaki Kinoshita <fumiexcel@gmail.com> @fumieval":
1545 - boundingboxes
1544 - boundingboxes
@@ -1826,8 +1825,7 @@ packages:
1826 # - ipython-kernel # GHC 8
1825 # - ipython-kernel # GHC 8
1827
1826
1828 "Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr":
1827 "Andrés Sicard-Ramírez <asr@eafit.edu.co> @asr":
1829− []
1828+ - Agda
1830− # - Agda # via hashtables: bounds: vector
1831
1829
1832 "James Cook <mokus@deepbondi.net> @mokus0":
1830 "James Cook <mokus@deepbondi.net> @mokus0":
1833 - dependent-sum
1831 - dependent-sum
@@ -1840,7 +1838,7 @@ packages:
1840 "Timo von Holtz <tvh@tvholtz.de> @tvh":
1838 "Timo von Holtz <tvh@tvholtz.de> @tvh":
1841 - ekg-wai
1839 - ekg-wai
1842 - haxl-amazonka
1840 - haxl-amazonka
1843− # - hasql-migration # via hasql: via hashtables: bounds: vector
1841+ - hasql-migration
1844 - servant-JuicyPixels
1842 - servant-JuicyPixels
1845
1843
1846 "Artyom <yom@artyom.me> @neongreen":
1844 "Artyom <yom@artyom.me> @neongreen":
@@ -1972,7 +1970,7 @@ packages:
1972 - smallcaps
1970 - smallcaps
1973
1971
1974 "Gregory Collins <greg@gregorycollins.net> @gregorycollins":
1972 "Gregory Collins <greg@gregorycollins.net> @gregorycollins":
1975− # - hashtables # bounds: vector
1973+ - hashtables
1976 - io-streams
1974 - io-streams
1977 - openssl-streams
1975 - openssl-streams
1978
1976
@@ -2001,7 +1999,7 @@ packages:
2001 - cabal2nix
1999 - cabal2nix
2002 - funcmp
2000 - funcmp
2003 - hackage-db
2001 - hackage-db
2004− # - hledger-interest # via hledger-lib: via hashtables: bounds: vector
2002+ - hledger-interest
2005 - hopenssl
2003 - hopenssl
2006 - hsdns
2004 - hsdns
2007 - hsemail
2005 - hsemail
@@ -2071,8 +2069,7 @@ packages:
2071 # - multiplate # bounds: transformers
2069 # - multiplate # bounds: transformers
2072
2070
2073 "Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in> @sumitsahrawat":
2071 "Sumit Sahrawat <sumit.sahrawat.apm13@iitbhu.ac.in> @sumitsahrawat":
2074− []
2072+ - plot-gtk-ui
2075− # - plot-gtk-ui # via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
2076 # - calculator # bounds: ghc, base
2073 # - calculator # bounds: ghc, base
2077
2074
2078 "Emmanuel Touzery <etouzery@gmail.com> @emmanueltouzery":
2075 "Emmanuel Touzery <etouzery@gmail.com> @emmanueltouzery":
@@ -2500,8 +2497,8 @@ packages:
2500 - wikicfp-scraper
2497 - wikicfp-scraper
2501 - wild-bind
2498 - wild-bind
2502 - wild-bind-x11
2499 - wild-bind-x11
2503− # - wild-bind-indicator # via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
2500+ - wild-bind-indicator
2504− # - wild-bind-task-x11 # via wild-blind-indicator: via gtk: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
2501+ - wild-bind-task-x11
2505
2502
2506 "Cies Breijs <cies@kde.nl> @cies":
2503 "Cies Breijs <cies@kde.nl> @cies":
2507 - htoml
2504 - htoml
@@ -2586,7 +2583,7 @@ packages:
2586 - open-witness
2583 - open-witness
2587
2584
2588 "Victor Denisov <denisovenator@gmail.com> @VictorDenisov":
2585 "Victor Denisov <denisovenator@gmail.com> @VictorDenisov":
2589− # - mongoDB # via hashtables: bounds: vector
2586+ - mongoDB
2590 - bson
2587 - bson
2591
2588
2592 "Alexis King <lexi.lambda@gmail.com> @lexi-lambda":
2589 "Alexis King <lexi.lambda@gmail.com> @lexi-lambda":
@@ -2729,7 +2726,7 @@ packages:
2729 "Mahdi Dibaiee <mdibaiee@aol.com>":
2726 "Mahdi Dibaiee <mdibaiee@aol.com>":
2730 - picedit
2727 - picedit
2731 - mathexpr
2728 - mathexpr
2732− # - sibe # via Chart-cairo: via cairo: via gtk2hs-buildtools: via hashtables: bounds: vector
2729+ - sibe
2733
2730
2734 "Alexis Williams <sasinestro@gmail.com> @typedrat":
2731 "Alexis Williams <sasinestro@gmail.com> @typedrat":
2735 # - stb-image-redux # bounds: vector
2732 # - stb-image-redux # bounds: vector
@@ -2773,8 +2770,7 @@ packages:
2773 # - hip # via repa: bounds: vector
2770 # - hip # via repa: bounds: vector
2774
2771
2775 "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
2772 "Hans-Peter Deifel <hpd@hpdeifel.de> @hpdeifel":
2776− []
2773+ - hledger-iadd
2777− # - hledger-iadd # via hledger-lib: via hashtables: bounds: vector
2778
2774
2779 "Roy Levien <royl@aldaron.com> @orome":
2775 "Roy Levien <royl@aldaron.com> @orome":
2780 - crypto-enigma
2776 - crypto-enigma
debian-bootstrap.sh+3−4
@@ -22,9 +22,8 @@ add-apt-repository ppa:hvr/ghc -y
22add-apt-repository -y ppa:marutter/rrutter
22add-apt-repository -y ppa:marutter/rrutter
23# not sure what this was needed for
23# not sure what this was needed for
24#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
24#add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
25−wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
25+#wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
26−echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
27−echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main" >> /etc/apt/sources.list
26+add-apt-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main"
28
27
29# Set the GHC version
28# Set the GHC version
30GHCVER=8.0.2
29GHCVER=8.0.2
@@ -115,8 +114,8 @@ apt-get install -y \
115 libzip-dev \
114 libzip-dev \
116 libzmq3-dev \
115 libzmq3-dev \
117 llvm-3.7 \
116 llvm-3.7 \
117+ llvm-4.0 \
118 locales \
118 locales \
119− llvm-4.0-dev \
120 m4 \
119 m4 \
121 nettle-dev \
120 nettle-dev \
122 nodejs \
121 nodejs \