Commit graph

27115 commits

Author SHA1 Message Date
William A. Kennington III
95c22086a6 openjdk: 7u85b02 -> 7u91b01 2015-11-10 18:26:52 -08:00
William A. Kennington III
cb21b77ff1 gtk3: 3.18.0 -> 3.18.3 2015-11-10 18:25:47 -08:00
Robert Helgesson
5bc1ddd78f perl-DBIx-Class: 0.082801 -> 0.082820 2015-11-11 02:23:02 +01:00
Stéphane Jourdois
492562fe59 darwin: subunit: allow build on Darwin 2015-11-10 22:14:06 +01:00
Stéphane Jourdois
ea5a227993 darwin: check: add missing CoreServices dep 2015-11-10 22:13:31 +01:00
Pascal Wittmann
d8c5f4dd56 Merge pull request #10655 from spacefrogg/dialog
dialog: updated to 1.2.20150920
2015-11-10 17:25:49 +01:00
Matthijs Steen
67c4c5fd16 flow: added Linux support
Changed the build inputs to only include the additional Darwin inputs when building for Darwin.
2015-11-10 16:23:20 +01:00
Peter Simons
4e47af8041 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:

  - Nixpkgs: 29fff27a55
  - Hackage: fccc42cccb
  - LTS Haskell: 1ae555e197
  - Stackage Nightly: ec7b421c66
