From 5793a14c369f741f49d5d54a88f6024990d96420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Aug 2016 18:18:44 +0200
Subject: [PATCH] release.nix: tiny improvements on top of #18059

---
 pkgs/development/compilers/strategoxt/0.18.nix |  5 +++++
 pkgs/top-level/release.nix                     | 14 ++++++--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix
index 611586c5d932..ea2a86593fa9 100644
--- a/pkgs/development/compilers/strategoxt/0.18.nix
+++ b/pkgs/development/compilers/strategoxt/0.18.nix
@@ -22,6 +22,7 @@ rec {
     meta = {
       homepage = http://www.program-transformation.org/Sdf/SdfBundle;
       meta = "Tools for the SDF2 Syntax Definition Formalism, including the `pgen' parser generator and `sglr' parser";
+      platforms = stdenv.lib.platforms.linux;
     };
   } // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2 -Wl,--stack=0x2300000"; } else {} ) ) ;
 
@@ -39,6 +40,7 @@ rec {
     meta = {
       homepage = http://strategoxt.org/;
       meta = "A language and toolset for program transformation";
+      platforms = stdenv.lib.platforms.linux;
     };
   };
 
@@ -55,6 +57,7 @@ rec {
     meta = {
       homepage = http://strategoxt.org/;
       meta = "A language and toolset for program transformation";
+      platforms = stdenv.lib.platforms.linux;
       broken = true;
     };
   };
@@ -76,6 +79,7 @@ rec {
     meta = {
       homepage = http://strategoxt.org/Stratego/JavaFront;
       meta = "Tools for generating or transforming Java code";
+      platforms = stdenv.lib.platforms.linux;
     };
   } // ( if stdenv.system == "i686-cygwin" then { CFLAGS = "-O2"; } else {} ) ) ;
 
@@ -105,6 +109,7 @@ rec {
     meta = {
       homepage = http://strategoxt.org/Stratego/TheDryad;
       meta = "A collection of tools for developing transformation systems for Java source and bytecode";
+      platforms = stdenv.lib.platforms.linux;
       broken = true;
     };
   };
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 7bb097b3530b..160c19b1d859 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -11,8 +11,9 @@
 
 { nixpkgs ? { outPath = (import ../.. {}).lib.cleanSource ../..; revCount = 1234; shortRev = "abcdef"; }
 , officialRelease ? false
-, # The platforms for which we build Nixpkgs.
-  supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
+# The platforms for which we build Nixpkgs.
+, supportedSystems ? [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]
+# Strip most of attributes when evaluating to spare memory usage
 , scrubJobs ? true
 }:
 
@@ -84,18 +85,15 @@ let
         };
 
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
-
-      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
-
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 
+      # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66
+
+      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
       #rPackages = packagePlatforms pkgs.rPackages;
-
       ocamlPackages = { };
-
       perlPackages = { };
-
       pythonPackages = {
         pandas = unix;
         scikitlearn = unix;