mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 19:21:04 +00:00
Merge pull request #335604 from NixOS/revert-334894-erofs-1.8
Revert "erofs-utils upgrade to 1.8"
This commit is contained in:
commit
8a3354191c
|
@ -1,50 +1,29 @@
|
|||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchurl,
|
||||
autoreconfHook,
|
||||
pkg-config,
|
||||
fuse,
|
||||
util-linux,
|
||||
lz4,
|
||||
xz,
|
||||
zlib,
|
||||
libselinux,
|
||||
fuseSupport ? stdenv.isLinux,
|
||||
selinuxSupport ? false,
|
||||
lzmaSupport ? false,
|
||||
{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, xz, zlib, libselinux
|
||||
, fuseSupport ? stdenv.isLinux
|
||||
, selinuxSupport ? false
|
||||
, lzmaSupport ? false
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "erofs-utils";
|
||||
version = "1.8.1";
|
||||
outputs = [
|
||||
"out"
|
||||
"man"
|
||||
];
|
||||
version = "1.7.1";
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-Xb97SS92gkYrl6dxIdQ8p2Cc2Q5l+MlpMa78ggpvDaM=";
|
||||
url =
|
||||
"https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/snapshot/erofs-utils-${version}.tar.gz";
|
||||
hash = "sha256-GWCD1j5eIx+1eZ586GqUS7ylZNqrzj3pIlqKyp3K/xU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
autoreconfHook
|
||||
pkg-config
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
util-linux
|
||||
lz4
|
||||
zlib
|
||||
]
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
buildInputs = [ util-linux lz4 zlib ]
|
||||
++ lib.optionals fuseSupport [ fuse ]
|
||||
++ lib.optionals selinuxSupport [ libselinux ]
|
||||
++ lib.optionals lzmaSupport [ xz ];
|
||||
|
||||
configureFlags =
|
||||
[ "MAX_BLOCK_SIZE=4096" ]
|
||||
++ lib.optional fuseSupport "--enable-fuse"
|
||||
configureFlags = [
|
||||
"MAX_BLOCK_SIZE=4096"
|
||||
] ++ lib.optional fuseSupport "--enable-fuse"
|
||||
++ lib.optional selinuxSupport "--with-selinux"
|
||||
++ lib.optional lzmaSupport "--enable-lzma";
|
||||
|
||||
|
@ -53,11 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
description = "Userspace utilities for linux-erofs file system";
|
||||
changelog = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/tree/ChangeLog?h=v${version}";
|
||||
license = with licenses; [ gpl2Plus ];
|
||||
maintainers = with maintainers; [
|
||||
ehmry
|
||||
nikstur
|
||||
jmbaur
|
||||
];
|
||||
maintainers = with maintainers; [ ehmry nikstur ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue