Commit graph

46632 commits

Author SHA1 Message Date
Luke Clifton
e27dcfff1b Allows the JDK to be chosen in services.tomcat 2014-08-01 16:52:19 +08:00
Vladimír Čunát
c92a8584ee fix eval after cf6bb72c6 2014-08-01 10:04:08 +02:00
Vincent Laporte
81f258e7bf merlin: some cleaning of the derivation 2014-08-01 09:42:37 +02:00
aszlig
fb1f257189
i3: Don't run test cases in parallel.
Unfortunately, running them in parallel sometimes lead to tests not even
starting up. Probably lock contention is the issue here, but haven't
investigated further so I'm deactivating parallel testing.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 08:04:09 +02:00
aszlig
57781346d7
Merge branch 'i3-tests'.
The reason I went through this whole journey of gathering dependencies
and debugging just in order to get i3 tests working was because I wanted
to supply test cases to a small patch I wrote for the upstream project.

This adds/updates quite a few Perl packages and a X dummy helper, which
are all needed in order to successfully run the test suite.
2014-08-01 05:51:57 +02:00
aszlig
31e77f5096
i3: Abort build if test suite is failing.
The exit code of the i3 test runner is always 0, regardless of whether
tests were failing or not, so let's quickly grep for a "not ok" in the
test logfile and if it occurs, the whole build is failing now.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig
2c1d04a563
i3: Enable running test suite by default.
Finally, after going through the journey of debugging and gathering
dependencies, we now have tests for i3, hooray!

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig
feeb5bae23
Add new package xdummy, a dummy X server.
This is actually a small script which just starts an X server without
any real display. Right now only needed for running the test suite of
the i3 window manager within the Nix chroot, but might be useful for
running other tests needing a DISPLAY.

Usage is just like a regular X server, so in order to start an instance
for display :666, you just run it like this:

xdummy :666

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig
b02d72f754
perl-packages: Add new package Inline-C, v0.62.
This is needed for running the test suite of the i3 window manager.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig
bae7da07d8
perl-packages: Add MouseXNativeTraits to X11-XCB.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig
dff91a009d
perl-packages: Add new package MouseXNativeTraits.
This is actually needed by X11-XCB, but I only found out after hours of
digging through Perl code from the stone age.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:14 +02:00
aszlig
8851638ea7
perl-packages: Add new package CarpAlways, v0.13.
This has been proven to be VERY handy for providing useful stacktraces
in Perl. Just invoke it using:

