Merge pull request NixOS#335604 from NixOS/revert-334894-erofs-1.8

Revert "erofs-utils upgrade to 1.8"
wentasah · Aug 18, 2024 · 8a33541 · 8a33541
2 parents 4695415 + 13c304e
commit 8a33541
Showing 1 changed file with 17 additions and 42 deletions.
diff --git a/pkgs/tools/filesystems/erofs-utils/default.nix b/pkgs/tools/filesystems/erofs-utils/default.nix
@@ -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;
   };
-})
+}