4 files changed, 81 insertions, 14 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 5150cbb..2cd621b 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,6 @@
 final: prev: {
+  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [(import ./python.nix)];
+
   luks-hw-password = final.callPackage ./luks-hw-password {};
   dev = final.callPackage ./dev {
     devShells = import ../devShells final;
@@ -22,6 +24,7 @@ final: prev: {
 
   dodo = final.callPackage ./dodo {};
   elf-size-analyze = final.callPackage ./elf-size-analyze {};
+  docstrfmt = final.callPackage ./docrstfmt {};
 
   # OpenWrt One
   armTrustedFirmwareMT7981 = final.callPackage ./mtk-arm-trusted-firmware rec {
@@ -73,19 +76,16 @@ final: prev: {
       nativeBuildInputs = [final.buildPackages.unixtools.xxd] ++ oldAttrs.nativeBuildInputs;
     });
   linuxOpenWrtOne = final.buildLinux {
-    version = "6.18.0-rc1";
+    version = "6.19.0-rc2";
     src = final.buildPackages.fetchgit {
-      url = "git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git";
-      rev = "67ed5843a67b7ba63d79f2ba3fd21bee151d3138";
-      hash = "sha256-jXBDVZOAk+/vf55cQWMlV4ZhmSwYucqMOuOGDLxSYis=";
+      url = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git";
+      rev = "b927546677c876e26eba308550207c2ddf812a43";
+      hash = "sha256-Ti4No/FUoc2RgHxat908Uy0HnETlnyF/ZAJ4JmxD+jY=";
     };
     kernelPatches = [
       {
         name = "openwrt-one";
-        patch = ./linux-openwrt-one-mediatek.patch;
-        #structuredExtraConfig = with final.lib.kernel; {
-        #  NET_MEDIATEK_SOC = yes;
-        #};
+        patch = ./linux-openwrt-one-6_19.patch;
       }
     ];
   };
@@ -102,9 +102,18 @@ final: prev: {
   };
 
   # NixPkgs patches
-  searxng = prev.searxng.overrideAttrs (oldAttrs: {
-    pythonRelaxDeps = oldAttrs.pythonRelaxDeps ++ ["markdown-it-py"];
-  });
+  gnutls =
+    if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
+    then
+      prev.gnutls.overrideAttrs (oldAttrs: {
+        configureFlags = oldAttrs.configureFlags ++ ["--disable-doc"];
+        outputs = builtins.filter (v: v != "man" && v != "devdoc") oldAttrs.outputs;
+      })
+    else prev.gnutls;
+  git =
+    if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
+    then prev.git.override {rustSupport = false;}
+    else prev.git;
   libcap =
     if prev.stdenv.hostPlatform != prev.stdenv.buildPlatform
     then
diff --git a/pkgs/docrstfmt/default.nix b/pkgs/docrstfmt/default.nix
new file mode 100644
index 0000000..9d2761a
--- /dev/null
+++ b/pkgs/docrstfmt/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+python3.pkgs.buildPythonApplication rec {
+  pname = "docstrfmt";
+  version = "2.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "LilSpazJoekp";
+    repo = "docstrfmt";
+    tag = "v${version}";
+    hash = "sha256-DoxRBRCHl/F7nvUiA4+c3DtxggzH9hHtHuoJsyPCA94=";
+  };
+
+  build-system = [
+    python3.pkgs.flit-core
+  ];
+
+  dependencies = with python3.pkgs; [
+    black
+    click
+    coverage
+    docutils
+    libcst
+    platformdirs
+    roman
+    sphinx
+    tabulate
+    types-docutils
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-aiohttp
+  ];
+
+  pythonImportsCheck = [
+    "docstrfmt"
+  ];
+
+  meta = {
+    description = "Formatter for reStructuredText";
+    homepage = "https://github.com/LilSpazJoekp/docstrfmt";
+    changelog = "https://github.com/LilSpazJoekp/docstrfmt/blob/${src.tag}/CHANGES.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [doronbehar];
+    mainProgram = "docstrfmt";
+  };
+}
diff --git a/pkgs/dodo/default.nix b/pkgs/dodo/default.nix
index 242f4a4..627635e 100644
--- a/pkgs/dodo/default.nix
+++ b/pkgs/dodo/default.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication {
   pname = "dodo";
-  version = "250806";
+  version = "20250926";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "akissinger";
     repo = "dodo";
-    rev = "bcb0db840f6eb0223f99e9ddefe147d84f50dc98";
-    hash = "sha256-ScMzSz6HzSUHE5jOrXvcMaokQILaXJV58k87SXujaXg=";
+    rev = "a710d0a3fe78d5bf4b3d07ea087712d3581e5a85";
+    hash = "sha256-IylZCG/7egGA7IBfSIMwmSbJVRv5cMWEtiIyds720Sw=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/python.nix b/pkgs/python.nix
new file mode 100644
index 0000000..b1a76fd
--- /dev/null
+++ b/pkgs/python.nix
@@ -0,0 +1,6 @@
+_: prev: {
+  # NixPkgs patches
+  sphinx-book-theme = prev.sphinx-book-theme.overrideAttrs {
+    pythonRelaxDeps = ["pydata-sphinx-theme"];
+  };
+}