diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2012-11-26 05:00:45 +0100 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2012-11-26 05:07:01 +0100 |
| commit | 54eafed24c2a11c739d75618cf2ef45cb1f7ab10 (patch) | |
| tree | 46f9940292d75160c85cde0980fa4b65a53589e7 /machines | |
| parent | 7b679af78d7d8a86b7b3129016d404fb62a2ecde (diff) | |
Move kernel source expr into nixpkgs/config.nix.
I'm just using the kernel source from mmrnmhrm, even though it's older than dnyarri's kernel config. The reason is because I want to make sure that a nixos-rebuild won't bring up any changes. It is rather unlikely, but I better want to make sure it won't happen. Afterwards, let's upgrade that old kernel, because the 3.7.0-rc7 tag was pushed by Linus just about two hours ago. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/dnyarri.nix | 8 | ||||
| -rw-r--r-- | machines/mmrnmhrm.nix | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/machines/dnyarri.nix b/machines/dnyarri.nix index 945b8ace..d2cfaf73 100644 --- a/machines/dnyarri.nix +++ b/machines/dnyarri.nix @@ -39,12 +39,8 @@ with pkgs.lib; ]; linuxAszlig = pkgs.linuxManualConfig { - version = "3.7.0-rc6"; - src = pkgs.fetchgit { - url = /home/aszlig/linux; - rev = "f60c7ab5c56292820f96d8fcb21124c53ae02d0e"; - sha256 = "0zy6p14qjnk3dl3hy725m9mlavdklq2zjk64jk75ajmfygbz2q56"; - }; + version = pkgs.kernelSourceAszlig.version; + src = pkgs.kernelSourceAszlig.src; configfile = pkgs.substituteAll { name = "aszlig-with-firmware.kconf"; diff --git a/machines/mmrnmhrm.nix b/machines/mmrnmhrm.nix index 65e58851..a765918e 100644 --- a/machines/mmrnmhrm.nix +++ b/machines/mmrnmhrm.nix @@ -7,12 +7,8 @@ with pkgs.lib; boot = let linuxAszlig = pkgs.linuxManualConfig { - version = "3.7.0-rc6"; - src = pkgs.fetchgit { - url = /home/aszlig/linux; - rev = "c56dcc86b9a0a140ae0b35abb4b2ecd1b45e8bda"; - sha256 = "1km8dgfgdcgngcdnj5jzy98zyn7mrfryygnrp2wvzk5vi53wksmx"; - }; + version = pkgs.kernelSourceAszlig.version; + src = pkgs.kernelSourceAszlig.src; configfile = pkgs.fetchurl { name = "aszlig.kconf"; url = "file:///home/aszlig/linux/.config"; |