diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-09 10:15:17 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-09 10:15:17 +0100 |
| commit | 7f9e3b8206b8761d98972d08cb7f3bd6d3183337 (patch) | |
| tree | 4e592516f6e1f4e8a9b162c696574214cc18ce6d /pkgs/tools/admin | |
| parent | 6ae1cc2e624ed7dcc7026b7c134f0e32eca3e1c6 (diff) | |
| parent | baf6ba553f729f063359a59ceb54de11328e0aba (diff) | |
| download | nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.gz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.bz2 nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.lz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.xz nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.tar.zst nixpkgs-7f9e3b8206b8761d98972d08cb7f3bd6d3183337.zip | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1504357
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/acme.sh/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 4bdc9f096cf..fc4f5e8843e 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/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 ]; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index e48b525caba..e037541557c 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/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 |