From 376309fc14fed804c295638991b24c65ff735534 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 May 2024 09:41:33 +0200
Subject: [PATCH 1/2] python312Packages.stickytape: refactor

---
 .../python-modules/stickytape/default.nix      | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/stickytape/default.nix b/pkgs/development/python-modules/stickytape/default.nix
index 71d5327ef5cf..094c43d96570 100644
--- a/pkgs/development/python-modules/stickytape/default.nix
+++ b/pkgs/development/python-modules/stickytape/default.nix
@@ -1,20 +1,28 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "stickytape";
   version = "0.2.1";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "mwilliamson";
-    repo = pname;
-    rev = version;
+    repo = "stickytape";
+    rev = "refs/tags/${version}";
     hash = "sha256-KOZN9oxPb91l8QVU07I49UMNXqox8j+oekA1fMtj6l8=";
   };
 
+  build-system = [
+    setuptools
+  ];
+
   # Tests have additional requirements
   doCheck = false;
 
@@ -24,9 +32,9 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python module to convert Python packages into a single script";
-    mainProgram = "stickytape";
     homepage = "https://github.com/mwilliamson/stickytape";
-    license = with licenses; [ bsd2 ];
+    license = licenses.bsd2;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "stickytape";
   };
 }

From 0fc78b936e98c11e6be4f3cbb5922b5b81ac1e83 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 May 2024 09:42:05 +0200
Subject: [PATCH 2/2] python312Packages.stickytape: format with nixfmt

---
 .../python-modules/stickytape/default.nix     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/stickytape/default.nix b/pkgs/development/python-modules/stickytape/default.nix
index 094c43d96570..405d7202a16d 100644
--- a/pkgs/development/python-modules/stickytape/default.nix
+++ b/pkgs/development/python-modules/stickytape/default.nix
@@ -1,8 +1,9 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, setuptools
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -19,16 +20,12 @@ buildPythonPackage rec {
     hash = "sha256-KOZN9oxPb91l8QVU07I49UMNXqox8j+oekA1fMtj6l8=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
   # Tests have additional requirements
   doCheck = false;
 
-  pythonImportsCheck = [
-    "stickytape"
-  ];
+  pythonImportsCheck = [ "stickytape" ];
 
   meta = with lib; {
     description = "Python module to convert Python packages into a single script";