From 2f40a56b080e16aca69710f626bed167b4e0ee51 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Tue, 2 Jun 2026 19:27:10 +0300 Subject: [PATCH 1/5] compsize: add myself as maintainer --- pkgs/by-name/co/compsize/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix index 10057405e27a..6b15eb212aa1 100644 --- a/pkgs/by-name/co/compsize/package.nix +++ b/pkgs/by-name/co/compsize/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { mainProgram = "compsize"; homepage = "https://github.com/kilobyte/compsize"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sandarukasa ]; platforms = lib.platforms.linux; }; } From 8a0c212b74a3406368d9dc50fdd65acdfbca9b45 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Tue, 2 Jun 2026 19:28:52 +0300 Subject: [PATCH 2/5] compsize: fix build with newer btrfs-progs --- .../co/compsize/btrfs-progs-6-10-1.patch | 47 +++++++++++++++++++ pkgs/by-name/co/compsize/package.nix | 19 ++------ 2 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch diff --git a/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch b/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch new file mode 100644 index 000000000000..a0b4f0b6ae1d --- /dev/null +++ b/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch @@ -0,0 +1,47 @@ +From a471982c82d1917637cce81a084fcd4b02d6e33b Mon Sep 17 00:00:00 2001 +From: David Roman +Date: Mon, 25 Nov 2024 14:10:16 +0100 +Subject: [PATCH] fix build with btrfs-progs >= 6.10.1 + +https://github.com/kilobyte/compsize/pull/54 + +--- + compsize.c | 2 ++ + radix-tree.h | 4 ---- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/compsize.c b/compsize.c +index 42ec304..0f533e5 100644 +--- a/compsize.c ++++ b/compsize.c +@@ -5,12 +5,14 @@ + #include + #include + #include ++#include "kerncompat.h" + #include + #include + #include + #include + #include + #include ++#include + #include + #include + #include +diff --git a/radix-tree.h b/radix-tree.h +index bf96d83..d99ea7e 100644 +--- a/radix-tree.h ++++ b/radix-tree.h +@@ -37,11 +37,7 @@ + #ifndef _LINUX_RADIX_TREE_H + #define _LINUX_RADIX_TREE_H + +-#if BTRFS_FLAT_INCLUDES + #include "kerncompat.h" +-#else +-#include +-#endif /* BTRFS_FLAT_INCLUDES */ + + #define RADIX_TREE_MAX_TAGS 2 + diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix index 6b15eb212aa1..1f100808d18d 100644 --- a/pkgs/by-name/co/compsize/package.nix +++ b/pkgs/by-name/co/compsize/package.nix @@ -2,22 +2,9 @@ lib, stdenv, fetchFromGitHub, - fetchurl, btrfs-progs, }: -let - # https://github.com/kilobyte/compsize/issues/52 - btrfs-progs' = btrfs-progs.overrideAttrs (old: rec { - pname = "btrfs-progs"; - version = "6.10"; - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8="; - }; - }); - -in stdenv.mkDerivation rec { pname = "compsize"; version = "1.5"; @@ -29,7 +16,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; }; - buildInputs = [ btrfs-progs' ]; + patches = [ + ./btrfs-progs-6-10-1.patch + ]; + + buildInputs = [ btrfs-progs ]; installFlags = [ "PREFIX=${placeholder "out"}" From 34e8e9fce77cdf90f54e6025ce17e0699999bce8 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Tue, 2 Jun 2026 19:47:20 +0300 Subject: [PATCH 3/5] compsize: 1.5 -> 1.5-unstable-2023-12-24 Includes a few minor fixes and one significant to big-endian platforms --- pkgs/by-name/co/compsize/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix index 1f100808d18d..a3689b475144 100644 --- a/pkgs/by-name/co/compsize/package.nix +++ b/pkgs/by-name/co/compsize/package.nix @@ -5,15 +5,15 @@ btrfs-progs, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compsize"; - version = "1.5"; + version = "1.5-unstable-2023-12-24"; src = fetchFromGitHub { owner = "kilobyte"; repo = "compsize"; - rev = "v${version}"; - sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; + rev = "d79eacf77abe3b799387bb8a4e07a18f1f1031e8"; + sha256 = "sha256-pwHFllwTznhgZAGtGsULoLLBZlCllGt1eBmUKoJ/2wk="; }; patches = [ @@ -26,10 +26,6 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - preInstall = '' - mkdir -p $out/share/man/man8 - ''; - meta = { description = "Find compression type/ratio on a file or set of files in the Btrfs filesystem"; mainProgram = "compsize"; From 0f05671f5e3671e1c4c76521137ce856a73f256b Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Fri, 5 Jun 2026 06:16:40 +0300 Subject: [PATCH 4/5] compsize: add `man` output --- pkgs/by-name/co/compsize/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix index a3689b475144..408ad2f37e1c 100644 --- a/pkgs/by-name/co/compsize/package.nix +++ b/pkgs/by-name/co/compsize/package.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation { ./btrfs-progs-6-10-1.patch ]; + outputs = [ + "out" + "man" + ]; + buildInputs = [ btrfs-progs ]; installFlags = [ From 67936cc4f7415aca1d8dba832f08f3eac55c4920 Mon Sep 17 00:00:00 2001 From: SandaruKasa Date: Mon, 15 Jun 2026 04:39:19 +0300 Subject: [PATCH 5/5] compsize: `__structuredAttrs`, `strictDeps`, `enableParallelBuilding` --- pkgs/by-name/co/compsize/package.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix index 408ad2f37e1c..13d736337294 100644 --- a/pkgs/by-name/co/compsize/package.nix +++ b/pkgs/by-name/co/compsize/package.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation { ./btrfs-progs-6-10-1.patch ]; + __structuredAttrs = true; + strictDeps = true; + enableParallelBuilding = true; + outputs = [ "out" "man"