Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1504357

pkgs/tools/admin/acme.sh/default.nix

@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute }:
 stdenv.mkDerivation rec {
   name = "acme.sh-${version}";
-  version = "2.7.9";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "Neilpang";
     repo = "acme.sh";
     rev = version;
-    sha256 = "1fp1sifhm4in0cqmc8i0zms7fqxw0rgfi1rkkm496d3068a4a51x";
+    sha256 = "1h22bmx065v0lhwkr4zykybfl6ppjr2wibgwy2wnihy30g28zq7v";
   };
 
   nativeBuildInputs = [ makeWrapper ];

pkgs/tools/admin/lxd/default.nix

@@ -7,13 +7,13 @@
 }:
 
 buildGoPackage rec {
-  name = "lxd-3.0.2";
+  name = "lxd-3.10";
 
   goPackagePath = "github.com/lxc/lxd";
 
   src = fetchurl {
     url = "https://github.com/lxc/lxd/releases/download/${name}/${name}.tar.gz";
-    sha256 = "1ha8ijzblf15p0kcpgwshswz6s2rdd2b4qnzjw3l72ww620hr84j";
+    sha256 = "0vd0p3xf54s7f9vcjfiin29py6hxyyxnisvp6am67l5nwhg7rnnc";
   };
 
   preBuild = ''
@@ -28,8 +28,8 @@ buildGoPackage rec {
   buildFlags = [ "-tags libsqlite3" ];
 
   postInstall = ''
-    # binaries from test/
-    rm $bin/bin/{deps,macaroon-identity}
+    # test binaries, code generation
+    rm $bin/bin/{deps,macaroon-identity,generate}
 
     wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [
       acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash