Commit graph

22555 commits

Author SHA1 Message Date
Vladimír Čunát d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Michael Raskin cdb2bc77c4 davfs2: 1.4.7 -> 1.5.2; fixes the build 2016-03-31 14:14:40 +02:00
Nikolay Amiantov 594cd3bf5e Merge pull request #14337 from dguibert/fix/skype
skype: build qt4 with the 32bits clangStdenv
2016-03-31 13:49:58 +04:00
Frederik Rietdijk 97a29ff817 Merge pull request #14110 from lancelotsix/clean_sqlalchemy_legacy
Clean sqlalchemy legacy
2016-03-31 10:52:53 +02:00
David Guibert 7f69d5ed8c skype: build qt4 with the 32bits clangStdenv
This allows to build skype without errors like this:
clang++ -Wl,-O1 -o libmng libmng.o     -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/72nklasrjg774iwxxnpyxwkzxz2j37v5-libmng-2.0.2/lib/libmng.so when searching for -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: cannot find -lmng
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.so when searching for -lm
/nix/store/1d2abmmqvindckyq51nq9kd1yisiv54j-binutils-2.26/bin/ld: skipping incompatible /nix/store/n0y8pv4kaff7vnq7rmzwrd654gqaj0ki-glibc-2.23/lib/libm.a when searching for -lm
clang-3.7: error: linker command failed with exit code 1 (use -v to see invocation)
2016-03-31 10:37:02 +02:00
Franz Pletz e5334ceca2 Merge pull request #14305 from benwbooth/xe-guest-utilities-6.2.0
xe-guest-utilities: init at 6.2.0
2016-03-31 10:12:42 +02:00
Ben Darwin 8347f94216 fix nesting error resulting in topydo metadata being attached to the enclosing set 2016-03-30 19:56:01 -04:00
Domen Kožar 1845159705 perlPackages.UnicodeString: fix build (also imapsync) 2016-03-30 21:06:40 +01:00
Nikolay Amiantov 1d24a7b6f8 tdesktop: init at 0.9.33 2016-03-30 22:22:51 +03:00
Nikolay Amiantov a8f5991db7 libunity: init at 6.12.0 2016-03-30 22:22:51 +03:00
Nikolay Amiantov e0ee6dc8fc breakpad: init at 2016-03-28 2016-03-30 22:22:51 +03:00
Nikolay Amiantov 01e2511668 dee: init at 1.2.7 2016-03-30 22:22:51 +03:00
Nikolay Amiantov c419e3c6d6 libgee_0_6: init at 0.6.8 2016-03-30 22:22:51 +03:00
Nikolay Amiantov c091e61a09 pcre: add 16- and 32-bit character size versions 2016-03-30 22:22:51 +03:00
Domen Kožar a1cfdb9c88 remove erlangR14: outdated and doesn't build 2016-03-30 18:54:58 +01:00
Ben Booth 449d908b88 xe-guest-utilities: init at 6.2.0
use mkEnableOption

use sha256

add xe-guest-utilities to module-list.nix
2016-03-30 09:27:40 -07:00
Luca Bruno 088231fe9f libiberty: add static variant 2016-03-30 17:51:19 +02:00
joachifm 532beaa2a3 Merge pull request #13913 from grwlf/torch
torch: add expression for Torch7 the machine-learning framework
2016-03-30 14:29:32 +00:00
Domen Kožar 96be420e44 move growpart out of nixos into cloud-init package 2016-03-30 14:40:24 +01:00
Aristid Breitkreuz 63032dae9d Finance::Quote: 1.37 -> 1.38 & add missing dependency on CGI 2016-03-30 15:01:28 +02:00
Franz Pletz ef31c0ecd2 Merge pull request #14308 from juliendehos/fswebcam
fswebcam: init 20140113
2016-03-30 11:15:39 +02:00
Julien Dehos 70af93f0ca fswebcam: init 20140113 2016-03-30 09:48:11 +02:00
Franz Pletz e498a645c1 ncat: Remove old package, available in nmap 2016-03-30 08:53:22 +02:00
Nikolay Amiantov 8862c5db0c pythonPackages.nototools: 2015-09-16 -> 2016-03-25 2016-03-29 21:02:16 +03:00
Lluís Batlle i Rossell f6a44bea9e Updating wings and dependencies to match erlang
I updated the erlang esdl lib, added the erlang cl lib,
added opencl-headers and ocl-icd to make wings build and run.

