public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable system_tarball_pc and fix eval 

It refers to a kernel version that no longer exists.

(cherry picked from commit e4b9624ca8)
This commit is contained in:
Eelco Dolstra 2015-06-15 14:18:27 +02:00
parent 5d02c02a9b
commit 4232f5d219
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/release.nix
View File

@ -176,10 +176,12 @@ in rec {
# boot that system from uboot (like for the sheevaplug). # boot that system from uboot (like for the sheevaplug).
# The pc variant helps preparing the expression for the system tarball # The pc variant helps preparing the expression for the system tarball
# in a machine faster than the sheevpalug # in a machine faster than the sheevpalug
/*
system_tarball_pc = forAllSystems (system: makeSystemTarball { system_tarball_pc = forAllSystems (system: makeSystemTarball {
module = ./modules/installer/cd-dvd/system-tarball-pc.nix; module = ./modules/installer/cd-dvd/system-tarball-pc.nix;
inherit system; inherit system;
}); });
*/
# Provide container tarball for lxc, libvirt-lxc, docker-lxc, ... # Provide container tarball for lxc, libvirt-lxc, docker-lxc, ...
containerTarball = forAllSystems (system: makeSystemTarball { containerTarball = forAllSystems (system: makeSystemTarball {

1
pkgs/top-level/release-cross.nix
View File

@ -16,7 +16,6 @@ let
#xorgserver.crossDrv = nativePlatforms; #xorgserver.crossDrv = nativePlatforms;
}; };
nixUnstable.crossDrv = nativePlatforms; nixUnstable.crossDrv = nativePlatforms;
linuxPackages_3_4.kernel.crossDrv = linux;
}; };
/* Basic list of packages to be natively built, /* Basic list of packages to be natively built,