From a94e8f24f2bada8afde821a86bd3f9e8846a4f5a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 26 Aug 2015 14:40:20 +0200
Subject: mcelog: update 123 -> 124

---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index aa1b197e83ff..c6ca6d21d2d0 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "123"; in
+let version = "124"; in
 stdenv.mkDerivation {
   name = "mcelog-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0hrpqx0wfwribzm3j132k0869xbh5wa89pzhwcych5w2w0n2i890";
+    sha256 = "02yqf9vcbkw9kpl0dl619scb9njkwklspvr5mhjb307004b71qqd";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";
-- 
cgit 1.4.1


From 8c2f7fcfeda241e891b6913166ab0c7f2caab5fa Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Wed, 26 Aug 2015 20:33:29 +0200
Subject: apparmor: don't depend on tetex

It seemed unused - no mention in the log, and builds without it.
/cc maintainers: @phreedom, @thoughtpolice.
---
 pkgs/os-specific/linux/apparmor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index f68b436bed1c..22413b2ed314 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , autoconf, automake, libtool, makeWrapper
-, perl, bison, flex, glibc, gettext, which, rpm, tetex, LocaleGettext
+, perl, bison, flex, glibc, gettext, which, rpm, LocaleGettext
 , bash, pam, TermReadKey, RpcXML, swig, python}:
 stdenv.mkDerivation rec {
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    autoconf automake libtool perl bison flex gettext which rpm tetex
+    autoconf automake libtool perl bison flex gettext which rpm
     LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ];
 
   prePatch = ''
-- 
cgit 1.4.1


From ca11cb828876f9d315598b3699fa9343442d1607 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Thu, 27 Aug 2015 09:46:24 +0200
Subject: reptyr: 0.5 -> 0.6.2

---
 pkgs/os-specific/linux/reptyr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix
index e5e579081f67..99f52dc5aed3 100644
--- a/pkgs/os-specific/linux/reptyr/default.nix
+++ b/pkgs/os-specific/linux/reptyr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.5";
+  version = "0.6.2";
   name = "reptyr-${version}";
   src = fetchurl {
     url = "https://github.com/nelhage/reptyr/archive/reptyr-${version}.tar.gz";
-    sha256 = "077cvjjf534nxh7qqisw27a0wa61mdgyik43k50f8v090rggz2xm";
+    sha256 = "07pfl0rkgm8m3f3jy8r9l2yvnhf8lgllpsk3mh57mhzdxq8fagf7";
   };
   makeFlags = ["PREFIX=$(out)"];
   meta = {
-- 
cgit 1.4.1


From 5a303519fae00496e0393a81bf47f3f4d0234df0 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 15:46:34 -0700
Subject: kernel: 3.12.46 -> 3.12.47

---
 pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 904aebd75be5..8146f4a5decb 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.46";
+  version = "3.12.47";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "01w0b1sifzivbagm724bz0mlfrm7hpbj5a3lx1yrv8xg64gni3m1";
+    sha256 = "0mcchrm79zjsnxvwf1v3glhv0zs4dszi9qwhmnws3dqxaj9brgyn";
   };
 
   features.iwlwifi = true;
-- 
cgit 1.4.1


From b409331a5a96c3dd67004d25adb1d96dbb8aa468 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 28 Aug 2015 17:49:15 -0700
Subject: ipset: 6.24 -> 6.26

---
 pkgs/os-specific/linux/ipset/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs/os-specific')

diff --git a/pkgs/os-specific/linux/ipset/default.nix b/pkgs/os-specific/linux/ipset/default.nix
index b76ce583b23c..2db57ecef92a 100644
--- a/pkgs/os-specific/linux/ipset/default.nix
+++ b/pkgs/os-specific/linux/ipset/default.nix
@@ -1,14 +1,15 @@
 { stdenv, fetchurl, pkgconfig, libmnl }:
 
 stdenv.mkDerivation rec {
-  name = "ipset-6.24";
+  name = "ipset-6.26";
 
   src = fetchurl {
     url = "http://ipset.netfilter.org/${name}.tar.bz2";
-    sha256 = "1l4mx78473azf7cb19fxf37gmj95k1zzabimbcmlg9h07wlgqw9h";
+    sha256 = "0lbsg1fbiw9m959lgqziyivmx32z3vbnp3jhgnprkq31ia7a29kn";
   };
 
-  buildInputs = [ pkgconfig libmnl ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libmnl ];
 
   configureFlags = [ "--with-kmod=no" ];
 
-- 
cgit 1.4.1