From f9ee83ebe9c5098543fd711ae4711fdc827ca3d2 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 13 Apr 2016 15:20:24 +0200
Subject: mmrnmhrm/dnyarri: Update kernel src/cfg to 4.6-rc3

This is -rc3 + 17 commits ahead.

Configuration is once again just to get it to compile, the only new
configuration option that I really want to consider using is
CONFIG_FS_ENCRYPTION, everything else is just "updating config to latest
kernel".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/system/kernel.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix
index 39128817..5f0d8520 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/user/aszlig/system/kernel.nix
@@ -18,11 +18,11 @@ let
   in pkgs.writeText "generated.kconf" (mkConf exprs + "\n");
 
   mainlineKernel = {
-    version = "4.5.0-rc5";
+    version = "4.6.0-rc3";
     src = pkgs.fetchgit {
       url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;
-      rev = "81f70ba233d5f660e1ea5fe23260ee323af5d53a";
-      sha256 = "0zr5fq85plb3mpbwz6rczy4478p0rp6mgd0p9bza7wi2ny2xw87a";
+      rev = "1c74a7f812b135d3df41d7c3671b647aed6467bf";
+      sha256 = "05yrym9pidy5kgjxfwm9sw9b4h1jnm218ydafq6fa5xjnf8fmkgx";
     };
   };
 
-- 
cgit 1.4.1


From f9dd1944419b989f7eca27f24fc93688d80c4566 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 15 Apr 2016 06:01:46 +0200
Subject: modules/programs/mpv: Fix build

Since the latest upstream version, the directory $out/etc/mpv doesn't
seem to get created anymore, but a quick strace shows that mpv still
tries to open it upon startup, so let's just create the directories
leading to mpv.conf.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/programs/mpv/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules')

diff --git a/modules/user/aszlig/programs/mpv/default.nix b/modules/user/aszlig/programs/mpv/default.nix
index 1e412c71..7f7f66fa 100644
--- a/modules/user/aszlig/programs/mpv/default.nix
+++ b/modules/user/aszlig/programs/mpv/default.nix
@@ -7,6 +7,7 @@ let
 
   patchedMpv = overrideDerivation pkgs.mpv (o: {
     installPhase = o.installPhase + ''
+      mkdir -p "$out/etc/mpv"
       cat > "$out/etc/mpv/mpv.conf" <<CONFIG
       ao=pulse
       CONFIG
-- 
cgit 1.4.1