Merge branch 'staging' into staging-next

In particular I wanted the security bump of go

pkgs/development/compilers/go/1.26.nix

@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.26.2";
+  version = "1.26.3";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-LpHrtpR6lulDb7KzkmqIAu/mOm03Xf/sT4Kqnb1v1Ds=";
+    hash = "sha256-HGRoddCqh5kTMYTtV895/yS97+jIggRwYCqdPW2Rkrg=";
   };
 
   strictDeps = true;

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

@@ -1,8 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  fetchpatch,
+  fetchFromGitHub,
   pytest-asyncio,
   pytestCheckHook,
   setuptools-scm,
@@ -10,28 +9,18 @@
   typeguard,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "tenacity";
-  version = "9.1.2";
+  version = "9.1.4";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-EWnTdsKX5944jRi0SBdg1Hiw6Zp3fK06nIblVvS2l8s=";
+  src = fetchFromGitHub {
+    owner = "jd";
+    repo = "tenacity";
+    tag = finalAttrs.version;
+    hash = "sha256-JiWfIlStps3HZQw4KEohKAUWWZtMAuluXXzvqU+p8V4=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/jd/tenacity/commit/eed7d785e667df145c0e3eeddff59af64e4e860d.patch";
-      includes = [
-        "tenacity/__init__.py"
-        "tests/test_asyncio.py"
-        "tests/test_issue_478.py"
-      ];
-      hash = "sha256-TMhBjRmG7pBP3iKq83RQzkV9yO2TEcA+3mo9cz6daxs=";
-    })
-  ];
-
   build-system = [ setuptools-scm ];
 
   nativeCheckInputs = [
@@ -45,9 +34,9 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "https://github.com/jd/tenacity";
-    changelog = "https://github.com/jd/tenacity/releases/tag/${version}";
+    changelog = "https://github.com/jd/tenacity/releases/tag/${finalAttrs.src.tag}";
     description = "Retrying library for Python";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jakewaksbaum ];
   };
-}
+})