diff options
author | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2020-06-10 09:41:53 +0200 |
commit | 6e9bb30566a617613e607a3641fe12d040de3afb (patch) | |
tree | 0241cf4a29146f6fec8e61b1b02a32a72a48f03f /pkgs/tools | |
parent | c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67 (diff) | |
parent | f6482597318278cdc4d33b703effa4636d2875c6 (diff) |
Merge branch 'master' into staging-next
In particular, this fixes ISO evaluation.
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/admin/eksctl/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/security/ibm-sw-tpm2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/agrep/default.nix | 8 |
3 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 18fb37aa41c05..4fce865573729 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.19.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q"; + sha256 = "0pfjv5m1fly7n9hmxy8bnpblfh5rzbjkiav3dczy4hkmq226gjsa"; }; - vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx"; + vendorSha256 = "09c3a5g27aqmy4ml42c6zwzrv8yas7i04w3j9jbvp90npwvc62cz"; subPackages = [ "cmd/eksctl" ]; diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index 5e1d460a4634d..d6e8a521a2fa2 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1563"; + version = "1628"; src = fetchurl { url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - sha256 = "1sfi7drmbm08rgd2414s3sxd7h5g8d4kiwk40xklf7sw67w1ffpw"; + sha256 = "18wywbsdp5sjrapznk2ydbmx0whz513dhybn1lls24xfl7kp9s58"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index c285b892b925b..c0816f8ab76c5 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -21,10 +21,12 @@ stdenv.mkDerivation { install -Dm 444 docs/* -t "$out/doc" ''; - meta = { + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + meta = with stdenv.lib; { description = "Approximate grep for fast fuzzy string searching"; homepage = "https://www.tgries.de/agrep/"; - license = stdenv.lib.licenses.isc; - platforms = stdenv.lib.platforms.linux; + license = licenses.isc; + platforms = with platforms; linux ++ darwin; }; } |