From ead1b8bc5c85378f3a8f678fb4e93738dd0cc83a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 10 Sep 2010 14:07:22 +0000 Subject: [PATCH] * Move config-blocks.nix to zen-kernel where it's used. svn path=/nixpkgs/trunk/; revision=23721 --- pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix | 2 +- pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix | 2 +- pkgs/os-specific/linux/{kernel => zen-kernel}/config-blocks.nix | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/os-specific/linux/{kernel => zen-kernel}/config-blocks.nix (100%) diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix index ec52d701df5..78a36c73ca5 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.32-zen4.nix @@ -4,7 +4,7 @@ args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? " ...}: let - conf = import ../kernel/config-blocks.nix; + conf = import ./config-blocks.nix; in diff --git a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix index a3824a4fb15..5c1a315cb38 100644 --- a/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix +++ b/pkgs/os-specific/linux/zen-kernel/2.6.33-zen1.nix @@ -4,7 +4,7 @@ args @ {stdenv, fetchurl, xz, runCommand, userModeLinux ? false, extraConfig ? " ...}: let - conf = import ../kernel/config-blocks.nix; + conf = import ./config-blocks.nix; baseKernelVersion = "2.6.33"; ZenSuffix = "zen1"; diff --git a/pkgs/os-specific/linux/kernel/config-blocks.nix b/pkgs/os-specific/linux/zen-kernel/config-blocks.nix similarity index 100% rename from pkgs/os-specific/linux/kernel/config-blocks.nix rename to pkgs/os-specific/linux/zen-kernel/config-blocks.nix