Commit Graph

30641 Commits

Author SHA1 Message Date
Frederik Rietdijk
def310df45 pythonPackages.setuptools: fix for use in buildEnv
pythonPath needs to be set for it to be included in buildEnv.
This will also fix tox.
2016-07-02 23:44:10 +02:00
Peter Simons
cbcb23dcf6 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:

  - Hackage: 8b1e5923b5
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: 39da79aced
2016-07-02 20:59:02 +02:00
Joachim Fasting
af9b7ba1e3 Merge pull request #16552 from Mayeu/elixir-1.3
elixir: 1.2.6 -> 1.3.0
2016-07-02 14:37:25 +02:00
Joachim Fasting
fa3a410027 Merge pull request #16647 from holidaycheck/fix-galen-on-nixos
galen: fix on nixos
2016-07-02 14:03:52 +02:00
Rickard Nilsson
5356154366 libvirt and pythonPackages.libvirt: 1.3.5 -> 2.0.0 2016-07-02 00:24:36 +02:00
Benno Fünfstück
b01886d654 fix 32bit android emulator 2016-07-01 21:41:32 +02:00
Rickard Nilsson
8404d626ad libvirt: Fix libsystemd dependency 2016-07-01 20:12:33 +02:00
Tobias Pflug
6ed9cd9b00 galen: fix on nixos
overwritten phases omitted patchShebangs from being called so
the galen wrapper still contained `#!/usr/bin/bash`.
2016-07-01 16:43:26 +02:00
Frederik Rietdijk
880475bbd5 python: fix modules in buildEnv, closes #16646
Python 2.7 on Nix is stripped of some modules, which can be added when
needed. This was broken with python.buildEnv.
2016-07-01 16:16:55 +02:00
Peter Simons
14a42dba66 haskell-semigroups: add missing overrides for old version of the package 2016-07-01 12:01:04 +02:00
Peter Simons
ec2e568b35 configuration-hackage2nix.yaml: disable failing builds 2016-07-01 12:01:04 +02:00
Peter Simons
a7e33a1a1e cabal2nix: update to version 20160613-10-g57dddc7 2016-07-01 12:01:03 +02:00
Peter Simons
77f6750ef0 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-12-g1145e86 using the following inputs:

  - Hackage: 53b696d106
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: affdd756e9
2016-07-01 12:00:58 +02:00
Vladimír Čunát
a441a7c257 Merge branch 'staging' 2016-07-01 12:42:05 +02:00
zimbatm
08939189e1 Merge pull request #16621 from solson/drumstick
drumstick: init at 1.0.2
2016-07-01 09:30:23 +01:00
Tim Steinbach
e00c572698 gradle: 2.13 -> 2.14 2016-07-01 02:23:28 +00:00
Michele Guerini Rocco
d75c7d0dcd btfs: 2.9 -> 2.10 (#16603) 2016-06-30 23:39:15 +02:00
Scott Olson
73ee19f0e1 drumstick: init at 1.0.2 2016-06-30 14:39:03 -06:00
Vincent Laporte
cb3d2d0526 fstar: fix build on Darwin 2016-06-30 16:57:32 +01:00
Tobias Geerinckx-Rice
dccac25d5f
libpsl: list 2016-06-10 -> 2016-06-30 2016-06-30 17:17:55 +02:00
Vladimír Čunát
dcb950718a Merge #16617: gtk3: re-enable wayland support on Linux 2016-06-30 11:13:53 +02:00
Vladimír Čunát
547092d827 Merge branch 'master' into staging 2016-06-30 11:12:46 +02:00
Vladimír Čunát
17faf910b7 gnutls: fixup various problems
- disable a test that started failing due to date expiration, see #16610
- bash doesn't need adding
- defining patchPhase was overriding passed postPatch and patches
2016-06-30 11:06:34 +02:00
Théophane Hufschmitt
d756aee6f6 Gtk : Enable wayland support on Linux 2016-06-30 10:06:20 +02:00
Christoph Hrdinka
0630771674 libcommuni: 2016-01-02 -> 2016-03-23 2016-06-30 09:58:01 +02:00
Meyer S. Jacobs
42f52792bc libcommuni: enabled doCheck
Closes #16612.
2016-06-30 09:56:26 +02:00
Meyer S. Jacobs
bc0a7e7d44 Fixed libcommuni build. 2016-06-30 09:56:09 +02:00
Kranium Gikos Mendoza
86e2b0e52b gtk3: 3.20.5 -> 3.20.6 2016-06-30 09:10:44 +02:00
Peter Simons
e2c1926758 hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20160613-11-g57dddc7 using the following inputs:

  - Hackage: 6d525b6502
  - LTS Haskell: 1c63caa7b8
  - Stackage Nightly: b1d16f45de
2016-06-29 11:54:27 +02:00
Vladimír Čunát
3afa246038 Merge branch 'staging'
This includes a security update of expat.
2016-06-29 07:47:04 +02:00
Rok Garbas
d9036a02b5 pypi2nix: 1.0.0 -> 1.1.0 2016-06-29 01:48:38 +02:00
Joachim Fasting
b38ba1c935 Merge pull request #16554 from matthewbauer/json-glib-darwin-fix
json-glib: add libintl for darwin
2016-06-28 19:22:46 +02:00
Joachim Fasting
96a3bbd86f
Revert "Merge pull request #16507 from vrthra/unifdef"
This reverts commit cab28503ad, reversing
changes made to 5313f1096a (but retaining
the meta updates).

The update to 2.11 breaks the darwin toolchain, see discussion at
https://github.com/NixOS/nixpkgs/pull/16507

Once the issues with 2.11 are worked out, this revert can be reverted.
2016-06-28 18:53:39 +02:00
Edward Tjörnhammar
4eb08c560d Merge pull request #16553 from cko/typesafe_activator
activator: 1.3.5 -> 1.3.10
2016-06-28 10:10:14 +02:00
Austin Seipp
de6977ffe3 unifdef: set platforms to unix, not linux
Apparently, Darwin evaluation is somehow busted without this, although
I can't verify it. Reported by @matthewbauer on IRC. I'll take the
blame if this somehow makes life worse.

/cc @vrthra as maintainer

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2016-06-28 04:39:54 +00:00
Matthew Bauer
994c845405 json-glib: add libintl for darwin 2016-06-27 17:22:09 +00:00
Christine Koppelt
5e226cd66e activator: 1.3.5 -> 1.3.10 2016-06-27 19:13:22 +02:00
Cast
f055b46a4f elixir: 1.2.6 -> 1.3.0 2016-06-27 18:09:32 +02:00
Vladimír Čunát
19e80fa19d pypy: fix pyexpat tests with expat-2.2.0
/cc #16477. /cc @domenKozar (don't know who better),
as I still experience test failures of different kind:
=================================== FAILURES ===================================
_______________________________________  _______________________________________
Traceback (most recent call last):
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/pypy/tool/pytest/run-script/regrverbose.py", line 14, in <module>
    indirect_test()
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/test/test_ctypes.py", line 10, in test_main
    skipped, testcases = ctypes.test.get_tests(ctypes.test, "test_*.py", verbosity=0)
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/ctypes/test/__init__.py", line 72, in get_tests
    mod = __import__(modname, globals(), locals(), ['*'])
  File "/tmp/nix-build-pypy-5.1.1.drv-0/pypy-pypy-b0a649e90b66/lib-python/2.7/ctypes/test/test_python_api.py", line 9, in <module>
    from _ctypes import PyObj_FromPtr
ImportError: cannot import name 'PyObj_FromPtr'

=========================== short test summary info ============================
FAIL lib-python/2.7/test/test_ctypes.py::unmodified
 9 tests deselected by '-knot ( test_ssl or test_urllib2net or test_urllibnet or test_urllib2_localnet or test_socket or test_shutil or test_zipfile64 or test_epoll )'
======= 1 failed, 341 passed, 51 skipped, 9 deselected in 550.97 seconds =======
2016-06-27 17:06:08 +02:00
Arseniy Seroka
a5b3517fd8 Merge pull request #16536 from vrthra/cgdb
cgdb: 0.6.7 -> 0.6.8
2016-06-27 16:44:59 +03:00
Rahul Gopinath
021dd6a5f6 waf: 1.8.19 -> 1.9.0 2016-06-26 21:59:23 -07:00
Rahul Gopinath
cae58e3d26 objconv: 1.0 -> 2.16 (#16538) 2016-06-27 03:57:45 +02:00
Rahul Gopinath
e45ed9e780 toluapp: 1.0.92 -> 1.0.93 (#16539) 2016-06-27 03:57:10 +02:00
Rahul Gopinath
601d4f5523 cflow: 1.4 -> 1.5 (#16535) 2016-06-27 01:24:49 +02:00
Rahul Gopinath
c3d10d6d0d cgdb: 0.6.7 -> 0.6.8 2016-06-26 16:21:06 -07:00
Franz Pletz
5c59a30191 php: fix hashes for 5.5 and 5.6 2016-06-27 00:47:39 +02:00
Thomas Tuegel
c78f9ad2f9 Merge pull request #16530 from vandenoever/qt56
add qtwebchannel and qtwebengine
2016-06-26 17:34:42 -05:00
Franz Pletz
8ace098f43 libressl_2_4: init at 2.4.1 2016-06-27 00:30:24 +02:00
Franz Pletz
4157f53bf1 libressl: 2.2.7 -> 2.2.9, 2.3.5 -> 2.3.6 2016-06-27 00:29:43 +02:00
Franz Pletz
56bbc4cc61 php56: 5.6.22 -> 5.6.23 (security)
See https://secure.php.net/ChangeLog-5.php#5.6.23.
2016-06-27 00:14:00 +02:00