Commit graph

17741 commits

Author SHA1 Message Date
Peter Simons
689b322e10 Agda: update to version 2.4.0.2 2014-07-31 13:57:45 +02:00
Peter Simons
73f1976155 haskell-cgrep: update to version 6.4.5 2014-07-31 13:57:45 +02:00
Pascal Wittmann
3e35b46519 Merge pull request #3413 from svenkeidel/gtkpod
version bump gtkpod from 1.0.0 to 2.1.4
2014-07-31 13:26:37 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Lluís Batlle i Rossell
43ed6b8f62 Updating octave to 3.8.1 2014-07-31 10:11:18 +02:00
John Wiegley
7d90959d73 idris: 0.9.14 -> 0.9.14.1 2014-07-30 18:11:18 -05:00
John Wiegley
11dc22e3ee Agda needs an older version of haskell-equivalence 2014-07-30 18:10:59 -05:00
Sven Keidel
2d31046a40 gtkpod: bump to 2.1.4 2014-07-31 00:41:17 +02:00
John Ericson
a510e024b6 rust: Add hashes for i686-darwin 2014-07-31 00:12:16 +02:00
Matej Cotman
b1ba1689bd zed: build from source, ditch the installer, upgrade node-webkit 2014-07-30 12:43:24 +02:00
Eelco Dolstra
95bbfc957f erlang: Fix name attribute
Versions should not start with a letter.
2014-07-30 12:39:35 +02:00
John Ericson
399f8b48f9 rust: Prepare for more versions part 2:
- Default is now an alias for 0.11
2014-07-30 07:39:06 +02:00
John Ericson
210452979a rust: Prepare for more versions part 1:
- Factor out some things that REALLY shouldn't change between versions
2014-07-30 07:39:06 +02:00
Bjørn Forsman
559eaeb2d2 Revert "use wrapper to set LUA_PATH variable"
This reverts commit 807cd4b4d4, as it
broke the 'awesome' package. It was also an incomplete change, only
modifying lua-5.1 and none of the other lua versions.

A better approach, if wanting lua to pick up external modules, would be
to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build
environments, so it should be safe.

Conflicts:
	pkgs/development/interpreters/lua-5/5.1.nix
2014-07-29 18:42:20 +02:00
Peter Simons
90939a0482 haskell-hlint: update to version 1.9.3 2014-07-29 18:39:36 +02:00
Peter Simons
877585bf38 haskell-yesod-auth: update to version 1.3.3 2014-07-29 18:39:35 +02:00
Peter Simons
3b07c45fb7 haskell-wai-extra: update to version 3.0.1.1 2014-07-29 18:39:35 +02:00
Peter Simons
5fd8cff160 haskell-stm-containers: update to version 0.1.3 2014-07-29 18:39:35 +02:00
Peter Simons
5738b59400 haskell-profunctors: update to version 4.2 2014-07-29 18:39:35 +02:00
Peter Simons
f900746689 haskell-filestore: update to version 0.6.0.3 2014-07-29 18:39:35 +02:00
Peter Simons
3e551e05c6 haskell-conduit-extra: update to version 1.1.3 2014-07-29 18:39:34 +02:00
Peter Simons
d711c60c3d haskell-base-prelude: add version 0.1.3 2014-07-29 18:39:34 +02:00
aszlig
ec65a1e391
erlang: Add manpages to all release packages.
This puts manpages into "$out/lib/erlang/man" and also symlinks them
into "$out/share/man" with an "erl" suffix (similar to how Debian is
handling this) so those manpages are unlikely to collide with any other
manpages, like for example inet(3).

Closes #3396.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Moritz Ulrich <moritz@tarn-vedra.de>
2014-07-29 15:26:13 +02:00
aszlig
21a2f99dd3
python-wrapper: Fix handling of line breaks.
Not really critical for anything we have in <nixpkgs> I guess, but
skipping lines three times really was a workaround and we're better off
just appending the lines ending with backslash to the pattern space so
we can accumulate all the crap until the last line of crap (crap, that
is "broken lines").

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-29 06:53:17 +02:00
aszlig
ff15c31c37
python-wrapper: Fix handling __future__ imports.
The bazaar package is still broken even with 5f01cc7, because __future__
imports need to be the first imports before anything else. So this time
I'm going to make the sed expression with explicit branching so we can
properly match all the occasions we want to skip and insert the line
modifying sys.argv[0] only _once_ and leave the command block after
that one substitution. So no ugly swaps between hold and pattern space.