2015-11-10 16:19:06 +01:00
Michael Raitza
01038feea0 dialog: 1.2-20150225 -> 1.2.20150920 2015-11-10 13:27:48 +00:00
Arseniy Seroka
a8a58faedb Merge pull request #10896 from sjourdois/gnutls
darwin: gnutls: add missing libiconv dep
2015-11-10 15:29:13 +03:00
Arseniy Seroka
2092b833bb Merge pull request #10895 from sjourdois/libidn
darwin: libidn: add missing libiconv dep
2015-11-10 15:29:01 +03:00
taku0
63385e9712 ncurses: revived clang patch (close #10622) 2015-11-10 09:08:09 +01:00
Karn Kallio
75ffec77ee signond : update the URL, which has changed
Patch contributed by Karn Kallio <tierpluspluslists@skami.org>.
Committed by falsifian <jcook@cs.berkeley.edu>.
2015-11-09 23:49:31 -08:00
Edward Tjörnhammar
38ca909811 maven: 3.2.5 -> 3.3.3 2015-11-10 08:46:14 +01:00
Bjørn Forsman
ff4d8513b4 qtcreator: add qtdeclarative to QML2_IMPORT_PATH
When building with Qt 5.4 this is not a problem, but with Qt 5.5 (tested
locally), it is clear that this dependency is missing:

$ ./result/bin/qtcreator
file:///nix/store/zmpf6ydrjdydd85wh6splpywv6aj4782-qtcreator-3.4.2/share/qtcreator/welcomescreen/welcomescreen.qml:31:1:
module "QtQuick" is not installed
     import QtQuick 2.1
     ^

With Qt 5.4 something else is pulling in the qtdeclarative dependency,
it can be seen in the qtcreator wrapper script.

Note to self: "import QtQuick" != qtquickcontrols. QtQuick is
apparently located in the qtdeclarative module.
2015-11-09 21:00:10 +01:00
Peter Simons
0435fe715c Merge pull request #10790 from mcmtroffaes/feature/openssl-mingw
openssl: cross build improvement
2015-11-09 20:53:22 +01:00
Thomas Tuegel
d9f64f975b Merge pull request #10916 from bjornfor/fix-qt55-qtmultimedia
qt55: fix qtmultimedia gstreamer support
2015-11-09 05:41:58 -06:00
Bjørn Forsman
2cec70ce6c qt55: fix qtmultimedia gstreamer support
Without this, configure will say:

  Checking for openal... no
  /tmp/nix-build-qtmultimedia-5.5.0.drv-0/qtmultimedia-opensource-src-5.5.0/qtmultimedia.pro:28:
  Variable GST_VERSION is not defined.
  Checking for resourcepolicy... no

And there may be application runtime errors like

  defaultServiceProvider::requestService(): no service found for - "org.qt-project.qt.camera"

After this fix, configure will say:

  Checking for openal... no
  Checking for gstreamer... yes
  Checking for gstreamer_photography... no
  Checking for gstreamer_encodingprofiles... yes
  Checking for gstreamer_appsrc... yes
  Checking for linux_v4l... yes
  Checking for resourcepolicy... no

And the above runtime error will not appear.

This fix is similar to 449b6028 ("qt5.multimedia: fix gstreamer
support."), except with Qt 5.5 we also need to set GST_VERSION.
2015-11-09 10:55:04 +01:00
Chris Martin
d03cee22c4 parse: init at 3.0.1 2015-11-09 04:22:34 -05:00
Pascal Wittmann
fc6c73c3c2 Merge pull request #10887 from devhell/mediainfo
{lib}mediainfo-{gui}, libzen: 0.7.78 -> 0.7.79, 0.4.31 -> 0.4.32
2015-11-09 10:06:06 +01:00
goibhniu
2583b323c5 Merge pull request #10910 from wjlroe/exercism-go
exercism: migrate to go-packages, 1.9.2 -> 2.2.1
2015-11-09 09:49:13 +01:00
William A. Kennington III
4674e53eea rdkafka: 0.8.6 -> 2015-11-03 2015-11-08 20:42:12 -08:00
William A. Kennington III
7e56400d4f rabbitmq-c: 0.7.0 -> 0.7.1 2015-11-08 20:42:12 -08:00
William Roe
3c8f2fc9a7 exercism: migrate to go-packages, 1.9.2 -> 2.2.1 2015-11-09 01:17:57 +00:00
vbgl
6fa6ff9e25 Merge pull request #10899 from krgn/update-mono
update mono to 4.0.4.1
2015-11-08 23:29:35 +01:00
Karn Kallio
60b4d47f90 xulrunner: fix path to configure script 2015-11-08 22:12:06 +01:00
karsten gebbert
16f7b10a59 update mono to 4.0.4.1 2015-11-08 21:40:22 +01:00
Stéphane Jourdois
d2452d1951 darwin: gnutls: add missing libiconv dep 2015-11-08 19:02:43 +01:00
Stéphane Jourdois
31c3301d23 darwin: libidn: add missing libiconv dep 2015-11-08 19:02:12 +01:00
devhell
e20ce69aca libzen: 0.4.31 -> 0.4.32
This is the update to `libzen` which is a dependency of `mediainfo{-gui}`.
2015-11-08 15:05:26 +00:00
devhell
25ba56a263 {lib}mediainfo-gui: 0.7.78 -> 0.7.79
Following a commit by @k0ral, this completes the upgrade of the other
`mediainfo` components.

From the changelog:
```
Version 0.7.79, 2015-11-02
+ CLI/DLL only, XML: new option --Output=MIXML, with XML v2.0beta1
  status, not for production, see
  https://github.com/MediaArea/MediaAreaXml for more details
+ MediaTrace: support of more than 1 file in XML output.
+ CLI/DLL only, XML: new option --Output=MAXML, with XML v0.1 status, in
  order to have bot MediaInfo and MediaTrace in the same output, not for
  production, see https://github.com/MediaArea/MediaAreaXml for more
  details
x MediaTrace: fixed some invalid outputs
x #B951, Amazon S3 support (REST API v2), CLI/DLL only and if compiled
  with libcurl support: URL without credential were badly interpreted
```
2015-11-08 15:03:00 +00:00
Peter Simons
6687047a04 configuration-hackage2nix.yaml: update list of broken builds 2015-11-08 15:20:28 +01:00
Peter Simons
f050c42f0b hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-35-g816abb5 using the following inputs:

  - Nixpkgs: 1df25a5f13
  - Hackage: cb4ec9770f
  - LTS Haskell: 71e581f8e4
  - Stackage Nightly: 6fbe569da0
2015-11-08 15:19:55 +01:00
Arseniy Seroka
afc06c11b9 Merge pull request #10882 from phile314/master
uhc: Update to 1.1.9.2
2015-11-08 17:11:32 +03:00
Philipp Hausmann
4030070e40
uhc: Update to 1.1.9.2 2015-11-08 12:24:19 +01:00
Domen Kožar
792fcd9f70 pycairo: disable on py35 2015-11-08 08:22:04 +01:00
William A. Kennington III
5149c03adc Merge branch 'master.upstream' into staging.upstream 2015-11-07 18:53:26 -08:00
William A. Kennington III
e41d1a8c93 uid_wrapper: 1.1.1 -> 1.2.0 2015-11-07 18:52:45 -08:00
William A. Kennington III
faad921106 tevent: 0.9.25 -> 0.9.26 2015-11-07 18:52:27 -08:00
William A. Kennington III
332e1dd2ab tdb: 1.3.7 -> 1.3.8 2015-11-07 18:52:12 -08:00
William A. Kennington III
863ef41025 talloc: 2.1.3 -> 2.1.5 2015-11-07 18:51:59 -08:00
William A. Kennington III
d6f46e31af socket_wrapper: 1.1.4 -> 1.1.5 2015-11-07 18:51:46 -08:00
William A. Kennington III
a11a88aad9 ldb: 1.1.21 -> 1.1.23 2015-11-07 18:51:34 -08:00
William A. Kennington III
767f1d5a74 glib: 2.46.0 -> 2.46.2 2015-11-07 16:32:17 -08:00
William A. Kennington III
a26c8e9b83 Merge branch 'master.upstream' into staging.upstream 2015-11-07 15:51:51 -08:00
William A. Kennington III
9fd510e95a zeromq: Fix with new libsodium 2015-11-07 15:44:53 -08:00
Thomas Tuegel
9a2d5cb4d5 openblas: include which on all platforms
The `f_check` script uses `which` to check that the Fortran compiler is
available. `which` is a shell built-in on NixOS, but not on Darwin or
other Linuxes.
2015-11-07 14:00:04 -06:00
Thomas Tuegel
841df2cd7a openblas: use packaged LAPACK
Upstream began shipping OpenBLAS with LAPACK 3.4.1. This is the version
we were using in Nixpkgs anyway, so there is no reason to continue
copying the LAPACK sources into the build tree.
2015-11-07 14:00:04 -06:00
Domen Kožar
4f44172f49 Merge pull request #10855 from ryanartecona/jq-oniguruma
jq: build with oniguruma for regex support
2015-11-07 20:01:19 +01:00
Ryan Artecona
76e99d76ce jq: build with oniguruma for regex support 2015-11-07 13:54:45 -05:00
Domen Kožar
310b7e24d2 zeromq: add patch to fix build 2015-11-07 18:13:50 +01:00
Aristid Breitkreuz
c35e349409 rename make->gnustep-make to avoid people installing it accidentally 2015-11-07 16:08:17 +01:00
Domen Kožar
c478d12bc1 libssh: current url is down, provide a new one 2015-11-07 14:16:47 +01:00
Pascal Wittmann
ecb651349a Merge pull request #10738 from matthewbauer/emscripten-1.35
emscripten 1.29 -> 1.35
2015-11-06 17:21:21 +01:00
Pascal Wittmann
fcb4627695 Merge pull request #9980 from wavewave/gradle25
add gradle 2.5.
2015-11-06 17:17:28 +01:00
Ian-Woo Kim
3d5f95d61b gradle: reinit at 2.5.
For some projects (especially using android ndk), we still need to keep 2.5.
2015-11-06 07:31:58 -08:00
Domen Kožar
916c10138a Merge pull request #10510 from taku0/oraclejdk-8u65
oraclejdk: 8u60 -> 8u65, 8u66
2015-11-06 16:21:37 +01:00
Pascal Wittmann
309d4e955b Merge pull request #10299 from bcdarwin/smlnj-upgrade
smlnj: 110.78 -> 110.79
2015-11-06 12:28:35 +01:00
Domen Kožar
e9c48edc85 Merge pull request #10792 from msteen/indicator
indicator libraries: init at 12.10
2015-11-06 10:52:46 +01:00
William A. Kennington III
1e7aa4f17d Merge branch 'master.upstream' into staging.upstream 2015-11-05 18:30:11 -08:00
William A. Kennington III
ddbb174bb0 accelio: 2015-08-30 -> 1.5 2015-11-05 18:28:29 -08:00
William A. Kennington III
974dd8012d sqlite: 3.9.1 -> 3.9.2 2015-11-05 18:25:49 -08:00
William A. Kennington III
94a4ffe949 icu: 55.1 -> 56.1 2015-11-05 18:25:39 -08:00
William A. Kennington III
cf802b8075 gmp: 6.0.0a -> 6.1.0 2015-11-05 18:21:44 -08:00
William A. Kennington III
84b2e41f83 rocksdb: 3.13.1 -> 4.0 2015-11-05 18:21:43 -08:00
William A. Kennington III
7de7628c98 libssh: 0.7.1 -> 0.7.2 2015-11-05 18:21:43 -08:00
William A. Kennington III
f9c77b6d72 libsodium: 1.0.3 - 1.0.6 2015-11-05 18:21:42 -08:00
Pascal Wittmann
17fbc42cde groovy: 2.4.3 -> 2.4.5 and wrap correctly 2015-11-05 20:37:08 +01:00
William A. Kennington III
2837a5e091 Merge branch 'master.upstream' into staging.upstream 2015-11-05 10:07:28 -08:00
Thomas Tuegel
3d87c5f9c3 openblas: 0.2.14 -> 0.2.15 2015-11-05 10:24:31 -06:00
Vladimír Čunát
53c60a0ce4 live555: fixup after accidental merge, close #10624
Use a URL that works (checked md5 was the same) but use a stronger hash.
2015-11-05 16:58:09 +01:00
Ilya Novoselov
ac2582baea live555: added package 2015-11-05 15:47:03 +01:00
Nicolas B. Pierron
13a379cfa2 Merge pull request #10672 from wizeman/u/upd-rr
rr: 3.0.0 -> 4.0.0
2015-11-05 14:21:25 +00:00
Pascal Wittmann
44af3d438d perl-DBD-mysql: 4.031 -> 4.033 2015-11-05 14:56:58 +01:00
Pascal Wittmann
6f37d11e8c perl-DBD-Pg: 3.0.0 -> 3.5.3 2015-11-05 14:56:58 +01:00
Pascal Wittmann
bf41c5c233 audiofile: fix CVE-2015-7747 (close #10829)
Fixes #10678.
2015-11-05 12:48:40 +01:00
Peter Simons
f119c9d43d configuration-hackage2nix.yaml: update list of broken builds 2015-11-05 11:57:00 +01:00
Peter Simons
2b3485181f git-annex: update overrides 2015-11-05 11:57:00 +01:00
Peter Simons
78615301aa hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-35-g816abb5 using the following inputs:

  - Nixpkgs: f90e42f382
  - Hackage: 96af3096ee
  - LTS Haskell: 71e581f8e4
  - Stackage Nightly: 97a0714af7
2015-11-05 11:57:00 +01:00
vbgl
343de3b64a Merge pull request #10637 from vbgl/ppx
ocaml-ppx_tools: init at 0.99.2
2015-11-04 23:16:54 +01:00
Tobias Geerinckx-Rice
486d58748f vc: fix evaluation (licences -> licenses) 2015-11-04 22:04:45 +01:00
Nikolay Amiantov
997bf2c665 vc: init at 0.7.5, 1.0.0 2015-11-04 23:10:36 +03:00
Pascal Wittmann
8843f53fcb pugixml: 1.6 -> 1.7 2015-11-04 21:08:57 +01:00
Thomas Tuegel
b3bb609b96 atlas: build on Linux only
Fixes #10808.
2015-11-04 12:36:23 -06:00
Stéphane Jourdois
0a2c78fb5f cairo: maintenance update 1.14.2 -> 1.14.4 (close #10778) 2015-11-04 18:39:28 +01:00
Thomas Tuegel
90cc190db2 Merge pull request #10731 from ttuegel/plasma-5.4
KDE Plasma 5.4, Frameworks 5.15, and Applications 15.08
2015-11-04 10:06:28 -06:00
Eelco Dolstra
3e44182487 Merge remote-tracking branch 'origin/systemd-219' into staging 2015-11-04 15:37:28 +01:00
Domen Kožar
d34f5b6570 python: skip build at install phase
"python setup.py install" will also run "python setup.py build"
which we've already done in buildPhase.
2015-11-04 11:40:09 +01:00
Domen Kožar
ce4657b769 pythonPackages.sphinx: apply a patch to support py35 2015-11-04 10:40:28 +01:00
William A. Kennington III
4251612faa Merge branch 'master.upstream' into staging.upstream 2015-11-04 01:00:48 -08:00
William A. Kennington III
e8cbf833ef nss: 3.20 -> 3.20.1 2015-11-04 00:58:28 -08:00
William A. Kennington III
d80f4c49b0 nspr: 4.10.9 -> 4.10.10 2015-11-04 00:58:28 -08:00
Matthias C. M. Troffaes
1c0b060295 openssl: use prefixed windres and ranlib for cross build 2015-11-04 08:48:38 +00:00
Ricardo M. Correia
3ea8b08004 rustcMaster: 2015-10-27 -> 2015-11-01 2015-11-04 05:06:35 +01:00
vbgl
f9e681e09e Merge pull request #10802 from michelk/gdal/update2
gdal: 2.0.0 -> 2.0.1
2015-11-04 00:37:15 +01:00
Allen Nelson
b8c784f061 patch to remove large file test in numpy 2015-11-03 16:26:29 -06:00
Jude Taylor
58b862b750 darwin purity: pythonPackages.pandas 2015-11-03 14:00:51 -08:00
vbgl
95388b6500 Merge pull request #10801 from michelk/gdal/update
gdal: 1.11.2 -> 1.11.3
2015-11-03 22:56:36 +01:00
Ricardo M. Correia
84afac6b89 cargo: 0.5.0 -> 0.6.0 2015-11-03 20:32:12 +01:00
Edward Tjörnhammar
4a6c595b0f Merge pull request #10806 from joelmo/openjdk8-font-patch-up
openjdk: add infinality patch to improve font-rendering
2015-11-03 15:14:18 +01:00
Joel Moberg
bd3099ff6f openjdk: add infinality patch to improve font-rendering 2015-11-03 14:59:16 +01:00
Jude Taylor
137cadb66b darwin purity: flow 2015-11-03 04:53:25 -08:00
Michel Kuhlmann
7c9be48423 gdal: 2.0.0 -> 2.0.1 2015-11-03 09:04:07 +01:00
Michel Kuhlmann
8e9a8a8fd0 gdal: 1.11.2 -> 1.11.3 2015-11-03 09:00:08 +01:00
Michael Raskin
70aff600ff Merge pull request #10797 from tohl/master
sbcl: 1.2.16 -> 1.3.0
2015-11-03 10:08:45 +03:00
Jude Taylor
135b32f2a0 darwin purity: doxygen 2015-11-02 14:37:10 -08:00
Jude Taylor
f4f3df5f5d llvm-3.7: add libcxxabi as a buildInput on darwin 2015-11-02 14:33:51 -08:00
Tomas Hlavaty
c4a825da8b sbcl: 1.2.16 -> 1.3.0 2015-11-02 21:22:55 +01:00
Peter Simons
c10589cebb Merge pull request #10793 from Profpatsch/HEAD
haskellPackages: enable hsparql checks again
2015-11-02 18:04:46 +01:00
Domen Kožar
fb998dd033 Merge pull request #10779 from mayflower/update-php
Update php
2015-11-02 17:47:38 +01:00
Ricardo M. Correia
2ede3e6ddd rustfmt: 2015-10-17 -> 2015-10-28
... which also fixes the build.
Also, I've switched the compiler to the stable channel since rustfmt
supports it now.
2015-11-02 15:44:42 +01:00
Profpatsch
d68a77e504 haskellPackages: enable hsparql checks again 2015-11-02 15:35:20 +01:00
Matthijs Steen
1502152a7d indicator libraries: init at 12.10
The indicator libraries for GTK2 and GTK3.

The bindings for Mono do not work yet because of some issues with Perl in
gtk-sharp-2 and an Unhandled Exception caused by building with multiple cores:
https://aur.archlinux.org/packages/libindicate-sharp/#comment-290385

Some packages have TODOs for the indicator libraries,
since it is an optional dependency for most packages.
These packages have not been updated by this commit.
2015-11-02 15:23:35 +01:00
Bjørn Forsman
eeced1bc51 jenkins: 1.633 -> 1.636 2015-11-02 10:39:16 +01:00
Peter Simons
9c2eb52140 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-27-g14f44af using the following inputs:

  - Nixpkgs: 296838820e
  - Hackage: cbced5bc0e
  - LTS Haskell: 4622b913dc
  - Stackage Nightly: 05c38f5cda
2015-11-02 10:09:33 +01:00
Benno Fünfstück
a027470a69 python-dubs: set pythonPath for wrapper
The python.buildEnv wrapper expects that all pythonPackages
have a pythonPath set, so we set to a dummy value here.
2015-11-01 17:56:18 +01:00
Robin Gloster
fdf8e4f2c8 php70: 7.0.0beta1 -> 7.0.0RC6 2015-11-01 12:13:16 +00:00
Robin Gloster
0ceec8420c php: 5.6.14 -> 5.6.15 2015-11-01 12:12:13 +00:00
Jude Taylor
020bd4a723 darwin purity: polyml 2015-10-31 16:58:32 -07:00
Matthew Bauer
3807372d5b emscripten 1.29 -> 1.35
also updates to store files in $out/share/emscripten instead of $out/bin.
also fix issue with closure compiler.
2015-10-31 14:37:57 -05:00
Peter Simons
a9254356d1 haskell-math-functions: trigger re-build to fix broken binaries on Hydra 2015-10-31 18:44:43 +01:00
Peter Simons
ed3f952933 configuration-hackage2nix.yaml: update list of broken packages 2015-10-31 18:44:41 +01:00
Peter Simons
7a6fe2d4c5 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-27-g14f44af using the following inputs:

  - Nixpkgs: 07b9003464
  - Hackage: b8c50379ae
  - LTS Haskell: 4622b913dc
  - Stackage Nightly: 05c38f5cda
2015-10-31 18:43:34 +01:00
John Wiegley
22392d8134 Correction to Boost RPATH for Darwin systems 2015-10-31 09:35:06 -07:00
John Wiegley
cdfb08b9c6 haskellPackages.c2hs: Disable tests on Darwin
The tests require gcc, but gcc is no longer available on Darwin systems.
2015-10-31 09:34:26 -07:00
John Wiegley
8f97ad7b3c coqPackages.ssreflect: add ncurses as a dependency
This is needed in the Darwin pure environment, where ncurses is not
available within the sandbox.  The exact error was:

coqmktop -coqlib `coqtop -where` -o bin/ssrcoq.byte -I +threads src/ssrmatching.cmo src/ssreflect.cmo
ld: warning: directory not found for option '-L/nix/store/wlf8pb7gz5alzbhdxwayxx0x4as3rnw8-coq-8.5b2/lib/coq/kernel/byterun'
ld: library not found for -lncurses
2015-10-31 09:33:05 -07:00
Thomas Tuegel
db408a8ceb plasma_stable: plasma-5.3.2 -> plasma-5.4.2 2015-10-31 08:48:54 -05:00
Thomas Tuegel
afc364f194 Revert "kiconthemes: default theme is breeze"
This reverts commit 6454d8725b21fbd8c85acdda4cc1de4e8eb9c1a7.
2015-10-31 08:48:53 -05:00
Thomas Tuegel
24babaad9a makeQtWrapper: wrap XDG directories 2015-10-31 08:48:53 -05:00
Thomas Tuegel
4c4a53e516 kiconthemes: default theme is breeze 2015-10-31 08:48:51 -05:00
Thomas Tuegel
dcd70c54aa qtbase: copy qmake to temp dir
Fixes #10273.
2015-10-31 08:48:45 -05:00
Jude Taylor
7eea66cabe Merge pull request #10729 from Profpatsch/hsparql-fix-build
haskellPackages: skip hsparql checks
2015-10-30 20:30:18 -07:00
Profpatsch
35dd880019 haskellPackages: skip hsparql checks 2015-10-31 04:25:37 +01:00
Jude Taylor
9da6517c36 atlas: patch out usage of deprecated tmpnam on darwin 2015-10-30 20:15:26 -07:00
William A. Kennington III
aed092339d rustcMaster: 2015-10-17 -> 2015-10-27 2015-10-30 19:40:52 -07:00
William A. Kennington III
3406cdd0ce rustc: 1.3.0 -> 1.4.0 2015-10-30 19:40:35 -07:00
William A. Kennington III
00c9039141 mesa: 11.0.3 -> 11.0.4 2015-10-30 18:07:41 -07:00
William A. Kennington III
dd2de66d61 Merge branch 'master.upstream' into staging.upstream 2015-10-30 17:16:07 -07:00
Peter Simons
9405a67858 uhc: the build is broken
src/ehc/Base/Debug.chs:22:34:
        Ambiguous occurrence `showPP'
        It could refer to either `UHC.Compiler.Base.Debug.showPP',
                                 defined at src/ehc/Base/Debug.chs:19:1
                              or `UHC.Util.Pretty.showPP',
                                 imported from `UHC.Util.Pretty' at UHC/Compiler/Base/Debug.hs:5:1-22

    src/ehc/Base/Debug.chs:28:32:
        Ambiguous occurrence `showPP'
        It could refer to either `UHC.Compiler.Base.Debug.showPP',
                                 defined at src/ehc/Base/Debug.chs:19:1
                              or `UHC.Util.Pretty.showPP',
                                 imported from `UHC.Util.Pretty' at UHC/Compiler/Base/Debug.hs:5:1-22
2015-10-30 23:16:25 +01:00
Peter Simons
e2db6af4b6 configuration-hackage2nix.yaml: update broken builds 2015-10-30 23:16:19 +01:00
Peter Simons
51ce51a60f hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-26-gcb66650 using the following inputs:

  - Nixpkgs: 62a178f86b
  - Hackage: d288879f8a
  - LTS Haskell: 4622b913dc
  - Stackage Nightly: 61e6f9dbeb
2015-10-30 23:16:10 +01:00
Thomas Tuegel
361b1165ef qtbase: propagate runtime dependencies
This is done so that makeQtWrapper works correctly.
2015-10-30 16:10:37 -05:00
Thomas Tuegel
9fa17aa293 kdoctools: set XDG_DATA_DIRS in setupHook 2015-10-30 16:10:37 -05:00
Thomas Tuegel
03ed16a1c4 kservice: propagate service providers 2015-10-30 16:10:37 -05:00
Thomas Tuegel
e2383b1f08 extra-cmake-modules: propagate MIME type providers 2015-10-30 16:10:37 -05:00
Thomas Tuegel
5a2c45427b makeQtWrapper: always wrap impurely 2015-10-30 16:10:37 -05:00
Thomas Tuegel
5292e67e50 remove kf515.makeKDEWrapper 2015-10-30 16:10:37 -05:00
Thomas Tuegel
fa81cf0874 kservice: don't build kdesycoca 2015-10-30 16:10:37 -05:00
Thomas Tuegel
cdbb1360c2 makeKDEWrapper: don't build kdesycoca 2015-10-30 16:10:37 -05:00
Thomas Tuegel
300b5eb7ed makeKDEWrapper: allow impure wrappers 2015-10-30 16:10:37 -05:00