summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-11-23 12:49:46 +0100
committerGitHub <noreply@github.com>2016-11-23 12:49:46 +0100
commitd97a379510846cc00dde4fac0a36725c9177ac79 (patch)
treeab5763ac13c022feeca150786df5097e2d67c7c2 /nixos
parentd074a5a07ee5fa96d5f4994b489c50dea1e4745a (diff)
parent1d08acb3053936b6d67bbdbfb06a66f5f64bdc9e (diff)
downloadnixpkgs-d97a379510846cc00dde4fac0a36725c9177ac79.tar
nixpkgs-d97a379510846cc00dde4fac0a36725c9177ac79.tar.gz
nixpkgs-d97a379510846cc00dde4fac0a36725c9177ac79.tar.bz2
nixpkgs-d97a379510846cc00dde4fac0a36725c9177ac79.tar.lz
nixpkgs-d97a379510846cc00dde4fac0a36725c9177ac79.tar.xz
nixpkgs-d97a379510846cc00dde4fac0a36725c9177ac79.tar.zst
nixpkgs-d97a379510846cc00dde4fac0a36725c9177ac79.zip
Merge pull request #20641 from mayflower/fix/installer-closure-size
Reduce closure size of installer images
Diffstat (limited to 'nixos')
-rw-r--r--nixos/lib/make-squashfs.nix2
-rw-r--r--nixos/modules/profiles/base.nix4
-rw-r--r--nixos/modules/profiles/minimal.nix2
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index 3b640334e17..2baa4f66760 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -25,6 +25,6 @@ stdenv.mkDerivation {
 
       # Generate the squashfs image.
       mksquashfs nix-path-registration $storePaths $out \
-        -keep-as-directory -all-root
+        -keep-as-directory -all-root -comp xz
     '';
 }
diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 32bea97823c..f90d0d992ec 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -7,7 +7,7 @@
   # Include some utilities that are useful for installing or repairing
   # the system.
   environment.systemPackages = [
-    pkgs.w3m # needed for the manual anyway
+    pkgs.w3m-nox # needed for the manual anyway
     pkgs.testdisk # useful for repairing boot problems
     pkgs.mssys # for writing Microsoft boot sectors / MBRs
     pkgs.efibootmgr
@@ -42,8 +42,6 @@
     # Some compression/archiver tools.
     pkgs.unzip
     pkgs.zip
-    pkgs.dar # disk archiver
-    pkgs.cabextract
   ];
 
   # Include support for various filesystems.
diff --git a/nixos/modules/profiles/minimal.nix b/nixos/modules/profiles/minimal.nix
index b047b706365..e2497d04252 100644
--- a/nixos/modules/profiles/minimal.nix
+++ b/nixos/modules/profiles/minimal.nix
@@ -14,4 +14,6 @@ with lib;
 
   programs.man.enable = mkDefault false;
   programs.info.enable = mkDefault false;
+
+  sound.enable = mkDefault false;
 }