From c22f13788f22ce308ee9ca40928c0efa5c529a08 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 26 Dec 2024 18:45:16 -0500 Subject: [PATCH 1/2] {libsForQt5,kdePackages}.{partitionmanager,kpmcore}: drop ReiserFS support ReiserFS has not been actively maintained for many years. It has been marked as obsolete since Linux 6.6, and is removed in the next 6.13 release. --- nixos/doc/manual/release-notes/rl-2505.section.md | 5 +++++ pkgs/applications/kde/partitionmanager/default.nix | 7 ++----- pkgs/kde/gear/kpmcore/default.nix | 5 +---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 0f24a0cd49600..834066df59acf 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -290,6 +290,11 @@ To get the necessary hash of the vendored dependencies, omit `hash`. The build will fail and tell you the correct value. +- KDE Partition Manager `partitionmanager`'s support for ReiserFS is removed. + ReiserFS has not been actively maintained for many years. It has been marked as obsolete since Linux 6.6, and + [is removed](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c01f664e4ca210823b7594b50669bbd9b0a3c3b0) + in Linux 6.13. + - `programs.fzf.keybindings` now supports the fish shell. diff --git a/pkgs/applications/kde/partitionmanager/default.nix b/pkgs/applications/kde/partitionmanager/default.nix index 35ede9df1eebf..0493484295344 100644 --- a/pkgs/applications/kde/partitionmanager/default.nix +++ b/pkgs/applications/kde/partitionmanager/default.nix @@ -24,8 +24,6 @@ jfsutils, nilfs-utils, ntfs3g, - reiser4progs, - reiserfsprogs, udftools, xfsprogs, zfs, @@ -54,8 +52,7 @@ let jfsutils nilfs-utils ntfs3g - reiser4progs - reiserfsprogs + # reiser{4,fs}progs intentionally omitted due to filesystem removal from Linux. udftools xfsprogs zfs @@ -98,7 +95,7 @@ mkDerivation { longDescription = '' KDE Partition Manager is a utility to help you manage the disks, partitions, and file systems on your computer. It allows you to easily create, copy, move, delete, back up, restore, and resize them without losing data. - It supports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and more. + It supports a large number of file systems, including ext2/3/4, btrfs, NTFS, FAT16/32, JFS, XFS and more. To install on NixOS, use the option `programs.partition-manager.enable = true`. ''; diff --git a/pkgs/kde/gear/kpmcore/default.nix b/pkgs/kde/gear/kpmcore/default.nix index fcbfa4a730d67..7800962d6b3cf 100644 --- a/pkgs/kde/gear/kpmcore/default.nix +++ b/pkgs/kde/gear/kpmcore/default.nix @@ -18,8 +18,6 @@ jfsutils, nilfs-utils, ntfs3g, - reiser4progs, - reiserfsprogs, udftools, xfsprogs, zfs, @@ -44,8 +42,7 @@ let jfsutils nilfs-utils ntfs3g - reiser4progs - reiserfsprogs + # reiser{4,fs}progs intentionally omitted due to filesystem removal from Linux. udftools xfsprogs zfs From a3464a420c5fe6694f7c16f8c3206ce2a97d86fb Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 26 Dec 2024 18:53:11 -0500 Subject: [PATCH 2/2] reiser4progs: mark as broken --- pkgs/by-name/re/reiser4progs/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/re/reiser4progs/package.nix b/pkgs/by-name/re/reiser4progs/package.nix index 51bef2c7db74b..da46037d21be6 100644 --- a/pkgs/by-name/re/reiser4progs/package.nix +++ b/pkgs/by-name/re/reiser4progs/package.nix @@ -38,5 +38,11 @@ stdenv.mkDerivation rec { description = "Reiser4 utilities"; license = licenses.gpl2Plus; platforms = platforms.linux; + + # error: initialization of + # 'int (*)(uint64_t *, uint64_t, uint32_t, int, int)' {aka 'int (*)(long unsigned int *, long unsigned int, unsigned int, int, int)'} + # from incompatible pointer type + # 'int (*)(uint64_t *, uint32_t, uint64_t, int, int)' {aka 'int (*)(long unsigned int *, unsigned int, long unsigned int, int, int)'} + broken = true; }; }