3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

81303 commits

Author SHA1 Message Date
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
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
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
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
Moritz Ulrich 6645ae3946 google-chrome: Also add ${deps}/lib64 to $LD_LIBRARY_PATH.
...as per @abbradar's suggestion. Thanks!
2016-04-14 19:00:15 +02:00
Moritz Ulrich 0c5ed43cd4 google-chrome: Fix regression from closure-size merge.
Fixes #14695

I'm not entirely sure if including `stdenv.cc.cc` in `makeLibraryPath`
is the correct thing to do here. If it's incorrect, please feel free to
ping me.
2016-04-14 18:54:48 +02:00
Michael Raskin 73fba62fb1 Merge pull request #13545 from bendlas/init-webkitgtk-212
webkitgtk: init at 2.12
2016-04-14 16:37:56 +00:00
Alexander V. Nikolaev 32724102ed minetest: Fix finding gettext by CMake 2016-04-14 19:36:37 +03:00
Tobias Geerinckx-Rice 7818fda09e
eid-mw: 4.1.13 -> 4.1.14 2016-04-14 18:34:53 +02:00
obadz bf5e339d24 virtualbox: dontPatchELF = true
Workaround patchelf#93 and help move forward on #14595
2016-04-14 17:05:31 +01:00
zimbatm 366c19ffd8 Merge pull request #14654 from zimbatm/slack-fix
slack: fixes
2016-04-14 15:52:00 +01:00
zimbatm 7081325518 slack: fixes
* Fixes missing stdlib rpath
* Removes unused share/lintian
* Fixes slack.desktop paths
2016-04-14 15:50:55 +01:00
Nikolay Amiantov cb0b0190cb syncthing service: fix mkEnableOption call 2016-04-14 17:44:02 +03:00
Nikolay Amiantov c9f2753c7b syncthing service: fix invalid conflict resolution 2016-04-14 17:38:25 +03:00
Nikolay Amiantov 37d641ff3d dfhack: use protobuf compiled with old ABI 2016-04-14 17:30:40 +03:00
Nikolay Amiantov cd4b76c821 protobuf: split to multiple outputs 2016-04-14 17:30:40 +03:00
Tim Steinbach ccc3080857 kernel: 4.4.6 -> 4.4.7 (#14690) 2016-04-14 16:30:20 +02:00
Tobias Geerinckx-Rice a8a75f7a94
pythonPackages.tzlocal: 1.1.1 -> 1.2.2 2016-04-14 16:27:51 +02:00
Tim Steinbach af4d84544f kernel: 4.5 -> 4.5.1 (#14691) 2016-04-14 15:57:18 +02:00
joachifm 59ac68d05e Merge pull request #14683 from peterhoeg/st_systemd
syncthing service: support running from systemd --user instance
2016-04-14 15:49:10 +02:00
Peter Hoeg 32bc5cfa24 syncthing service: support running from systemd --user instance 2016-04-14 21:22:31 +08:00
Peter Simons acaf255687 Merge pull request #14686 from wizeman/u/fix-updatedb
nixos.locate: fix update-locatedb service failure
2016-04-14 15:17:06 +02:00
joachifm 20095d48de Merge pull request #14224 from yokto/add/libpinyin
ibus-libpinyin: init at 1.7.4
2016-04-14 14:55:00 +02:00
joachifm 3d5e2c5569 Merge pull request #14688 from taku0/thunderbird-bin-45.0
thunderbird-bin: 38.7.2 -> 45.0
2016-04-14 14:43:31 +02:00
Frederik Rietdijk aedf601bba Merge pull request #14687 from makefu/devpi-client-fix
devpi-client: add missing python libraries
2016-04-14 14:25:21 +02:00
joachifm be284a5f97 Merge pull request #14577 from hrdinka/fix/pcsx2
pcsx2: disable advance SIMD instructions
2016-04-14 14:17:22 +02:00
joachifm 19e425fa0c Merge pull request #14447 from mucaho/vscode_unfree
vscode: switch to unfree, binary package
2016-04-14 14:16:43 +02:00
joachifm ca2e555793 Merge pull request #14646 from peterhoeg/flexget
flexget nixos module: run the service and specify configuration
2016-04-14 14:16:04 +02:00
makefu 776ff2e735 devpi-client: add missing python libraries 2016-04-14 14:06:32 +02:00
Ricardo M. Correia f5951c55f7 nixos.locate: fix update-locatedb service failure
It was failing with a `Read-only filesystem` failure due to the systemd
service option `ReadWriteDirectories` not being correctly configured.

Fixes #14132
2016-04-14 13:51:17 +02:00
Domen Kožar 0f9268e52c fetchurl: assert required Nix version for sha512 2016-04-14 12:50:21 +01:00
Nikolay Amiantov 04c67c316c ettercap: fix gdkconfig path 2016-04-14 14:46:23 +03:00
Vladimír Čunát ddb4051bf7 xorg-sys-opengl: fix with multiple outputs
Fixes #14669.
2016-04-14 13:43:08 +02:00
obadz 079e1c76cf Revert "dbus nixos module: add units for systemd user session"
This reverts commit 83cb6ec399.

Was breaking: nix-build '<nixos/release.nix>' -A tests.xfce.x86_64-linux
2016-04-14 12:38:36 +01:00
Arseniy Seroka 9cfa2029de Merge pull request #14656 from DamienCassou/add-pidgin-gnome-extension
pidgin-im-gnome-shell-extension: init at 1.0
2016-04-14 14:28:37 +03:00
Myrl Hex c73d14a39f profont: init 2016-04-14 14:27:25 +03:00