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 --- .../installer/cd-dvd/system-tarball-fuloong2f.nix | 2 +- .../installer/cd-dvd/system-tarball-sheevaplug.nix | 2 +- nixos/modules/installer/tools/tools.nix | 2 +- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- nixos/modules/tasks/filesystems/btrfs.nix | 6 ++--- nixos/modules/virtualisation/lxd.nix | 2 +- nixos/tests/partition.nix | 2 +- .../applications/virtualization/docker/default.nix | 4 +-- pkgs/tools/filesystems/btrfs-progs/default.nix | 31 ++++++++++++++++++++++ pkgs/tools/filesystems/btrfsprogs/default.nix | 31 ---------------------- pkgs/tools/misc/snapper/default.nix | 4 +-- pkgs/top-level/all-packages.nix | 3 ++- pkgs/top-level/python-packages.nix | 2 +- 13 files changed, 47 insertions(+), 46 deletions(-) create mode 100644 pkgs/tools/filesystems/btrfs-progs/default.nix delete mode 100644 pkgs/tools/filesystems/btrfsprogs/default.nix diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index bbf0311c04d..f0351d12718 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 46dc1c70502..cdacc56f7ab 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 04e4c1eb945..9ac3b7a5b16 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 47605e3685c..c2bf5764804 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 049f7708d73..2e5b34a3246 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 488153334bc..845f14352f3 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"; diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix index 5e94b263d5b..291d9b278d3 100644 --- a/nixos/tests/partition.nix +++ b/nixos/tests/partition.nix @@ -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 ]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 5a51749652d..1d9b1737f65 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -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 ]; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix new file mode 100644 index 00000000000..53da1607087 --- /dev/null +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo +, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt +}: + +let version = "4.3.1"; in + +stdenv.mkDerivation rec { + name = "btrfs-progs-${version}"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; + sha256 = "0fpxi9pd297lrrynnsyggdwdcb4xvjvn2gvzlzsws0gdvqazzd8c"; + }; + + buildInputs = [ + pkgconfig attr acl zlib libuuid e2fsprogs lzo + asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + ]; + + # gcc bug with -O1 on ARM with gcc 4.8 + # This should be fine on all platforms so apply universally + patchPhase = "sed -i s/-O1/-O2/ configure"; + + meta = with stdenv.lib; { + description = "Utilities for the btrfs filesystem"; + homepage = https://btrfs.wiki.kernel.org/; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin wkennington ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix deleted file mode 100644 index 53da1607087..00000000000 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt -}: - -let version = "4.3.1"; in - -stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0fpxi9pd297lrrynnsyggdwdcb4xvjvn2gvzlzsws0gdvqazzd8c"; - }; - - buildInputs = [ - pkgconfig attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt - ]; - - # gcc bug with -O1 on ARM with gcc 4.8 - # This should be fine on all platforms so apply universally - patchPhase = "sed -i s/-O1/-O2/ configure"; - - meta = with stdenv.lib; { - description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ raskin wkennington ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 0f28b15ea97..41a5a6797d1 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -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" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a405d07b327..731089c20b5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 71980a33e2d..f6da9a1d4f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 ]; -- cgit 1.4.1