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

Merge branch 'master' of https://github.com/NixOS/nixpkgs into ansible

Browse Source
This commit is contained in:
Jussi Maki
2014-05-26 10:28:52 +02:00
parent 75cb485718 b0234f216c
commit ab3aed6dfc
207 changed files with 1727 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/monit/default.nix
+2 -2
View File
@@ -1,11 +1,11 @@
{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
stdenv.mkDerivation rec {
name = "monit-5.8";
name = "monit-5.8.1";
src = fetchurl {
url = "${meta.homepage}dist/${name}.tar.gz";
sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c";
sha256 = "1rbhr3aff8pbiz60r73607hci4yngv5xq1b6yjx9xhks4mwlnpm2";
};
nativeBuildInputs = [ bison flex ];
pkgs/tools/system/syslog-ng/default.nix
+3 -3
View File
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, eventlog, pkgconfig, glib, python }:
stdenv.mkDerivation {
name = "syslog-ng-3.5.3";
name = "syslog-ng-3.5.4.1";
src = fetchurl {
url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.3/source/syslog-ng_3.5.3.tar.gz";
sha256 = "1l3424qn9bf9z742pqba8x3dj7g729asimmhlizv1rvjlaxa2jd3";
url = "http://www.balabit.com/downloads/files?path=/syslog-ng/sources/3.5.4.1/source/syslog-ng_3.5.4.1.tar.gz";
sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj";
};
buildInputs = [ eventlog pkgconfig glib python ];