diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-03-25 10:59:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-25 10:59:58 +0100 |
| commit | 682dc91691562463a8fb3a8a17001d787bac71a3 (patch) | |
| tree | 16d94e96ef345ac44dfeb0a45047b214112f806c /pkgs | |
| parent | 287ca47ab59a428657d20237934cb4050fbef555 (diff) | |
| parent | 19d0baefa9de0cb67ac2ad99f1f93e10453e478e (diff) | |
| download | nixlib-682dc91691562463a8fb3a8a17001d787bac71a3.tar nixlib-682dc91691562463a8fb3a8a17001d787bac71a3.tar.gz nixlib-682dc91691562463a8fb3a8a17001d787bac71a3.tar.bz2 nixlib-682dc91691562463a8fb3a8a17001d787bac71a3.tar.lz nixlib-682dc91691562463a8fb3a8a17001d787bac71a3.tar.xz nixlib-682dc91691562463a8fb3a8a17001d787bac71a3.tar.zst nixlib-682dc91691562463a8fb3a8a17001d787bac71a3.zip | |
Merge pull request #298735 from anthonyroussel/update/autosuspend_2
autosuspend: 6.0.0 -> 6.1.1
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/by-name/au/autosuspend/package.nix (renamed from pkgs/os-specific/linux/autosuspend/default.nix) | 33 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 27 deletions
diff --git a/pkgs/os-specific/linux/autosuspend/default.nix b/pkgs/by-name/au/autosuspend/package.nix index 5abacf966b9e..a39d3ec782c1 100644 --- a/pkgs/os-specific/linux/autosuspend/default.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -1,31 +1,13 @@ { lib +, dbus , fetchFromGitHub , fetchPypi , python3 }: -let - python = python3.override { - packageOverrides = self: super: { - # autosuspend is incompatible with tzlocal v5 - # See https://github.com/regebro/tzlocal#api-change - tzlocal = super.tzlocal.overridePythonAttrs (prev: rec { - version = "4.3.1"; - src = fetchPypi { - inherit (prev) pname; - inherit version; - hash = "sha256-7jLvjCCAPBmpbtNmrd09SnKe9jCctcc1mgzC7ut/pGo="; - }; - propagatedBuildInputs = with self; [ - pytz-deprecation-shim - ]; - }); - }; - }; -in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "autosuspend"; - version = "6.0.0"; + version = "6.1.1"; disabled = python3.pythonOlder "3.8"; @@ -33,15 +15,15 @@ python.pkgs.buildPythonApplication rec { owner = "languitar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gS8NNks4GaIGl7cEqWSP53I4/tIV4LypkmZ5vNOjspY="; + hash = "sha256-LGU/yhwuc6BuctCibm0AaRheQkuSIgEVXzcWQHCJ/8Y="; }; postPatch = '' substituteInPlace setup.cfg \ - --replace '--cov-config=setup.cfg' "" + --replace-fail '--cov-config=setup.cfg' "" ''; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python3.pkgs; [ dbus-python icalendar jsonpath-ng @@ -56,7 +38,8 @@ python.pkgs.buildPythonApplication rec { tzlocal ]; - nativeCheckInputs = with python.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ + dbus freezegun pytest-datadir pytest-httpserver diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 737b6146488b..063b30660ca3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3337,8 +3337,6 @@ with pkgs; autospotting = callPackage ../applications/misc/autospotting { }; - autosuspend = callPackage ../os-specific/linux/autosuspend { }; - avfs = callPackage ../tools/filesystems/avfs { }; aliyun-cli = callPackage ../tools/admin/aliyun-cli { }; |