Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2018-11-11 14:28:08 +01:00
600 changed files with 13864 additions and 7148 deletions
+2 -2
View File
@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
name = "acpica-tools-${version}";
version = "20180927";
version = "20181031";
src = fetchurl {
url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz";
sha256 = "1c9d505mw1wyga65y4nmiz55gs357z97wnycx77yvjwvi08qsh6w";
sha256 = "1zz1lfrl1rihs47a0cirdp32p53297kjm0l27b4kvibb5b7pa3h9";
};
NIX_CFLAGS_COMPILE = "-O3";
+2 -2
View File
@@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
name = "facter-${version}";
version = "3.12.0";
version = "3.12.1";
src = fetchFromGitHub {
sha256 = "1bg044j3dv6kcksy3cyda650ara8s4awdf665k10gaaxa0gwn0jj";
sha256 = "08mhsf9q9mhjfdzn8qkm12i1k5l7fnm6hqx6rqr8ni5iprl73b3d";
rev = version;
repo = "facter";
owner = "puppetlabs";
+2 -2
View File
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
name = "fio-${version}";
version = "3.11";
version = "3.12";
src = fetchFromGitHub {
owner = "axboe";
repo = "fio";
rev = "fio-${version}";
sha256 = "0k5hja50qmz6qwm8h7z00zdgxhf1vg1g168jinqzn1521fihvlvz";
sha256 = "18awz03mdzdbja1n9nm6jyvv7ic2dabh6c7ip5vwpam8c6mj4yjq";
};
buildInputs = [ python zlib ]
+2 -2
View File
@@ -11,11 +11,11 @@ let
mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
in
stdenv.mkDerivation rec {
name = "rsyslog-8.38.0";
name = "rsyslog-8.39.0";
src = fetchurl {
url = "https://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
sha256 = "0b52pcamj2g27zdg0szzk03kigm9lanj0v0w80alwy5fpk9qwcjd";
sha256 = "1d3ac448b8gj58vg7n99ffv2rvpnhhin1ni5vyby73aksvz9c7y7";
};
#patches = [ ./fix-gnutls-detection.patch ];