I have not tested its opencl part; I only added dependencies so
it builds.
2016-03-29 12:24:42 +02:00
Frederik Rietdijk 572a723ee5 Merge pull request #14270 from Beauhurst/kombu_3_0_35
Python kombu, billiard & celery updates
2016-03-29 12:09:10 +02:00
Vladimír Čunát 5147b9d30a pythonPackages.poppler-qt4: fix build by a hack
/cc maintainer @sepi.
2016-03-29 11:56:52 +02:00
Arseniy Seroka 63c78c34ab Merge pull request #14288 from kragniz/opencpn
opencpn: init at 4.2.0
2016-03-29 10:15:48 +03:00
Louis Taylor b40f0ac3c7 opencpn: init at 4.2.0 2016-03-29 07:31:56 +01:00
Nikolay Amiantov a6e0046b75 Merge pull request #14218 from abbradar/avidemux
avidemux: 2.5.6 -> 2.6.12
2016-03-29 04:48:51 +04:00
Patrick Callahan 66b5055b95 gazebo: init at 6.5.1 and 7.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan 565b7b34ed ignition.transport: init at 0.9.0 and 1.0.1 2016-03-28 11:44:37 -07:00
Patrick Callahan 3c95d6d1ea sdformat: init at 3.7.0 and 4.0.0 2016-03-28 11:44:37 -07:00
Patrick Callahan b682906b6a ignition robotics libs: init; .math: init at 2.3.0 2016-03-28 11:44:37 -07:00
Patrick Callahan 008bcf51a4 tinyxml-2: init at 3.0.0 2016-03-28 11:44:36 -07:00
Frederik Rietdijk 9825a81cfc pythonPackages.numpy: 1.11 -> 1.10
Reverting default numpy to 1.11, since 1.10 breaks pandas and required
patches couldn't be cherry-picked.

1.11 is still available as `pythonPackages.numpy_1_11`.
2016-03-28 19:06:48 +02:00
Shea Levy 57d5860bd5 Merge branch 'bower2nix' 2016-03-28 12:59:49 -04:00
joachifm 58ef31f18a Merge pull request #14263 from risicle/osrm_remove_luajit
osrm-backend: remove osrm-backend_luajit variant - it has been broken for a while
2016-03-28 15:59:01 +00:00
joachifm 02108fe91c Merge pull request #14271 from Beauhurst/django_reversion_1_10_1
django_reversion: 1.8.5 -> 1.10.1
2016-03-28 15:57:33 +00:00
joachifm aa2ebd4b11 Merge pull request #14215 from Beauhurst/django_remove_mo
django packaging: remove remaining uses of makeOverridable for django-depending packages
2016-03-28 15:56:55 +00:00
Robert Scott 46d26e82f4 django_reversion: 1.8.5 -> 1.10.1 2016-03-28 14:55:22 +00:00
Robert Scott a01b9f7c74 celery: 3.1.19 -> 3.1.23 2016-03-28 14:29:16 +00:00
Robert Scott e6026003df billiard: 3.3.0.21 -> 3.3.0.23 2016-03-28 14:29:16 +00:00
Robert Scott 364b3d2453 kombu: tidy up, removing py3k fussiness which is handled by the deps and adding to buildInputs to allow more of the test suite to run 2016-03-28 14:28:50 +00:00
Frederik Rietdijk 654d2e672d pythonPackages.numpy: 1.10 -> 1.11 2016-03-28 16:11:30 +02:00
Frederik Rietdijk 9ee7b3f628 pythonPackages.scipy: use latest numpy version 2016-03-28 16:04:51 +02:00
Robert Scott 86435a1b41 kombu: 3.0.33 -> 3.0.35, add redis to buildInputs to allow tests to pass 2016-03-28 13:39:38 +00:00
Frederik Rietdijk 7ab852d7b8 Merge pull request #12538 from FRidh/yakuake
kde5.yakuake: init at 3.0.2
2016-03-28 14:55:41 +02:00
Frederik Rietdijk c39fe33998 kde5.yakuake: init at 3.0.2 2016-03-28 14:52:20 +02:00