From 07eedae576e3b668afce445a6e48d54d0f4387e0 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 24 Dec 2007 13:43:25 +0000 Subject: [PATCH] * Linux 2.6.23.12. svn path=/nixpkgs/trunk/; revision=9965 --- pkgs/os-specific/linux/kernel/linux-2.6.23.nix | 4 ++-- pkgs/top-level/all-packages.nix | 10 ++++------ 2 files changed, 6 insertions(+), 8 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 1d034e897cce..c38c0aa699bc 100644 --- a/pkgs/os-specific/linux/kernel/linux-2.6.23.nix +++ b/pkgs/os-specific/linux/kernel/linux-2.6.23.nix @@ -28,7 +28,7 @@ let lib = import ../../../lib; - version = "2.6.23.1"; + version = "2.6.23.12"; in @@ -38,7 +38,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://kernel/linux/kernel/v2.6/linux-${version}.tar.bz2"; - sha256 = "0737g83h7jbrlss8782b17mhc3nfn8qfbh5s71flz8pjxmbbmg1m"; + sha256 = "1x3ngnhyxy9rlaislm2hzijaaa2mp8v930dyp8zmmhjdpzjf3w8k"; }; patches = map (p: p.patch) kernelPatches; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd430daea182..7a14145e308e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2994,13 +2994,13 @@ rec { }; devicemapperStatic = lowPrio (appendToName "static" (import ../os-specific/linux/device-mapper { - inherit fetchurl stdenv; - static = true; - })); + inherit fetchurl stdenv; + static = true; + })); dietlibc = import ../os-specific/linux/dietlibc { inherit fetchurl glibc; -# Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works. + # Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works. stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv; }; @@ -3267,8 +3267,6 @@ rec { ]; }; - - kernel_2_6_23 = import ../os-specific/linux/kernel/linux-2.6.23.nix { inherit fetchurl stdenv perl mktemp module_init_tools; kernelPatches = [