From 4e6794edb5633ae0aa9ce5ee8787a5ac59de7e62 Mon Sep 17 00:00:00 2001
From: Siroj42 <siroj42@t-online.de>
Date: Thu, 16 Nov 2023 13:17:36 +0100
Subject: [PATCH 1/4] offpunk: 1.10 -> 2.0

---
 .../networking/browsers/offpunk/default.nix            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix
index e1b4fdcfa205..1b69b396efe1 100644
--- a/pkgs/applications/networking/browsers/offpunk/default.nix
+++ b/pkgs/applications/networking/browsers/offpunk/default.nix
@@ -1,5 +1,6 @@
 {
   fetchFromSourcehut,
+  file,
   installShellFiles,
   less,
   lib,
@@ -23,6 +24,7 @@ let
     setproctitle
   ];
   otherDependencies = [
+    file
     less
     timg
     xdg-utils
@@ -31,7 +33,7 @@ let
 in
 python3Packages.buildPythonPackage rec {
   pname = "offpunk";
-  version = "1.10";
+  version = "2.0";
   format = "pyproject";
 
   disabled = python3Packages.pythonOlder "3.7";
@@ -40,10 +42,10 @@ python3Packages.buildPythonPackage rec {
     owner = "~lioploum";
     repo = "offpunk";
     rev = "v${version}";
-    hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU=";
+    hash = "sha256-6ftc2goCNgvXf5kszvjeSHn24Hn73jq26Irl5jiN6pk=";
   };
 
-  nativeBuildInputs = [ python3Packages.flit-core installShellFiles ];
+  nativeBuildInputs = [ python3Packages.hatchling installShellFiles ];
   propagatedBuildInputs = otherDependencies ++ pythonDependencies;
 
   postInstall = ''
@@ -57,6 +59,6 @@ python3Packages.buildPythonPackage rec {
     homepage = src.meta.homepage;
     maintainers = with maintainers; [ DamienCassou ];
     platforms = platforms.linux;
-    license = licenses.bsd2;
+    license = licenses.agpl3Plus;
   };
 }

From 03f305e65c1dc6937aa27860d1e9a89c80af6873 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 18 Nov 2023 07:44:56 +0100
Subject: [PATCH 2/4] offpunk: reformat

---
 .../networking/browsers/offpunk/default.nix   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix
index 1b69b396efe1..4d2cdf69d740 100644
--- a/pkgs/applications/networking/browsers/offpunk/default.nix
+++ b/pkgs/applications/networking/browsers/offpunk/default.nix
@@ -1,15 +1,15 @@
-{
-  fetchFromSourcehut,
-  file,
-  installShellFiles,
-  less,
-  lib,
-  offpunk,
-  python3Packages,
-  testers,
-  timg,
-  xdg-utils,
-  xsel,
+{ fetchFromSourcehut
+, file
+, installShellFiles
+, less
+, lib
+, offpunk
+, python3Packages
+, testers
+, timg
+, xdg-utils
+, xsel
+,
 }:
 
 let

From e2c704f5121e596796240dc986628cd63fe053a1 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 18 Nov 2023 07:43:55 +0100
Subject: [PATCH 3/4] offpunk: remove broken passthru.tests.version check

Upstream issue: https://todo.sr.ht/~lioploum/offpunk/27
---
 pkgs/applications/networking/browsers/offpunk/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix
index 4d2cdf69d740..e0814a43ef8a 100644
--- a/pkgs/applications/networking/browsers/offpunk/default.nix
+++ b/pkgs/applications/networking/browsers/offpunk/default.nix
@@ -52,8 +52,6 @@ python3Packages.buildPythonPackage rec {
     installManPage man/*.1
   '';
 
-  passthru.tests.version = testers.testVersion { package = offpunk; };
-
   meta = with lib; {
     description = "An Offline-First browser for the smolnet ";
     homepage = src.meta.homepage;

From d3079756e1a907a5f1eb176dfa6e31bdd4c3da87 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 18 Nov 2023 07:48:13 +0100
Subject: [PATCH 4/4] offpunk: move to by-name

---
 .../offpunk/default.nix => by-name/of/offpunk/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/browsers/offpunk/default.nix => by-name/of/offpunk/package.nix} (100%)

diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/by-name/of/offpunk/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/offpunk/default.nix
rename to pkgs/by-name/of/offpunk/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6e33201aeb2..9102f22e3d26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32529,8 +32529,6 @@ with pkgs;
 
   noson = libsForQt5.callPackage ../applications/audio/noson { };
 
-  offpunk = callPackage ../applications/networking/browsers/offpunk { };
-
   owl-compositor = callPackage ../applications/window-managers/owl { };
 
   p2pool = callPackage ../applications/misc/p2pool { };