From 1994bd5b6a96fb7acd8d44bd8262a611b3245b4e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 28 Sep 2007 20:34:48 +0000 Subject: [PATCH] Some corrections to 2.6.23-rc8; builds now svn path=/nixpkgs/trunk/; revision=9383 --- .../os-specific/linux/kernel/linux-2.6.23.nix | 4 ++-- pkgs/top-level/all-packages.nix | 24 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-2.6.23.nix b/pkgs/os-specific/linux/kernel/linux-2.6.23.nix index 9ef610d0b22a..9b5a47b17a97 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.23.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.23.nix @@ -24,7 +24,7 @@ let lib = import ../../../lib; - version = "2.6.22.9"; + version = "2.6.22"; in @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "19rspc22ld2xxdgik10c876m1lbxhcb1k3f31fg404dp21nxvkhq"; + sha256 = "73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7"; }; patches = map (p: p.patch) kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 069e674cc805..d91d79b03fd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2818,7 +2818,19 @@ rec { kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix { inherit fetchurl stdenv perl mktemp module_init_tools; - kernelPatches = [ + kernelPatches = + [{ + name = "patch-2.6.23-rc8"; + patch = fetchurl { + url = http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.23-rc8.bz2; + sha256 = "1007y8z9zs32fcm1m9ic8dp01jfj7550pr0l2sbhxlwr7v6cy554"; + }; + } + ] + ++ + [ + + /*{ name = "ext3cow"; patch = ../os-specific/linux/kernel/linux-2.6.20.3-ext3cow.patch; extraConfig = @@ -2887,16 +2899,6 @@ rec { patch = ../lib/empty.file; extraConfig =( getConfig ["kernel" "addConfig"] ""); }] - ++ - [{ - name = "patch-2.6.23-rc8"; - patch = fetchurl { - url = http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.23-rc8.bz2; - sha256 = "1007y8z9zs32fcm1m9ic8dp01jfj7550pr0l2sbhxlwr7v6cy554"; - }; - } - ] - ; };