summary refs log tree commit diff
path: root/pkgs/applications/virtualization/xen/packages.nix
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2020-01-29 09:37:47 +0100
committerGitHub <noreply@github.com>2020-01-29 09:37:47 +0100
commitc55809e256024880420bdc101c7ce9562d213dfa (patch)
treee6178b2b40387f47a60ce77b2085e1cb5ea7553a /pkgs/applications/virtualization/xen/packages.nix
parenta2ee235cbd83e725e2afe16f2faafbb35c7ba790 (diff)
parentdd583e7f129c0489c6175e4a9e0df7d968be1540 (diff)
downloadnixpkgs-c55809e256024880420bdc101c7ce9562d213dfa.tar
nixpkgs-c55809e256024880420bdc101c7ce9562d213dfa.tar.gz
nixpkgs-c55809e256024880420bdc101c7ce9562d213dfa.tar.bz2
nixpkgs-c55809e256024880420bdc101c7ce9562d213dfa.tar.lz
nixpkgs-c55809e256024880420bdc101c7ce9562d213dfa.tar.xz
nixpkgs-c55809e256024880420bdc101c7ce9562d213dfa.tar.zst
nixpkgs-c55809e256024880420bdc101c7ce9562d213dfa.zip
Merge pull request #77985 from Ma27/drop-old-gcc
gcc: remove versions 4.9 and 5
Diffstat (limited to 'pkgs/applications/virtualization/xen/packages.nix')
-rw-r--r--pkgs/applications/virtualization/xen/packages.nix53
1 files changed, 1 insertions, 52 deletions
diff --git a/pkgs/applications/virtualization/xen/packages.nix b/pkgs/applications/virtualization/xen/packages.nix
index 791a3b91818..e30006fbcc1 100644
--- a/pkgs/applications/virtualization/xen/packages.nix
+++ b/pkgs/applications/virtualization/xen/packages.nix
@@ -1,62 +1,11 @@
 { callPackage
-, stdenv, overrideCC, gcc49
+, stdenv, overrideCC
 }:
 
 # TODO(@oxij) on new Xen version: generalize this to generate [vanilla slim
 # light] for each ./<version>.nix.
 
 rec {
-
-  xen_4_5-vanilla = callPackage ./4.5.nix {
-    # At the very least included seabios and etherboot need gcc49,
-    # so we have to build all of it with gcc49.
-    stdenv = overrideCC stdenv gcc49;
-
-    meta = {
-      description = "vanilla";
-      longDescription = ''
-        Vanilla version of Xen. Uses forks of Qemu and Seabios bundled
-        with Xen. This gives vanilla experince, but wastes space and
-        build time: typical NixOS setup that runs lots of VMs will
-        build three different versions of Qemu when using this (two
-        forks and upstream).
-      '';
-    };
-  };
-
-  xen_4_5-slim = xen_4_5-vanilla.override {
-    withInternalQemu = false;
-    withInternalTraditionalQemu = true;
-    withInternalSeabios = false;
-    withSeabios = true;
-
-    meta = {
-      description = "slim";
-      longDescription = ''
-        Slimmed-down version of Xen that reuses nixpkgs packages as
-        much as possible. Different parts may get out of sync, but
-        this builds faster and uses less space than vanilla. Use with
-        `qemu_xen` from nixpkgs.
-      '';
-    };
-  };
-
-  xen_4_5-light = xen_4_5-vanilla.override {
-    withInternalQemu = false;
-    withInternalTraditionalQemu = false;
-    withInternalSeabios = false;
-    withSeabios = true;
-
-    meta = {
-      description = "light";
-      longDescription = ''
-        Slimmed-down version of Xen without `qemu-traditional` (you
-        don't need it if you don't know what it is). Use with
-        `qemu_xen-light` from nixpkgs.
-      '';
-    };
-  };
-
   xen_4_8-vanilla = callPackage ./4.8.nix {
     meta = {
       description = "vanilla";