Commit Graph

44377 Commits

Author SHA1 Message Date
Vladimír Čunát
5a98b9f514 Merge recent master into p/stdenv
Merged just before the pypi update, as it seems to cause problems on Hydra.
2014-06-09 19:07:31 +02:00
Vladimír Čunát
5e37c09f06 ghc on darwin: second attempt to fix build
Tested not to affect hash on linux.
2014-06-09 19:01:49 +02:00
Domen Kožar
e1a0d45d00 openra: runtime dependency on systemd 2014-06-08 19:55:38 +02:00
Domen Kožar
e26b5600e2 springlobby: 0.186 -> 0.195 2014-06-08 19:39:55 +02:00
Domen Kožar
7a88839b90 spring: fix runtime dependency on udev 2014-06-08 19:39:55 +02:00
Bjørn Forsman
0195628118 nixos/statsd-service: fix 'graphitePort' default value
graphitePort must point to the port that carbon-cache listens on, not
the graphite webUI port.

With this change I finally got data from statsd to graphite.
2014-06-08 16:10:39 +02:00
John Wiegley
edd4729838 crafty: specify the support platforms 2014-06-08 04:28:11 -05:00
John Wiegley
e18b59540c haskell-bytes: new expression 2014-06-08 04:18:46 -05:00
cillianderoiste
fc91b87dd3 Merge pull request #2762 from pSub/llpp
Added llpp, a mupdf based pdf pager written in ocaml.
2014-06-08 11:17:15 +02:00
Michael Raskin
25351ddf70 Use the libav version compatible with our gstreamer version 2014-06-08 12:20:47 +04:00
William A. Kennington III
d91eacd720 kernel: 3.14.5 -> 3.14.6 (close #2868) 2014-06-08 09:12:05 +02:00
John Wiegley
c6261157f8 prooftree: new expression 0.12 2014-06-08 05:35:49 +00:00
Bjørn Forsman
476a3d818f nixos/graphite-service: fix filename typo
It's "aggregation" with two 'g's.

Fixes this:
carbon-cache[9363]: [console] /nix/store/drxq4jj92sjk3cjik2l4hnsndbray3i4-graphite-config/storage-aggregation.conf not found, ignoring.
2014-06-07 23:45:17 +02:00
John Wiegley
34495b67ce haskell-data-checked: new expression 2014-06-07 16:38:55 -05:00
John Wiegley
45d58e4912 Merge pull request #2864 from Fuuzetsu/ppsspp
PPSSPP: add platforms
2014-06-07 15:39:16 -05:00
Mateusz Kowalczyk
6c3cc8bb95 PPSSPP: add platforms 2014-06-07 22:28:56 +02:00
John Wiegley
6a3a9589e2 macvim: add missing call to ensureDir 2014-06-07 20:22:58 +00:00
John Wiegley
c06613a3af macvim: move the .app bundle to $out/Applications 2014-06-07 20:18:27 +00:00
John Wiegley
e5e9171578 hoogle-local: minor changes for consistency 2014-06-07 20:17:47 +00:00
John Wiegley
b896b49827 libdrm: allow to build on any unix 2014-06-07 20:17:47 +00:00
John Wiegley
10d1fd0457 crafty: simplify expression 2014-06-07 20:17:47 +00:00
John Wiegley
0fcd4f98ff haskell-fuzzcheck: new expression 2014-06-07 20:17:46 +00:00
John Wiegley
03bd5f9f44 Merge pull request #2856 from cstrahan/macvim
add MacVim
2014-06-07 15:16:48 -05:00
Charles Strahan
72cd8ce56c add MacVim 2014-06-07 15:26:01 -04:00
Jussi Maki
393923a869 graphite-web: Fix webapp content path 2014-06-07 16:47:00 +02:00
Pascal Wittmann
b40ce8a1f1 Update feh from 2.11 to 2.12.
The relevant source code of giblib was imported into feh,
therefore giblib is no longer a dependency.
2014-06-07 15:22:20 +02:00
Pascal Wittmann
91b2021782 feh: Set the default theme explicitly to 'feh'
feh uses argv[0] to set the default theme, because
feh is wrapped this will be .feh-wrapper. This makes
it hard to use the configuration on multiple systems
and can be confusion. Therefore the theme is explicity
set to 'feh'.
2014-06-07 15:18:09 +02:00
Austin Seipp
4dd5496bd4 arcanist: build xhpast for 'arc liberate'
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-07 07:12:02 -05:00
Florian Friesdorf
0136fcb3df Merge pull request #2726 from pSub/trackpoint
Added an option to configure sensitivity and speed of trackpoints.
2014-06-07 13:09:26 +02:00
Peter Simons
36e6eda5fc r-modules: set meta.hydraPlatforms for all R packages 2014-06-07 12:28:54 +02:00
Austin Seipp
80f3e943b1 dd-agent: 4.2.1 -> 4.3.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-06 23:14:54 -05:00
Austin Seipp
8c0b63162b compcert: 2.2 -> 2.3pl2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-06 23:09:47 -05:00
Austin Seipp
17368bdf8e arcanist: update
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-06 23:01:13 -05:00
Austin Seipp
5f987d99e8 Merge pull request #2768 from CodeBlock/purescript
Purescript + deps
2014-06-06 09:32:45 -05:00
Rok Garbas
cc160a196a couchdb service: adding customizable config file which is writable by couchdb 2014-06-06 15:30:58 +01:00
Austin Seipp
f60fffa59c Merge pull request #2847 from bennofs/haskell-th-lift-instances
haskell-th-lift-instances: update 0.1.2 -> 0.1.3
2014-06-06 09:30:31 -05:00
Austin Seipp
86c12b033f Merge pull request #2841 from Fuuzetsu/livestreamer
livestreamer: 1.8.0 -> 1.8.2; fix up dependencies
2014-06-06 09:30:19 -05:00
Shea Levy
94f3ae9b73 Merge pull request #2849 from proger/sysdig-0.1.83
sysdig: update to 0.1.83
2014-06-06 10:22:33 -04:00
Vladimir Kirillov
1859dbc4a2 sysdig: update to 0.1.83 2014-06-06 17:21:00 +03:00
Shea Levy
05b6bdb6f9 Merge pull request #2848 from proger/php-apc
php: import apc 3.1.13
2014-06-06 09:57:28 -04:00
Vladimir Kirillov
98dfd12456 php: import apc 3.1.13 2014-06-06 16:20:31 +03:00
Benno Fünfstück
82d4f431ed haskell-th-lift-instances: update 0.1.2 -> 0.1.3 2014-06-06 15:11:56 +02:00
Peter Simons
57eaced234 spamassassin: download from any Apache mirror 2014-06-06 14:08:41 +02:00
Luca Bruno
94c2661503 tomcat: fix service to be a daemon, and run tomcat in script rather than preStart 2014-06-06 14:04:35 +02:00
Moritz Ulrich
77a937beec elixir: Bump to 1.13.3. 2014-06-06 11:57:54 +02:00
Moritz Ulrich
f6d03359b3 Only overwrite container-configuration when --config is specified.
Fixes #2834.
2014-06-06 11:49:16 +02:00
Peter Simons
d5afbf8235 Merge pull request #2842 from tomberek/add_holy_project
Add holy-project to nixpkgs. Patch is required until the next version is...
2014-06-06 11:39:29 +02:00
Thomas Bereknyei
1dae8bd2bf Add holy-project to nixpkgs. Patch is required until the next version is pushed to hackage. 2014-06-06 02:50:54 -04:00
Mateusz Kowalczyk
10b9ce53a3 livestreamer: 1.8.0 -> 1.8.2; fix up dependencies 2014-06-06 03:44:28 +02:00
Bjørn Forsman
b8af23e4b7 python-pygments: update 1.5 -> 1.6
Bug fixes, some new features and lots of new lexers.

Full changelog:
http://pygments.org/docs/changelog/#version-1-6
2014-06-05 17:48:08 +02:00