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

Merge remote-tracking branch 'origin/master' into staging

Browse Source 
Conflicts:
	pkgs/servers/serfdom/default.nix
This commit is contained in:
Eelco Dolstra
2014-07-01 11:25:41 +02:00
parent 89f8af55f1 ce623950ad
commit 06fc1ec34d
244 changed files with 5400 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/system/storebrowse/default.nix
+1 -1
View File
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
# This source has license BSD
srcGoSqlite = fetchhg {
url = "https://code.google.com/p/gosqlite/";
tag = "5baefb109e18";
rev = "5baefb109e18";
sha256 = "0mqfnx06jj15cs8pq9msny2z18x99hgk6mchnaxpg343nzdiz4zk";
};
pkgs/tools/system/syslog-ng/default.nix
+8 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, eventlog, pkgconfig, glib, python }:
{ stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl }:
stdenv.mkDerivation {
name = "syslog-ng-3.5.4.1";
@@ -8,8 +8,13 @@ stdenv.mkDerivation {
sha256 = "0rkgrmnyx1x6m3jw5n49k7r1dcg79lxh900g74rgvd3j86g9dilj";
};
buildInputs = [ eventlog pkgconfig glib python ];
configureFlags = "--enable-dynamic-linking";
buildInputs = [ eventlog pkgconfig glib python systemd perl ];
configureFlags = [
"--enable-dynamic-linking"
"--enable-systemd"
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
];
meta = {
homepage = "http://www.balabit.com/network-security/syslog-ng/";