The label which is resonsible for not escaping the command block is "r"
and we jump to it as long as we need to skip something from the start of
the file.

While at it, I'm not only skipping every line with __future__ in it but
also backslashes at the end of the line, so for example:

```python
from __future__ import shiny_feature1, \
                       shiny_feature2, \
                       shiny_feature3
```

... will now be properly skipped as well.

Tested against bazaar and nixops.

Thanks to @edolstra for reporting this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-29 06:40:39 +02:00
aszlig
88a8b004c6
freealut: Clean up expression and add meta.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 21:19:08 +02:00
aszlig
e542ff7288
libtoxcore: Enable and fix up running test suite.
We not only require libcheck but also needed to disable a few tests,
without providing the former, test cases were signalled as being run
successfully but weren't actually run.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:11 +02:00
aszlig
40548fce62
libtoxcore: Add libopus and libvpx to buildInputs.
Those are necessary to do audio/video calls, which I guess is the whole
point of the Tox project.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:10 +02:00
aszlig
2aa89519a0
libtoxcore: Update to latest Git master.
The GitHub repository has changed the name to "toxcore".
Also indented buildInputs/configureFlags a bit less messy.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 20:53:10 +02:00
Peter Simons
5cc55e9523 Partially revert 7a45996 some more.
Removing more references to the non-existent license "stdenv.lib.licenses.perl5".
Thanks to @FlashKorten for catching those.
2014-07-28 20:52:47 +02:00
Peter Simons
9d56d25673 haskell-vty: update to version 5.1.3 2014-07-28 20:32:59 +02:00
Peter Simons
86dc30daa6 haskell-keter: update to version 1.3.3 2014-07-28 20:32:59 +02:00
Peter Simons
f74d211818 haskell-yesod-routes: update to version 1.2.0.7 2014-07-28 20:32:59 +02:00
Peter Simons
4886d942b9 haskell-yesod-form: update to version 1.3.13 2014-07-28 20:32:58 +02:00
Peter Simons
510a784242 haskell-yesod-core: update to version 1.2.18 2014-07-28 20:32:58 +02:00
Peter Simons
9ded0e831e haskell-yesod-bin: update to version 1.2.12 2014-07-28 20:32:58 +02:00
Peter Simons
ad0bd2a795 haskell-yesod-auth: update to version 1.3.2 2014-07-28 20:32:58 +02:00
Peter Simons
93e75667cf haskell-wai-logger: update to version 2.1.2 2014-07-28 20:32:58 +02:00
Peter Simons
27b7ae9b62 haskell-vector-algorithms: update to version 0.6.0.3 2014-07-28 20:32:58 +02:00
Peter Simons
df253270e4 haskell-tzdata: update to version 0.1.20140612.0 2014-07-28 20:32:55 +02:00
Peter Simons
2d604d3416 haskell-tz: update to version 0.0.0.8 2014-07-28 20:32:55 +02:00
Peter Simons
63005f734f haskell-trifecta: update to version 1.5.1 2014-07-28 20:32:55 +02:00
Peter Simons
e3e77ec115 haskell-taggy: update to version 0.1.2 2014-07-28 20:32:55 +02:00
Peter Simons
55b8994ac7 haskell-statistics: update to version 0.13.1.1 2014-07-28 20:32:55 +02:00
Peter Simons
69a1a8a435 haskell-sparse: update to version 0.9.1 2014-07-28 20:32:55 +02:00
Peter Simons
5d7bd07003 haskell-shakespeare: update to version 2.0.1.1 2014-07-28 20:32:55 +02:00
Peter Simons
8f625b50a3 haskell-semigroups: update to version 0.15.2 2014-07-28 20:32:54 +02:00
Peter Simons
cb0e5f8e87 haskell-semigroupoids: update to version 4.0.4 2014-07-28 20:32:54 +02:00
Peter Simons
4d54be786b haskell-repa: update to version 3.3.1.2 2014-07-28 20:32:54 +02:00
Peter Simons
f33521699c haskell-repa-io: update to version 3.3.1.2 2014-07-28 20:32:54 +02:00
Peter Simons
a8b5bd5fe6 haskell-repa-examples: update to version 3.3.1.1 2014-07-28 20:32:54 +02:00
Peter Simons
6dfc5dc01e haskell-repa-algorithms: update to version 3.3.1.2 2014-07-28 20:32:54 +02:00
Peter Simons
2074cd3850 haskell-profunctors: update to version 4.1 2014-07-28 20:32:54 +02:00
Peter Simons
6db5defffc haskell-mono-traversable: update to version 0.6.1 2014-07-28 20:32:54 +02:00
Peter Simons
a80f691ea6 haskell-mongoDB: update to version 2.0.3 2014-07-28 20:32:54 +02:00
Peter Simons
39b1199265 haskell-lifted-async: update to version 0.2.0.1 2014-07-28 20:32:54 +02:00
Peter Simons
4fb51b17d3 haskell-lens: update to version 4.3.2 2014-07-28 20:32:54 +02:00
Peter Simons
8ba0c3eb04 haskell-kan-extensions: update to version 4.1 2014-07-28 20:32:54 +02:00
Peter Simons
653ed04b03 haskell-hslua: update to version 0.3.13 2014-07-28 20:32:54 +02:00
Peter Simons
9e7dd8705e haskell-hp2any-graph: update to version 0.5.4.2 2014-07-28 20:32:53 +02:00
Peter Simons
595cfaadb7 haskell-haskell-token-utils: update to version 0.0.0.5 2014-07-28 20:32:53 +02:00
Peter Simons
cd3c2b7ed7 haskell-equivalence: update to version 0.2.5 2014-07-28 20:32:53 +02:00
Peter Simons
15deeec1bc haskell-dns: update to version 1.4.1 2014-07-28 20:32:53 +02:00
Peter Simons
5c22263945 haskell-contravariant: update to version 1.1 2014-07-28 20:32:53 +02:00
Peter Simons
add9078981 haskell-conduit-combinators: update to version 0.2.8.2 2014-07-28 20:32:53 +02:00
Peter Simons
9fab47de52 haskell-comonad: update to version 4.2.2 2014-07-28 20:32:53 +02:00
Peter Simons
b614d0ad7b haskell-cmdargs: update to version 0.10.9 2014-07-28 20:32:53 +02:00
Peter Simons
5fde244c07 haskell-classy-prelude: update to version 0.9.3 2014-07-28 20:32:53 +02:00
Peter Simons
71859fe4ce haskell-classy-prelude-conduit: update to version 0.9.3 2014-07-28 20:32:53 +02:00
Peter Simons
c5bf78474b haskell-bindings-GLFW: update to version 3.0.3.3 2014-07-28 20:32:53 +02:00
Peter Simons
4b3ad3291b haskell-atomic-primops: update to version 0.6.0.6 2014-07-28 20:32:53 +02:00
Peter Simons
6e9bfd2d92 haskell-adjunctions: update to version 4.2 2014-07-28 20:32:53 +02:00
Peter Simons
a62a2c303d haskell-MFlow: update to version 0.4.5.6 2014-07-28 20:32:53 +02:00
Peter Simons
0aa0b7680c haskell-parsers: update to version 0.12.1 2014-07-28 20:32:52 +02:00
Peter Simons
41ff906084 haskell-easy-file: add version 0.2.0 2014-07-28 20:32:52 +02:00
Peter Simons
c526312445 haskell-free-game: update to version 1.1.78 2014-07-28 20:32:52 +02:00
Peter Simons
cadf6e1622 haskell-folds: update to version 0.6.2 2014-07-28 20:32:52 +02:00
Peter Simons
95199088ed haskell-thyme: re-generate with cabal2nix 2014-07-28 20:32:52 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Peter Simons
7325894d72 haskell-hflags: re-generate with cabal2nix 2014-07-28 20:32:52 +02:00
Peter Simons
eec522e69a haskell-nixpkgs.nix: update Cabal to version 1.20.0.2 2014-07-28 20:32:52 +02:00
Michael Weiss
39c09b04c7 ATS2 version [0.0.7] --> [0.1.0] 2014-07-28 17:00:02 +02:00
Peter Simons
d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Evgeny Egorochkin
30431e7160 rabbitmq-client-java: refactor the package according to the guidelines from nixpkgs manual 2014-07-28 11:37:58 +03:00
aszlig
5f01cc70d3
python-wrapper: Fix fixup for wrapped argv[0].
Fixes issues introduced by 24ef871e6a.

