tuh fix

flake.lock

@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761173472,
+        "lastModified": 1762653957,
-        "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=",
+        "narHash": "sha256-3em63zYO+s0NxxKwPXyzV80fXfwZOg7/LjYF5ndZltc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb",
+        "rev": "c148fa0cf61fc3bb7b011f2d4f8d789964ea7dd0",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "master",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -1,7 +1,7 @@
 {
   description = "Nix flake for the activity logging script";
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/master";
     sudoku-solver.url = "path:./src/sudoku-hs";
   };
   outputs =
@@ -11,6 +11,7 @@
       pkgs = import nixpkgs {
         inherit system;
         config.allowUnfree = true;
+        overlays = [ inputs.self.overlays.default ];
       };
       generatePackages =
         args:
@@ -29,15 +30,11 @@
     in
     {
       overlays.default = _final: prev: {
-        scrapy = prev.scrapy.overrideAttrs (_old: rec {
+        python3Packages = prev.python3Packages.override {
-          version = "2.11.2";
+          overrides = pyself: pysuper: {
-          src = prev.fetchFromGitHub {
+            webcomix = prev.python3Packages.callPackage ./pkgs_pr/webcomix.nix { };
-            owner = "scrapy";
-            repo = "scrapy";
-            tag = version;
-            hash = "sha256-EaO1kQ3VSTwEW+r0kSKycOxHNTPwwCVjch1ZBrTU0qQ=";
           };
-        });
+        };
       };
       packages.x86_64-linux =
         let

pkgs/download.nix

@@ -1,14 +1,19 @@
 {
-  python3Packages,
+  buildPythonApplication,
+  setuptools,
+  pyyaml,
+  types-pyyaml,
+  yt-dlp,
   gallery-dl,
   ffmpeg,
+  webcomix,
   ...
 }:
 let
   pname = "download";
   version = "2.6";
 in
-python3Packages.buildPythonApplication {
+buildPythonApplication {
   inherit pname version;
 
   src = builtins.path {
@@ -18,18 +23,14 @@ python3Packages.buildPythonApplication {
 
   pyproject = true;
 
-  build-system = [ python3Packages.setuptools ];
+  build-system = [ setuptools ];
 
   dependencies = [
     ffmpeg
     gallery-dl
-    # (callPackage ../pkgs_pr/webcomix.nix { })
+    pyyaml
-  ]
+    types-pyyaml
-  ++ builtins.attrValues {
+    yt-dlp
-    inherit (python3Packages)
+    webcomix
-      pyyaml
+  ];
-      types-pyyaml
-      yt-dlp
-      ;
-  };
 }

pkgs/run.nix

@@ -6,6 +6,7 @@
   gum,
   xclip,
   ghostty,
+  rmlint,
   callPackage,
   ...
 }:
@@ -19,7 +20,7 @@ writeShellApplication {
     gum
     xclip
     ghostty
-    (callPackage ../pkgs_pr/rmlint.nix { })
+    rmlint
   ];
 
   text = builtins.readFile ../src/packaged_scripts/run.sh;

pkgs/tuh-activity-logger.nix

@@ -1,23 +1,28 @@
-{ python3Packages, sqlite, ... }:
+{
+  buildPythonApplication,
+  setuptools,
+  beautifulsoup4,
+  requests,
+  matplotlib,
+  sqlite,
+  ...
+}:
 let
   pname = "tuh-activity-logger";
   version = "1.0";
 in
-python3Packages.buildPythonApplication {
+buildPythonApplication {
   inherit pname version;
   src = builtins.path {
     path = ../src/tuhmayto/.;
     name = "${pname}-${version}";
   };
-  build-system = [ python3Packages.setuptools ];
+  pyproject = true;
+  build-system = [ setuptools ];
   dependencies = [
     sqlite
-  ]
+    beautifulsoup4
-  ++ builtins.attrValues {
+    requests
-    inherit (python3Packages)
+    matplotlib
-      beautifulsoup4
+  ];
-      requests
-      matplotlib
-      ;
-  };
 }

pkgs_pr/webcomix.nix

@@ -39,8 +39,16 @@ buildPythonApplication rec {
     click
     tqdm
     scrapy
-    scrapy-splash
+    (scrapy-splash.overridePythonAttrs (oldAttrs: {
-    scrapy-fake-useragent
+      doCheck = false;
+      nativeCheckInputs = [ ];
+    }))
+    (scrapy-fake-useragent.overridePythonAttrs (oldAttrs: {
+      doCheck = false;
+      nativeCheckInputs = [ ];
+      checkPhase = "";
+      preCheck = "";
+    }))
     pytest-rerunfailures
     docker
   ];