From 3e85b02cbe1dfa366bd86dc0665de55c87ad9832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sun, 18 Sep 2022 20:21:41 +1000 Subject: [PATCH 1/2] python310Packages.pyramid_jinja2: mark not broken --- pkgs/development/python-modules/pyramid_jinja2/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 6ec35620cd65..d83b28e0a4f7 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -1,5 +1,4 @@ -{ stdenv -, lib +{ lib , buildPythonPackage , fetchPypi , webtest @@ -53,7 +52,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Jinja2 template bindings for the Pyramid web framework"; homepage = "https://github.com/Pylons/pyramid_jinja2"; license = licenses.bsd0; From 0deb0714564aff18af5873b1cca1d95edbcb249f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 6 Jun 2023 23:41:31 +0200 Subject: [PATCH 2/2] python310Packages.pyramid-jinja2: rename from pyramid_jinja2 Normalizes the package attribute according to PEP 0503. --- pkgs/development/python-modules/cypherpunkpay/default.nix | 4 ++-- .../{pyramid_jinja2 => pyramid-jinja2}/default.nix | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) rename pkgs/development/python-modules/{pyramid_jinja2 => pyramid-jinja2}/default.nix (100%) diff --git a/pkgs/development/python-modules/cypherpunkpay/default.nix b/pkgs/development/python-modules/cypherpunkpay/default.nix index f52fbd02cacd..9bf5e8fcd85d 100644 --- a/pkgs/development/python-modules/cypherpunkpay/default.nix +++ b/pkgs/development/python-modules/cypherpunkpay/default.nix @@ -11,7 +11,7 @@ , pypng , pyqrcode , pyramid -, pyramid_jinja2 +, pyramid-jinja2 , pysocks , pytestCheckHook , pythonOlder @@ -60,7 +60,7 @@ buildPythonPackage rec { pypng pyqrcode pyramid - pyramid_jinja2 + pyramid-jinja2 pysocks requests tzlocal diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid-jinja2/default.nix similarity index 100% rename from pkgs/development/python-modules/pyramid_jinja2/default.nix rename to pkgs/development/python-modules/pyramid-jinja2/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5e531b9544e7..095f2815413b 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -216,6 +216,7 @@ mapAliases ({ pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 PyMVGLive = pymvglive; # added 2023-02-19 pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2 + pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06 pyreadability = readability-lxml; # added 2022-05-24 pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47bee0bd76a6..10eebb2cca1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9202,7 +9202,7 @@ self: super: with self; { pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; - pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; + pyramid-jinja2 = callPackage ../development/python-modules/pyramid-jinja2 { }; pyramid_mako = callPackage ../development/python-modules/pyramid_mako { };