From 917a44a660dabf875125df823be85f66d1a972e9 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 7 Jul 2024 07:24:15 +0200 Subject: [PATCH 1/5] python312Packages.pony: fix python3.12 compat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Florian Brandes Co-authored-by: Robert Schütz --- pkgs/development/python-modules/pony/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 20d39a3592b2d..734da54c25452 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -4,8 +4,8 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, - pythonAtLeast, setuptools, + fetchpatch, }: buildPythonPackage rec { @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "0.7.17"; pyproject = true; - disabled = pythonOlder "3.8" || pythonAtLeast "3.12"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ponyorm"; @@ -22,6 +22,15 @@ buildPythonPackage rec { hash = "sha256-wBqw+YHKlxYplgsYL1pbkusHyPfCaVPcH/Yku6WDYbE="; }; + patches = [ + # https://github.com/ponyorm/pony/pull/713 + (fetchpatch { + name = "py312-compat.patch"; + url = "https://github.com/ponyorm/pony/commit/5a37f6d59b6433d17d6d56b54f3726190e98c98f.patch"; + hash = "sha256-niOoANOYHqrcmEXRZEDew2BM8P/s7UFnn0qpgB8V0Mk="; + }) + ]; + nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From 7bd190a07e95539bab949c0202b73cb174003c69 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 7 Jul 2024 08:31:28 +0200 Subject: [PATCH 2/5] python312.flask-mailman: 1.1.0 -> 1.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix build for python3.12 Signed-off-by: Florian Brandes Co-authored-by: Robert Schütz --- .../python-modules/flask-mailman/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/flask-mailman/default.nix b/pkgs/development/python-modules/flask-mailman/default.nix index 2403e436266ed..e76561dc8ca13 100644 --- a/pkgs/development/python-modules/flask-mailman/default.nix +++ b/pkgs/development/python-modules/flask-mailman/default.nix @@ -1,5 +1,6 @@ { lib, + aiosmtpd, buildPythonPackage, fetchFromGitHub, poetry-core, @@ -11,30 +12,34 @@ buildPythonPackage rec { pname = "flask-mailman"; - version = "1.1.0"; - format = "pyproject"; + version = "1.1.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "waynerv"; - repo = pname; + repo = "flask-mailman"; rev = "refs/tags/v${version}"; - hash = "sha256-2ll5+D35dQN3r7gDpY1iSOuJBlqMorhjhFohPug8GK8="; + hash = "sha256-0kD3rxFDJ7FcmBLVju75z1nf6U/7XfjiLD/oM/VP4jQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ flask mkdocs-material-extensions ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + aiosmtpd + pytestCheckHook + ]; pythonImportsCheck = [ "flask_mailman" ]; meta = with lib; { + changelog = "https://github.com/waynerv/flask-mailman/blob/${src.rev}/CHANGELOG.md"; homepage = "https://github.com/waynerv/flask-mailman"; description = "Flask extension providing simple email sending capabilities"; license = licenses.bsd3; From 7b3717d41eadac6d9c40e7429dbab0b35cfb02dd Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 7 Jul 2024 08:32:57 +0200 Subject: [PATCH 3/5] python312Packages.flask-security-too: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit relax dependency which is actually newer Signed-off-by: Florian Brandes Co-authored-by: Robert Schütz --- .../python-modules/flask-security-too/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index e02bb99626df6..cf5e161f9ae31 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -59,9 +59,12 @@ buildPythonPackage rec { hash = "sha256-YrGTl+jXGo1MuNwNRAnMehSXmCVJAwOWlgruUYdV5YM="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + # flask-login>=0.6.2 not satisfied by version 0.7.0.dev0 + pythonRelaxDeps = [ "flask-login" ]; + + dependencies = [ email-validator flask flask-login From 4c179d4b9455361c23ac7ca100a6b598d95fe093 Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 10 Jul 2024 23:17:18 +0200 Subject: [PATCH 4/5] agda-pkg: drop as unmaintained last commit was 05/2021 and no pkgs in nixpkgs depend on it Signed-off-by: Florian Brandes --- pkgs/development/tools/agda-pkg/default.nix | 47 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 pkgs/development/tools/agda-pkg/default.nix diff --git a/pkgs/development/tools/agda-pkg/default.nix b/pkgs/development/tools/agda-pkg/default.nix deleted file mode 100644 index 81af5e1958959..0000000000000 --- a/pkgs/development/tools/agda-pkg/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ lib -, python3Packages -, fetchPypi -}: - -with python3Packages; - -buildPythonApplication rec { - pname = "agda-pkg"; - version = "0.1.51"; - - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "ee370889a1558caf45930d9f898dbe248048078e1e7e3ee17382bf574dc795f2"; - }; - - # Checks need internet access, so we just check the program executes - # At the moment the help page needs to write to $HOME, this can - # be removed if https://github.com/agda/agda-pkg/issues/40 is fixed - checkPhase = '' - HOME=$NIX_BUILD_TOP $out/bin/apkg --help > /dev/null - ''; - - propagatedBuildInputs = [ - click - gitpython - pony - whoosh - natsort - click-log - requests - humanize - distlib - jinja2 - pyyaml - ponywhoosh - ]; - - meta = with lib; { - homepage = "https://agda.github.io/agda-pkg/"; - description = "Package manager for Agda"; - license = licenses.mit; - maintainers = with maintainers; [ alexarice ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4f0b3a9f0aee4..f9cbc90c116b9 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -71,6 +71,7 @@ mapAliases ({ advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29 aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03 afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21 + agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10" airfield = throw "airfield has been removed due to being unmaintained"; # Added 2023-05-19 alertmanager-bot = throw "alertmanager-bot is broken and has been archived by upstream"; # Added 2023-07-28 alsa-project = throw "alsa-project was removed and its sub-attributes were promoted to top-level."; # Added 2023-11-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e439820389df6..926a5f88242c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1600,8 +1600,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - agda-pkg = callPackage ../development/tools/agda-pkg { }; - agi = callPackage ../tools/graphics/agi { }; agola = callPackage ../development/tools/continuous-integration/agola { }; From 52928570d77b18520446417651afb2882a7e80db Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 10 Jul 2024 23:53:53 +0200 Subject: [PATCH 5/5] libtorrent-rasterbar-1_2_x: mark broken ModuleNotFoundError: No module named 'distutils' Signed-off-by: Florian Brandes --- pkgs/development/libraries/libtorrent-rasterbar/1.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix index 6b4be4b832a44..d1cc525922158 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { description = "C++ BitTorrent implementation focusing on efficiency and scalability"; license = licenses.bsd3; maintainers = [ ]; - broken = stdenv.isDarwin; + broken = true; # ModuleNotFoundError: No module named 'distutils' platforms = platforms.unix; }; }