Unverified Commit f93bab43 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #325181 from gador/pony-py12 

python312Packages.pony: fix python3.12 compat, fix flask-mailman, fix flask-security-too
parents 7252b96d 52928570

pkgs/development/libraries/libtorrent-rasterbar/1.2.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

  };

}

pkgs/development/python-modules/flask-mailman/default.nix

+12 −7
Original line number Diff line number Diff line 
{

  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;

pkgs/development/python-modules/flask-security-too/default.nix

+5 −2
Original line number Diff line number Diff line
@@ -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

pkgs/development/python-modules/pony/default.nix

+11 −2
Original line number Diff line number Diff line
@@ -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 ];

pkgs/development/tools/agda-pkg/default.nix

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
{ 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 ];

  };

}