Unverified Commit 28f2c868 authored by Robert Schütz's avatar Robert Schütz Committed by GitHub
Browse files

Merge pull request #330919 from dotlambda/python3Packages.py-synologydsm-api 

python312Packages.synologydsm-api: drop
parents a457f213 f0b5f849

pkgs/development/python-modules/py-synologydsm-api/default.nix

+7 −11
Original line number Diff line number Diff line 
{

  lib,

  aiohttp,

  async-timeout,

  buildPythonPackage,

  fetchFromGitHub,

  poetry-core,

  pytest-asyncio,

  pytestCheckHook,

  pythonOlder,

  setuptools,
@@ -24,17 +23,14 @@ buildPythonPackage rec { 
    hash = "sha256-46KoOKBiulTYH2x8ftFPVDF0oeBG1Pe9PkonxIV7528=";

  };



  nativeBuildInputs = [

    poetry-core

    setuptools

  ];

  build-system = [ setuptools ];



  propagatedBuildInputs = [

    aiohttp

    async-timeout

  ];

  dependencies = [ aiohttp ];



  nativeCheckInputs = [ pytestCheckHook ];

  nativeCheckInputs = [

    pytest-asyncio

    pytestCheckHook

  ];



  pythonImportsCheck = [ "synology_dsm" ];

pkgs/development/python-modules/synologydsm-api/default.nix

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  pythonOlder,

  fetchFromGitHub,

  fetchpatch,

  poetry-core,

  requests,

  urllib3,

  pytestCheckHook,

}:



buildPythonPackage rec {

  pname = "synologydsm-api";

  version = "1.0.2";



  pyproject = true;



  disabled = pythonOlder "3.7";



  src = fetchFromGitHub {

    owner = "hacf-fr";

    repo = "synologydsm-api";

    rev = "v${version}";

    hash = "sha256-UQdPwvRdv7SCOTxkA1bfskQ9oL/DB0j1TdJE04ODyj8=";

  };



  patches = [

    # https://github.com/hacf-fr/synologydsm-api/pull/84

    (fetchpatch {

      name = "switch-to-poetry-core.patch";

      url = "https://github.com/hacf-fr/synologydsm-api/commit/f1ea2be927388bdff6d43d09027b82a854635e34.patch";

      hash = "sha256-+c25zLkTtjeX7IE+nZEnjrWfnDhDJpeHN7qRKO5rF4g=";

    })

  ];



  nativeBuildInputs = [

    poetry-core

  ];



  pythonRelaxDeps = [ "urllib3" ];



  propagatedBuildInputs = [

    requests

    urllib3

  ];



  nativeCheckInputs = [ pytestCheckHook ];



  pythonImportsCheck = [ "synology_dsm" ];



  meta = with lib; {

    description = "Python API for communication with Synology DSM";

    mainProgram = "synologydsm-api";

    homepage = "https://github.com/hacf-fr/synologydsm-api";

    license = licenses.mit;

    maintainers = with maintainers; [ dotlambda ];

  };

}

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -564,6 +564,7 @@ mapAliases ({ 
  suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27

  supervise_api = supervise-api; # added 2023-10-11

  suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27

  synologydsm-api = py-synologydsm-api; # added 2024-07-29

  sysv_ipc = sysv-ipc; # added 2024-01-07

  tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25

  tensorflow-build_2 = tensorflow-build; # added 2021-11-25

pkgs/top-level/python-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -15115,8 +15115,6 @@ self: super: with self; { 














  synergy = callPackage ../development/python-modules/synergy { };



























  synologydsm-api = callPackage ../development/python-modules/synologydsm-api { };



























  syslog-rfc5424-formatter = callPackage ../development/python-modules/syslog-rfc5424-formatter { };





























  systembridge = callPackage ../development/python-modules/systembridge { };