From 149b48f5abcb6ec9d904f599be48569f37406cc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 May 2024 14:03:23 +0000
Subject: [PATCH 1/2] python311Packages.online-judge-tools: 11.5.1 -> 12.0.0

---
 .../python-modules/online-judge-tools/default.nix      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/online-judge-tools/default.nix b/pkgs/development/python-modules/online-judge-tools/default.nix
index 00be2701e604..272c03f2b63a 100644
--- a/pkgs/development/python-modules/online-judge-tools/default.nix
+++ b/pkgs/development/python-modules/online-judge-tools/default.nix
@@ -4,24 +4,26 @@
   colorama,
   fetchFromGitHub,
   online-judge-api-client,
+  packaging,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "online-judge-tools";
-  version = "11.5.1";
+  version = "12.0.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "online-judge-tools";
     repo = "oj";
-    rev = "v${version}";
-    sha256 = "0zkzmmjgjb6lyrzq1ip54cpnp7al9a7mcyjyi5vx58bvnx3q0c6m";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-m6V4Sq3yU/KPnbpA0oCLI/qaSrAPA6TutcBL5Crb/Cc=";
   };
 
-  propagatedBuildInputs = [
+  dependencies = [
     colorama
     online-judge-api-client
+    packaging
     requests
   ];
 

From efdb33a49cb3c3bd833d4b8bb5e43c9a457235f5 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 2 Jun 2024 20:42:55 +0900
Subject: [PATCH 2/2] python311Packages.online-judge-tools: refactor

---
 .../python-modules/online-judge-tools/default.nix      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/online-judge-tools/default.nix b/pkgs/development/python-modules/online-judge-tools/default.nix
index 272c03f2b63a..23e9a259be02 100644
--- a/pkgs/development/python-modules/online-judge-tools/default.nix
+++ b/pkgs/development/python-modules/online-judge-tools/default.nix
@@ -6,12 +6,13 @@
   online-judge-api-client,
   packaging,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "online-judge-tools";
   version = "12.0.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "online-judge-tools";
@@ -20,6 +21,8 @@ buildPythonPackage rec {
     hash = "sha256-m6V4Sq3yU/KPnbpA0oCLI/qaSrAPA6TutcBL5Crb/Cc=";
   };
 
+  build-system = [ setuptools ];
+
   dependencies = [
     colorama
     online-judge-api-client
@@ -27,6 +30,11 @@ buildPythonPackage rec {
     requests
   ];
 
+  pythonImportsCheck = [
+    "onlinejudge"
+    "onlinejudge_command"
+  ];
+
   # Requires internet access
   doCheck = false;