diff options
author | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-03 19:21:27 +0100 |
---|---|---|
committer | Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com> | 2016-01-03 20:38:44 +0100 |
commit | 82419575aa66135e83971f92896435d87f206b5a (patch) | |
tree | a10f3d35bb4b6dc4da4b34d5729ecf2c088afaf2 /nixos/modules | |
parent | 1799d134ba4e388d928ebb8b7c47661dd5eb6ca8 (diff) | |
download | nixlib-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')
-rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 2 | ||||
-rw-r--r-- | nixos/modules/installer/tools/tools.nix | 2 | ||||
-rw-r--r-- | nixos/modules/system/boot/loader/grub/grub.nix | 2 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems/btrfs.nix | 6 | ||||
-rw-r--r-- | nixos/modules/virtualisation/lxd.nix | 2 |
6 files changed, 8 insertions, 8 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; }; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 47605e3685ca..c2bf5764804c 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -56,7 +56,7 @@ let extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios; path = (makeSearchPath "bin" ([ - pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs + pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) )) + ":" + (makeSearchPath "sbin" [ pkgs.mdadm pkgs.utillinux 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 ''; }; diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index 488153334bc1..845f14352f3d 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -45,7 +45,7 @@ in after = [ "systemd-udev-settle.service" ]; # TODO(wkennington): Add lvm2 and thin-provisioning-tools - path = with pkgs; [ acl rsync gnutar xz btrfsProgs ]; + path = with pkgs; [ acl rsync gnutar xz btrfs-progs ]; serviceConfig.ExecStart = "@${pkgs.lxd}/bin/lxd lxd --syslog --group lxd"; serviceConfig.Type = "simple"; |