Unpin psutil and requests

AdnanHodzic · Aug 3, 2024 · f45c739 · f45c739
1 parent a14d06c
commit f45c739
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 38 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/default.nix b/nix/default.nix
@@ -7,15 +7,6 @@
 }:
 let
 
-  psutil = python3Packages.psutil.overrideAttrs (oldAttrs: {
-    src = fetchFromGitHub {
-      owner = "giampaolo";
-      repo = "psutil";
-      rev = "4cf56e08c1bc883ec89758834b50954380759858";
-      sha256 = "61JwXP/cZrXqdBnb2J0kdDJoKpltO62KcpM0sYX6g1A=";
-    };
-  });
-
   pyinotify = python3Packages.pyinotify.overrideAttrs (oldAttrs: {
     src = fetchFromGitHub {
       owner = "shadeyg56";
@@ -26,14 +17,6 @@ let
     patches = [];
   });
 
-  requests = python3Packages.requests.overrideAttrs (oldAttrs: {
-    src = fetchPypi {
-      pname = "requests";
-      version = "2.32.1";
-      hash = "sha256-65fofmTHnmTluKx1zundH5f0niibCD7mvpYmiTByVoU=";
-    };
-  });
-
 in
 python3Packages.buildPythonPackage {
   # use pyproject.toml instead of setup.py

diff --git a/nix/shell.nix b/nix/shell.nix
@@ -1,14 +1,15 @@
 {
-  python310Packages,
   python3Packages,
+  pkgs,
   ...
 }: let
   mainPkg = python3Packages.callPackage ./default.nix {};
 in
   mainPkg.overrideAttrs (oa: {
     nativeBuildInputs =
       [
-        python310Packages.pip
+        python3Packages.pip
+        pkgs.poetry
       ]
       ++ (oa.nativeBuildInputs or []);
   })
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,10 +22,10 @@ packages = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-psutil = {git = "https://github.com/giampaolo/psutil.git", rev = "4cf56e08c1bc883ec89758834b50954380759858"}
+psutil = "^6.0.0"
 click = "^8.1.0"
 distro = "^1.8.0"
-requests = "^2.32.0"
+requests = "^2.32.3"
 PyGObject = "^3.46.0"
 pyinotify = {git = "https://github.com/shadeyg56/pyinotify-3.12"}