Commit graph

25338 commits

Author SHA1 Message Date
Nikolay Amiantov
4748709926 Merge commit 'refs/pull/18498/head' of git://github.com/NixOS/nixpkgs 2016-09-13 12:51:34 +03:00
Domen Kožar
e53b3ea859 pypeg2: disable tests on py3k
(cherry picked from commit 2adbd13f9561edf7771fc8687b9299a817ee71b6)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-13 09:44:59 +02:00
Jascha Geerds
a514bf604c
pytest-rerunfailures: init at 2.0.1
(cherry picked from commit 6ddf8f31d3998e464c10fdb59385bf79cf08ef09)
(cherry picked from commit 074013bca596571a33852f18ff0f29c4578c347c)
2016-09-13 09:23:24 +02:00
Franz Pletz
d320fbbd05 Merge pull request #18467 from lsix/update_pyyaml
Update libyaml and pyyaml
2016-09-13 07:35:46 +02:00
Lancelot SIX
b76badd21b pythonPackages.Mako: 1.0.2 -> 1.0.4 (#18494) 2016-09-13 07:10:04 +02:00
James Wood
87ee2736ce asunder: init at 2.8 (#18510) 2016-09-13 07:06:23 +02:00
Michal Rus
6846b22bb4 squishyball: init at 19580 (#18354) 2016-09-13 07:00:39 +02:00
Nikolay Amiantov
9b26cb92e3 Merge branch 'displaylink'
Close #18041
2016-09-13 01:59:47 +03:00
Nikolay Amiantov
fbf6a97b04 linuxPackages.displaylink: init at 1.1.62 2016-09-13 00:30:35 +03:00
Vladimír Čunát
66eb909fbf Merge #17861: root: add support for x86_64-darwin 2016-09-12 21:39:07 +02:00
Markus Hauck
d37c84106a ntl: init at 9.11.0 (#18507) 2016-09-12 19:26:30 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Vincent Laporte
b8ed622bbb lua-sockets: fix on darwin 2016-09-12 14:42:37 +02:00
Domen Kožar
5ecb8b0c51 Merge pull request #18483 from nbp/revert-14398
Using self prevent aliasing overriden packages
2016-09-12 14:02:13 +02:00
cmfwyp
4659e2d54b
libre-franklin: init at 1.014 2016-09-12 11:13:33 +02:00
cmfwyp
323e74f457
libre-caslon: init at 1.002 2016-09-12 11:13:33 +02:00
cmfwyp
db73ecc0f7
libre-bodoni: init at 2.000 2016-09-12 11:13:33 +02:00
cmfwyp
74de2c6b03
libre-baskerville: init at 1.000 2016-09-12 11:13:33 +02:00
cmfwyp
470855ed82
encode-sans: init at 1.002 2016-09-12 11:13:32 +02:00
cmfwyp
49e5e972b9
dosis: init at 1.007 2016-09-12 11:13:32 +02:00
cmfwyp
d6404ad48e
cabin: init at 1.005 2016-09-12 11:13:26 +02:00
Frederik Rietdijk
29f00f954b Merge pull request #18396 from rycee/fix/udiskie
udiskie: 1.4.8 -> 1.5.1
2016-09-12 11:05:38 +02:00
Jesse Haber-Kucharsky
99e06fe771 opam, aspcud: init packages for external solver (#16938)
The opam package manager relies on external solvers to determine package
management decisions it makes related to upgrades, new installations,
etc.

While, strictly speaking, an external solver is optional, aspcud is
highly recommended in documentation. Furthermore, even having a
relatively small number of packages installed quickly causes the limits
of the interal solver to be reached (before it times out).

Aspcud itself depends on two programs from the same suite: gringo, and
clasp.

On Darwin, Boost 1.55 (and thus Gringo) do not build, so we only support
Aspcud on non-Darwin platforms.
2016-09-12 10:44:50 +02:00
Dmitry Kalinkin
5646c2aba6 root: add support for x86_64-darwin
1) add pcre dependency (for some reason builtin_pcre doesn't work)
2) Disable dependencies that are currently not supported by the
expression.  Most users should not need those. These are disabled to
prevent cmake from picking them up from system and causing impurities.
Once there is a user who needs these they will have to update the
expression.
3) disable some OSX detection code that relies on /usr/bin/sw_vers
that chooses c++ library, silences warnings and sets macosx-version-min.
macosx-version-min is already set by nix using MACOSX_DEPLOYMENT_TARGET
environment variable.
2016-09-11 17:29:13 -04:00
Peter Simons
3d479813f5 Merge pull request #18497 from aneeshusa/add-z3-dependency-for-cryptol
cryptol: Make Z3 available for REPL users
2016-09-11 01:15:58 +02:00
Tuomas Tynkkynen
628c86c51a release-lib: Remove unused allowTexliveBuilds option
This is dead code since the old monolithic TeXLive was dropped in
da421bc75f.
2016-09-11 01:13:49 +03:00
Aneesh Agrawal
54ff118477 cryptol: Make Z3 available for REPL users
The Cryptol REPL has a hard dependency on Z3, but the rest of the
library uses SBV to support multiple solvers. Ensure that Z3 is
available for `pkgs.cryptol`, which is likely to be installed via
nix-env for REPL usage, but do not change pkgs.haskellPackages.cryptol,
which is likely to be used as a dependency (in Nix expressions).
2016-09-10 17:15:51 -04:00
Tuomas Tynkkynen
0dbfb0fc48 Merge commit 'bd6e40c' from staging into master
Major changes being pulled in:

- mesa: maintenance 12.0.1 -> 12.0.2
- texlive: 2015 -> 2016
2016-09-10 23:23:44 +03:00
Shea Levy
c6460fb0cb melpa: Add inherit-local, bump f.el 2016-09-10 11:25:21 -04:00
Joachim F
67061dd466 Merge pull request #18453 from chris-martin/atermjava
atermjava: remove
2016-09-10 16:16:19 +02:00
Nicolas B. Pierron
5c6bcee944 Fix #18316 - Revert #14398, Using self prevent aliasing overriden packages. 2016-09-10 14:05:02 +00:00
Lancelot SIX
2efaf6ff1f pythonPackages.pyyaml: 3.11 -> 3.12 2016-09-10 14:44:17 +02:00
Robert Helgesson
2fa41249ce
udiskie: move to all-packages
This is an application, not a python library and should therefore be in
its own package.
2016-09-10 12:25:50 +02:00
Vladimír Čunát
bd6e40c27d Merge #16391: texlive: 2015 -> 2016
Mirroring isn't finalized, but we'll have to fix that on the go.
2016-09-10 12:04:25 +02:00
Frederik Rietdijk
594cf66c5c Merge pull request #18332 from offlinehacker/pkgs/pythonPackages/docker_compose/update/1.8.0
pythonPackages.docker_compose: 1.6.2 -> 1.8.0
2016-09-10 11:13:56 +02:00
Vladimír Čunát
31c719cf8e pythonPackages.qscintilla: fixup build
It's the same as fcc76325ef.
2016-09-10 01:09:14 +02:00
Vladimír Čunát
f348e6ff5a gccgo-4.8: remove
I see no use to keep it. I doesn't build since April,
and noone has bothered to fixup the multiple-output problem.
2016-09-10 00:52:22 +02:00
danbst
8511ddc89a tomcat: 7.0.68 -> 7.0.70, 8.0.32 -> 8.0.37, init 8.5.5, init 9.0.0.M10 2016-09-09 18:29:12 +02:00
danbst
39ad7a9e60 tomcat: cleanup package with callPackages 2016-09-09 18:29:12 +02:00
Joachim F
81b643edbe Merge pull request #18317 from Profpatsch/mustache-docs
mustache: init mustache at 1.0.2
2016-09-09 17:16:58 +02:00
Kamil Chmielewski
e4d62926d6 python27Packages.cairocffi: FIX test_scaled_font
workaround for https://github.com/Kozea/cairocffi/issues/88

(cherry picked from commit 9e18b81dedec6d06f5bdfc80c26f281f1b07a2d1)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:16:53 +02:00
Domen Kožar
1d371218cf pythonPackages.libtmux: fix build
(cherry picked from commit ac46759f7a0d6ce49a34984df5fa1fd8c6dc6c91)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:05:29 +02:00
Domen Kožar
e0b29b4541 pypeg2: 2.15.1 -> 2.15.2 (fix build)
(cherry picked from commit ace7bbb06c966f1c4c4dfa96ebfc0eeffee4874d)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-09 16:05:27 +02:00
Peter Simons
3594e34979 darcs: switch default build to GHC 8.x 2016-09-09 13:55:39 +02:00
Peter Simons
4a1ab71f4b cryptol: switch default build to GHC 8.x 2016-09-09 13:55:39 +02:00
Tuomas Tynkkynen
65146185d4 python-systemd: Fix build 2016-09-09 06:19:37 +03:00
Tuomas Tynkkynen
06b2ff50b9 udev: Remove hacky alias
It's not clear to me what this is achieving, plus for some reason this
is causing an evaluation error in hyperterm. So let's hope it's not
really needed...
2016-09-09 06:13:14 +03:00
Chris Martin
d9599e22a2 atermjava: remove 2016-09-08 21:51:10 -04:00
Tuomas Tynkkynen
290db94f04 Merge remote-tracking branch 'upstream/master' into staging 2016-09-09 02:40:47 +03:00
Eelco Dolstra
5d670ed65c gdrivefs: 0.14.3 -> 0.14.8 2016-09-08 21:16:58 +02:00