diff --git a/pkgs/development/compilers/strategoxt/strategoxt-0.9.5.nix b/pkgs/development/compilers/strategoxt/strategoxt-0.9.5.nix
new file mode 100644
index 000000000000..f608cb47c5cf
--- /dev/null
+++ b/pkgs/development/compilers/strategoxt/strategoxt-0.9.5.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, sdf}: derivation {
+  name = "strategoxt-0.9.5";
+  system = stdenv.system;
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = ftp://ftp.stratego-language.org/pub/stratego/StrategoXT/strategoxt-0.9.5.tar.gz;
+    md5 = "c3caea5c05f8d8439450866b6d5664df";
+  };
+  inherit stdenv aterm sdf;
+  tarfile = "true";
+  dir = "strategoxt";
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index 489a6b393ae2..74bb2fc231d5 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -250,6 +250,16 @@ rec {
     sdf = sdf2;
   };
 
+  strategoxt094 = (import ../development/compilers/strategoxt/strategoxt-0.9.4.nix) {
+    inherit fetchurl stdenv aterm;
+    sdf = sdf2;
+  };
+
+  strategoxt095 = (import ../development/compilers/strategoxt/strategoxt-0.9.5.nix) {
+    inherit fetchurl stdenv aterm;
+    sdf = sdf2;
+  };
+
   tiger = (import ../development/compilers/tiger) {
     inherit fetchurl stdenv aterm strategoxt;
     sdf = sdf2;
diff --git a/pkgs/system/all-packages.nix b/pkgs/system/all-packages.nix
index f1a0c917f718..571986ec997f 100644
--- a/pkgs/system/all-packages.nix
+++ b/pkgs/system/all-packages.nix
@@ -13,5 +13,5 @@
   body =
     if system == "i686-linux"
     then stdenvs.stdenvLinuxPkgs
-    else stdenvs.stdenvNixPkgs;
+    else (stdenvs.stdenvNixPkgs);
 }