1 files changed, 17 insertions, 10 deletions

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 648eef655d8d7..490d943cf2012 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -167,7 +167,6 @@ with (import ./release-lib.nix);
   kbd = linux;
   keen4 = ["i686-linux"];
 #  klibc = linux;
-  ktorrent = linux;
   kvm = linux;
   qemu = linux;
   qemu_kvm = linux;
@@ -203,9 +202,11 @@ with (import ./release-lib.nix);
   module_init_tools = linux;
   mono = linux;
   mpg321 = linux;
+  mupen64plus = linux;
   mutt = linux;
   mysql = linux;
   mysql51 = linux;
+  mysql55 = linux;
   namazu = all;
   nano = allBut "i686-cygwin";
   ncat = linux;
@@ -306,6 +307,7 @@ with (import ./release-lib.nix);
   tightvnc = linux;
   time = linux;
   tinycc = ["i686-linux"];
+  uae = linux;
   udev = linux;
   uml = ["i686-linux"];
   unrar = linux;
@@ -319,6 +321,7 @@ with (import ./release-lib.nix);
   vice = linux;
   vim = linux;
   vimHugeX = linux;
+  VisualBoyAdvance = linux;
   vlc = linux;
   vncrec = linux;
   vorbisTools = linux;
@@ -352,6 +355,7 @@ with (import ./release-lib.nix);
   zile = linux;
   zip = all;
   zsh = linux;
+  zsnes = ["i686-linux"];
 
   aspellDicts = {
     de = all;
@@ -362,7 +366,7 @@ with (import ./release-lib.nix);
     ru = all;
   };
 
-  dbus = {
+  dbus_all = {
     libs = linux;
     tools = linux;
   };
@@ -381,8 +385,8 @@ with (import ./release-lib.nix);
   };
 
   firefox36Pkgs.firefox = linux;
-  firefox40Pkgs.firefox = linux;
   firefox50Pkgs.firefox = linux;
+  firefox60Pkgs.firefox = linux;
 
   gnome = {
     gnome_panel = linux;
@@ -394,6 +398,7 @@ with (import ./release-lib.nix);
     gtk = linux;
   };
 
+  /*
   haskellPackages_ghc6104 = {
     ghc = ghcSupported;
     haskellPlatform_2009_2_0_2 = ghcSupported;
@@ -405,14 +410,10 @@ with (import ./release-lib.nix);
   };
 
   haskellPackages_ghc6123 = {
-    darcs = ghcSupported;
     ghc = ghcSupported;
     gitit = linux;
     gtk = linux;
-    leksah = linux;
-    haskellPlatform_2010_2_0_0 = ghcSupported;
-    lhs2tex = ghcSupported;
-    xmonad = linux;
+    haskellPlatform = ghcSupported;
   };
 
   haskellPackages_ghc701 = {
@@ -420,14 +421,20 @@ with (import ./release-lib.nix);
   };
 
   haskellPackages_ghc702 = {
+    ghc = ghcSupported;
+    haskellPlatform = ghcSupported;
+  };
+
+  haskellPackages_ghc704 = {
     darcs = ghcSupported;
     ghc = ghcSupported;
     gitit = linux;
     gtk = linux;
-    haskellPlatform_2011_2_0_0 = ghcSupported;
+    haskellPlatform = ghcSupported;
     lhs2tex = ghcSupported;
     xmonad = linux;
   };
+  */
 
   kde3 = {
     kdebase = linux;
@@ -558,7 +565,7 @@ with (import ./release-lib.nix);
     xwininfo = linux;
   };
 
-  xfce4 = {
+  xfce = {
     gtk_xfce_engine = linux;
     mousepad = linux;
     ristretto = linux;