about summary refs log tree commit diff
path: root/nixos/modules/installer
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-03 19:21:27 +0100
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2016-01-03 20:38:44 +0100
commit82419575aa66135e83971f92896435d87f206b5a (patch)
treea10f3d35bb4b6dc4da4b34d5729ecf2c088afaf2 /nixos/modules/installer
parent1799d134ba4e388d928ebb8b7c47661dd5eb6ca8 (diff)
downloadnixlib-82419575aa66135e83971f92896435d87f206b5a.tar
nixlib-82419575aa66135e83971f92896435d87f206b5a.tar.gz
nixlib-82419575aa66135e83971f92896435d87f206b5a.tar.bz2
nixlib-82419575aa66135e83971f92896435d87f206b5a.tar.lz
nixlib-82419575aa66135e83971f92896435d87f206b5a.tar.xz
nixlib-82419575aa66135e83971f92896435d87f206b5a.tar.zst
nixlib-82419575aa66135e83971f92896435d87f206b5a.zip
btrfsProgs -> canonical btrfs-progs
Diffstat (limited to 'nixos/modules/installer')
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix2
-rw-r--r--nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix2
-rw-r--r--nixos/modules/installer/tools/tools.nix2
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
index bbf0311c04d6..f0351d127183 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
@@ -74,7 +74,7 @@ in
 
       # Tools to create / manipulate filesystems.
       pkgs.ntfsprogs # for resizing NTFS partitions
-      pkgs.btrfsProgs
+      pkgs.btrfs-progs
       pkgs.jfsutils
 
       # Some compression/archiver tools.
diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 46dc1c705022..cdacc56f7ab9 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -67,7 +67,7 @@ in
       pkgs.dmraid
 
       # Tools to create / manipulate filesystems.
-      pkgs.btrfsProgs
+      pkgs.btrfs-progs
 
       # Some compression/archiver tools.
       pkgs.unzip
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 04e4c1eb9459..9ac3b7a5b16f 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -38,7 +38,7 @@ let
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
-    path = [ pkgs.btrfsProgs ];
+    path = [ pkgs.btrfs-progs ];
     perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl";
     inherit (config.system) nixosRelease;
   };