diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-06-04 22:43:03 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2018-06-04 22:43:03 +0000 |
| commit | d1ebf508f508603fdc592f3ac12b1ad6b8d91849 (patch) | |
| tree | ffcc863741749f6df334ef210b052e7aa600ac91 /pkgs/development/python-modules/httpserver | |
| parent | 957810e04fa2bdaf2bb07471ad7f9bc4a2a66bf6 (diff) | |
| parent | 8414fa2d6bb1249ed77565ff6b9f312fd52917da (diff) | |
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 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and properly remove the temporary ssh host keys file/directory.
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions