Commit Graph

81986 Commits

Author SHA1 Message Date
aszlig
f5ec09842d
pygame: Fix build with multiple outputs
The config.py script doesn't seem to cope very well with symlinks, so
let's pass it the right derivation outputs wherever possible and fall
back to drv.out.

I've disabled the tests because they somehow now seem to cause the build
to fail even though the tests failed *before* the merge of the
closure-size branch, but the whole build didn't fail regardless.

Here is a build from before the closure-size branch merge:

http://hydra.nixos.org/build/34367296

If you have a look at the build log, you already see a bunch of failing
tests (to be exact: the same set of tests that are failing now with the
fix of the preConfigure phase).

Other than that, the build now succeeds on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:35:11 +02:00
aszlig
2c024d28a2
cmst: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of cmst override
the whole configurePhase, so this hook isn't run at all.

I've also added running the preBuild and postBuild hooks for the sake of
completeness so that it's easier to override the derivation attributes.

This fixes the build of cmst and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
f1c2572479
pyqt5: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of pyqt5 override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of pyqt5 and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
96bed5b7aa
signon: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of signon override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of signon and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
f43d8b2336
libkeyfinder: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of libkeyfinder
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of libkeyfinder and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
25382a37e3
accounts-qt: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of accounts-qt
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of accounts-qt and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
9cfc8d94bb
zeal: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of zeal override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of zeal and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
dbc1605dea
shotcut: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of shotcut
override the whole configurePhase, so this hook isn't run at all.

However, this still doesn't fix the package and its already marked as
broken.

The build fails with the following error:

Project ERROR: Unknown module(s) in QT: qml quick webkitwidgets x11extras

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
11294eaf16
qgroundcontrol: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qgroundcontrol
override the whole configurePhase, so this hook isn't run at all.

Instead of using pushd/popd, I'm making it a bit more readable by just
spawning a subshell with the right working directory.

This fixes the build of qgroundcontrol and it now successfully compiles
on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
01900ac06e
qgroundcontrol: Drop unused preConfigure phase
The configurePhase is overridden here and the preConfigure hook isn't
referenced otherwise in the package, so it's basically dead code.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
81fc546df3
fritzing: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of fritzing
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of fritzing and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
cf3f891369
linssid: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of linssid
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of linssid and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
fab7c7edbf
twmn: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of twmn override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of twmn and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
0cfff33f59
qtpass: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qtpass override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of qtpass and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
38d5c07b14
rapcad: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of rapcad
override the whole configurePhase, so this hook isn't run at all.

However, this still doesn't fix the build of rapcad, because it's unable
to find GL/glu.h.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
a0dd8d5afe
phototonic: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of phototonic
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of phototonic and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
6d9147abab
keyfinder: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of keyfinder
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of keyfinder and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
bb543e1540
iannix: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of iannix override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of iannix and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
97d89ad7ee
fmit: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of fmit override
the whole configurePhase, so this hook isn't run at all.

This doesn't fix the build of fmit, because it's unable to find
GL/glu.h. However I think this isn't an issue of the fmit package but
rather rooted in propagating the wrong output paths from freeglut.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
4dde716a05
dfasma: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of dfasma override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of dfasma and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
0fefa9939e
communi: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of communi
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of communi and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
ee1af147f3
libcommuni: Fix finding qmake
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path.

As the configurePhase is replaced by a qmake path directly from qtbase,
it won't work because the setup-hook from qtbase needs to do some setup
in order for qmake to find its own data files.

So instead of hardcoding that path, we just go for setting the
configureFlags attribute and replacing which with "type -P" so that the
configure script can figure out the right path to qmake on its own.

This fixes the build of libcommuni and it now successfully compiles on
my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
7f4ab1cb72
cutegram: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of cutegram
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of cutegram and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
c275fc610e
telegram-qml: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of telegram-qml
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of telegram-qml and it now successfully compiles on
my machine.

Built it using the following command, because it wasn't exposed via the
top-level packages attribute:

nix-build -E '
  with import ./. {};
  qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/telegram-qml {
    libqtelegram-aseman-edition = qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition {};
  }
'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
080b54d766
libqtelegram-aseman-edition: Add pre/postConfigure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of
libqtelegram-aseman-edition override the whole configurePhase, so this
hook isn't run at all.

This fixes the build of libqtelegram-aseman-edition and it now
successfully compiles on my machine.

Built it using the following command, because it wasn't exposed via the
top-level packages attribute:

nix-build -E '
  with import ./. {};
  qt55.callPackage pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition {}
