From 1d66376480492be8f7b9abad917728855c6acb45 Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 2 May 2026 18:21:40 -0400 Subject: [PATCH 1/2] treewide: "format = "pyproject";" -> "pyproject = true;" --- pkgs/by-name/de/devede/package.nix | 3 +-- pkgs/by-name/je/jello-lang/package.nix | 2 +- pkgs/by-name/je/jellyfish/package.nix | 2 +- .../python-modules/aliyun-python-sdk-alimt/default.nix | 2 +- pkgs/development/python-modules/flask-sqlalchemy/default.nix | 2 +- pkgs/development/python-modules/issubclass/default.nix | 2 +- pkgs/development/python-modules/retryhttp/default.nix | 2 +- pkgs/development/python-modules/svcs/default.nix | 2 +- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/de/devede/package.nix b/pkgs/by-name/de/devede/package.nix index 12b452c4e33a..e70579c59119 100644 --- a/pkgs/by-name/de/devede/package.nix +++ b/pkgs/by-name/de/devede/package.nix @@ -11,7 +11,6 @@ wrapGAppsHook3, gdk-pixbuf, gobject-introspection, - nix-update-script, }: let @@ -28,7 +27,7 @@ in buildPythonApplication (finalAttrs: { pname = "devede"; version = "4.21.3.1"; - format = "pyproject"; + pyproject = true; namePrefix = ""; src = fetchFromGitLab { diff --git a/pkgs/by-name/je/jello-lang/package.nix b/pkgs/by-name/je/jello-lang/package.nix index 38ed8612c932..a79bf87162eb 100644 --- a/pkgs/by-name/je/jello-lang/package.nix +++ b/pkgs/by-name/je/jello-lang/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication { pname = "jello-lang"; version = "0-unstable-2025-01-07"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "codereport"; diff --git a/pkgs/by-name/je/jellyfish/package.nix b/pkgs/by-name/je/jellyfish/package.nix index 99613f9960db..0b00dcd4f722 100644 --- a/pkgs/by-name/je/jellyfish/package.nix +++ b/pkgs/by-name/je/jellyfish/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication { pname = "jellyfish"; version = "0-unstable-2024-05-27"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "codereport"; diff --git a/pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix index 0cf8c0d931e7..ccb5ac809695 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-alimt"; version = "3.2.0"; - format = "pyproject"; + pyproject = true; # Upstream doesn't tag releases on Github # https://github.com/aliyun/aliyun-openapi-python-sdk/issues/551 diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 7ca65ea6b18a..1645ffa46f12 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "flask-sqlalchemy"; version = "3.1.1"; - format = "pyproject"; + pyproject = true; src = fetchPypi { pname = "flask_sqlalchemy"; diff --git a/pkgs/development/python-modules/issubclass/default.nix b/pkgs/development/python-modules/issubclass/default.nix index 041ec408e62e..83629c2da99b 100644 --- a/pkgs/development/python-modules/issubclass/default.nix +++ b/pkgs/development/python-modules/issubclass/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "issubclass"; version = "0.1.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "zmievsa"; diff --git a/pkgs/development/python-modules/retryhttp/default.nix b/pkgs/development/python-modules/retryhttp/default.nix index 8cc37882c709..872bdd24c2db 100644 --- a/pkgs/development/python-modules/retryhttp/default.nix +++ b/pkgs/development/python-modules/retryhttp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "retryhttp"; version = "1.3.1"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "austind"; diff --git a/pkgs/development/python-modules/svcs/default.nix b/pkgs/development/python-modules/svcs/default.nix index 08a1452b9bfb..367129a4fadb 100644 --- a/pkgs/development/python-modules/svcs/default.nix +++ b/pkgs/development/python-modules/svcs/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "svcs"; version = "25.1.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "hynek"; From e1812ab0c62beccedcdf95fb513a64a3a114d3ba Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Sat, 2 May 2026 18:24:16 -0400 Subject: [PATCH 2/2] treewide: "format = "other";" -> "pyproject = false;" --- pkgs/by-name/ne/neuron/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/neuron/package.nix b/pkgs/by-name/ne/neuron/package.nix index 9b3d54ccbe30..9a721411cecb 100644 --- a/pkgs/by-name/ne/neuron/package.nix +++ b/pkgs/by-name/ne/neuron/package.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { pname = "neuron"; version = "8.2.7"; - # format is for pythonModule conversion - format = "other"; + # pyproject is for pythonModule conversion + pyproject = false; nativeBuildInputs = [ cmake