Commit graph

46442 commits

Author SHA1 Message Date
Vladimír Čunát 6295a3ca36 Merge recent master into x-updates
Hydra: ?compare=1142825

Conflicts (easy):
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Vladimír Čunát 91b53aaebc xorg.libXext: minor update 2014-08-02 04:43:19 +02:00
Vladimír Čunát 9fcd3c2825 libdrm: update 2014-08-02 04:43:11 +02:00
Vladimír Čunát 3a6135a907 harfbuzz: small update 2014-08-02 04:31:51 +02:00
Vladimír Čunát f681a7683c poppler: maintenance update 2014-08-02 04:31:26 +02:00
Shea Levy fb565f1a4e amazon-image.nix: Overwrite busybox swapon 2014-08-01 17:55:37 -04:00
Shea Levy 7fec575976 Fix lib functions taken from pkgs.lib instead of lib in nixos 2014-08-01 16:23:56 -04:00
Shea Levy b0c8769c84 Add tornadokick python package 2014-08-01 15:14:38 -04:00
Sander van der Burg b0769d8db1 Use hyperlink and click action instead of meta refresh 2014-08-01 19:26:34 +02:00
aszlig 3d34dc39ac
i3: Only enable tests for x86_64-linux.
Right now, tests for i686-linux fail, see:

https://hydra.nixos.org/build/13024964

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 18:41:39 +02:00
Sander van der Burg 5a918f5f5c Add experimental link to proxy to page that does wireless distributions of IPA files 2014-08-01 18:34:18 +02:00
Rob Vermaas 64561b437d Remove broken flag for xen, build with gcc45. 2014-08-01 17:18:27 +02:00
Lluís Batlle i Rossell 00b63f6655 Update mumble to 1.2.7.
(Chery picked from release-14.04)
2014-08-01 16:56:27 +02:00
Lluís Batlle i Rossell 5e35fef0eb freecad: updating to 0.14
I had to update all the pyside programs, or freecad failed to build.  I picked
the versions advertised in http://qt-project.org/wiki/PySideDownloads . The
rest I took for github latest releases.
2014-08-01 16:56:27 +02:00
Eelco Dolstra 688824cc60 Add a bunch of Hydra dependencies to the channel 2014-08-01 16:11:33 +02:00
Rob Vermaas 3566807e76 Google Compute image:
Removed the 'wait for GCE metadata service' job, as it was causing
issues with the metadata service (likely some firewall or something).
In stead, use wget with retries (including connection refused) in
stead or curl for fetching the SSH keys. Also made the stdout/-err
of this job appear in the console.
2014-08-01 15:25:50 +02:00
Pascal Wittmann 0baac649aa Merge pull request #3188 from vbgl/merlin
Adds merlin
2014-08-01 13:39:27 +02:00
aszlig 32d7c4c435
i3: Remove CarpAlways from buildInputs.
Oops, it was a leftover from debugging.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-08-01 11:19:06 +02:00
Pascal Wittmann bb153cfe72 calibre: update from 1.46.0 to 1.47.0 2014-08-01 11:17:00 +02: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
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