From 9fb5374acb6cd1faa025b76386cdecd1e1732a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Nov 2025 15:16:58 +0100 Subject: [PATCH 1/5] nixos/tasks/reiserfs: drop --- nixos/modules/module-list.nix | 1 - nixos/modules/tasks/filesystems/reiserfs.nix | 31 -------------------- 2 files changed, 32 deletions(-) delete mode 100644 nixos/modules/tasks/filesystems/reiserfs.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 953444abe586..660c8d2c1321 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1930,7 +1930,6 @@ ./tasks/filesystems/nfs.nix ./tasks/filesystems/ntfs.nix ./tasks/filesystems/overlayfs.nix - ./tasks/filesystems/reiserfs.nix ./tasks/filesystems/squashfs.nix ./tasks/filesystems/sshfs.nix ./tasks/filesystems/unionfs-fuse.nix diff --git a/nixos/modules/tasks/filesystems/reiserfs.nix b/nixos/modules/tasks/filesystems/reiserfs.nix deleted file mode 100644 index 6302ff735816..000000000000 --- a/nixos/modules/tasks/filesystems/reiserfs.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - - inInitrd = config.boot.initrd.supportedFilesystems.reiserfs or false; - -in - -{ - config = mkIf (config.boot.supportedFilesystems.reiserfs or false) { - - system.fsPackages = [ pkgs.reiserfsprogs ]; - - boot.initrd.kernelModules = mkIf inInitrd [ "reiserfs" ]; - - boot.initrd.extraUtilsCommands = mkIf (inInitrd && !config.boot.initrd.systemd.enable) '' - copy_bin_and_libs ${pkgs.reiserfsprogs}/sbin/reiserfsck - ln -s reiserfsck $out/bin/fsck.reiserfs - ''; - - boot.initrd.systemd.initrdBin = mkIf inInitrd [ pkgs.reiserfsprogs ]; - - }; -} From 4c232305c92f379671492f2ff193de362ca1d521 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Nov 2025 15:16:03 +0100 Subject: [PATCH 2/5] linux: be explicit about REISERFS being gone after 6.13 see 25.05 release notes --- pkgs/os-specific/linux/kernel/common-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index e1380b86a11f..4302e9041166 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -699,9 +699,9 @@ let NTFS3_LZX_XPRESS = whenAtLeast "5.15" yes; NTFS3_FS_POSIX_ACL = whenAtLeast "5.15" yes; - REISERFS_FS_XATTR = option yes; - REISERFS_FS_POSIX_ACL = option yes; - REISERFS_FS_SECURITY = option yes; + REISERFS_FS_XATTR = whenOlder "6.13" (option yes); + REISERFS_FS_POSIX_ACL = whenOlder "6.13" (option yes); + REISERFS_FS_SECURITY = whenOlder "6.13" (option yes); JFS_POSIX_ACL = option yes; JFS_SECURITY = option yes; From 8f8e74fd27e7ff047bfc3e6d7fbf01f9ddf5ad04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Nov 2025 15:15:23 +0100 Subject: [PATCH 3/5] reiserfsprogs: drop --- pkgs/by-name/gp/gparted/package.nix | 2 - pkgs/by-name/re/reiserfsprogs/package.nix | 39 ------------------- .../python-modules/blivet/default.nix | 2 - pkgs/top-level/aliases.nix | 1 + 4 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 pkgs/by-name/re/reiserfsprogs/package.nix diff --git a/pkgs/by-name/gp/gparted/package.nix b/pkgs/by-name/gp/gparted/package.nix index 9b492e9f9b69..2f62aff4e2dc 100644 --- a/pkgs/by-name/gp/gparted/package.nix +++ b/pkgs/by-name/gp/gparted/package.nix @@ -35,7 +35,6 @@ lvm2, nilfs-utils, ntfs3g, - reiserfsprogs, udftools, xfsprogs, xfsdump, @@ -97,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { lvm2 nilfs-utils ntfs3g - reiserfsprogs udftools xfsprogs xfsdump diff --git a/pkgs/by-name/re/reiserfsprogs/package.nix b/pkgs/by-name/re/reiserfsprogs/package.nix deleted file mode 100644 index 68aaafcf0318..000000000000 --- a/pkgs/by-name/re/reiserfsprogs/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - libuuid, - autoreconfHook, - e2fsprogs, - acl, -}: - -stdenv.mkDerivation rec { - pname = "reiserfsprogs"; - version = "3.6.27"; - - src = fetchurl { - url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-DpW2f6d0ajwtWRRem5wv60pr5ShT6DtJexgurlCOYuM="; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ - libuuid - e2fsprogs - acl - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-std=gnu90" - "-D_GNU_SOURCE" - ]; - - meta = { - inherit version; - homepage = "http://www.namesys.com/"; - description = "ReiserFS utilities"; - license = lib.licenses.gpl2Only; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index dd433a46b892..f13e9190c551 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -20,7 +20,6 @@ f2fs-tools, ntfs3g, btrfs-progs, - reiserfsprogs, mdadm, lvm2, gfs2-utils, @@ -76,7 +75,6 @@ buildPythonPackage rec { f2fs-tools ntfs3g btrfs-progs - reiserfsprogs mdadm lvm2 gfs2-utils diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7dfe86967e25..0f5822f7fbb1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1431,6 +1431,7 @@ mapAliases { redocly-cli = throw "'redocly-cli' has been renamed to/replaced by 'redocly'"; # Converted to throw 2025-10-27 redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27 redshift-plasma-applet = throw "'redshift-plasma-applet' has been removed as it is obsolete and lacks maintenance upstream."; # Added 2025-11-09 + reiserfsprogs = throw "'reiserfsprogs' has been removed as ReiserFS has not been actively maintained for many years."; # Added 2025-11-13 remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11 resp-app = throw "'resp-app' has been replaced by 'redisinsight'"; # Added 2025-12-17 responsively-app = throw "'responsively-app' has been removed due to lack of maintenance upstream."; # Added 2025-06-25 From a212ef4e2afe99e40b20a5bcda970b72e1d3ea2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Nov 2025 15:17:43 +0100 Subject: [PATCH 4/5] nixos/filesystems: drop reiserfs --- nixos/modules/tasks/filesystems.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 108c1b495c9e..714f9d5f6d89 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -284,7 +284,6 @@ let ++ lib.optionals (!config.boot.initrd.checkJournalingFS) [ "ext3" "ext4" - "reiserfs" "xfs" "jfs" "f2fs" From 2459f7a59630d9034e92a59b5a158fb38978338c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 13 Nov 2025 15:18:09 +0100 Subject: [PATCH 5/5] platforms: drop REISERFS_FS --- lib/systems/platforms.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/systems/platforms.nix b/lib/systems/platforms.nix index 9c9010b9fb46..c0b893fdf361 100644 --- a/lib/systems/platforms.nix +++ b/lib/systems/platforms.nix @@ -85,7 +85,6 @@ rec { BLK_DEV_DM m DM_CRYPT m MD y - REISERFS_FS m BTRFS_FS m XFS_FS m JFS_FS m @@ -430,7 +429,6 @@ rec { BLK_DEV_DM m DM_CRYPT m MD y - REISERFS_FS m EXT4_FS m USB_STORAGE_CYPRESS_ATACB m @@ -475,7 +473,6 @@ rec { FRAMEBUFFER_CONSOLE y EXT2_FS y EXT3_FS y - REISERFS_FS y MAGIC_SYSRQ y # The kernel doesn't boot at all, with FTRACE