The problem here is that "import sys; sys.argv[0] = ..." is just
appended after the first "#!", which in turn breaks things such as
encoding specifications. A second problem - although not very common -
is when there's another #! within the script.

This should take care of both cases.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-28 04:18:21 +02:00
Christian Theune
24ef871e6a python: fix argv[0] for wrapped console_scripts.
Previously programs would see '.<program>-wrapped' as their program name. This is a workaround
but should be reasonably safe and reliable.
2014-07-27 13:23:15 +02:00
Cillian de Róiste
077d989ad1 Merge branch 'shotcut'
Add Shotcut (video editor), update Kdenlive and MLT, add frei0r and movit plugins
2014-07-27 13:03:08 +02:00
Cillian de Róiste
a9c04fa699 frei0r: fix typo 2014-07-27 12:53:57 +02:00
Cillian de Róiste
1f9334cab3 MLT: 0.9.0 -> 0.9.2, add movit and frei0r plugins, add qt4 and qt5 variants
Shotcut segfaults on startup when compiled against an MLT which was
built with qt4. Kdenlive seqfaults when compiled against an MLT which
was built with qt5. Hence the need for the two variants.

Also, I'm adopting MLT as a maintainer.
2014-07-27 12:53:56 +02:00
Cillian de Róiste
0fec3f82fc Add frei0r: Minimalist, cross-platform, shared video plugins 2014-07-27 12:53:56 +02:00
Cillian de Róiste
ae16e892bb Add movit: High-performance, high-quality video filters for the GPU
NOTE: movit expected to be able to read source files from gtest, so I
also made them available.

