diff options
| author | Profpatsch <mail@profpatsch.de> | 2016-04-25 01:28:55 +0200 |
|---|---|---|
| committer | Profpatsch <mail@profpatsch.de> | 2016-04-25 01:28:55 +0200 |
| commit | 4e9ff898a06e247d989a2f220e07aa3776991aaa (patch) | |
| tree | 9cc4209a57cdf77ba8f89747362f36f524aff4c4 /modules/user | |
| parent | 3fcbe6c5458d5866c4234695b00b500d26de0af0 (diff) | |
| parent | f9dd1944419b989f7eca27f24fc93688d80c4566 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'modules/user')
| -rw-r--r-- | modules/user/aszlig/programs/mpv/default.nix | 1 | ||||
| -rw-r--r-- | modules/user/aszlig/system/kernel.nix | 6 |
2 files changed, 4 insertions, 3 deletions
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 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"; }; }; |