diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-06-15 14:18:27 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-22 12:27:15 +0200 |
| commit | 4232f5d219527fddee96f69ff94af0a8bde703ba (patch) | |
| tree | 4564a15c94374a37a907d985ed0c248fcbe35a84 | |
| parent | 5d02c02a9bfd6912e4e0f700b1b35e76d1d6bd3f (diff) | |
| download | nixlib-4232f5d219527fddee96f69ff94af0a8bde703ba.tar nixlib-4232f5d219527fddee96f69ff94af0a8bde703ba.tar.gz nixlib-4232f5d219527fddee96f69ff94af0a8bde703ba.tar.bz2 nixlib-4232f5d219527fddee96f69ff94af0a8bde703ba.tar.lz nixlib-4232f5d219527fddee96f69ff94af0a8bde703ba.tar.xz nixlib-4232f5d219527fddee96f69ff94af0a8bde703ba.tar.zst nixlib-4232f5d219527fddee96f69ff94af0a8bde703ba.zip | |
Disable system_tarball_pc and fix eval
It refers to a kernel version that no longer exists. (cherry picked from commit e4b9624ca89617005cb082e2a8301695759e1b19)
| -rw-r--r-- | nixos/release.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/release-cross.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index cf0a00dd2540..05023868fa1b 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 cef3d2dffbdb..ced90c0489ca 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, |