'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
44a2ca4a34
cool-retro-term: Add running {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of cool-retro-term
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of cool-retro-term and it now successfully compiles
on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
aszlig
2d6ea2cc30
qmltermwidget: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qmltermwidget
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of qmltermwidget and it now successfully compiles
on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 05:26:02 +02:00
Eric Sagnes
c6ec758fe3 libpinyin: move to libraries 2016-04-15 10:22:35 +09:00
davidak
51119d2f35 caddy: build only with go 1.6 2016-04-15 03:01:34 +02:00
Luca Bruno
5c7131213e Merge pull request #14707 from NicolasPetton/gnome-maps-coredump
gnome-maps: Add missing gsettings schemas
2016-04-15 01:42:45 +02:00
aszlig
9fa8fb1dec
antimony: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of antimony
override the whole configurePhase, so this hook isn't run at all.

This fixes the build of antimony and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:34:42 +02:00
aszlig
8779e0f274
qt5.qwt: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of qwt override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of qwt and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:29:56 +02:00
Brian McKenna
bc2f314f73 dockerTools: make tars deterministic
There were two sources of non-determinisim coming into the images. The
first was tar mtimes, the second was pigz/gzip times.

An example image now passes with the --check flag.
2016-04-15 09:29:15 +10:00
aszlig
d663b3df24
qt5.quazip: Fix running of {pre,post}Configure
Commit 0055c6a introduced a new preConfigure hook that sets the right
qmake path. Unfortunately the mkDerivation attributes of quazip override
the whole configurePhase, so this hook isn't run at all.

This fixes the build of quazip and it now successfully compiles on my
machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 01:27:21 +02:00
Tuomas Tynkkynen
ab428dce14 stage-1: Remove doublePatchelf hack
No longer needed with the new patchelf version.
2016-04-15 01:53:34 +03:00
aszlig
9cc1b065ca
Merge branch 'taskserver'
Contains the merge of pull request #14476, which introduces a new
service module for Taskserver and a small fix to work with multiple
outputs of gnutls.

I've tested this using the "taskserver" NixOS VM test and it succeeded
on i686-linux and x86_64-linux.
2016-04-15 00:32:49 +02:00
aszlig
1f46decba7
nixos/taskserver: Fix reference to certtool.
With the merge of the closure-size branch, most packages now have
multiple outputs. One of these packages is gnutls, so previously
everything that we needed was to reference "${gnutls}/bin/..." and now
we need to use "${gnutls.bin}/bin/...".

So it's not a very big issue to fix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-15 00:28:57 +02:00
aszlig
9ed9e268a2
Merge pull request #14476 (taskserver)
This adds a Taskserver module along with documentation and a small
helper tool which eases managing a custom CA along with Taskserver
organisations, users and groups.

Taskserver is the server component of Taskwarrior, a TODO list
application for the command line.

The work has been started by @matthiasbeyer back in mid 2015 and I have
continued to work on it recently, so this merge contains commits from
both of us.

Thanks particularly to @nbp and @matthiasbeyer for reviewing and
suggesting improvements.

I've tested this with the new test (nixos/tests/taskserver.nix) this
branch adds and it fails because of the changes introduced by the
closure-size branch, so we need to do additional work on base of this.
2016-04-15 00:21:49 +02:00
Tuomas Tynkkynen
fed091db17 Merge pull request #14703 from elitak/mongo
mongodb: fix broken pcre dep
2016-04-15 01:18:03 +03:00
Aneesh Agrawal
60f97245a2 libressl 2.3: enable multiple outputs 2016-04-14 17:45:43 -04:00
Luca Bruno
0876c2f4ac netdata: init at 1.0.0 2016-04-14 23:43:01 +02:00
Nicolas Petton
032e3e53d3 gnome-maps: Add missing build inputs
Without gnome3.gsettings_desktop_schemas and
gnome3.evolution_data_server as buildInputs, gnome-maps won't start at
all.
2016-04-14 23:39:49 +02:00
Jeffrey David Johnson
2291885f9e mark bioc packages broken; should match hydra now 2016-04-14 14:34:11 -07:00
Luca Bruno
88c0ac1f02 Merge pull request #14702 from NicolasPetton/totem-libpeas-plugins
totem: Add missing python3 dependencies for plugins
2016-04-14 22:51:37 +02:00
Eric Litak
6c37503f54 mongodb: fix broken pcre dep 2016-04-14 13:41:42 -07:00
Nicolas Petton
cf7d79de2c
totem: Add missing python3 dependencies for plugins
libpeas: build with python3 support
2016-04-14 22:18:56 +02:00
aszlig
c36d6e5964
nixos/doc: Revert allowing olinks from options
This reverts commit 1d77dcaed3.

It will be reintroduced along with #14700 as a separate branch, as
suggested by @nbp.

I added this to this branch because I thought it was a necessary
dependency, but it turns out that the build of the manual/manpages still
succeeds and merely prints a warning like this:

warning: failed to load external entity "olinkdb.xml"
Olink error: could not open target database 'olinkdb.xml'.
Error: unresolved olink: targetdoc/targetptr = 'manual/module-taskserver'.

The olink itself will be replaced by "???", so users looking at the
description of the option in question will still see the reference to
the NixOS manual, like this:

More instructions about NixOS in conjuction with Taskserver can be found
in the NixOS manual at ???.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-14 21:31:02 +02:00
aszlig
940120a711
nixos/taskserver/doc: Improve example org name
Suggested by @nbp:

"Choose a better organization name in this example, such that it is less
confusing. Maybe something like my-company"

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-04-14 21:16:14 +02:00
Tobias Geerinckx-Rice
358900674b
webgitgtk 2.12: fix evaluation
Remove reference to unknown maintainer @iyzsong.
2016-04-14 19:57:14 +02:00
Nikolay Amiantov
6c13d6b402 Merge pull request #14696 from avnik/fixes
minetest: Fix finding gettext by CMake
2016-04-14 21:11:25 +04:00