diff options
| author | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-08-12 09:46:53 +0000 |
| commit | b7787d932ec9cbd82ea6bc7c69d8df159b606fdc (patch) | |
| tree | c4b6af2e6b49732ce5c6982cb8512ce9b7f1f34d /pkgs/tools/system | |
| parent | bc025e83bd6c44df38851ef23da53359a0e62841 (diff) | |
| parent | 532b2222965377e77ed884c463ee2751fb51dba3 (diff) | |
| download | nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.gz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.bz2 nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.lz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.xz nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.tar.zst nixlib-b7787d932ec9cbd82ea6bc7c69d8df159b606fdc.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/system')
| -rw-r--r-- | pkgs/tools/system/collectd/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/freeipmi/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/system/wsmancli/default.nix | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 7c889d89303b..c428fb07facd 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -32,12 +32,12 @@ , net_snmp ? null }: stdenv.mkDerivation rec { - version = "5.5.1"; + version = "5.5.2"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "0gxwq3jl20wgvb7qawivshpkm4i3kvghpnfcn5yrlhphw4kdbigr"; + sha256 = "03w2pawbshl2wrl4cmyw8alsi0pvamb6ibxni96mjzhqc903lzq1"; }; buildInputs = [ diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 44e249102965..76f640711a88 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.3"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0xgfwk6lxwwzq8pbyxjl5xxpybs9p4qwgb7q0ykf048xwxha4kvk"; + sha256 = "0s4q7imc4r3g9lkd92bnvw70679q83b0irrlw895i5nc05dj4djx"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index 5449d53229c8..d66d4b575783 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman }: +{ fetchurl, stdenv, autoconf, automake, libtool, pkgconfig, openwsman, openssl }: stdenv.mkDerivation rec { version = "2.6.0"; @@ -9,9 +9,15 @@ stdenv.mkDerivation rec { sha256 = "03ay6sa4ii8h6rr3l2qiqqml8xl6gplrlg4v2avdh9y6sihfyvvn"; }; - buildInputs = [ autoconf automake libtool pkgconfig openwsman ]; + buildInputs = [ autoconf automake libtool pkgconfig openwsman openssl ]; - preConfigure = "./bootstrap"; + preConfigure = '' + ./bootstrap + + configureFlagsArray=( + LIBS="-L${openssl}/lib -lssl -lcrypto" + ) + ''; meta = { description = "Openwsman command-line client"; |