flake.nix

@@ -46,7 +46,7 @@
             let
               content = builtins.readFile path;
             in
-            if builtins.match ".*(buildPythonPackage|buildPythonApplication).*" content != null
+            if builtins.match ".*buildPythonPackage.*" content != null
             then pkgs.python3Packages.callPackage path { }
             else pkgs.callPackage path { };
         in

pkgs_pr/gevent-eventemitter.nix

@@ -1,13 +1,10 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchFromGitHub,
-  setuptools,
-  wheel,
-  gevent,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "gevent-eventemitter";
   version = "2.1";
   pyproject = true;
@@ -19,12 +16,12 @@ buildPythonPackage rec {
     hash = "sha256-aW4OsQi3N5yAMdbTd8rxbb2qYMfFJBR4WQFIXvxpiMw=";
   };
 
-  build-system = [
+  build-system = with python3Packages; [
     setuptools
     wheel
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     gevent
   ];
 

pkgs_pr/inputs.nix

@@ -1,12 +1,10 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonPackage,
+  python3Packages,
-  setuptools,
-  wheel,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
   pname = "inputs";
   version = "0.5";
   pyproject = true;
@@ -19,8 +17,8 @@ buildPythonPackage rec {
   };
 
   build-system = [
-    setuptools
+    python3Packages.setuptools
-    wheel
+    python3Packages.wheel
   ];
 
   pythonImportsCheck = [

pkgs_pr/pureref.nix

@@ -0,0 +1,67 @@
+{
+  lib,
+  appimageTools,
+  runCommand,
+  curl,
+  gnugrep,
+  cacert,
+  fetchurl,
+  copyDesktopItems,
+  makeDesktopItem,
+}:
+
+appimageTools.wrapType1 rec {
+  pname = "pureref";
+  version = "2.0.3";
+
+  src =
+    runCommand "PureRef-${version}_x64.Appimage"
+      {
+        nativeBuildInputs = [
+          curl
+          gnugrep
+          cacert
+        ];
+        outputHash = "sha256-0iR1cP2sZvWWqKwRAwq6L/bmIBSYHKrlI8u8V2hANfM=";
+      }
+      ''
+        key="$(curl -A 'nixpkgs/Please contact maintainer if there is an issue' "https://www.pureref.com/download.php" --silent | grep '%3D%3D' | cut -d '"' -f2)"
+        curl -L "https://www.pureref.com/files/build.php?build=LINUX64.Appimage&version=${version}&downloadKey=$key" --output $out
+      '';
+
+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/nextcloud/talk-desktop/refs/tags/v1.0.0/img/icons/icon.png";
+    hash = "sha256-DteSSuxIs0ukIJrvUO/3Mrh5F2GG5UAVvGRZUuZonkg=";
+  };
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      type = "Application";
+      name = "pureref";
+      desktopName = "PureRef";
+      # comment = finalAttrs.meta.description;
+      # exec = finalAttrs.meta.mainProgram;
+      icon = "pureref";
+      categories = [
+        "Graphics"
+        "2DGraphics"
+        "RasterGraphics"
+      ];
+    })
+  ];
+
+  meta = with lib; {
+    description = "Reference Image Viewer";
+    homepage = "https://www.pureref.com";
+    license = licenses.unfree;
+    maintainers = with maintainers; [
+      elnudev
+      husjon
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}

pkgs_pr/rmlint.nix

@@ -0,0 +1,106 @@
+{
+  lib,
+  stdenv,
+  cairo,
+  elfutils,
+  fetchFromGitHub,
+  fetchpatch,
+  glib,
+  gobject-introspection,
+  gtksourceview3,
+  json-glib,
+  makeWrapper,
+  pango,
+  pkg-config,
+  polkit,
+  python3,
+  scons,
+  sphinx,
+  util-linux,
+  wrapGAppsHook3,
+  withGui ? false,
+}:
+
+assert withGui -> !stdenv.hostPlatform.isDarwin;
+
+stdenv.mkDerivation rec {
+  pname = "rmlint";
+  version = "2.10.2";
+
+  src = fetchFromGitHub {
+    owner = "sahib";
+    repo = "rmlint";
+    rev = "v${version}";
+    sha256 = "sha256-pOo1YfeqHUU6xyBRFbcj2lX1MHJ+a5Hi31BMC1nYZGo=";
+  };
+
+  patches = [
+    # pass through NIX_* environment variables to scons.
+    ./rmlint/scons-nix-env.patch
+    # fix #664
+    (fetchpatch {
+      url = "https://github.com/sahib/rmlint/commit/f0ca57ec907f7199e3670038d60b4702d1e1d8e2.patch";
+      hash = "sha256-715X+R2BcQIaUV76hoO+EXPfNheOfw4OIHsqSoruIUI=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    sphinx
+    scons
+  ]
+  ++ lib.optionals withGui [
+    makeWrapper
+    wrapGAppsHook3
+    gobject-introspection
+  ];
+
+  buildInputs = [
+    glib
+    json-glib
+    util-linux
+  ]
+  ++ lib.optionals withGui [
+    cairo
+    gtksourceview3
+    pango
+    polkit
+    python3
+    python3.pkgs.pygobject3
+  ]
+  ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform elfutils) [
+    elfutils
+  ];
+
+  prePatch = ''
+    # remove sources of nondeterminism
+    substituteInPlace lib/cmdline.c \
+      --replace "__DATE__" "\"Jan  1 1970\"" \
+      --replace "__TIME__" "\"00:00:00\""
+    substituteInPlace docs/SConscript \
+      --replace "gzip -c " "gzip -cn "
+  '';
+
+  # Otherwise tries to access /usr.
+  prefixKey = "--prefix=";
+
+  sconsFlags = lib.optionals (!withGui) [ "--without-gui" ];
+
+  # in GUI mode, this shells out to itself, and tries to import python modules
+  postInstall = lib.optionalString withGui ''
+    gappsWrapperArgs+=(--prefix PATH : "$out/bin")
+    gappsWrapperArgs+=(--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${python3.pkgs.pygobject3}):$(toPythonPath ${python3.pkgs.pycairo})")
+  '';
+
+  meta = with lib; {
+    description = "Extremely fast tool to remove duplicates and other lint from your filesystem";
+    homepage = "https://rmlint.readthedocs.org";
+    platforms = platforms.unix;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [
+      aaschmid
+      koral
+    ];
+    mainProgram = "rmlint";
+  };
+}

pkgs_pr/rmlint/scons-nix-env.patch

@@ -0,0 +1,19 @@
+scons does not use os environment by default:
+  https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html
+
+nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables
+to be passed through like NIX_CFLAGS_COMPILE_BEFORE.
+--- a/SConstruct
++++ b/SConstruct
+@@ -559,10 +559,7 @@ options = dict(
+     SHLINKCOMSTR=link_shared_library_message,
+     LINKCOMSTR=link_program_message,
+     PREFIX=GetOption('prefix'),
+-    ENV = dict([ (key, os.environ[key])
+-                 for key in os.environ
+-                 if key in ['PATH', 'TERM', 'HOME', 'PKG_CONFIG_PATH']
+-              ])
++    ENV = os.environ,
+ )
+ 
+ if ARGUMENTS.get('VERBOSE') == "1":

pkgs_pr/steam.nix

@@ -1,24 +1,12 @@
 {
   lib,
-  buildPythonPackage,
+  python3Packages,
   fetchFromGitHub,
   callPackage,
-  setuptools,
-  wheel,
-  six,
-  pycryptodomex,
-  requests,
-  urllib3,
-  vdf,
-  gevent,
-  protobuf,
-  cachetools,
-  cryptography,
-  gevent-eventemitter,
 }:
 
-buildPythonPackage rec {
+python3Packages.buildPythonPackage rec {
-  pname = "steam-python";
+  pname = "steam";
   version = "1.4.4";
   pyproject = true;
 
@@ -29,23 +17,25 @@ buildPythonPackage rec {
     hash = "sha256-OY04GsX3KMPvpsQl8sUurzFyJu+JKpES8B0iD6Z5uyw=";
   };
 
-  build-system = [
+  build-system = with python3Packages; [
     setuptools
     wheel
   ];
 
-  dependencies = [
+  dependencies =
-    six
+    with python3Packages;
-    pycryptodomex
+    [
-    requests
+      six
-    urllib3
+      pycryptodomex
-    vdf
+      requests
-    gevent
+      urllib3
-    protobuf
+      vdf
-    cachetools
+      gevent
-    cryptography
+      protobuf
-    gevent-eventemitter
+      cachetools
-  ];
+      cryptography
+    ]
+    ++ [ (callPackage ./gevent-eventemitter.nix { }) ];
 
   pythonImportsCheck = [
     "steam"

pkgs_pr/talk.nix

@@ -0,0 +1,113 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchzip,
+  autoPatchelfHook,
+  copyDesktopItems,
+  makeDesktopItem,
+  nss,
+  cairo,
+  xorg,
+  libxkbcommon,
+  alsa-lib,
+  at-spi2-core,
+  mesa,
+  pango,
+  libdrm,
+  vivaldi-ffmpeg-codecs,
+  gtk3,
+  libGL,
+  libglvnd,
+  systemd,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nextcloud-talk-desktop";
+  version = "1.0.0";
+
+  # Building from source would require building also building Server and Talk components
+  # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
+  src = fetchzip {
+    url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
+    hash = "sha256-XQa4Fa9eEaFlYrWa00S9aMWKJOPPFGSo4NAlRqE23jM=";
+    stripRoot = false;
+  };
+
+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/nextcloud/talk-desktop/refs/tags/v1.0.0/img/icons/icon.png";
+    hash = "sha256-DteSSuxIs0ukIJrvUO/3Mrh5F2GG5UAVvGRZUuZonkg=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    nss
+    cairo
+    alsa-lib
+    at-spi2-core
+    pango
+    libdrm
+    libxkbcommon
+    gtk3
+    vivaldi-ffmpeg-codecs
+    mesa
+    libGL
+    libglvnd
+  ]
+  ++ (with xorg; [
+    libX11
+    libXcomposite
+    libXdamage
+    libXrandr
+    libXfixes
+    libXcursor
+  ]);
+
+  # Required to launch the application and proceed past the zygote_linux fork() process
+  # Fixes `Zygote could not fork`
+  runtimeDependencies = [ systemd ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      type = "Application";
+      name = "nextcloud-talk-desktop";
+      desktopName = "Nextcloud Talk";
+      comment = finalAttrs.meta.description;
+      exec = finalAttrs.meta.mainProgram;
+      icon = "nextcloud-talk-desktop";
+      categories = [ "Chat" ];
+    })
+  ];
+
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $out/opt
+
+    cp -r $src/* $out/opt/
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # Link the application in $out/bin away from contents of `preInstall`
+    ln -s "$out/opt/Nextcloud Talk-linux-x64/Nextcloud Talk" $out/bin/nextcloud-talk-desktop
+    mkdir -p $out/share/icons/hicolor/512x512/apps
+    cp $icon $out/share/icons/hicolor/512x512/apps/nextcloud-talk-desktop.png
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Nextcloud Talk Desktop Client";
+    homepage = "https://github.com/nextcloud/talk-desktop";
+    changelog = "https://github.com/nextcloud/talk-desktop/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = licenses.agpl3Only;
+    maintainers = with maintainers; [ kashw2 ];
+    mainProgram = "nextcloud-talk-desktop";
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+})

pkgs_pr/webcomix.nix

@@ -1,27 +1,19 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonApplication,
+  python3Packages,
-  poetry-core,
-  click,
-  tqdm,
-  scrapy,
-  scrapy-splash,
-  scrapy-fake-useragent,
-  pytest-rerunfailures,
-  docker,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "webcomix";
-  version = "3.12.0";
+  version = "3.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "J-CPelletier";
     repo = "webcomix";
     rev = version;
-    hash = "sha256-Vsn6Ju4+SG8iOCxnqixnpi9apr8Nc4/mFjpjipPud6g=";
+    hash = "sha256-vs7IE1IQ6/2uOYqLUskW4vGFdoz8z/ZBYQPteTcdOR0=";
   };
 
   postPatch = ''
@@ -32,10 +24,10 @@ buildPythonApplication rec {
   '';
 
   build-system = [
-    poetry-core
+    python3Packages.poetry-core
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     click
     tqdm
     scrapy
@@ -51,9 +43,6 @@ buildPythonApplication rec {
 
   doCheck = false;
 
-  # Skip runtime dependency check due to version mismatches with nixpkgs
-  dontCheckRuntimeDeps = true;
-
   meta = {
     description = "Webcomic downloader";
     homepage = "https://github.com/J-CPelletier/webcomix";

pkgs_wip/aviator.nix

@@ -2,6 +2,7 @@
   stdenv,
   lib,
   python3,
+  python3Packages,
   fetchFromGitHub,
   meson,
   appstream-glib,
@@ -34,7 +35,7 @@ stdenv.mkDerivation (_finaAttrs: rec {
     pkg-config
     desktop-file-utils
     ninja
-    python3.pkgs.pygobject3
+    python3Packages.pygobject3
     gobject-introspection
   ];
 

pkgs_wip/colordle.nix

@@ -2,11 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  makeWrapper,
-  python3,
-  gtk4,
-  libadwaita,
-  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,38 +15,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-oPGC0D7sh+H25qg2ttRtIMjI+HjZImRieWmYw+I6sQE=";
   };
 
-  nativeBuildInputs = [
-    makeWrapper
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    gtk4
-    libadwaita
-    (python3.withPackages (ps: with ps; [
-      pygobject3
-      pycairo
-    ]))
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    
-    mkdir -p $out/bin $out/share/hexcolordle-gtk $out/share/applications $out/share/metainfo
-    cp -r * $out/share/hexcolordle-gtk/
-    
-    # Install desktop file and metainfo
-    cp net.krafting.HexColordle.desktop $out/share/applications/
-    cp net.krafting.HexColordle.metainfo.xml $out/share/metainfo/
-    
-    # Create wrapper for the main Python file
-    makeWrapper ${python3.withPackages (ps: with ps; [pygobject3 pycairo])}/bin/python3 $out/bin/hexcolordle-gtk \
-      --add-flags "$out/share/hexcolordle-gtk/HexColordle.py" \
-      --prefix PYTHONPATH : "$out/share/hexcolordle-gtk"
-    
-    runHook postInstall
-  '';
-
   meta = {
     description = "A game where you need to find a color by guessing its hex code";
     homepage = "https://gitlab.com/Krafting/hexcolordle-gtk";

pkgs_wip/dosage.nix

@@ -15,18 +15,17 @@
   gtk4,
   libadwaita,
   wrapGAppsHook4,
-  makeWrapper,
 }:
 
 stdenv.mkDerivation rec {
   pname = "dosage";
-  version = "1.9.11";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "diegopvlk";
     repo = "Dosage";
     rev = "v${version}";
-    hash = "sha256-TS9niQd3jlALQrFu6H2SucZwwQp0k2BRHqZCYfbz+CI=";
+    hash = "sha256-dpmv9GbAgLAZJCifHssC0HQEBXHjrO0mquQd24pNMM0=";
   };
 
   nativeBuildInputs = [
@@ -39,30 +38,18 @@ stdenv.mkDerivation rec {
     glib
     appstream-glib
     appstream
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
     gjs
     gtk4
     libadwaita
-    glib
+    wrapGAppsHook4
   ];
 
-  # Ensure GResource files are properly accessible
-  postInstall = ''
-    # The GResource files should be automatically handled by wrapGAppsHook4
-    # but let's make sure the GResource path is correct
-    wrapProgram $out/bin/io.github.diegopvlk.Dosage \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
   meta = {
     description = "Medication tracker for Linux";
     homepage = "https://github.com/diegopvlk/Dosage";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ ];
-    mainProgram = "io.github.diegopvlk.Dosage";
+    mainProgram = "dosage";
     platforms = lib.platforms.all;
   };
 }

pkgs_wip/girens.nix

@@ -5,11 +5,6 @@
   meson,
   ninja,
   gettext,
-  pkg-config,
-  desktop-file-utils,
-  appstream-glib,
-  glib,
-  blueprint-compiler,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,19 +23,8 @@ stdenv.mkDerivation rec {
     meson
     ninja
     gettext
-    pkg-config
-    desktop-file-utils
-    appstream-glib
-    glib
-    blueprint-compiler
   ];
 
-  # Override the post-install script to avoid sandbox issues
-  postInstall = ''
-    # The original postinstall.py tries to run glib-compile-schemas which fails in sandbox
-    echo "Skipping glib-compile-schemas and other post-install steps"
-  '';
-
   meta = {
     description = "Girens is a Plex GTK client for playing movies, TV shows and music from your Plex library";
     homepage = "https://gitlab.gnome.org/tijder/girens";

pkgs_wip/hiit.nix

@@ -17,26 +17,24 @@
   pango,
   darwin,
   alsa-lib,
-  pulseaudio,
-  pipewire,
   desktop-file-utils,
 }:
 
 stdenv.mkDerivation rec {
   pname = "exercise-timer";
-  version = "1.8.5";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "mfep";
     repo = "exercise-timer";
     rev = "v${version}";
-    hash = "sha256-YZYAhG8xpXM1m1LrXgwxo3JF74QjOmbnuSbo4SYPBmg=";
+    hash = "sha256-6MBSUYFZ8nMZX7acam8T0uJWb9E2/L9vnKzJq14p4BY=";
   };
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
+  cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-JObzeiQHEGIDjOung3o8dpaXVcOoJS2v1hyrcS1fqcI=";
+    hash = "sha256-mXHw87IUMq1qXQSTavI/ReKUyB0rNMXYld8vND38C30=";
   };
 
   nativeBuildInputs = [

pkgs_wip/inputs.nix

@@ -1,38 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildPythonPackage,
-  setuptools,
-  wheel,
-}:
-
-buildPythonPackage rec {
-  pname = "inputs";
-  version = "0.5";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "zeth";
-    repo = "inputs";
-    rev = "v${version}";
-    hash = "sha256-tU1R6lhSMZj3Y6XdrT/Yfbte/BdLDvo6TzvLbnr+1vo=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  pythonImportsCheck = [
-    "inputs"
-  ];
-
-  meta = {
-    description = "Cross-platform Python support for keyboards, mice and gamepads";
-    homepage = "https://github.com/zeth/inputs";
-    changelog = "https://github.com/zeth/inputs/blob/${src.rev}/CHANGELOG.rst";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ CaptainJawZ ];
-    mainProgram = "inputs";
-  };
-}

pkgs_wip/protonup-qt.nix

@@ -1,56 +1,50 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
   callPackage,
-  setuptools,
-  pyside6,
-  pyxdg,
-  pyyaml,
-  requests,
-  vdf,
-  zstandard,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "proton-up-qt";
-  version = "2.14.0";
+  version = "2.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DavidoTek";
     repo = "ProtonUp-Qt";
     rev = "v${version}";
-    hash = "sha256-UiU2yLajMW5FnRSNS8TCg9Cqs8AkuXA+4FJTS2kfi6I=";
+    hash = "sha256-hf0ZLvn5mv0BlUgMvDwpdsa9ye3Bz47n0aSz+jgBrXg=";
   };
 
   pythonRemoveDeps = [
     "pyside6-essentials"
   ];
 
-  # Skip runtime dependency check for missing packages
-  dontCheckRuntimeDeps = true;
-
   build-system = [
-    setuptools
+    python3Packages.setuptools
   ];
 
-  dependencies = [
+  dependencies =
-    pyside6
+    with python3Packages;
-    pyxdg
+    [
-    pyyaml
+      pyside6
-    requests
+      pyxdg
-    vdf
+      pyyaml
-    zstandard
+      requests
-    (callPackage ./inputs.nix { })
+      vdf
-    (callPackage ./steam-python.nix { })
+      zstandard
-  ];
+    ]
+    ++ [
+      (callPackage ./inputs.nix { })
+      (callPackage ./steam.nix { })
+    ];
 
   meta = {
     description = "Install and manage GE-Proton, Luxtorpeda & more for Steam and Wine-GE & more for Lutris with this graphical user interface";
     homepage = "https://github.com/DavidoTek/ProtonUp-Qt";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ CaptainJawZ ];
-    mainProgram = "protonup-qt";
+    mainProgram = "proton-up-qt";
   };
 }

pkgs_wip/qbit-manage.nix

@@ -1,25 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3,
   fetchFromGitHub,
-  setuptools,
-  wheel,
-  argon2-cffi,
-  bencode-py,
-  croniter,
-  fastapi,
-  gitpython,
-  humanize,
-  pytimeparse2,
-  qbittorrent-api,
-  requests,
-  retrying,
-  ruamel-yaml,
-  slowapi,
-  uvicorn,
 }:
 
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "qbit-manage";
   version = "4.6.3";
   pyproject = true;
@@ -35,29 +20,30 @@ buildPythonApplication rec {
     rm LICENSE
   '';
 
-  build-system = [
+  build-system = builtins.attrValues {
-    setuptools
+    inherit (python3.pkgs)
-    wheel
+      setuptools
-  ];
+      wheel
+      ;
+  };
 
-  dependencies = [
+  propagatedBuildInputs = builtins.attrValues {
-    argon2-cffi
+    inherit (python3.pkgs)
-    bencode-py
+      argon2-cffi
-    croniter
+      bencode-py
-    fastapi
+      croniter
-    gitpython
+      fastapi
-    humanize
+      gitpython
-    pytimeparse2
+      humanize
-    qbittorrent-api
+      pytimeparse2
-    requests
+      qbittorrent-api
-    retrying
+      requests
-    ruamel-yaml
+      retrying
-    slowapi
+      ruamel-yaml
-    uvicorn
+      slowapi
-  ];
+      uvicorn
-  
+      ;
-  # Skip runtime dependency check due to version mismatches with nixpkgs
+  };
-  dontCheckRuntimeDeps = true;
 
   meta = {
     description = "This tool will help manage tedious tasks in qBittorrent and automate them. Tag, categorize, remove Orphaned data, remove unregistered torrents and much much more";

pkgs_wip/qbittorrent-api.nix

@@ -15,13 +15,13 @@
 
 buildPythonPackage rec {
   pname = "qbittorrent-api";
-  version = "2025.7.0";
+  version = "2025.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "qbittorrent_api";
     inherit version;
-    hash = "sha256-9GLygXVZzKpMbNwSaUoxU++s1Q+jKFpCVAGrMKvA3nY=";
+    hash = "sha256-NKD5weGufhbeUOlGUXUsjZejz1TCo+GgXGqDdzmaDjA=";
   };
 
   build-system = [

pkgs_wip/steam-python.nix

@@ -1,59 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  callPackage,
-  setuptools,
-  wheel,
-  six,
-  pycryptodomex,
-  requests,
-  urllib3,
-  vdf,
-  gevent,
-  protobuf,
-  cachetools,
-  cryptography,
-}:
-
-buildPythonPackage rec {
-  pname = "steam-python";
-  version = "1.4.4";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "ValvePython";
-    repo = "steam";
-    rev = version;
-    hash = "sha256-OY04GsX3KMPvpsQl8sUurzFyJu+JKpES8B0iD6Z5uyw=";
-  };
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [
-    six
-    pycryptodomex
-    requests
-    urllib3
-    vdf
-    gevent
-    protobuf
-    cachetools
-    cryptography
-    (callPackage ../pkgs_pr/gevent-eventemitter.nix { })
-  ];
-
-  pythonImportsCheck = [
-    "steam"
-  ];
-
-  meta = {
-    description = "Python package for interacting with Steam";
-    homepage = "https://github.com/ValvePython/steam";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ CaptainJawZ ];
-  };
-}

pkgs_wip/torf-cli.nix

@@ -1,20 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3,
   fetchFromGitHub,
-  setuptools,
-  pyxdg,
-  torf,
-  coverage,
-  flake8,
-  isort,
-  pytest,
-  pytest-cov,
-  ruff,
-  tox,
 }:
 
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "torf-cli";
   version = "5.2.1";
   pyproject = true;
@@ -27,15 +17,15 @@ buildPythonApplication rec {
   };
 
   build-system = [
-    setuptools
+    python3.pkgs.setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3.pkgs; [
     pyxdg
     torf
   ];
 
-  optional-dependencies = {
+  optional-dependencies = with python3.pkgs; {
     dev = [
       coverage
       flake8

pkgs_wip/torf.nix

@@ -1,23 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3,
   fetchFromGitHub,
-  setuptools,
-  flatbencode,
-  coverage,
-  flake8,
-  isort,
-  mypy,
-  pytest,
-  pytest-cov,
-  pytest-httpserver,
-  pytest-mock,
-  pytest-xdist,
-  ruff,
-  tox,
 }:
 
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
   pname = "torf";
   version = "4.3.0";
   pyproject = true;
@@ -30,14 +17,14 @@ buildPythonApplication rec {
   };
 
   build-system = [
-    setuptools
+    python3.pkgs.setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3.pkgs; [
     flatbencode
   ];
 
-  optional-dependencies = {
+  optional-dependencies = with python3.pkgs; {
     dev = [
       coverage
       flake8