From 757ad392b4af2d37dd932821d3f55a3bd310fc76 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 3 Sep 2024 20:18:31 +0100 Subject: [PATCH 1/2] python312Packages.webob: 1.8.7 -> 1.8.8 addresses CVE-2024-42353 switch to github source as pypi isn't up to date (cherry picked from commit 5097974f8e231d14862ed2def077cc7c775f608e) --- pkgs/development/python-modules/webob/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 921b75ef0778..60cf24f37191 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -1,22 +1,23 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "webob"; - version = "1.8.7"; + version = "1.8.8"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "WebOb"; - inherit version; - hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM="; + src = fetchFromGitHub { + owner = "Pylons"; + repo = "webob"; + rev = "refs/tags/${version}"; + hash = "sha256-QN0UMLzO0g8Oalnn5GlOulXUxtXOx89jeeEvJV53rVs="; }; nativeCheckInputs = [ pytestCheckHook ]; From 5284e6f47e9684064705584f736823fb533a9260 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 3 Sep 2024 21:47:44 +0100 Subject: [PATCH 2/2] python312Packages.webob: add some key reverse dependencies to passthru.tests (cherry picked from commit 1a171ee732761a15ed743b9fe36b0e387c74f79b) --- pkgs/development/python-modules/webob/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index 60cf24f37191..93ad2874aab9 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -4,6 +4,11 @@ fetchFromGitHub, pytestCheckHook, pythonOlder, + + # for passthru.tests + pyramid, + routes, + tokenlib, }: buildPythonPackage rec { @@ -30,6 +35,10 @@ buildPythonPackage rec { "tests/test_client_functional.py" ]; + passthru.tests = { + inherit pyramid routes tokenlib; + }; + meta = with lib; { description = "WSGI request and response object"; homepage = "https://webob.org/";