Commit graph

27065 commits

Author SHA1 Message Date
Domen Kožar
0b4776b6b7 Merge pull request #9182 from greedy/erlang-setup-hook
erlang: add setupHook to set ERL_LIBS
2015-11-16 13:09:26 +01:00
Domen Kožar
5ca01c71d1 Merge pull request #10814 from NarrativeScience/no_large_file_test
numpy: patch to remove large file test
2015-11-16 12:55:13 +01:00
Domen Kožar
4755afc385 Merge commit 'b666ac3e9ff3f08b120d068770768be580e67f76' (staging)
Merge rest of the fixes from staging
2015-11-16 11:23:06 +01:00
Peter Simons
731965eb24 Merge pull request #10967 from sjourdois/cracklib
cracklib: 2.9.4 -> 2.9.6
2015-11-16 11:09:04 +01:00
Peter Simons
2025ed52a0 Merge pull request #10987 from mcmtroffaes/feature/libssh2-mingw
libssh2: fix shared library build under mingw
2015-11-16 11:05:45 +01:00
Florent Becker
7ff5826e08 kcov : init at 29 2015-11-15 18:07:48 +01:00
Domen Kožar
b666ac3e9f Revert "python: skip build at install phase"
This reverts commit d34f5b6570.

PIL and NumPy don't like this change and I'd rather spend time on
bringing wheels to Nix than fixing old infrastructure.
2015-11-15 13:50:04 +01:00
Domen Kožar
5a16c0e6e4 buildPythonPackage: clean up shellHook 2015-11-15 13:50:04 +01:00
Tobias Geerinckx-Rice
b0e253a05c libpsl: list 2015-11-12 -> 2015-11-13 2015-11-15 03:56:59 +01:00
Arseniy Seroka
20024205d3 Merge pull request #11014 from Havvy/node10
nodejs: 0.10.38 -> 0.10.40
2015-11-15 01:23:20 +03:00
William A. Kennington III
b762a2035c taglib: 1.9.1 -> 1.10 2015-11-14 13:28:48 -08:00
William A. Kennington III
453f7c7218 Merge branch 'master.upstream' into staging.upstream 2015-11-14 12:39:32 -08:00
William A. Kennington III
6602f49495 Revert "Revert "Merge pull request #9543 from NixOS/staging.post-15.06""
This reverts commit 741bf840da.

