public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hardened-stdenv

Browse Source
This commit is contained in:
Robin Gloster
2016-08-12 09:46:53 +00:00
parent bc025e83bd 532b222296
commit b7787d932e
372 changed files with 7520 additions and 3777 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/collectd/default.nix
+2 -2
View File
@@ -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 = [
pkgs/tools/system/freeipmi/default.nix
+2 -2
View File
@@ -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 ];
pkgs/tools/system/wsmancli/default.nix
+9 -3
View File
@@ -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";