mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

btrfsProgs -> canonical btrfs-progs

Browse source
This commit is contained in:
Tobias Geerinckx-Rice 2016-01-03 19:21:27 +01:00
parent 1799d134ba
commit 82419575aa
12 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix
View file

@ -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.

2
nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
View file

@ -67,7 +67,7 @@ in
pkgs.dmraid
# Tools to create / manipulate filesystems.
pkgs.btrfsProgs
pkgs.btrfs-progs
# Some compression/archiver tools.
pkgs.unzip

2
nixos/modules/installer/tools/tools.nix
View file

@ -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;
};

2
nixos/modules/system/boot/loader/grub/grub.nix
View file

@ -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

6
nixos/modules/tasks/filesystems/btrfs.nix
View file

@ -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
'';
};

2
nixos/modules/virtualisation/lxd.nix
View file

@ -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";

2
nixos/tests/partition.nix
View file

@ -68,7 +68,7 @@ in {
machine = { config, pkgs, ... }: {
environment.systemPackages = [
pkgs.pythonPackages.nixpart0
pkgs.file pkgs.btrfsProgs pkgs.xfsprogs pkgs.lvm2
pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2
];
virtualisation.emptyDiskImages = [ 4096 4096 ];
};

4
pkgs/applications/virtualization/docker/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, makeWrapper
, go, sqlite, iproute, bridge-utils, devicemapper
, btrfsProgs, iptables, e2fsprogs, xz, utillinux
, btrfs-progs, iptables, e2fsprogs, xz, utillinux
, enableLxc ? false, lxc
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
makeWrapper go sqlite iproute bridge-utils devicemapper btrfsProgs
makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs
iptables e2fsprogs
];

0
pkgs/tools/filesystems/btrfsprogs/default.nix → pkgs/tools/filesystems/btrfs-progs/default.nix
View file

4
pkgs/tools/misc/snapper/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfsProgs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }:
{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45, diffutils, pam, utillinux, attr, gettext }:
stdenv.mkDerivation rec {
name = "snapper-0.2.4";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b";
};
buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfsProgs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
patchPhase = ''
# work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H"

3
pkgs/top-level/all-packages.nix
View file

@ -733,7 +733,7 @@ let
bsod = callPackage ../misc/emulators/bsod { };
btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { };
btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };
bwm_ng = callPackage ../tools/networking/bwm-ng { };
@ -15894,6 +15894,7 @@ aliases = with self; rec {
saneBackends = sane-backends; # added 2016-01-02
saneBackendsGit = sane-backends-git; # added 2016-01-02
saneFrontends = sane-frontends; # added 2016-01-02
btrfsProgs = btrfs-progs; # added 2016-01-03
};
tweakAlias = _n: alias: with lib;

2
pkgs/top-level/python-packages.nix
View file

@ -1430,7 +1430,7 @@ in modules // {
sha256 = "e61768fa19934bd176799f90bda3ea9f49a5def21fa2523a8e47df8a48e730e9";
};
buildInputs = with self; [ pkgs.btrfsProgs ];
buildInputs = with self; [ pkgs.btrfs-progs ];
propagatedBuildInputs = with self; [ contextlib2 pyxdg pycparser alembic ]
++ optionals (!isPyPy) [ cffi ];