Author: viric
Date: Mon Sep 13 20:52:49 2010
New Revision: 23772
URL: https://svn.nixos.org/websvn/nix/?rev=23772&sc=1
Log:
Making the system tarballs of fuloong and sheevaplug reference the proper
nixpkgs, and not that of /etc/...
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Mon Sep 13 20:14:45 2010 (r23771)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
Mon Sep 13 20:52:49 2010 (r23772)
@@ -147,6 +147,6 @@
system.boot.loader.kernelFile = "/vmlinux";
nixpkgs.config = {
- platform = (import
/etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).fuloong2f_n32;
+ platform = pkgs.platforms.fuloong2f_n32;
};
}
Modified:
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
==============================================================================
---
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Mon Sep 13 20:14:45 2010 (r23771)
+++
nixos/branches/stdenv-updates/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
Mon Sep 13 20:52:49 2010 (r23772)
@@ -183,8 +183,6 @@
jobs.openssh.startOn = pkgs.lib.mkOverride 50 {} "";
nixpkgs.config = {
- packageOverrides = pkgs : rec {
- };
- platform = (import
/etc/nixos/nixpkgs/pkgs/top-level/platforms.nix).sheevaplug;
+ platform = pkgs.platforms.sheevaplug;
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
