From 67ecaddbe72dbfde5003ce274ccf3b848fff58d9 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Date: Sat, 22 Mar 2025 13:24:09 +0100
Subject: [PATCH] cramfsprogs: 1.1 -> 2.1-unstable-2025-01-27

Update to the latest version of cramfs tooling recommended by the
Linux kernel documentation:

https://docs.kernel.org/filesystems/cramfs.html
---
 .../cr/cramfsprogs/include-sysmacros.patch    | 12 ---------
 pkgs/by-name/cr/cramfsprogs/package.nix       | 25 ++++++++++---------
 2 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch

diff --git a/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch b/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch
deleted file mode 100644
index 7c115a66ac90..000000000000
--- a/pkgs/by-name/cr/cramfsprogs/include-sysmacros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/mkcramfs.c b/mkcramfs.c
-index a2ef018959d..bec83c112d1 100644
---- a/mkcramfs.c
-+++ b/mkcramfs.c
-@@ -22,6 +22,7 @@
-  * If you change the disk format of cramfs, please update fs/cramfs/README.
-  */
- 
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <stdio.h>
- #include <sys/stat.h>
diff --git a/pkgs/by-name/cr/cramfsprogs/package.nix b/pkgs/by-name/cr/cramfsprogs/package.nix
index f626203c0bfa..46f24eae1326 100644
--- a/pkgs/by-name/cr/cramfsprogs/package.nix
+++ b/pkgs/by-name/cr/cramfsprogs/package.nix
@@ -1,23 +1,21 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "cramfsprogs";
-  version = "1.1";
+  version = "2.1-unstable-2025-01-27";
 
-  src = fetchurl {
-    url = "mirror://debian/pool/main/c/cramfs/cramfs_${version}.orig.tar.gz";
-    sha256 = "0s13sabykbkbp0pcw8clxddwzxckyq7ywm2ial343ip7qjiaqg0k";
+  src = fetchFromGitHub {
+    owner = "npitre";
+    repo = "cramfs-tools";
+    rev = "13ad7ee1df5ce42cf9758053186554d7cb15e2cc";
+    sha256 = "sha256-JlDOowJYJJNB1opNabJgYfdt0khQFsdDvzbtY/bJwRI=";
   };
 
-  # CramFs is unmaintained upstream: https://tracker.debian.org/pkg/cramfs.
-  # So patch the "missing include" bug ourselves.
-  patches = [ ./include-sysmacros.patch ];
-
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
   ];
@@ -30,9 +28,12 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Tools to create, check, and extract content of CramFs images";
-    homepage = "https://packages.debian.org/jessie/cramfsprogs";
+    homepage = "https://github.com/npitre/cramfs-tools";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pamplemousse ];
+    maintainers = with maintainers; [
+      pamplemousse
+      blitz
+    ];
     platforms = platforms.linux;
   };
 }