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/installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +- nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/modules/installer') 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; }; -- cgit 1.4.1