Commit Graph

90099 Commits

Author SHA1 Message Date
obadz
92d929c884 Merge branch 'master' into staging 2016-08-28 14:48:02 +01:00
obadz
4f299fdd53 nixos/modules/rename.nix: fix eval error
cc @Profpatsch @joachifm  @domenkozar
2016-08-28 14:47:24 +01:00
Graham Christensen
1a64734bc6 Merge pull request #18031 from ambrop72/kdevelop5.0
kdevelop: Init at 5.0
2016-08-28 08:58:21 -04:00
Thomas Tuegel
43bf5d2c30 Merge pull request #18052 from loskutov/master
Qt5: Enable Wayland support
2016-08-28 07:38:23 -05:00
Thomas Tuegel
b8a83d901f qt5: use absolute paths to plugins in CMake
This reverts commit 17f9b21c09.

This is a partial unrevert. Qt 5.6 and Qt 5.7 remain building and
working. Qt 5.5 stays building but broken.
2016-08-28 07:33:42 -05:00
obadz
c7142c1aa3 Merge branch 'master' into staging 2016-08-28 13:33:13 +01:00
obadz
6eb4014874 go_1_4: set CGO_ENABLED=0 to cope with binutils 2.27 version bump
See also https://github.com/golang/go/issues/16906
cc @cstrahan @edolstra @lancelotsix @globin @fpletz
2016-08-28 13:29:44 +01:00
Ambroz Bizjak
529fbe05a3 kdevelop: Init at 5.0
Doesn't use Okteta yet.
2016-08-28 14:15:54 +02:00
Domen Kožar
e01e92f12f Merge pull request #15025 from ericsagnes/modules/manual
manual: automatically generate modules documentation
2016-08-28 13:57:34 +02:00
Domen Kožar
4af09e0031 Merge pull request #14311 from Profpatsch/mkRemovedOptionModule-replacement
mkRemovedOptionModule: add replacement argument
2016-08-28 13:55:28 +02:00
David Guibert
21f2f30740 virtualbox: 5.0.20 -> 5.0.26 2016-08-28 13:45:49 +02:00
obadz
57ddc155fc Merge branch 'master' into staging
Conflicts:
	pkgs/games/scummvm/default.nix
2016-08-28 12:20:59 +01:00
obadz
f0da094b2e virtualbox-image: remove raw image (hopefully fixes ova tests)
See also 80660f8
2016-08-28 11:33:15 +01:00
Moritz Ulrich
17f9b21c09 Revert "qt5: use absolute paths to plugins in CMake"
This reverts commit 7a9e04943d.

