about summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-26 10:15:05 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-02-26 10:15:05 +0100
commit6177710ac7ecd20c45faebfb7dc088ef49c6de0f (patch)
tree43d026175d600a3a67dd3837075b57cca3695a67 /pkgs/top-level
parentb6672f232acdcc2628656272ec77697c28cd0d75 (diff)
parent3d4fbb874cbc3d5d179e9fab0f7099e95b34d960 (diff)
downloadnixlib-6177710ac7ecd20c45faebfb7dc088ef49c6de0f.tar
nixlib-6177710ac7ecd20c45faebfb7dc088ef49c6de0f.tar.gz
nixlib-6177710ac7ecd20c45faebfb7dc088ef49c6de0f.tar.bz2
nixlib-6177710ac7ecd20c45faebfb7dc088ef49c6de0f.tar.lz
nixlib-6177710ac7ecd20c45faebfb7dc088ef49c6de0f.tar.xz
nixlib-6177710ac7ecd20c45faebfb7dc088ef49c6de0f.tar.zst
nixlib-6177710ac7ecd20c45faebfb7dc088ef49c6de0f.zip
Merge pull request #6046 from ts468/xen
Update: Xen 4.5 + NixOS Xen modules
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e69bee776c48..b56379e6e55d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12020,9 +12020,10 @@ let
 
   xdotool = callPackage ../tools/X11/xdotool { };
 
-  xen = callPackage ../applications/virtualization/xen {
-    stdenv = overrideCC stdenv gcc45;
-  };
+  xen_4_4_1 = callPackage ../applications/virtualization/xen/4.4.1.nix { };
+  xen_4_5_0 = callPackage ../applications/virtualization/xen/4.5.0.nix { };
+  xen_xenServer = callPackage ../applications/virtualization/xen/4.5.0.nix { xenserverPatched = true; };
+  xen = xen_4_5_0;
 
   xfe = callPackage ../applications/misc/xfe {
     fox = fox_1_6;