summary refs log tree commit diff
path: root/pkgs/top-level/release.nix
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2016-08-28 18:18:44 +0200
committerDomen Kožar <domen@dev.si>2016-08-28 18:18:44 +0200
commit5793a14c369f741f49d5d54a88f6024990d96420 (patch)
tree7d1823633eb2f6dced20d3b0725b55332b34c906 /pkgs/top-level/release.nix
parentcb9737fe439059294964e4b8c5c6017990d343b3 (diff)
downloadnixpkgs-5793a14c369f741f49d5d54a88f6024990d96420.tar
nixpkgs-5793a14c369f741f49d5d54a88f6024990d96420.tar.gz
nixpkgs-5793a14c369f741f49d5d54a88f6024990d96420.tar.bz2
nixpkgs-5793a14c369f741f49d5d54a88f6024990d96420.tar.lz
nixpkgs-5793a14c369f741f49d5d54a88f6024990d96420.tar.xz
nixpkgs-5793a14c369f741f49d5d54a88f6024990d96420.tar.zst
nixpkgs-5793a14c369f741f49d5d54a88f6024990d96420.zip
release.nix: tiny improvements on top of #18059
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix14
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 7bb097b3530..160c19b1d85 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;
 
-      #rPackages = packagePlatforms pkgs.rPackages;
+      # 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;