Commit graph

80352 commits

Author SHA1 Message Date
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
Vladimír Čunát a26357eefe Merge recent staging (with binaries on Hydra) 2016-03-30 10:41:02 +02:00
Ryan Trinkle 8605dab964 webkitgtk: add darwin support 2016-03-30 09:40:36 +02:00
Franz Pletz e498a645c1 ncat: Remove old package, available in nmap 2016-03-30 08:53:22 +02:00
Frederik Rietdijk df79303703 Merge pull request #13700 from FRidh/python-docs
Documentation: rewrite Python
2016-03-30 08:35:23 +02:00
Franz Pletz e7ca626031 Merge pull request #14295 from NeQuissimus/kotlin101_2
kotlin: 1.0.1 -> 1.0.1-2
2016-03-30 07:33:59 +02:00
Franz Pletz 315982049f Merge pull request #14292 from romildo/fix.weather
weather: fix file locations, add python dependency
2016-03-30 07:30:54 +02:00
Thomas Tuegel 13e83a493e kde5.applications: 15.12.1 -> 15.12.3 2016-03-29 21:21:44 -05:00
joachifm bff64a3c10 Merge pull request #14307 from acowley/assimp
assimp: add missing zlib dependency
2016-03-29 20:33:25 +00:00
joachifm f807cce1eb Merge pull request #14175 from peterhoeg/tmux
tmux nixos module: add nixos program module for tmux
2016-03-29 20:26:42 +00:00
Anthony Cowley d52efcc9d3 assimp: add missing zlib dependency
cmake searches for this package during the build phase.
2016-03-29 15:38:48 -04:00
Pascal Wittmann 0ca288abc8 global: 6.5.3 -> 6.5.4 2016-03-29 21:29:26 +02:00
Pascal Wittmann 51135d803a bitlbee: 3.4.1 -> 3.4.2 2016-03-29 21:17:30 +02:00
Nikolay Amiantov e65b0b851b noto-fonts-emoji: add uncommited fix 2016-03-29 21:05:32 +03:00
Nikolay Amiantov 8862c5db0c pythonPackages.nototools: 2015-09-16 -> 2016-03-25 2016-03-29 21:02:16 +03:00
Nikolay Amiantov f4fa3565b8 noto-fonts-emoji: 2015-08-17 -> 2016-03-17 2016-03-29 21:02:16 +03:00
Nikolay Amiantov 08db1b19a2 noto-fonts-cjk: cleanup 2016-03-29 21:02:16 +03:00
Nikolay Amiantov 9c8f810f83 noto-fonts: 2015-09-08 -> 2016-03-29 2016-03-29 21:02:15 +03:00
Nikolay Amiantov 63f1eb6b00 xserver service: add glamoregl for intel drivers
Closes #14286

Credits to vcunat for the initial patch.
2016-03-29 18:52:04 +03:00
Lluís Batlle i Rossell 0c98b52816 Fix evaluation. (licenses, not licences)
Thanks Domen.
2016-03-29 17:47:07 +02:00
Lluís Batlle i Rossell f38d620d59 Updating giv to latest from git (>0.9.25).
We were using a version years old.

I picked the git version instead of the last release because the git version
has fixes not released for almost one year.
2016-03-29 17:40:49 +02:00
Nikolay Amiantov a5322efd95 Revert "Remove PATH assumption from fhs-userenv."
This reverts commit 2f26b82411.

This breaks terminfo in Bash for some reason (i.e. TAB and other
special keys).
2016-03-29 17:58:07 +03:00
Vladimír Čunát d9b98b6b50 manual rl-16.03: document broadcom issue #12595 2016-03-29 16:32:50 +02:00
Arseniy Seroka d4c4a81022 Merge pull request #14298 from obadz/minor-upgrades
Minor upgrades
2016-03-29 16:30:35 +03:00
Domen Kožar c56c3b6596 nixos/lib/testing.nix: make 'config' a free variable
cc @edolstra
2016-03-29 14:16:54 +01:00
Nikolay Amiantov 54eb061a12 avidemux: don't depend on unfree FAAC by default 2016-03-29 16:16:36 +03:00
obadz fc33e877c1 spacefm: 1.0.4 -> 1.0.5 2016-03-29 14:15:21 +01:00
obadz b48a6fea80 google-drive-ocamlfuse: 0.5.18 -> 0.5.22 2016-03-29 14:10:00 +01:00
obadz 14fd473894 gapi-ocaml: 0.2.6 -> 0.2.10 2016-03-29 14:09:34 +01:00
Tim Steinbach 5ad9ed9291 kotlin: 1.0.1 -> 1.0.1-2 2016-03-29 08:23:27 -04:00
José Romildo Malaquias 27eaa37757 weather: fix file locations, add python dependency 2016-03-29 08:18:46 -03:00
Vladimír Čunát d7e87db0c7 rustc: disable parallel building
http://hydra.nixos.org/build/33119905/nixlog/1/raw
2016-03-29 13:01:27 +02: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
Vladimír Čunát e69306c463 xmlsec: fix linkage, probably after #909
This fixes builds of (some) reverse dependencies, e.g. aqbanking.
2016-03-29 12:22:54 +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
Peter Simons a1f7b231c4 Merge pull request #14279 from acowley/doxygen
doxygen: fix on darwin
2016-03-29 11:24:10 +02:00
Peter Simons 7237161bb0 Merge pull request #14287 from kragniz/git-2.8.0
git: 2.7.4 -> 2.8.0
2016-03-29 11:23:12 +02:00
Vladimír Čunát 117183e27e intltool: fix problems with perl-5.22
http://hydra.nixos.org/build/33608086/nixlog/1/raw
2016-03-29 11:12:42 +02:00
Vladimír Čunát 62c29908da dvdisaster: disable parallel building
http://hydra.nixos.org/build/33609373/nixlog/1/raw
/cc @nkcx. I notified upstream.
2016-03-29 10:53:36 +02:00
Vladimír Čunát b44b0ab27c nixpkgs manual: remove cruft from a merge conflict
It was clearly added unintentionally during #14243 merge.
2016-03-29 10:02:57 +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
Louis Taylor 69c6f7e20a git: 2.7.4 -> 2.8.0 2016-03-29 07:21:41 +01:00
Franz Pletz ebf21fd29e libressl_2_3: 2.3.2 -> 2.3.3 2016-03-29 04:55:14 +02: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
joachifm 0270ce193e Merge pull request #14281 from taku0/thunderbird-bin-38.7.1
thunderbird-bin: 38.6.0 -> 38.7.1
2016-03-29 00:33:35 +00:00
taku0 dc73280d19 thunderbird-bin: 38.6.0 -> 38.7.1 2016-03-29 09:19:34 +09:00
Nikolay Amiantov cef2db7e76 haskellPackages.mueval: fix build 2016-03-29 02:23:06 +03:00
Nikolay Amiantov 986a42c461 Merge pull request #14278 from puffnfresh/bug/steam-hardware-decoding
steam: enable hardware decoding (for In-Home Streaming)
2016-03-29 02:19:57 +04:00