squash
2014-07-27 12:53:39 +02:00
Cillian de Róiste
e7bb85e448 Add epoxy: A library for handling OpenGL function pointer management 2014-07-27 12:14:38 +02:00
Evgeny Egorochkin
a7207cf389 RabbitMQ Java client library: package 2014-07-26 14:33:53 +03:00
Joachim Schiele
4f83b890db Merge pull request #3371 from qknight/qt53
qt-5.3: added attrPath="qt53Full" and "attrPath="qt53"; qt-5.2 still default
2014-07-26 13:10:31 +02:00
Aycan iRiCAN
33c177c5e6 Merge pull request #3378 from MP2E/hlint_1_9_2
update hlint to 1.9.2
2014-07-26 13:33:37 +03:00
Jaka Hudoklin
b9b5e84081 Merge pull request #3003 from offlinehacker/nixpkg/nodejs/buildNodePackage/shellHook
buildNodePackage: add shell hook for development
2014-07-26 08:53:52 +02:00
Cray Elliott
441ccf85dc update hlint to 1.9.2 2014-07-25 14:45:47 -07:00
Gergely Risko
a78ae3bea4 Fix bloomfilter package on 32 bits
The git-annex derivation depends on bloomfilter and it's currently broken on
i686 because of this.  Upstream bloomfilter pull request already sent, this
is for the meantime.
2014-07-25 17:17:36 +02:00
Joachim Schiele
9d724820c3 added attrPath="qt53Full" and "attrPath="qt53"; qt-5.2 still default 2014-07-25 13:38:56 +02:00
John Wiegley
ee8f098c9d haskell-th-desugar: tests don't compile with 7.8.3 2014-07-24 15:48:07 -05:00
John Wiegley
d7a2884e0d haskell-ghc-mod: fix to prevent Emacs from hanging 2014-07-24 15:48:07 -05:00
John Wiegley
0e588f35fc haskell-thyme: fix for darwin 2014-07-24 15:48:07 -05:00
John Wiegley
5c6512434a idris: patch 0.9.14 to workaround a bug 2014-07-24 15:48:07 -05:00
Austin Seipp
ee775eebda sparse: 0.4.4 -> 0.5.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-24 06:04:36 -05:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Vladimír Čunát
cbd8f7093b gcc49: maintenance update 2014-07-23 20:19:35 +02:00
Eelco Dolstra
5c5f115603 firefox: Build without xulrunner
Fixes #2950.
2014-07-23 17:28:36 +02:00
Eelco Dolstra
ea0013a0d9 nss: Update to 3.16.3 2014-07-23 17:28:36 +02:00
Bjørn Forsman
3a060bbcc6 Add missing 's' in remaining meta.maintainer(s) attrs 2014-07-22 23:49:21 +02:00
Andrew Morsillo
0f8df0b6f2 Add evemu tool to emulate and record input device event data
[Bjørn Forsman:
 * wrap some long lines
 * tweak meta attrs (don't repeat package name, s/meta.maintainer/meta.maintainers/)
 * provide a version number (v2.0) for 'evemu' (for nix-env)
]
2014-07-22 23:35:38 +02:00
Vladimír Čunát
27fe53e89c nss: minor update
I couldn't find any kind of news or changelog.
2014-07-22 22:12:19 +02:00
Bjørn Forsman
28f41870c4 portaudio: fixup .pc file to find alsa library 2014-07-22 21:24:25 +02:00
Eelco Dolstra
5add082ab8 gcc-4.2: Remove 2014-07-22 15:12:21 +02:00
Eelco Dolstra
ee39b4e82e opencxx: Remove
It's unused and unmaintained.
2014-07-22 15:12:21 +02:00
Peter Simons
02c99b7cd1 haskell-haste-perch: drop unsupported package
This package requires a special build process that's not based on Cabal (see
<https://github.com/agocorona/haste-perch/issues/5>). Someone needs to figure
out how to compile and install this stuff in the context of Nix.
2014-07-22 14:20:59 +02:00
Peter Simons
fd3ca78bfc haskell-hlint: update to version 1.9.1 2014-07-22 14:20:59 +02:00
Peter Simons
029d26cdfb haskell-codex: update to version 0.1.0.3 2014-07-22 14:20:59 +02:00
Peter Simons
7b9288bc81 haskell-HaRe: update to version 0.7.2.6 2014-07-22 14:20:59 +02:00
Peter Simons
55405fa201 haskell-xml-conduit: update to version 1.2.1 2014-07-22 14:20:59 +02:00
Peter Simons
e60fa1b3cb haskell-wai: update to version 3.0.1 2014-07-22 14:20:59 +02:00
Peter Simons
c8f9953107 haskell-vinyl: update to version 0.4.3 2014-07-22 14:20:59 +02:00
Peter Simons
0cb71fd83c haskell-units: update to version 2.1 2014-07-22 14:20:59 +02:00
Peter Simons
8ed8908997 haskell-trifecta: update to version 1.4.3 2014-07-22 14:20:59 +02:00
Peter Simons
12e8d29cf9 haskell-taggy: update to version 0.1.1 2014-07-22 14:20:59 +02:00
Peter Simons
58b3a7c437 haskell-streaming-commons: update to version 0.1.4.1 2014-07-22 14:20:59 +02:00
Peter Simons
1772a7857e haskell-stm-conduit: update to version 2.5.1 2014-07-22 14:20:59 +02:00
Peter Simons
5fdecebd54 haskell-scotty: update to version 0.8.2 2014-07-22 14:20:59 +02:00
Peter Simons
97dff65ae6 haskell-quickcheck-property-monad: update to version 0.2.3 2014-07-22 14:20:59 +02:00
Peter Simons
93f6495731 haskell-pandoc-types: update to version 1.12.4 2014-07-22 14:20:59 +02:00
Peter Simons
f31953f539 haskell-network-carbon: update to version 1.0.1 2014-07-22 14:20:58 +02:00
Peter Simons
9ba4d983c9 haskell-mongoDB: update to version 2.0.2 2014-07-22 14:20:58 +02:00
Peter Simons
c26575e5e3 haskell-json-schema: update to version 0.6.1.1 2014-07-22 14:20:58 +02:00
Peter Simons
fefd1a9d5e haskell-http-conduit: update to version 2.1.4 2014-07-22 14:20:58 +02:00
Peter Simons
d0e8593875 haskell-http-client: update to version 0.3.6 2014-07-22 14:20:58 +02:00
Peter Simons
dfaf4862b9 haskell-hspec2: update to version 0.4.0 2014-07-22 14:20:58 +02:00
Peter Simons
ab8dd24f11 haskell-hspec: update to version 1.11.0 2014-07-22 14:20:58 +02:00
Peter Simons
344b4197c9 haskell-hspec-meta: update to version 1.11.0 2014-07-22 14:20:58 +02:00
Peter Simons
639901ae56 haskell-hspec-expectations: update to version 0.6.0.1 2014-07-22 14:20:58 +02:00
Peter Simons
8606a1dddf haskell-highlighting-kate: update to version 0.5.8.5 2014-07-22 14:20:58 +02:00
Peter Simons
4daefeaeb6 haskell-hcltest: update to version 0.3.3 2014-07-22 14:20:58 +02:00
Peter Simons
7d6565da4a haskell-haskell-token-utils: update to version 0.0.0.4 2014-07-22 14:20:58 +02:00
Peter Simons
0aafa56004 haskell-generic-aeson: update to version 0.1.1.1 2014-07-22 14:20:57 +02:00
Peter Simons
e12bb1d4d9 haskell-gdiff: update to version 1.1 2014-07-22 14:20:57 +02:00
Peter Simons
549b50436c haskell-focus: update to version 0.1.2 2014-07-22 14:20:57 +02:00
Peter Simons
e54952dd3c haskell-ekg-carbon: update to version 1.0.1 2014-07-22 14:20:57 +02:00
Peter Simons
e96356056e haskell-cmdargs: update to version 0.10.8 2014-07-22 14:20:57 +02:00
Peter Simons
6051f59490 haskell-cgrep: update to version 6.4.4 2014-07-22 14:20:57 +02:00
Peter Simons
29f6060ca7 haskell-MFlow: update to version 0.4.5.5 2014-07-22 14:20:57 +02:00
Peter Simons
524be7b33c haskell-ChasingBottoms: update to version 1.3.0.8 2014-07-22 14:20:57 +02:00
Peter Simons
5e3f52243d haskell-HUnit-approx: add version 1.0 2014-07-22 14:20:57 +02:00
Peter Simons
1add807fdf haskell-parsers: switch to version 0.12 2014-07-22 14:20:57 +02:00
Peter Simons
06a6d219ad haskell-stylish-haskell: update to version 0.5.10.1 2014-07-22 14:20:57 +02:00
Peter Simons
429b0681c9 Re-generate Haskell packages with cabal2nix. 2014-07-22 14:20:57 +02:00
Eelco Dolstra
e0c43e8d04 llvm: Removed unused versions 3.1 and 3.2 2014-07-22 13:56:26 +02:00
Peter Simons
0d23cf835f Merge pull request #3318 from joelteon/master
Fix icu4c build on darwin
2014-07-22 12:27:11 +02:00
Sven Keidel
4ef371e1f6 added platform meta information to gpodder 2014-07-22 09:39:06 +02:00
Sven Keidel
ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
lethalman
5cde295b1d Merge pull request #3327 from svenkeidel/gpodder
added gpodder package
2014-07-21 18:37:28 +02:00
Shea Levy
430bf4719e Add plugins haskell package 2014-07-21 09:44:39 -04:00
Oliver Charles
a80a701101 haskellPackages.engineIO/engineIOSnap/socketIO: Update to latest versions 2014-07-21 14:24:57 +01:00
Oliver Charles
977add9710 haskellPackages.engineIO: Update to 1.0.2 2014-07-21 13:58:41 +01:00
Vladimír Čunát
9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát
65ac375aa2 Revert "qt4: try enableParallelBuilding again"
This reverts commit e8dc6258a1.

It's unfortunate, but there still are occurrences of the missing ui_qtgradientview.h
on Hydra: http://hydra.nixos.org/build/12625390/nixlog/1/tail-reload
2014-07-21 10:09:38 +02:00
Sven Keidel
eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Peter Simons
6609493aa5 Merge pull request #3322 from bennofs/haskell-gtk-gio
haskell-gtk: re-generate after applying NixOS/cabal2nix#70
2014-07-20 21:11:49 +02:00
Benno Fünfstück
e2046181b6 haskell-gtk: re-generate after applying NixOS/cabal2nix#70 2014-07-20 16:56:19 +02:00
Pascal Wittmann
c7add6c270 Merge pull request #3317 from Mathnerd314/prelink
Add prelink package
2014-07-20 14:03:12 +02:00
Vladimír Čunát
6b4929373f ffmpeg: major update 2.2.4 -> 2.3
It's claimed to be fully API-compatible update.
2014-07-20 08:44:58 +02:00
Vladimír Čunát
14953d7bc9 mesa: maintenance update 10.2.3 -> .4 2014-07-20 08:40:25 +02:00
Vladimír Čunát
65aacd459c harfbuzz: small update 2014-07-20 08:40:05 +02:00
Austin Seipp
f677e843d5 hhvm: remove bash input
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:46:32 -05:00
Austin Seipp
03fd95d248 hhvm: Fix path to /bin/bash
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 19:44:43 -05:00
Peter Simons
713379c658 Re-generate Haskell packages with cabal2nix. 2014-07-19 21:12:04 +02:00
Aycan iRiCAN
de155d13da Merge pull request #3227 from hrdinka/haskell-stm-containers
haskell-stm-containers: add package version 0.1.2 and its dependencies
2014-07-19 11:47:42 +03:00
Aycan iRiCAN
bfe2e05925 Merge pull request #3319 from luke-clifton/master
Added cgrep utility.
2014-07-19 11:43:06 +03:00
Aycan iRiCAN
f057f06136 resolved conflicts 2014-07-19 11:25:30 +03:00
Aycan iRiCAN
9489105aca Merge branch 'haskellPackages.rest' 2014-07-19 11:18:18 +03:00
Luke Clifton
8fcd7bffb9 Merge remote-tracking branch 'upstream/master' 2014-07-19 15:45:31 +08:00
Austin Seipp
4b0178d2a4 hhvm: 3.1.0 -> 3.2.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-07-19 01:58:09 -05:00
Luke Clifton
2fbd9e07f2 Added cgrep utility. 2014-07-19 12:21:15 +08:00
Joel Taylor
48d9dfa890 fix icu4c build on darwin 2014-07-18 19:25:46 -07:00
Mathnerd314
dd325fa30c Add prelink package 2014-07-19 02:16:41 +02:00
John Wiegley
9b608c0e99 haskell-codex: jailbreak due to circular dependency
It seems the codex-0.1.0.2 build requires 0.1.0.1.
2014-07-18 18:00:27 -05:00
Alexander Tsamutali
a1a9c26ccc Merge branch 'master' of https://github.com/NixOS/nixpkgs 2014-07-18 20:12:00 +04:00
Alexander Tsamutali
cc4c108965 usb-modeswitch: Update to 2.2.0. 2014-07-18 20:11:16 +04:00
Peter Simons
8a2aa3ccac haskell-parsers: add version 0.12 2014-07-18 17:30:49 +02:00
Peter Simons
2603db86d3 haskell-aeson: add version 0.8.0.0 2014-07-18 17:30:48 +02:00
Peter Simons
91c17543f2 haskell-QuickCheck: add version 2.7.6 2014-07-18 17:30:48 +02:00
Peter Simons
125aeed5a0 haddock: update to version 2.14.3 2014-07-18 17:30:48 +02:00
Peter Simons
dfbce69f05 haskell-codex: update to version 0.1.0.2 2014-07-18 17:30:48 +02:00
Peter Simons
c0791a5b2c haskell-HaRe: update to version 0.7.2.5 2014-07-18 17:30:48 +02:00
Peter Simons
82d1bce665 haskell-yaml: update to version 0.8.8.4 2014-07-18 17:30:48 +02:00
Peter Simons
cc25d3f876 haskell-word8: update to version 0.1.1 2014-07-18 17:30:48 +02:00
Peter Simons
6c1a24766f haskell-webdriver: update to version 0.6.0.1 2014-07-18 17:30:48 +02:00
Peter Simons
3f881c8bdf haskell-unix-time: update to version 0.3.2 2014-07-18 17:30:48 +02:00
Peter Simons
db91e939d5 haskell-streaming-commons: update to version 0.1.4 2014-07-18 17:30:48 +02:00
Peter Simons
9052bb66e7 haskell-statistics: update to version 0.13.1.0 2014-07-18 17:30:48 +02:00
Peter Simons
2bc6275cb3 haskell-safe: update to version 0.3.7 2014-07-18 17:30:48 +02:00
Peter Simons
b5211831ad haskell-reflection: update to version 1.5.1 2014-07-18 17:30:48 +02:00