Skip to content
Commit d1ebf508 authored by Orivej Desh's avatar Orivej Desh
Browse files

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 4a86f8c9 and properly remove the temporary ssh host keys file/directory.
parents 957810e0 8414fa2d
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment