Skip to content

Commit

Permalink
swap pyinotify for patched version
Browse files Browse the repository at this point in the history
  • Loading branch information
shadeyg56 committed Apr 29, 2024
1 parent 00463b3 commit e3678c1
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 10 deletions.
21 changes: 16 additions & 5 deletions nix/default.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
{
lib,
python310Packages,
python3Packages,
pkgs,
fetchFromGitHub,
}:
let
psutilGit = python310Packages.psutil.overrideAttrs (oldAttrs: {

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";
repo = "pyinotify-3.12";
rev = "923cebec3a2a84c7e38c9e68171eb93f5d07ce5d";
hash = "sha256-714CximEK4YhIqDmvqJYOUGs39gvDkWGrkNrXwxT8iM=";
};
});

in
python310Packages.buildPythonPackage {
python3Packages.buildPythonPackage {
# use pyproject.toml instead of setup.py
format = "pyproject";

Expand All @@ -24,9 +35,9 @@ python310Packages.buildPythonPackage {

nativeBuildInputs = with pkgs; [wrapGAppsHook gobject-introspection];

buildInputs = with pkgs; [gtk3 python310Packages.poetry-core];
buildInputs = with pkgs; [gtk3 python3Packages.poetry-core];

propagatedBuildInputs = with python310Packages; [requests pygobject3 click distro psutilGit setuptools poetry-dynamic-versioning pyinotify];
propagatedBuildInputs = with python3Packages; [requests pygobject3 click distro psutil setuptools poetry-dynamic-versioning pyinotify];

doCheck = false;
pythonImportsCheck = ["auto_cpufreq"];
Expand Down
13 changes: 9 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ click = "^8.1.0"
distro = "^1.8.0"
requests = "^2.31.0"
PyGObject = "^3.46.0"
pyinotify = "^0.9.6"
pyinotify = {git = "https://github.com/shadeyg56/pyinotify-3.12"}

[tool.poetry.group.dev.dependencies]
poetry = "^1.6.1"
Expand Down

0 comments on commit e3678c1

Please sign in to comment.