Jörg Thalheim
922b69683f
Merge pull request #41454 from volth/perl-aliases
...
[staging] perlPackages: convert some modules to aliases
2018-06-05 09:10:12 +01:00
John Ericson
c69c959cd9
Merge pull request #41429 from lopsided98/fix-env-hook
...
cc-wrapper, bintools-wrapper: unbreak include/link paths when cross-compiling
2018-06-04 22:42:27 -04:00
Orivej Desh
d1ebf508f5
Merge branch 'master' into staging
...
* master:
Revert "vinagre: disable format hardening"
nix: point at curl 7.59.0 (#41452 )
vinagre: disable format hardening
linux: Add 4.17
gnome3.vinagre: fix build
linux-copperhead: 4.16.12.a -> 4.16.13.a
julia: add some version info to passthru, will be used by julia2nix
gdal: Fix darwin build
opendkim: fix libbsd dependency
avoid redundant rm calls
perlPackages.CPANPLUS: add cpanp dependency
plotutils: fix parallel building
nixos/gitea: Respect gitea-dump enable option. (#41437 )
kubernetes: corrected spelling mistake in docs (#41439 )
python.pkgs.trustme: fix python2 build
revert 4a86f8c9ab
and properly remove the temporary ssh host keys file/directory.
2018-06-04 22:43:03 +00:00
Orivej Desh
8414fa2d6b
Revert "vinagre: disable format hardening"
...
This reverts commit f34b498bd2
.
It did not fix the build error in https://hydra.nixos.org/build/75464534/nixlog ,
but #41449 did.
2018-06-04 22:37:07 +00:00
Tim Steinbach
5574df3549
nix: point at curl 7.59.0 ( #41452 )
2018-06-04 22:25:23 +00:00
Daiderd Jordan
f19e64a0d2
Merge pull request #41445 from knedlsepp/fix-gdal-on-darwin
...
gdal: Fix darwin build
2018-06-04 23:39:14 +02:00
Matthew Justin Bauer
90f5c54248
Merge pull request #41443 from tkerber/opendkim/libbsd
...
opendkim: fix libbsd dependency
2018-06-04 17:10:52 -04:00
Daiderd Jordan
0b458a4129
Merge pull request #41449 from flokli/vinagre-build
...
gnome3.vinagre: fix build
2018-06-04 21:32:20 +02:00
Matthew Justin Bauer
f34b498bd2
vinagre: disable format hardening
...
https://hydra.nixos.org/build/75464534/nixlog/1
2018-06-04 14:52:32 -04:00
Tim Steinbach
39444569e0
linux: Add 4.17
2018-06-04 14:12:03 -04:00
volth
f76ffb0acd
perlPackages: convert some modules to aliases
2018-06-04 16:12:06 +00:00
Florian Klink
67eaab86b4
gnome3.vinagre: fix build
...
Currently, vinagre fails to build with the following message:
vinagre/vinagre-utils.c: In function 'vinagre_utils_request_credential':
vinagre/vinagre-utils.c:686:2: error: format not a string literal, argument types not checked [-Werror=format-nonliteral]
_tmp12_ = g_strdup_printf (_tmp10_, _tmp11_);
^~~~~~~
vinagre-utils.c seems to be generated from vinagre-utils.vala. I
couldn't find anything weird in here, so let's disable
-Werror=format-nonliteral for now as done elsewhere, too.
2018-06-04 16:24:38 +02:00
Tim Steinbach
5c4a404b0d
linux-copperhead: 4.16.12.a -> 4.16.13.a
2018-06-04 10:22:39 -04:00
Rob Vermaas
c548814b81
julia: add some version info to passthru, will be used by julia2nix
2018-06-04 15:06:33 +02:00
Orivej Desh
957810e04f
libarchive: fix patch hash
2018-06-04 12:49:21 +00:00
Josef Kemetmüller
13e3a21b5c
gdal: Fix darwin build
...
This fixes:
error: cannot initialize a variable of type 'GooString *' with an rvalue of type 'const GooString *'
which occurs with recent clang or gcc-7.
See https://github.com/OSGeo/gdal/pull/573
2018-06-04 14:19:35 +02:00
Thomas Kerber
b529dda3a1
opendkim: fix libbsd dependency
2018-06-04 13:06:54 +01:00
Orivej Desh
b75d7ebd1d
libevent: fix patch hashes introduced in #41386
...
(cherry picked from commit 968ed95966c481a75ba12f0d975581e909cf6cb3)
2018-06-04 09:50:50 +00:00
Rob Vermaas
19332e4d52
Merge pull request #41311 from AmineChikhaoui/fix-gce-fetch-ssh
...
GCE image: properly remove the temporary ssh host keys files/directory
2018-06-04 11:38:07 +02:00
AmineChikhaoui
1398d0c312
avoid redundant rm calls
2018-06-04 10:23:40 +01:00
Orivej Desh
e5dedc5f3b
perlPackages.CPANPLUS: add cpanp dependency
2018-06-04 08:40:39 +00:00
Orivej Desh
07e1ae54a6
plotutils: fix parallel building
...
E.g. https://hydra.nixos.org/build/75429322 :
b_closepl.c:21:10: fatal error: xmi.h: No such file or directory
make[2]: *** [Makefile:958: b_closepl.lo] Error 1
make[2]: Leaving directory '/build/plotutils-2.6/libplot'
2018-06-04 06:49:02 +00:00
Thomas Kerber
61f5b9d6c4
nixos/gitea: Respect gitea-dump enable option. ( #41437 )
2018-06-04 08:41:20 +02:00
Geoffrey Huntley
ca0e52edc3
kubernetes: corrected spelling mistake in docs ( #41439 )
2018-06-04 05:45:25 +00:00
Orivej Desh
859e27f177
mysql57: unbundle libedit, libevent, lz4, protobuf, zlib
2018-06-04 05:22:25 +00:00
Orivej Desh
1c7acb09fa
python.pkgs.trustme: fix python2 build
2018-06-04 04:06:09 +00:00
Orivej Desh
4869ddf883
Merge branch 'master' into staging
...
* master: (26 commits)
python.pkgs.cairocffi: update tests for Cairo 1.15.12
python.pkgs.cairocffi: 0.8.0 -> 0.8.1
freecell-solver: fix build
perlPackages.CPANPLUS: restore build inputs removed in #41394
Fix GHCJS 8.4/8.2 in sandboxed builds (#41411 )
dockerTools.pullImage: expose image* attributes (#41366 )
rust: disable tests on darwin
python.pkgs.detox: 0.11 -> 0.12
certbot: disable check on darwin
freeimage: fix build with glibc 2.27
shadowsocks-libev: supports darwin (#41421 )
pythonPackages.jira: fix build (#41419 )
SDL: propagate libiconv
schema2ldif: Init at 1.3
nixos/exim: Add unit restart trigger (#41418 )
Add myself as maintainer for dnsdist
Add myself as maintainer
synapse-bt: init at 2018-06-04 (#41402 )
skim: 0.3.2 -> 0.4.0 (#41417 )
ctags: fix source url (#41382 )
...
2018-06-04 03:50:03 +00:00
Orivej Desh
6db9f4685a
python.pkgs.cairocffi: update tests for Cairo 1.15.12
...
Fixes #41183
2018-06-04 02:37:14 +00:00
Orivej Desh
264254568b
python.pkgs.cairocffi: 0.8.0 -> 0.8.1
2018-06-04 02:00:32 +00:00
Orivej Desh
39c2df48d5
freecell-solver: fix build
2018-06-04 00:47:56 +00:00
Orivej Desh
5b96694e2d
perlPackages.CPANPLUS: restore build inputs removed in #41394
2018-06-03 22:47:19 +00:00
Orivej Desh
33ed2af2a7
ninja: support cross compilation
2018-06-03 22:44:15 +00:00
Orivej Desh
41c8b92d4f
ninja: build manual with docbook ( #41433 )
...
It is not meant to be built with asciidoc alone: it lacks the table of contents
and styles. See https://github.com/ninja-build/ninja/blob/v1.8.2/doc/README.md
2018-06-03 22:34:27 +00:00
Will Fancher
ea52ca64e8
Fix GHCJS 8.4/8.2 in sandboxed builds ( #41411 )
2018-06-03 23:28:17 +02:00
lewo
0644b4d948
dockerTools.pullImage: expose image* attributes ( #41366 )
...
Attributes `imageName` and `imageTag` are exposed if the image is
built by our Nix tools but not if the image is pulled. So, we expose
these attributes for convenience and homogeneity.
2018-06-03 22:58:23 +02:00
Matthew Justin Bauer
332b9dedc8
rust: disable tests on darwin
...
See https://github.com/rust-lang/rust/issues/51006
Tests frequently fail on Darwin. Not sure why but it's easier to just disable for now.
2018-06-03 16:56:17 -04:00
Orivej Desh
93cb47a2fc
python.pkgs.detox: 0.11 -> 0.12
...
Fixes build with python.pkgs.tox 3.0.0.
2018-06-03 20:48:54 +00:00
Orivej Desh
64fd1ceb38
certbot: disable check on darwin
...
On Hydra it fails with "Too many open files":
https://hydra.nixos.org/build/64286041
https://hydra.nixos.org/build/75419471
2018-06-03 20:42:53 +00:00
Orivej Desh
214b35d115
freeimage: fix build with glibc 2.27
2018-06-03 20:38:08 +00:00
Mario Rodas
76f6dc1772
shadowsocks-libev: supports darwin ( #41421 )
2018-06-03 22:20:21 +02:00
Maximilian Bosch
a47d34cebe
pythonPackages.jira: fix build ( #41419 )
...
The build for `pythonPackages.jira` failed with the following error:
```
Download error on https://pypi.python.org/simple/sphinx/ : [Errno -2] Name or service not known -- Some packages may not be found!
Couldn't find index page for 'sphinx' (maybe misspelled?)
Download error on https://pypi.python.org/simple/ : [Errno -2] Name or service not known -- Some packages may not be found!
No local packages or working download links found for sphinx>=1.6.5
Traceback (most recent call last):
...
File "/nix/store/bp4dillg6xxblpf00v8d9nxfx3bnggfy-python3.6-bootstrapped-pip-10.0.1/lib/python3.6/site-packages/setuptools/command/easy_install.py", line 667, in easy_install
raise DistutilsError(msg)
distutils.errors.DistutilsError: Could not find suitable distribution for Requirement.parse('sphinx>=1.6.5')
builder for '/nix/store/8dv7mpspyk6kxwnzqb43rzm4q5j14xp0-python3.6-jira-1.0.15.drv' failed with exit code 1
```
The root issue is most likely caused by some docs fixes upstream
(519183d874
)
which were released in 1.0.15. The bump (without the fix) has been
performed in 7a6bf668fb
. Since `sphinx`
isn't needed during runtime, it's not necessary to use it as
`propagatedBuildInput`. In order to work around this the dependency had
to be removed from from `setup.py`.
See https://hydra.nixos.org/build/75004048 for further reference
2018-06-03 22:11:29 +02:00
xeji
ca11e5acfa
Merge pull request #41424 from dasJ/schema2ldif
...
schema2ldif: Init at 1.3
2018-06-03 22:10:47 +02:00
Orivej Desh
96606abf82
SDL: propagate libiconv
...
SDL/SDL.h includes SDL/SDL_stdinc.h which includes iconv.h, therefore all
packages that include SDL.h should be able to include iconv.h
Fixes SDL_gfx, SDL_image etc. on Darwin.
2018-06-03 20:00:40 +00:00
Janne Heß
f569a0a684
schema2ldif: Init at 1.3
2018-06-03 21:39:06 +02:00
Janne Heß
b3e7923b94
nixos/exim: Add unit restart trigger ( #41418 )
2018-06-03 21:22:55 +02:00
Janne Heß
c1419f0e63
Add myself as maintainer for dnsdist
...
See Mic92's comment at #38658
2018-06-03 20:46:40 +02:00
Janne Heß
fdafb70453
Add myself as maintainer
2018-06-03 20:46:01 +02:00
qolii
a4e53b64d0
libevent: add patches to support LibreSSL 2.7 ( #41386 )
2018-06-03 18:43:34 +00:00
qolii
20d83e286d
libarchive: pull in patch to support LibresSSL-2.7 ( #41395 )
2018-06-03 17:59:43 +00:00
xeji
bb7d67d74a
Merge pull request #41410 from jokogr/u/jetbrains-idea-2018.1.4
...
Jetbrains IDEA: 2018.1.3 -> 2018.1.4
2018-06-03 19:24:47 +02:00