diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-16 09:01:53 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-16 09:01:53 +0100 |
| commit | 986c2d36da97856f392dd66d265b7646b32fa3b9 (patch) | |
| tree | caac503026c928b9dacd517c229e234dc66d47f6 /pkgs/tools/admin | |
| parent | da6239dab3d712aa335fd0928c4e64f9599fef73 (diff) | |
| parent | 300846f3c982ffc3e54775fa99b4ec01d56adf65 (diff) | |
| download | nixpkgs-986c2d36da97856f392dd66d265b7646b32fa3b9.tar nixpkgs-986c2d36da97856f392dd66d265b7646b32fa3b9.tar.gz nixpkgs-986c2d36da97856f392dd66d265b7646b32fa3b9.tar.bz2 nixpkgs-986c2d36da97856f392dd66d265b7646b32fa3b9.tar.lz nixpkgs-986c2d36da97856f392dd66d265b7646b32fa3b9.tar.xz nixpkgs-986c2d36da97856f392dd66d265b7646b32fa3b9.tar.zst nixpkgs-986c2d36da97856f392dd66d265b7646b32fa3b9.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/admin')
| -rw-r--r-- | pkgs/tools/admin/awsweeper/default.nix | 20 | ||||
| -rw-r--r-- | pkgs/tools/admin/lxd/default.nix | 4 |
2 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 2417854fcad..f148bd088f4 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -1,29 +1,25 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; - version = "0.7.0"; - - # Requires go generate to be run with mockgen, but doesn't check in the results. - patches = fetchurl { - url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch"; - sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl"; - }; + version = "0.10.2"; src = fetchFromGitHub { - owner = "cloudetc"; + owner = "jckuester"; repo = pname; rev = "v${version}"; - sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; + sha256 = "1ln4s04n1qd1wv88ahhvvvphlxf6c9krqz9lmbcx3n67sb8xngm5"; }; - vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp"; + vendorSha256 = "0zlhb84fmrnwq71d0h83p28aqlfclcydndl0z2j9nx2skjlxax2i"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; doCheck = false; meta = with lib; { description = "A tool to clean out your AWS account"; - homepage = "https://github.com/cloudetc/awsweeper/"; + homepage = "https://github.com/jckuester/awsweeper"; license = licenses.mpl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 331960e6857..9bff8332c34 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.7"; + version = "4.8"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1v95cnbs54gzyhzflwb8x0ykja202nll5p48l2nra7cpdsk4a5q1"; + sha256 = "0zrk6l2wwc2hmzwd9fayq54qxshp9pin638dihsyp324f5n0jkyy"; }; postPatch = '' |