From 90375f6df922da35a0c57027c81b10b0c870124a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Dec 2015 08:15:59 +0100
Subject: pkgs: Move bfqsched patch to its own directory.

We need to add our own patch and don't want to clutter up the kpatches
directory.

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

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3b56fbd2..a39871fb 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -22,7 +22,7 @@ let
     twitchstream = callPackage ./twitchstream { };
 
     kernelPatches = {
-      bfqsched = callPackage ./kpatches/bfqsched.nix { };
+      bfqsched = callPackage ./kpatches/bfqsched { };
     };
   };
 in pkgs // self
diff --git a/pkgs/kpatches/bfqsched.nix b/pkgs/kpatches/bfqsched.nix
deleted file mode 100644
index 275c1ee3..00000000
--- a/pkgs/kpatches/bfqsched.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl }:
-
-let
-  bfqVersion = "v7r9";
-  kernelVersion = "4.2";
-  version = "${kernelVersion}.0-${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-"
-           + "${bfqVersion}-${kernelVersion}";
-      sha256 = "1998g05gj2vcwxhccjsa4nch3pyzm2qlc1k9q688f70j19qbnybk";
-    })
-    (fetchPatch {
-      name = "0002-block-introduce-the-BFQ-"
-           + "${bfqVersion}-I-O-sched-for-${kernelVersion}";
-      sha256 = "1p5xxpzbmch03r7d0wpfr4x1vhy1h7mv2lwck7lq3184mcscqgkl";
-    })
-    (fetchPatch {
-      name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-"
-           + "${bfqVersion}-for-${kernelVersion}.0";
-      sha256 = "10bzgdz4n2q6inv1w8v0qdhl0pl1gndn1iz97qkxdi0zfabc574d";
-    })
-  ];
-
-  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
new file mode 100644
index 00000000..275c1ee3
--- /dev/null
+++ b/pkgs/kpatches/bfqsched/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl }:
+
+let
+  bfqVersion = "v7r9";
+  kernelVersion = "4.2";
+  version = "${kernelVersion}.0-${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-"
+           + "${bfqVersion}-${kernelVersion}";
+      sha256 = "1998g05gj2vcwxhccjsa4nch3pyzm2qlc1k9q688f70j19qbnybk";
+    })
+    (fetchPatch {
+      name = "0002-block-introduce-the-BFQ-"
+           + "${bfqVersion}-I-O-sched-for-${kernelVersion}";
+      sha256 = "1p5xxpzbmch03r7d0wpfr4x1vhy1h7mv2lwck7lq3184mcscqgkl";
+    })
+    (fetchPatch {
+      name = "0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-"
+           + "${bfqVersion}-for-${kernelVersion}.0";
+      sha256 = "10bzgdz4n2q6inv1w8v0qdhl0pl1gndn1iz97qkxdi0zfabc574d";
+    })
+  ];
+
+  patch = stdenv.mkDerivation {
+    name = "bfqsched-${version}.patch";
+    inherit allPatches;
+    buildCommand = ''
+      cat $allPatches > "$out"
+    '';
+  };
+
+in {
+  name = "bfqsched-${version}";
+  inherit version patch;
+}
-- 
cgit 1.4.1