The commit in question breaks the patches to qtbase, causing the build to fail. An issue to track this feature will follow.
2016-08-28 12:29:20 +02:00
David Guibert
dfb3707dab h5py: 2.5.0 -> 2.6.0
Tests are broken in 2.5.0 (errors when executing "cythonize()"), not in
version 2.6.0.
2016-08-28 11:42:21 +02:00
David Guibert
1c1a03f0d3 hdf5: 1.8.16 -> 1.10.0-patch1 2016-08-28 11:42:21 +02:00
Bjørn Forsman
1ba0ef1c73 borgbackup: 1.0.6 -> 1.0.7 2016-08-28 10:50:42 +02:00
Gabriel Ebner
497b3cabcc libqalculate, qalculate-gtk: 0.9.8 -> 0.9.9 2016-08-28 10:40:33 +02:00
Gabriel Ebner
9abbd6adc1 pythonPackages.vobject: 0.9.2 -> 0.9.3 2016-08-28 10:33:19 +02:00
Kovacsics Robert
5e76bc9c9d python-xlib: 0.15rc1 -> 0.17 (#18044) 2016-08-28 08:06:06 +00:00
Bjørn Forsman
26f65ae860 nixos/redis: enforce owner/perms on /var/lib/redis (#18046)
Previously it was only set once, now it is enforced on each start-up of
redis.service. Also set _ownership_ recursively, so that the
/var/lib/redis/dump.rdb file is guaranteed to be accessible by the
currently configured redis user.

Fixes issue #9687, where redis wouldn't start because /var/lib/redis had
wrong owner.
2016-08-28 08:05:14 +00:00
Jörg Thalheim
b170bed1ff lib.licenses: Fix typo in fdl13 license description (#18053) 2016-08-28 07:56:40 +00:00
Benjamin Herr
dbae71570f gitg: use wrapGAppsHook, pull in dconf (#18040)
Without dconf, gitg doesn't remember preferences such as window size.
2016-08-28 07:55:51 +00:00
Kranium Gikos Mendoza
33638ca99e scummvm: fix build (#18051) 2016-08-28 07:54:22 +00:00
Kranium Gikos Mendoza
388bc33f74 cuyo: fix build (#18049) 2016-08-28 07:54:03 +00:00
Carles Pagès
c227f665d4 Merge pull request #18050 from womfoo/fix/kobodeluxe-build
kobodeluxe: fix build
2016-08-28 09:34:34 +02:00
Frederik Rietdijk
562027e6c2 pythonPackages.twisted: 16.2.0 -> 16.4.0 2016-08-28 08:45:39 +02:00
Ignat Loskutov
cc83045026 Qt5: Enable Wayland support 2016-08-28 00:57:43 -04:00
Kranium Gikos Mendoza
ddcf259c2d kobodeluxe: fix build 2016-08-28 11:26:12 +08:00
obadz
ed01e0ca4f openssl: fix merge conflict between b6dabe3 and 6e7ca92 2016-08-28 03:53:13 +01:00
Graham Christensen
a29eb6bfe7 Merge pull request #18024 from cransom/blink1tool
blink1-tool: init at 1.98
2016-08-27 21:43:21 -04:00
Shea Levy
f168030af1 haskellPackages.unbound: 0.5.0 -> 0.5.1 2016-08-27 19:35:47 -04:00
obadz
3de6e5be50 Merge branch 'master' into staging
Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix
2016-08-27 23:54:54 +01:00
Robin Gloster
132571454c
springlobby: remove obsolete substituteInPlaces 2016-08-27 22:08:20 +00:00
Nikolay Amiantov
df27c35e9a navit: fix build 2016-08-28 01:04:18 +03:00
Nikolay Amiantov
5eaacbb981 xsw: fix build 2016-08-28 01:04:18 +03:00
Nikolay Amiantov
1db4cb750c gravit: fix build 2016-08-28 01:04:18 +03:00
Nikolay Amiantov
21c8422f7e pokerth: fix build 2016-08-28 01:04:18 +03:00
Nikolay Amiantov
9fa012dee5 SDL_ttf: don't link itself to /include 2016-08-28 01:04:18 +03:00
Robin Gloster
b37460ec63
xtreemfs: fix substituteInPlace paths 2016-08-27 21:56:45 +00:00
Robin Gloster
6f9d474db1
njam: disable format hardening 2016-08-27 21:56:33 +00:00
Robin Gloster
c30d4c732e
liquidwar: fix build after glibc upgrade 2016-08-27 21:55:58 +00:00
Robin Gloster
d80ad66701
svtplay-dl: fix path to test runner 2016-08-27 21:55:37 +00:00
Robin Gloster
3f4caa111f
scrypt: remove obsolete substituteInPlace 2016-08-27 21:55:19 +00:00
Robin Gloster
193a57fa48
noweb: remove obsolete substituteInPlace 2016-08-27 21:54:55 +00:00
Robin Gloster
29c5ccea4a
xen: remove obsolete substituteInPlace 2016-08-27 21:54:30 +00:00
Robin Gloster
9f80e55428
openmodelica: disable format hardening 2016-08-27 21:54:17 +00:00
Robin Gloster
191896e63a
qfsm: disable format hardening 2016-08-27 21:53:49 +00:00
Robin Gloster
c0e42fe741
imv: add fontconfig dependency 2016-08-27 21:53:27 +00:00
Tuomas Tynkkynen
1409bc003b make-bootstrap-tools-cross.nix: Fix gcc build-time options for armv5tel
I broke this in the cleanups I did in 171c7f0, the gcc inside the bootstrap
tarball is not getting built with the correct --with-fpu, --with-float
etc. options.
2016-08-28 00:30:48 +03:00