summary refs log tree commit diff
path: root/nixos/modules/tasks
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/tasks
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/tasks')
-rw-r--r--nixos/modules/tasks/filesystems/btrfs.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/tasks/filesystems/btrfs.nix b/nixos/modules/tasks/filesystems/btrfs.nix
index 049f7708d739..2e5b34a3246e 100644
--- a/nixos/modules/tasks/filesystems/btrfs.nix
+++ b/nixos/modules/tasks/filesystems/btrfs.nix
@@ -11,13 +11,13 @@ in
 {
   config = mkIf (any (fs: fs == "btrfs") config.boot.supportedFilesystems) {
 
-    system.fsPackages = [ pkgs.btrfsProgs ];
+    system.fsPackages = [ pkgs.btrfs-progs ];
 
     boot.initrd.kernelModules = mkIf inInitrd [ "btrfs" "crc32c" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
       ''
-        copy_bin_and_libs ${pkgs.btrfsProgs}/bin/btrfs
+        copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfs
         ln -sv btrfs $out/bin/btrfsck
         ln -sv btrfsck $out/bin/fsck.btrfs
       '';
@@ -36,7 +36,7 @@ in
     # new devices are discovered.
     jobs.udev.postStart =
       ''
-        ${pkgs.btrfsProgs}/bin/btrfs device scan
+        ${pkgs.btrfs-progs}/bin/btrfs device scan
       '';
 
   };