From 9305bbec01cdd5c5b08f076b0fe136b267596786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 24 May 2026 11:14:01 -0700
Subject: [PATCH 1/2] python3Packages.twisted: 25.5.0 -> 26.4.0

Changelog: https://github.com/twisted/twisted/blob/twisted-26.4.0/NEWS.rst
---
 .../python-modules/twisted/default.nix        | 29 +++++--------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index a886c3576a41..f96bed372e06 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -4,8 +4,7 @@
   buildPythonPackage,
   pythonAtLeast,
   pythonOlder,
-  fetchPypi,
-  fetchpatch,
+  fetchFromGitHub,
   python,
 
   # build-system
@@ -56,30 +55,16 @@
 
 buildPythonPackage rec {
   pname = "twisted";
-  version = "25.5.0";
+  version = "26.4.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    extension = "tar.gz";
-    hash = "sha256-HesnI1jLa+Hj6PxvnIs2946w+nwiM9Lb4R7G/uBOoxY=";
+  src = fetchFromGitHub {
+    owner = "twisted";
+    repo = "twisted";
+    tag = "twisted-${version}";
+    hash = "sha256-D6vDa+8qwjryKnElPBZgXCNokMX2l3i2bMdtk4FhEp4=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/twisted/twisted/pull/12508
-      url = "https://github.com/twisted/twisted/commit/ef6160aa2595adfba0c71da6db65b7a7252f23e9.patch";
-      hash = "sha256-zHkEWT0lvWf86RlkzU5Wx6R5ear04cfpxB7wjgdpw5c=";
-    })
-    # https://github.com/twisted/twisted/pull/12511
-    ./python314-urljoin-compat.patch
-    (fetchpatch {
-      # https://github.com/twisted/twisted/pull/12551
-      url = "https://github.com/twisted/twisted/commit/b1173fa307a9752eedd63890113eb610c3cca4a0.patch";
-      hash = "sha256-DWEygdo1b8uQOeFLy0/zcRNuuKJdSsF7cQM7RH04Puw=";
-    })
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   build-system = [

From 3c5b8bbdbaea8e109f0194917257d9cfbc75aff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 24 May 2026 11:44:55 -0700
Subject: [PATCH 2/2] python3Packages.scrapy: 2.14.1 -> 2.16.0

Diff: https://github.com/scrapy/scrapy/compare/2.14.1...2.16.0

Changelog: https://github.com/scrapy/scrapy/raw/2.16.0/docs/news.rst
---
 pkgs/development/python-modules/scrapy/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index 0cacbda728d8..cceb55ded458 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -9,6 +9,7 @@
   fetchFromGitHub,
   glibcLocales,
   hatchling,
+  httpx,
   installShellFiles,
   itemadapter,
   itemloaders,
@@ -40,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "scrapy";
-  version = "2.14.1";
+  version = "2.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scrapy";
     repo = "scrapy";
     tag = version;
-    hash = "sha256-KDci1Z5TZ+3svotYXkEG1s+bPWtxzIfQQwOgvI0k8w0=";
+    hash = "sha256-s72COXzDuTtRNGenZEZG8QCeq+9LBu6fuT5NOjpVYaY=";
   };
 
   pythonRelaxDeps = [
@@ -86,6 +87,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     botocore
     glibcLocales
+    httpx
     jmespath
     pexpect
     pytest-asyncio
@@ -106,7 +108,6 @@ buildPythonPackage rec {
   ];
 
   disabledTestPaths = [
-    "tests/test_proxy_connect.py"
     "tests/test_utils_display.py"
     "tests/test_command_check.py"
 
@@ -133,9 +134,12 @@ buildPythonPackage rec {
     "AnonymousFTPTestCase"
     "FTPFeedStorageTest"
     "FeedExportTest"
+    "TestRealWebsite"
     "test_custom_asyncio_loop_enabled_true"
     "test_custom_loop_asyncio"
     "test_custom_loop_asyncio_deferred_signal"
+    "test_pos_string"
+    "test_key_resp_or_url"
     # "FileFeedStoragePreFeedOptionsTest" # https://github.com/scrapy/scrapy/issues/5157
     "test_persist"
     "test_timeout_download_from_spider_nodata_rcvd"