From 82419575aa66135e83971f92896435d87f206b5a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 3 Jan 2016 19:21:27 +0100 Subject: btrfsProgs -> canonical btrfs-progs --- nixos/modules/tasks/filesystems/btrfs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/modules/tasks') 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 ''; }; -- cgit 1.4.1