From cd4acca2e22c33cfe3b03fc9370925dad6c9dfea Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Jan 2022 19:51:27 +0000 Subject: [PATCH] btrfs-progs: 5.14.1 -> 5.16 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index bdd26041d33a..ccaebd73f53f 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,14 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt, zstd, python3 +{ lib, stdenv, fetchurl +, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto +, zstd +, acl, attr, e2fsprogs, libuuid, lzo, systemd, zlib }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.14.1"; + version = "5.16"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-1UqTRlRcpG3xKOPMt31gwJfZDJO34xSZAjbijPr4xVs="; + sha256 = "0cqqlcq9bywfi3cpg5ivxiv7p9v6z1r6k4nnmin24mj1kp8krarq"; }; nativeBuildInputs = [ @@ -16,7 +18,7 @@ stdenv.mkDerivation rec { python3 python3.pkgs.setuptools ]; - buildInputs = [ attr acl zlib libuuid e2fsprogs lzo zstd python3 ]; + buildInputs = [ acl attr e2fsprogs libuuid lzo python3 systemd zlib zstd ]; # for python cross-compiling _PYTHON_HOST_PLATFORM = stdenv.hostPlatform.config; @@ -31,6 +33,8 @@ stdenv.mkDerivation rec { configureFlags = lib.optional stdenv.hostPlatform.isMusl "--disable-backtrace"; + makeFlags = [ "udevruledir=$(out)/lib/udev/rules.d" ]; + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/";