Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

python312Packages.pony: fix python3.12 compat, fix flask-mailman, fix flask-security-too #325181

Merged
merged 5 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions pkgs/development/python-modules/flask-mailman/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
lib,
aiosmtpd,
buildPythonPackage,
fetchFromGitHub,
poetry-core,
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 11 additions & 2 deletions pkgs/development/python-modules/pony/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
fetchFromGitHub,
pytestCheckHook,
pythonOlder,
pythonAtLeast,
setuptools,
fetchpatch,
}:

buildPythonPackage rec {
pname = "pony";
version = "0.7.17";
pyproject = true;

disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
disabled = pythonOlder "3.8";

src = fetchFromGitHub {
owner = "ponyorm";
Expand All @@ -22,6 +22,15 @@ buildPythonPackage rec {
hash = "sha256-wBqw+YHKlxYplgsYL1pbkusHyPfCaVPcH/Yku6WDYbE=";
};

patches = [
gador marked this conversation as resolved.
Show resolved Hide resolved
# 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 ];
Expand Down
47 changes: 0 additions & 47 deletions pkgs/development/tools/agda-pkg/default.nix

This file was deleted.

1 change: 1 addition & 0 deletions pkgs/top-level/aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down