diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-01 09:22:29 +0100 |
commit | 5effa4e0f98b317fe4607b1a6548811017c3325d (patch) | |
tree | d62ab19ccca3b0c6409595074b637eeb3d4371dc /pkgs/tools/admin | |
parent | ca2edf79f75ad2a43a5af5c1283db9f0f843680a (diff) | |
parent | 8f58e00226e3192994050b12aa9ed119be0220f3 (diff) | |
download | nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.gz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.bz2 nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.lz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.xz nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.tar.zst nixlib-5effa4e0f98b317fe4607b1a6548811017c3325d.zip |
Merge branch 'master' into staging-next
Comments on conflicts: - llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is to build all targets, so we should be fine - some pypi hashes: they were equivalent, just base16 vs. base32
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/amazon-ecr-credential-helper/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/admin/lego/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index 33b83bdb558f..02386a135f11 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "amazon-ecr-credential-helper-${version}"; - version = "0.1.0"; + version = "0.3.0"; goPackagePath = "github.com/awslabs/amazon-ecr-credential-helper"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "awslabs"; repo = "amazon-ecr-credential-helper"; rev = "v${version}"; - sha256 = "0mpwm21fphg117ryxda7696s8bnvi4bbc8rvi4zp2m1rhl04j2yy"; + sha256 = "06pcwgahcbi13ca5rs6giwdw3w364lbvmzcs4ka82igvcffxjvnd"; }; meta = with lib; { diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 4805a94e7e9e..e1964b2f1611 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { name = "lego-${version}"; - version = "1.2.1"; + version = "2.0.1"; rev = "v${version}"; src = fetchFromGitHub { inherit rev; owner = "xenolf"; repo = "lego"; - sha256 = "1b2cv78v54afflz3gfyidkwzq7r2h5j45rmz0ybps03pr0hs4gk3"; + sha256 = "17q5j2zxc2c0xw8pfhnls67dmwrkicjmd2jdyim3fhi5cgxl9h93"; }; goPackagePath = "github.com/xenolf/lego"; |