From 9bc417b108cc489df415cc5f97b7cd8932abd217 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 27 Oct 2016 01:32:35 +0200
Subject: pkgs: Rename "kpatches" directory to "kernel"

This now should reflect "all things kernel" and thus could not only
contain patches but other things. If we have so many patches that it
makes sense to namespace them further, we can still use kernel/patches
for that purpose which is way better than "kpatches".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/system/kernel.nix |  2 +-
 pkgs/default.nix                      |  4 ++--
 pkgs/kernel/bfqsched/default.nix      | 45 +++++++++++++++++++++++++++++++++++
 pkgs/kpatches/bfqsched/default.nix    | 45 -----------------------------------
 4 files changed, 48 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/kernel/bfqsched/default.nix
 delete mode 100644 pkgs/kpatches/bfqsched/default.nix

diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix
index 120a6c08..860dcc57 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/user/aszlig/system/kernel.nix
@@ -42,7 +42,7 @@ in {
 
   config = mkIf cfg.enable {
     boot = {
-      kernelPatches = singleton pkgs.vuizvui.kernelPatches.bfqsched;
+      kernelPatches = singleton pkgs.vuizvui.kernel.bfqsched;
       kernelPackages = pkgs.linuxPackages_custom {
         inherit (mainlineKernel) version src;
         configfile = generateKConf cfg.config;
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 78229945..2d8a2d70 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -40,8 +40,8 @@ let
       config = pkgs.config.vuizvui.games or null;
     };
 
-    kernelPatches = {
-      bfqsched = callPackage ./kpatches/bfqsched { };
+    kernel = {
+      bfqsched = callPackage ./kernel/bfqsched { };
     };
 
     openlab = pkgs.recurseIntoAttrs {
diff --git a/pkgs/kernel/bfqsched/default.nix b/pkgs/kernel/bfqsched/default.nix
new file mode 100644
index 00000000..3e0b122a
--- /dev/null
+++ b/pkgs/kernel/bfqsched/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl }:
+
+let
+  bfqVersion = "v8r2";
+  kernelVersion = "4.7.0";
+  version = "${kernelVersion}-${bfqVersion}";
+
+  baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
+
+  fetchPatch = { name, sha256 }: fetchurl {
+    url = "${baseURL}/${version}/${name}.patch";
+    inherit sha256;
+  };
+
+  allPatches = [
+    (fetchPatch {
+      name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0";
+      sha256 = "116jfdgjgmy1fv6kzz7dm1c7rjy1pbsfzzcjv5mgsb7pnaxq3gd6";
+    })
+    (fetchPatch {
+      name = "0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0";
+      sha256 = "0wjmnym2ycglx42f513n97b45x3xqi33q7z4cs0aiz0zbblm8jql";
+    })
+    (fetchPatch {
+      name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for";
+      sha256 = "0898aklynxb9dr0nb0kdhc2incjkjihds9dakxvdy0mwjqr0jd6v";
+    })
+    (fetchPatch {
+      name = "0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r2-for";
+      sha256 = "1aljji6ww73h0vpimbcmk0hj886m6fnnbahgmrkfcq1gc0n0484n";
+    })
+  ];
+
+  patch = stdenv.mkDerivation {
+    name = "bfqsched-${version}.patch";
+    inherit allPatches;
+    buildCommand = ''
+      cat $allPatches > "$out"
+    '';
+  };
+
+in {
+  name = "bfqsched-${version}";
+  inherit version patch;
+}
diff --git a/pkgs/kpatches/bfqsched/default.nix b/pkgs/kpatches/bfqsched/default.nix
deleted file mode 100644
index 3e0b122a..00000000
--- a/pkgs/kpatches/bfqsched/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  bfqVersion = "v8r2";
-  kernelVersion = "4.7.0";
-  version = "${kernelVersion}-${bfqVersion}";
-
-  baseURL = "http://algo.ing.unimo.it/people/paolo/disk_sched/patches";
-
-  fetchPatch = { name, sha256 }: fetchurl {
-    url = "${baseURL}/${version}/${name}.patch";
-    inherit sha256;
-  };
-
-  allPatches = [
-    (fetchPatch {
-      name = "0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.7.0";
-      sha256 = "116jfdgjgmy1fv6kzz7dm1c7rjy1pbsfzzcjv5mgsb7pnaxq3gd6";
-    })
-    (fetchPatch {
-      name = "0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.7.0";
-      sha256 = "0wjmnym2ycglx42f513n97b45x3xqi33q7z4cs0aiz0zbblm8jql";
-    })
-    (fetchPatch {
-      name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for";
-      sha256 = "0898aklynxb9dr0nb0kdhc2incjkjihds9dakxvdy0mwjqr0jd6v";
-    })
-    (fetchPatch {
-      name = "0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r2-for";
-      sha256 = "1aljji6ww73h0vpimbcmk0hj886m6fnnbahgmrkfcq1gc0n0484n";
-    })
-  ];
-
-  patch = stdenv.mkDerivation {
-    name = "bfqsched-${version}.patch";
-    inherit allPatches;
-    buildCommand = ''
-      cat $allPatches > "$out"
-    '';
-  };
-
-in {
-  name = "bfqsched-${version}";
-  inherit version patch;
-}
-- 
cgit 1.4.1