perl -MCarp::Always yourshinyscript.pl

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:13 +02:00
aszlig
4a412e9561
perl-packages: Update Any-Moose to version 0.24.
This has required to update a few dependencies, including Mouse (to
version 2.3.0).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:13 +02:00
aszlig
d49f152513
perl-packages: Update Inline to version 0.64.
Also tested whether all references (InlineJava, Autodia) are built
successfully.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:13 +02:00
aszlig
cf6bb72c6a
perl-packages: Add X11-XCB and dependencies.
This is another requirement for running the i3 test suite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:13 +02:00
aszlig
6ab0a8d0a8
perl-packages: Add AnyEvent::I3, version 0.15.
This is needed in order to run the i3 test suite.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 05:49:13 +02:00
Austin Seipp
181cdb7cc8 Merge pull request #3412 from Ericson2314/rust-master
Add alternative rustc package for master tip
2014-07-31 21:51:21 -05:00
John Ericson
8f763d0539 rustc: rename rust to rustc, but keep rust attr name for backwards compat 2014-08-01 04:39:37 +02:00
Austin Seipp
14e477b4c4 Merge pull request #3395 from mixis/master
ATS2 version [0.0.7] --> [0.1.0]
2014-07-31 21:29:01 -05:00
John Ericson
641ccec337 rust: Refer to 0.11.nix directly in all-packages
rather than use default.nix indirection
2014-08-01 04:28:54 +02:00
Austin Seipp
dfbeec5f50 Merge pull request #3409 from FlashKorten/scummvm_1.7
scummvm: version bump to 1.7
2014-07-31 21:28:46 -05:00
Austin Seipp
06d1d2d4df Merge pull request #3417 from madjar/master
Ansible: updated to 1.6.10
2014-07-31 21:28:31 -05:00
Austin Seipp
5b9be82617 Merge pull request #3415 from bodil/master
thunderbird-bin: Update to version 31.0.
2014-07-31 21:28:20 -05:00
Justin Bedo
befd1289ac Updated texlive to latest release 2014-08-01 10:19:00 +10:00
Jaka Hudoklin
b525d6085f Merge pull request #3421 from blazbratanic/master
Fixed download path for eclipse swt package.
2014-07-31 22:56:45 +02:00
Blaz Bratanic
1ecfba4391 Fixed download path 2014-08-01 22:41:33 +02:00
Eelco Dolstra
549855113b modprobe.nix: Use modern environment.etc syntax 2014-07-31 22:09:51 +02:00
John Ericson
584114b697 rust: Add an alternative package for the master tip
based off of pull request #3084
2014-07-31 20:42:20 +02:00
John Wiegley
511f41387d haskell-haddock: use buildTools, not extraBuildInputs
Fixes #2815
2014-07-31 12:48:54 -05:00
Aycan iRiCAN
db43774a27 Merge pull request #3420 from Fuuzetsu/bencoding
haskell-bencoding: 0.4.3.0
2014-07-31 20:39:23 +03:00
Mateusz Kowalczyk
ed51045f13 haskell-bencoding: 0.4.3.0 2014-07-31 19:12:43 +02:00
Sander van der Burg
30a941aa88 Change location of libmatthew-java to fedora's mirror. Original one is unreachable 2014-07-31 17:58:03 +02:00
Bjørn Forsman
a03ec2692b lttng: fix evaluation error
I'm giving up on the lttngModules backward compatibility attribute :-)
2014-07-31 17:08:23 +02:00
Bjørn Forsman
fdba7f35fe lttng-modules: fix bad attribute reference
Fixup error introduced in commit
410f2a9dab ("lttng: align attribute name
with package name"). lttng-modules is not a top-level attribute.
2014-07-31 17:04:45 +02:00
Rob Vermaas
a6e1caacda Merge pull request #3419 from dmgroenewegen/master
Restore extraWorkersProperties option for apache httpd tomcat-connector
2014-07-31 16:58:02 +02:00
Danny Groenewegen
51494f2c33 Restore extraWorkersProperties option for apache httpd tomcat-connector, issue https://github.com/NixOS/nixpkgs/issues/2202 2014-07-31 16:51:51 +02:00
Vladimír Čunát
dac1791fb5 thunderbird: major update 17.* -> 31.0
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra

(cherry picked from commit adc2edd5cf)
2014-07-31 16:30:04 +02:00
Vladimír Čunát
ddcc163711 libav: maintenance updates of all three branches
(cherry picked from commit c61c7e7313)
2014-07-31 16:30:04 +02:00
Vladimír Čunát
ace3d4685d xfce4-appfinder: update 4.9.4 -> 4.10.1
(cherry picked from commit 8aa892489e)
2014-07-31 16:30:04 +02:00
Vladimír Čunát
bc8abb2242 libxfce4util: minor update 4.10.0 -> 4.10.1
(cherry picked from commit 5c72dac548)
2014-07-31 16:30:04 +02:00
Vladimír Čunát
880fb28ecd xfce4-power-manager: update to 1.3.0, supporting upower-0.99
(cherry picked from commit 2027dcc4f9)
2014-07-31 16:30:04 +02:00
Bjørn Forsman
410f2a9dab lttng: align attribute name with package name
lttngModules => lttng-modules
lttngTools => lttng-tools
lttngUst => lttng-ust

But keep the old attributes around for backward compatibility.
2014-07-31 16:00:04 +02:00
Peter Simons
ae6d32ffd3 haskell-cabal2nix: update to version 1.67 2014-07-31 15:48:30 +02:00
Peter Simons
14ad244d92 haskell-snaplet-redis: update to version 0.1.3.3 2014-07-31 15:48:28 +02:00
Peter Simons
d4a863bdeb haskell-optparse-applicative: update to version 0.9.1.1 2014-07-31 15:48:26 +02:00
Peter Simons
6d40d5e564 haskell-hackage-db: update to version 1.8 2014-07-31 15:48:24 +02:00
Peter Simons
84cf3f3de7 Agda: drop obsolete version 2.3.2.2 2014-07-31 13:58:36 +02:00
Peter Simons
bb4d15a115 haskell-yesod-form: update to version 1.3.14 2014-07-31 13:57:46 +02:00
Peter Simons
9e4a54f4a6 haskell-yesod-core: update to version 1.2.19 2014-07-31 13:57:46 +02:00
Peter Simons
a2b1580716 haskell-semigroupoids: update to version 4.2 2014-07-31 13:57:46 +02:00