William A. Kennington III
e7bb9e1023
Merge branch 'master.upstream' into staging.upstream
2015-09-30 13:26:04 -07:00
Domen Kožar
d8c1284d81
pythonPackages: bump pyramid, webob and btrees
2015-09-30 18:15:21 +02:00
Bjørn Forsman
f35de8ea64
jenkins: 1.594 -> 1.631
2015-09-30 17:25:39 +02:00
Peter Simons
67fb69c23b
configuration-hackage2nix.yaml: update list of broken packages
2015-09-30 17:24:28 +02:00
Peter Simons
750e15fbd7
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20150922-6-g5d5ccfe-dirty using the following inputs:
- Nixpkgs: https://github.com/NixOS/nixpkgs/commit/7a2a9bbe1595c73f9aa2bba4c2a600c558ef5822
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/82f4bbff1b525f7cf33c525987268cdc651c3d33
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/831a37566be736e827a8f17d6c006a09ed384cd6
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/e7fd25c827f2a1bfb13ea6e716579b697a566ac3
2015-09-30 17:24:23 +02:00
Thomas Strobel
ca4a4714ef
neardal: add 'ncl' and 'demo' application
2015-09-30 16:10:06 +02:00
Thomas Strobel
6b934c30d3
neardal: init at 0.7-post-git-20150930
2015-09-30 11:36:47 +02:00
Peter Simons
741437dffc
configuration-hackage2nix.yaml: update list of broken packages
2015-09-30 11:33:37 +02:00
Peter Simons
96c1c16771
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs:
- Nixpkgs: https://github.com/NixOS/nixpkgs/commit/d64ca94227781f00e309a03b72475f6fe4b8a035
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/8f14dec4319f0b88ba503221342e58f1fd3752dd
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/831a37566be736e827a8f17d6c006a09ed384cd6
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/e7fd25c827f2a1bfb13ea6e716579b697a566ac3
2015-09-30 11:33:29 +02:00
Jude Taylor
a424afdedd
darwin purity: polyml
2015-09-30 00:36:31 -07:00
William A. Kennington III
5c7ba8c971
pkgconfig: 0.28 -> 0.29
2015-09-29 16:12:06 -07:00
William A. Kennington III
271972de0a
Merge branch 'master.upstream' into staging.upstream
2015-09-29 15:54:33 -07:00
Thomas Tuegel
5ba93bd4c3
kf513: don't override mkDerivation
...
Provides a globally unique name (kdeFramework) instead of using
attribute paths as namespaces and locally overloading the mkDerivation
name.
2015-09-29 16:57:26 -05:00
Domen Kožar
41007653db
Merge pull request #10122 from Havvy/elixir
...
elixir: 1.0.5 -> 1.1.0
2015-09-29 21:48:25 +02:00
David Kleuker
a2e6d9a4da
kibana: fix url and hash
2015-09-29 20:17:22 +02:00
vbgl
b02c07641b
Merge pull request #10014 from vbgl/camlp5-6.13
...
camlp5: 6.12 → 6.14
2015-09-29 19:43:15 +02:00
Vladimír Čunát
bfd8e56aa6
webkitgtk-2.4: drop autoreconf, propagate harfbuzz-icu
...
The autoreconf phase isn't needed anymore but wasn't removed.
Fixes #10099 (I think).
It's maybe slightly wasteful for the closure, but it's likely that
in the case of webkit it won't be a big deal and icu might
be in the closure anyway.
2015-09-29 18:16:37 +02:00
Marcus Crestani
c6de42d4d4
libxkbcommon: Remove --version-script on Darwin
...
Close #10094 . Simplified by vcunat.
2015-09-29 15:30:05 +02:00
Peter Simons
664de99887
Fix nix-env -f "<nixpkgs>" -qaP -A haskell.packages.ghc6123.
2015-09-29 14:46:08 +02:00
Ryan Scheel (Havvy)
f824566fb3
elixir: 1.0.5 -> 1.1.1
...
Had to change the `mix` shebang to do coreutils/bin/env elixir, not
coreutils/bin/env elixir/bin/elixir.
2015-09-29 13:10:39 +02:00
Luca Bruno
51512d4c8f
heimdal: try disabling parallel builds due to hydra issues
...
cc @wkennington
2015-09-29 10:49:33 +02:00
Matthias Beyer
f92d27d214
neon: Put version into own variable
2015-09-29 10:46:21 +02:00
Matthias Beyer
d2c32179fe
neon: 0.29.6 -> 0.30.1
2015-09-29 10:46:21 +02:00
Luca Bruno
b7f49e89af
xulrunner: disable gconf
2015-09-29 10:29:48 +02:00
Peter Simons
5602d609c7
Fix or disable broken Haskell builds.
2015-09-29 09:53:37 +02:00
Peter Simons
a14264db3e
haskell-pandoc-citeproc has spurious test suite failures.
2015-09-29 09:53:37 +02:00
Peter Simons
0139c51f1b
hackage-packages.nix: update Haskell package set
...
This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs:
- Nixpkgs: https://github.com/NixOS/nixpkgs/commit/f21f116631be9905ba96af24024fb506e1e65325
- Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/f8855b5494a1df4f7b93142a19d944f10380a75c
- LTS Haskell: https://github.com/fpco/lts-haskell/commit/831a37566be736e827a8f17d6c006a09ed384cd6
- Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/96ef887f310857f0d01e91995b9a4ecc938d434b
2015-09-29 09:53:36 +02:00
Tobias Geerinckx-Rice
788800e437
libpsl: list 2015-09-15 -> 2015-09-25
2015-09-29 03:45:44 +02:00
Jude Taylor
48a791d270
darwin purity: doxygen
2015-09-28 18:32:41 -07:00
Tobias Geerinckx-Rice
8ce79e0ef0
d-feet: remove unused arguments
2015-09-29 03:21:34 +02:00
Jude Taylor
f4a7173e83
add darwin libtool to nodejs 4.1.0
2015-09-28 17:23:25 -07:00
Jude Taylor
06eab94f16
patch sbcl-bootstrap for purity
2015-09-28 17:09:50 -07:00
Matthew Maurer
e6f51faa12
capnproto: 0.5.1.2 -> 0.5.3
2015-09-28 18:33:48 -04:00
Edward Tjörnhammar
c351c22db5
ihaskell: make sure the wrapped binaries pick up the python path
2015-09-28 21:26:17 +02:00
goibhniu
74a3f4b10a
Merge pull request #10106 from andrewrk/libsoundio
...
libsoundio: 1.0.1 -> 1.0.2
2015-09-28 18:48:43 +02:00
Jude Taylor
6367e48225
Revert "pop"
...
This reverts commit 724e243159 .
This (clearly) should never have been committed, and is probably due to a failed stash pop
on my part.
2015-09-28 09:41:02 -07:00
Jude Taylor
14bd5c0b39
revert realLibtool
2015-09-28 09:19:57 -07:00
Jude Taylor
406c366432
revert realLibtool
2015-09-28 09:16:05 -07:00
goibhniu
1cc351da07
Merge pull request #10112 from datakurre/datakurre-zc_buildout_nix
...
zc_buildout_nix: 1.4.0 -> 1.4.3
2015-09-28 16:16:34 +02:00
Eelco Dolstra
5b52b3589c
valgrind: Update to 3.11.0
2015-09-28 15:52:31 +02:00
Eelco Dolstra
a8de8e71d6
libmicrohttpd: Update to 0.9.43
2015-09-28 15:43:14 +02:00
Asko Soukka
f38f70021c
zc_buildout_nix: 1.4.0 -> 1.4.3
2015-09-28 15:38:10 +03:00
Bjørn Forsman
3dec100104
qt55: apply mkspecs-libgl.patch from qt54
2015-09-28 10:39:11 +02:00
Bjørn Forsman
583845d00b
qt54: add missing mesa include dir
...
Try to build e.g. the Qt5 Camera Example[1] and see that qmake fails to
find <GL/gl.h>. This fixes it.
[1] http://doc.qt.io/qt-5/qtmultimediawidgets-camera-example.html
(Although since nixpkgs qtcreator still lacks 'examples', we have to
download the sources manually and use "qmake && make".)
2015-09-28 10:39:11 +02:00
Bjørn Forsman
c79fa9aeda
Fix eval
...
Fix breakage from 078d544005 ("libdbusmenu-qt5: build with Qt 5.5").
2015-09-28 10:38:05 +02:00
Benjamin Saunders
fce8924331
libuv: 1.6.1 -> 1.7.5
...
closes #9814
2015-09-28 01:00:50 -04:00
Andrew Kelley
3fef85b168
libsoundio: 1.0.1 -> 1.0.2
2015-09-27 18:43:30 -07:00
Thomas Tuegel
cbe318d531
Merge branch 'qt-5.5'
2015-09-27 16:07:05 -05:00
Thomas Tuegel
50f76e0625
mlt-qt5: build with Qt 5.5
2015-09-27 15:09:49 -05:00
Thomas Tuegel
9e3b22d25a
telepathy_qt5: build with Qt 5.5
2015-09-27 15:09:44 -05:00