diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2024-05-24 15:20:17 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-24 15:20:17 +0000 |
| commit | b49ae4c6e873b85341681776b9f5abb0bc292211 (patch) | |
| tree | 96dad61279a4741a53c57dbe082364158705aaa6 /pkgs/tools/filesystems | |
| parent | a73d2d9b6290adef8185752cdf1ad5d87ad2af2a (diff) | |
| parent | 5e9dc71d53ed830449352682087f68d2bc523e5c (diff) | |
Merge pull request #313657 from yu-re-ka/e2fsprogs
e2fsprogs: 1.47.0 -> 1.47.1
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/btrfs-progs/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/tools/filesystems/e2fsprogs/default.nix | 14 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 6e2bdaea8f9e2..beaff7922e558 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchpatch , buildPackages , pkg-config , zstd @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { hash = "sha256-DkCgaKJsKWnLAqlbqf74iNemNW4/RX/5KtJHfQhzVng="; }; + patches = [ + # backport fix build with e2fsprogs 1.47.1 + (fetchpatch { + url = "https://github.com/kdave/btrfs-progs/commit/bcb887a4de2c56426a7a7de8d440b6ad75579f10.patch"; + hash = "sha256-Ir5EiiU0E8GBnGex0Q/WTNexW9XTWFNceiLQvXygIoo="; + }) + ]; + nativeBuildInputs = [ pkg-config ] ++ [ diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index a5ca282955f33..dfa47a824e259 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, buildPackages, fetchurl, fetchpatch, pkg-config, libuuid, gettext, texinfo -, withFuse ? stdenv.isLinux, fuse +, withFuse ? stdenv.isLinux, fuse3 , shared ? !stdenv.hostPlatform.isStatic , e2fsprogs, runCommand }: stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.47.0"; + version = "1.47.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - hash = "sha256-Zmev3lbu8MavJmhJdEAOTSKI6knpRBv15iKRldUaNXg="; + hash = "sha256-mvzSAfOUKdLbJJKusT26XnXWzFBoK3MtyjVkO9XwkuM="; }; # fuse2fs adds 14mb of dependencies @@ -20,15 +20,9 @@ stdenv.mkDerivation rec { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ libuuid gettext ] - ++ lib.optionals withFuse [ fuse ]; + ++ lib.optionals withFuse [ fuse3 ]; patches = [ - (fetchpatch { # avoid using missing __GNUC_PREREQ(X,Y) - url = "https://raw.githubusercontent.com/void-linux/void-packages/9583597eb3e6e6b33f61dbc615d511ce030bc443/srcpkgs/e2fsprogs/patches/fix-glibcism.patch"; - sha256 = "1gfcsr0i3q8q2f0lqza8na0iy4l4p3cbii51ds6zmj0y4hz2dwhb"; - excludes = [ "lib/ext2fs/hashmap.h" ]; - extraPrefix = ""; - }) # Avoid trouble with older systems like NixOS 23.05. # TODO: most likely drop this at some point, e.g. when 23.05 loses support. (fetchurl { |