From a78b3c85be57795c5e2c0191536b1213e8556176 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 13 Jul 2024 12:36:37 +0200
Subject: [PATCH 1/3] tomb: 2.10 -> 2.11

https://github.com/dyne/tomb/compare/v2.10...v2.11
https://github.com/dyne/tomb/blob/v2.11/ChangeLog.md#211
---
 pkgs/os-specific/linux/tomb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index 98dd9bc1dbca..d2465cbade74 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -22,13 +22,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "tomb";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "dyne";
     repo = "Tomb";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lLxQJX0P6b6lbXEcrq45EsX9iKiayZ9XkhqgMfpN3/w=";
+    hash = "sha256-H9etbodTKxROJAITbViQQ6tkEr9rKNITTHfsGGQbyR0=";
   };
 
   buildInputs = [ zsh pinentry ];

From e6625328346f2449033df2efea360c475c773cf3 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 13 Jul 2024 13:15:18 +0200
Subject: [PATCH 2/3] tomb: format with nixfmt-rfc-style, remove `with lib;`

---
 pkgs/os-specific/linux/tomb/default.nix | 64 ++++++++++++++-----------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix
index d2465cbade74..94d7cf2b34a6 100644
--- a/pkgs/os-specific/linux/tomb/default.nix
+++ b/pkgs/os-specific/linux/tomb/default.nix
@@ -1,23 +1,23 @@
-{ stdenvNoCC
-, lib
-, fetchFromGitHub
-, substituteAll
-, makeWrapper
-, zsh
-, coreutils
-, cryptsetup
-, e2fsprogs
-, file
-, gawk
-, getent
-, gettext
-, gnugrep
-, gnupg
-, libargon2
-, lsof
-, pinentry
-, util-linux
-, nix-update-script
+{
+  coreutils,
+  cryptsetup,
+  e2fsprogs,
+  fetchFromGitHub,
+  file,
+  gawk,
+  getent,
+  gettext,
+  gnugrep,
+  gnupg,
+  lib,
+  libargon2,
+  lsof,
+  makeWrapper,
+  nix-update-script,
+  pinentry,
+  stdenvNoCC,
+  util-linux,
+  zsh,
 }:
 
 stdenvNoCC.mkDerivation rec {
@@ -31,10 +31,13 @@ stdenvNoCC.mkDerivation rec {
     hash = "sha256-H9etbodTKxROJAITbViQQ6tkEr9rKNITTHfsGGQbyR0=";
   };
 
-  buildInputs = [ zsh pinentry ];
-
   nativeBuildInputs = [ makeWrapper ];
 
+  buildInputs = [
+    pinentry
+    zsh
+  ];
+
   postPatch = ''
     # if not, it shows .tomb-wrapped when running
     substituteInPlace tomb \
@@ -46,7 +49,8 @@ stdenvNoCC.mkDerivation rec {
     install -Dm644 doc/tomb.1 $out/share/man/man1/tomb.1
 
     wrapProgram $out/bin/tomb \
-      --prefix PATH : $out/bin:${lib.makeBinPath [
+      --prefix PATH : $out/bin:${
+        lib.makeBinPath [
           coreutils
           cryptsetup
           e2fsprogs
@@ -60,20 +64,24 @@ stdenvNoCC.mkDerivation rec {
           lsof
           pinentry
           util-linux
-        ]}
+        ]
+      }
   '';
 
   passthru = {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "File encryption on GNU/Linux";
     homepage = "https://www.dyne.org/software/tomb/";
     changelog = "https://github.com/dyne/Tomb/blob/v${version}/ChangeLog.md";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "tomb";
-    maintainers = with maintainers; [ peterhoeg anthonyroussel ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [
+      peterhoeg
+      anthonyroussel
+    ];
+    platforms = lib.platforms.linux;
   };
 }

From 88e8ae101aacfe5b559cd7b229fac170b226b9df Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 13 Jul 2024 13:16:33 +0200
Subject: [PATCH 3/3] tomb: move to pkgs/by-name

---
 .../linux/tomb/default.nix => by-name/to/tomb/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{os-specific/linux/tomb/default.nix => by-name/to/tomb/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/by-name/to/tomb/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/tomb/default.nix
rename to pkgs/by-name/to/tomb/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f90e707a504..691b7dd5060b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -40145,7 +40145,7 @@ with pkgs;
 
   linkchecker = callPackage ../tools/networking/linkchecker { };
 
-  tomb = callPackage ../os-specific/linux/tomb {
+  tomb = callPackage ../by-name/to/tomb/package.nix {
     pinentry = pinentry-curses;
   };