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
..
applications	Merge pull request #41410 from jokogr/u/jetbrains-idea-2018.1.4	2018-06-03 19:24:47 +02:00
build-support	dockerTools.pullImage: expose image* attributes (#41366)	2018-06-03 22:58:23 +02:00
common-updater
data	cacert: fix certdata2pem url	2018-06-01 17:56:53 -07:00
desktops	Revert "vinagre: disable format hardening"	2018-06-04 22:37:07 +00:00
development	Merge branch 'master' into staging	2018-06-04 22:43:03 +00:00
games	freecell-solver: fix build	2018-06-04 00:47:56 +00:00
misc	Merge pull request #41204 from ikervagyok/wine	2018-06-01 22:50:57 -04:00
os-specific	linux: Add 4.17	2018-06-04 14:12:03 -04:00
servers	mysql57: unbundle libedit, libevent, lz4, protobuf, zlib	2018-06-04 05:22:25 +00:00
shells
stdenv
test	tests.cc-wrapper: skip known-broken sanitizer cases	2018-05-30 18:48:42 -07:00
tools	Merge branch 'master' into staging	2018-06-04 22:43:03 +00:00
top-level	Merge branch 'master' into staging	2018-06-04 22:43:03 +00:00