From 4232f5d219527fddee96f69ff94af0a8bde703ba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 15 Jun 2015 14:18:27 +0200 Subject: [PATCH] Disable system_tarball_pc and fix eval It refers to a kernel version that no longer exists. (cherry picked from commit e4b9624ca89617005cb082e2a8301695759e1b19) --- nixos/release.nix | 2 ++ pkgs/top-level/release-cross.nix | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index cf0a00dd254..05023868fa1 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -176,10 +176,12 @@ in rec { # boot that system from uboot (like for the sheevaplug). # The pc variant helps preparing the expression for the system tarball # in a machine faster than the sheevpalug + /* system_tarball_pc = forAllSystems (system: makeSystemTarball { module = ./modules/installer/cd-dvd/system-tarball-pc.nix; inherit system; }); + */ # Provide container tarball for lxc, libvirt-lxc, docker-lxc, ... containerTarball = forAllSystems (system: makeSystemTarball { diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index cef3d2dffbd..ced90c0489c 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -16,7 +16,6 @@ let #xorgserver.crossDrv = nativePlatforms; }; nixUnstable.crossDrv = nativePlatforms; - linuxPackages_3_4.kernel.crossDrv = linux; }; /* Basic list of packages to be natively built,