diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-04 06:01:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 06:01:43 +0000 |
| commit | c852543c1fc05b539357c49ebaf7b951b7ff27b8 (patch) | |
| tree | d2d2f55f703642816d64cd32909877fc4af2f71c /pkgs/development/tools | |
| parent | 6cc62b18435d4413b00061baa49d5d1a73373084 (diff) | |
| parent | 89ee82a6e9e46e3394e6e87e30f9fd46b0b7947e (diff) | |
| download | nixpkgs-c852543c1fc05b539357c49ebaf7b951b7ff27b8.tar nixpkgs-c852543c1fc05b539357c49ebaf7b951b7ff27b8.tar.gz nixpkgs-c852543c1fc05b539357c49ebaf7b951b7ff27b8.tar.bz2 nixpkgs-c852543c1fc05b539357c49ebaf7b951b7ff27b8.tar.lz nixpkgs-c852543c1fc05b539357c49ebaf7b951b7ff27b8.tar.xz nixpkgs-c852543c1fc05b539357c49ebaf7b951b7ff27b8.tar.zst nixpkgs-c852543c1fc05b539357c49ebaf7b951b7ff27b8.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/build-managers/conan/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/tools/cloud-nuke/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/remarshal/default.nix | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 9c3e99e23ad..8c150e114f9 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -56,7 +56,7 @@ in newPython.pkgs.buildPythonApplication rec { propagatedBuildInputs = with newPython.pkgs; [ bottle colorama - dateutil + python-dateutil deprecation distro fasteners diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index ecb6991d3d9..75fb29db882 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FQx5k6HuOf3gKa71LteNGhH2KILUQ+aeKmtQXRwTNYI="; + sha256 = "sha256-rxWTh+iltD1kcntlu9sovwG/mQPmukYbw8V2FAFi1KE="; }; - vendorSha256 = "sha256-VsP1YWvszux7qiRVLRF40NX3qoNOa9yrfRhQAaw7aKI="; + vendorSha256 = "sha256-mfNbcnJ62v6tdEhOtA0P9lDoD5HmLBAtNcrv1H3/mSE="; buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 385db11d7ff..67137fb1ed9 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with python3Packages; [ - pyyaml cbor2 dateutil tomlkit u-msgpack-python + pyyaml cbor2 python-dateutil tomlkit u-msgpack-python ]; meta = with lib; { |