1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 21:50:55 +00:00
Commit graph

81359 commits

Author SHA1 Message Date
Brian McKenna 0167b61ef4 dockerTools: only add "/nix" if it exists
The /nix path in 4d200538 of the layer tar didn't exist for some
packages, such as cacert. This is because cacert just creates an /etc
directory and doesn't depend on any other /nix paths. If we tried
putting this directory in the tar and using overlayfs with it, we'd get
"Invalid argument" when trying to remove the directory.

We now check whether the closure is non-empty before telling tar to
store the /nix directory.

Fixes #14710.
2016-04-16 01:16:49 +10:00
joachifm 8b3c4348ab Merge pull request #14579 from elitak/factorio
factorio: 0.12.29 headless + server module
2016-04-15 16:14:14 +02:00
Peter Simons a6978ded09 Merge pull request #14144 from jefdaj/r-bioc-data-packages
r-modules: update CRAN, add Bioconductor data packages
2016-04-15 14:46:19 +02:00
Jost Tobias Springenberg 8816713001 geeqie: 1.1 -> 1.2.3 update package version and use the new source location (#14715) 2016-04-15 13:33:11 +01:00
Arseniy Seroka 5af369b338 Merge pull request #14712 from ericsagnes/pkg/j4-dmenu-desktop
j4-dmenu-desktop: init at 2.14
2016-04-15 14:08:36 +03:00
Domen Kožar 1834e72555 fix eval (explicit is better than implicit) 2016-04-15 10:39:11 +01:00
Luca Bruno 230bf0eab4 Merge pull request #14711 from puffnfresh/bug/docker-nondeterminism
dockerTools: make tars deterministic
2016-04-15 11:20:49 +02:00
Spencer Janssen a3d6602c39 kodi: fix build after pcre split (#14714) 2016-04-15 08:57:13 +01:00
Eric Litak 13577e8785 factorio: headless server module 2016-04-14 23:03:36 -07:00
Eric Litak 7ce216139c factorio: bump to 0.12.29 and headless version 2016-04-14 23:03:05 -07:00
Eric Litak c6750d2f46 factorio: refactor in preparation for headless version 2016-04-14 23:03:04 -07:00
Eric Sagnes 2ab46a9dae j4-dmenu-desktop: init at 2.14 2016-04-15 14:35:22 +09:00
joachifm ff44872c77 Merge pull request #14713 from ericsagnes/fix/libpinyin
libpinyin: move to libraries
2016-04-15 05:50:06 +02:00
joachifm dfc6d42860 Merge pull request #14709 from davidak/caddy-go16
caddy: build only with go 1.6
2016-04-15 05:45:50 +02:00
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