From 45de66b2b17690010b7d8918c4578d0b19b8dd7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 28 Jan 2013 23:42:36 +0000 Subject: [PATCH] Update the raspberry pi kernel to one newer. --- pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index 0dc6378fff3..b425f2792b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -1,5 +1,5 @@ args @ { - stdenv, fetchgit, extraConfig ? "" , perl, mktemp, module_init_tools, ... + stdenv, fetchurl, extraConfig ? "" , perl, mktemp, module_init_tools, ... }: let @@ -8,22 +8,24 @@ let ${if kernelPlatform ? kernelExtraConfig then kernelPlatform.kernelExtraConfig else ""} ${extraConfig} ''; + + rev = "91a3be5b2b"; in import ./generic.nix ( rec { - version = "3.6.y"; + version = "3.6.y-${rev}"; testing = false; preConfigure = '' substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' "" ''; - src = fetchgit { - url = https://github.com/raspberrypi/linux; - rev = "6e1f8bce970043a658d15f9350eb85152fd5fc4e"; - sha256 = ""; + src = fetchurl { + url = "https://api.github.com/repos/raspberrypi/linux/tarball/${rev}"; + name = "linux-raspberrypi-${version}.tar.gz"; + sha256 = "04370b1da7610622372940decdc13ddbba2a58c9da3c3bd3e7df930a399f140d"; }; config = configWithPlatform stdenv.platform; @@ -34,8 +36,6 @@ import ./generic.nix ( #features.needsCifsUtils = true; #features.canDisableNetfilterConntrackHelpers = true; #features.netfilterRPFilter = true; - - fetchurl = null; } // removeAttrs args ["extraConfig"] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7b3a1c128f..a58ab3471ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5901,7 +5901,7 @@ let }; linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) { - inherit fetchgit stdenv perl mktemp module_init_tools ubootChooser; + inherit fetchurl stdenv perl mktemp module_init_tools ubootChooser; }; /* Linux kernel modules are inherently tied to a specific kernel. So