This reverts the fallout from reverting the major changes.
2015-11-14 12:32:51 -08:00
William A. Kennington III
050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
William A. Kennington III
cdf65ba19e gtk3: 3.18.3 -> 3.18.4 2015-11-13 15:55:33 -08:00
William A. Kennington III
8f45d18a71 Merge branch 'master.upstream' into staging.upstream 2015-11-13 15:54:10 -08:00
William A. Kennington III
9579c9ec7f Merge commit 'cb21b77' into master.upstream
This is a partial merge of staging for builds which are working
2015-11-13 15:53:10 -08:00
Ryan Scheel (Havvy)
087202abf9 nodejs: 0.10.38 -> 0.10.40 2015-11-13 23:06:03 +00:00
Arseniy Seroka
f7bd63dc77 Merge pull request #10977 from sjourdois/ffmpeg
darwin: ffmpeg-full and deps: darwin fixes
2015-11-13 17:43:54 +03:00
Tobias Geerinckx-Rice
519d18b063 libpsl: list 2015-10-11 -> 2015-11-12 2015-11-13 15:07:34 +01:00
John Ericson
53e43204f9 ghcjs: update comment on generating built-in pkg list
Should we do `import (runCommand ...)` to automate this?
2015-11-12 16:47:41 -08:00
vbgl
c14eca68a4 Merge pull request #10965 from sjourdois/cgal
cgal: 4.6.1 -> 4.7
2015-11-13 00:07:04 +01:00
Peter Simons
aee2e72122 Haskell math-functions is broken on Hydra again. :-( 2015-11-12 22:31:03 +01:00
Peter Simons
4856880cab hackage-packages.nix: update Haskell package set
This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:

  - Nixpkgs: 7c001f31b0
  - Hackage: 46f2de463b
  - LTS Haskell: 1ae555e197
  - Stackage Nightly: 4113b2e369
2015-11-12 22:30:54 +01:00
Matthias C. M. Troffaes
d583c16568 libssh2: fix shared library build under mingw 2015-11-12 15:12:09 +00:00
Bjørn Forsman
30313d5c6e jenkins: 1.637 -> 1.638 (important security fixes)
I fat fingered the previous update, *this* is the real important
security updates:

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:40:09 +01:00
Bjørn Forsman
7a1c4ab324 jenkins: 1.636 -> 1.637 (security fixes)
https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:34:44 +01:00
vbgl
b3d2a2874a Merge pull request #10964 from vbgl/master
menhir: refactor to generic; init at 20151110 for OCaml >= 4.02
2015-11-12 01:15:26 +01:00
William A. Kennington III
6de80cb21b libevdev: 1.4.4 -> 1.4.5 2015-11-11 15:47:22 -08:00
William A. Kennington III
0ba740d26b mesa: 11.0.4 -> 11.0.5 2015-11-11 15:45:15 -08:00
Stéphane Jourdois
a2bf64a381 darwin: ffmpeg-full: add some missing darwin deps 2015-11-11 23:00:11 +01:00
Stéphane Jourdois
b096a863a9 darwin: wavpack: add missing darwin deps 2015-11-11 23:00:10 +01:00
Stéphane Jourdois
eed349522f darwin: libsndfile: add missing darwin deps 2015-11-11 23:00:10 +01:00
Stéphane Jourdois
00da78070e darwin: libdc1394: add missing darwin deps 2015-11-11 23:00:10 +01:00
Vladimír Čunát
1e6097f00a stace: add libunwind support (fixes #10515)
I think it's not worth making such a small library optional as in the PR.
2015-11-11 15:04:47 +01:00
Demin Dmitriy
f47103e015 libgksu: fix sudo references (close #10524)
gksudo wasn't working because libgksu used wrong sudo file which doesn't have setuid bit

Committer: it isn't optimal, as it won't work on non-NixOS. I've got a
patch for it to use relative paths, but apparently something's wrong
with it and I don't want to kill much more time with it ATM.
2015-11-11 14:24:05 +01:00
Stéphane Jourdois
50783998a2 cracklib: 2.9.4 -> 2.9.6 2015-11-11 13:44:07 +01:00
Stéphane Jourdois
48cd7177b2 cgal: 4.6.1 -> 4.7
Also enable darwin support
2015-11-11 13:09:57 +01:00
Domen Kožar
505117f3fb Merge branch 'master' into staging 2015-11-11 12:53:36 +01:00
Vincent Laporte
6cc033b99e menhir: refactor to generic; init at 20151110 for OCaml >= 4.02 2015-11-11 12:30:32 +01:00
Domen Kožar
cf55e0b2ac Merge pull request #10543 from LnL7/darwin-go
go: disabled some failing tests for darwin
2015-11-11 12:20:28 +01:00
Pascal Wittmann
f38170b40c Merge pull request #10960 from dochang/gradle
gradle: 2.6 -> 2.8
2015-11-11 12:11:55 +01:00
Domen Kožar
fba69ef35a Merge pull request #10940 from msteen/flow
flow: added Linux support
2015-11-11 12:03:32 +01:00
Domen Kožar
f81a32d7cb Merge pull request #10947 from sjourdois/check
darwin: check: add missing CoreServices dep
2015-11-11 12:03:14 +01:00
Domen Kožar
453caa99fc Merge pull request #10948 from sjourdois/subunit
darwin: subunit: allow build on Darwin
2015-11-11 12:02:52 +01:00
Domen Kožar
4d1129828a nodejs: 4.1.2 -> 4.2.2 2015-11-11 11:53:38 +01:00
karsten gebbert
5b9de55c26 fsharp: 3.1.2.5 -> 4.0.0.4 2015-11-11 10:54:10 +01:00
Desmond O. Chang
b9c11de2a8 gradle: 2.6 -> 2.8 2015-11-11 16:45:19 +08:00
Pascal Wittmann
2eec8b978c Merge pull request #10953 from rycee/bump/perl-packages
Bump versions of some Perl packages
2015-11-11 09:41:57 +01:00
William A. Kennington III
a5ea7cd1d1 openjdk: 8u72b04 -> 8u76b00 2015-11-10 18:27:19 -08:00