diff options
Diffstat (limited to 'pkgs/development')
19 files changed, 190 insertions, 105 deletions
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 56e79ffc59046..90bd678f287f1 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -42,6 +42,10 @@ let version = "8.06.11"; sha256 = "1zjpg9jvs6i9jvbgn6zgispwqiv8rxvaszxcx9ha9fax3wzhv9qy"; }; + "4.14" = mkNewParam { + version = "8.06.12"; + sha256 = "sha256:17fmb13l18isgwr38hg9r5a0nayf2hhw6acj5153cy1sygsdg3b5"; + }; }; param = params . ${lib.versions.majorMinor ocaml.version} or (throw "labltk is not available for OCaml ${ocaml.version}"); diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 163c0e4a15ad6..a452c310e43dd 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "browser-cookie3"; - version = "0.14.0"; + version = "0.14.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-kWYMl/JZxonLfT0u/13bXz0MlC36jssWWq/i05FDpOA="; + hash = "sha256-2cMWFyHK+7M99Z9O7PiKue37c5XVBe/n88AF5ax7A2s="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index f5a28fa383999..a75f2e3da959f 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.7.4"; + version = "1.7.5"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-aWl//usJk5BzYF7qyX9SS8yrrgQmV1eldcf8kjCHqmU="; + hash = "sha256-STdcYwmB3UBF2akuJwn81Edskfkn4CKEk+76Yl5wUTM="; }; postPatch = '' diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 25f02b87c9e78..cefedfe7fc371 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -10,6 +10,7 @@ , pythonOlder , pytz , six +, werkzeug }: buildPythonPackage rec { @@ -25,7 +26,7 @@ buildPythonPackage rec { hash = "sha256-zOxlC4NdSBkhOMhTKa4Dc15s7VjpstnCFG1shMBvpT4="; }; - patches = [ + patches = lib.optionals (lib.versionAtLeast werkzeug.version "2.1.0") [ ./werkzeug-2.1.0-compat.patch ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index c02e3b593b82c..e14223c1fd6db 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config -, python3 +, python , pygobject3 , gobject-introspection , gst-plugins-base @@ -32,7 +32,7 @@ buildPythonPackage rec { meson ninja pkg-config - python3 + python gobject-introspection gst-plugins-base ]; @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; mesonFlags = [ - "-Dpygi-overrides-dir=${placeholder "out"}/${python3.sitePackages}/gi/overrides" + "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides" ]; doCheck = true; diff --git a/pkgs/development/python-modules/osmpythontools/default.nix b/pkgs/development/python-modules/osmpythontools/default.nix index 23755583470aa..53c4dc1457e68 100644 --- a/pkgs/development/python-modules/osmpythontools/default.nix +++ b/pkgs/development/python-modules/osmpythontools/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "osmpythontools"; - version = "0.3.3"; + version = "0.3.4"; src = fetchFromGitHub { owner = "mocnik-science"; repo = "osm-python-tools"; - rev = "v.${version}"; - sha256 = "sha256-335zo/kOX4OpUwHas2aaPibY6zNmDaaHJpolbTQWqKk="; + rev = "v${version}"; + sha256 = "sha256-7r42b/B9h7cMgM+wFS0Fink/3WjUNvz+PwLn3C5hawc="; }; propagatedBuildInputs = [ @@ -54,6 +54,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/mocnik-science/osm-python-tools"; license = licenses.gpl3Only; + changelog = "https://raw.githubusercontent.com/mocnik-science/osm-python-tools/v${version}/version-history.md"; maintainers = with maintainers; [ das-g ]; }; } diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix index 2098a1d10cf63..a6d665651655d 100644 --- a/pkgs/development/python-modules/pex/default.nix +++ b/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.85"; + version = "2.1.87"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ABRidGtJikMIHItT21MJdiIqpA26IUN1aFMNyRVKyDA="; + hash = "sha256-LPOHpylnWxwEdPT3oJjbn8NkTY9tE/pMyGE8Dy7nwrU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/proxmoxer/default.nix b/pkgs/development/python-modules/proxmoxer/default.nix index 33b233bd60969..9684fe84ba0fc 100644 --- a/pkgs/development/python-modules/proxmoxer/default.nix +++ b/pkgs/development/python-modules/proxmoxer/default.nix @@ -11,14 +11,16 @@ buildPythonPackage rec { pname = "proxmoxer"; - version = "1.3.0"; - disabled = pythonOlder "3.6"; + version = "1.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = version; - sha256 = "sha256-3EpId20WVVjXA/wxwy1peyHPcXdiT3fprABkcNBpZtE="; + rev = "refs/tags/${version}"; + hash = "sha256-FY0JLDBoKmh85VoKh3UuPPRbMAIjs3l/fZM4owniH1c="; }; propagatedBuildInputs = [ @@ -32,9 +34,14 @@ buildPythonPackage rec { pytestCheckHook ]; - # Tests require openssh_wrapper which is outdated and not available - pytestFlagsArray = [ "tests/paramiko_tests.py" ]; - pythonImportsCheck = [ "proxmoxer" ]; + pytestFlagsArray = [ + # Tests require openssh_wrapper which is outdated and not available + "tests/paramiko_tests.py" + ]; + + pythonImportsCheck = [ + "proxmoxer" + ]; meta = with lib; { description = "Python wrapper for Proxmox API v2"; diff --git a/pkgs/development/python-modules/puremagic/default.nix b/pkgs/development/python-modules/puremagic/default.nix index fbc1bd69370e1..aac505dd8f39a 100644 --- a/pkgs/development/python-modules/puremagic/default.nix +++ b/pkgs/development/python-modules/puremagic/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "puremagic"; - version = "1.13"; + version = "1.14"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-yaHw/pOqWLUtYoM3l/JB0JToLXdi04n0BSccRdbCVDw="; + sha256 = "sha256-PV3ybMfsmuu/hCoJEVovqF3FnqZBT6VoVyxEd115bLw="; }; # test data not included on pypi diff --git a/pkgs/development/python-modules/pyautogui/default.nix b/pkgs/development/python-modules/pyautogui/default.nix index 08ab81ba93d35..a7b35bc5710eb 100644 --- a/pkgs/development/python-modules/pyautogui/default.nix +++ b/pkgs/development/python-modules/pyautogui/default.nix @@ -1,14 +1,10 @@ { lib , buildPythonPackage , fetchFromGitHub -, python3Packages -, pkgs -, fetchzip , mouseinfo , pygetwindow , pymsgbox , pyperclip -, pyrect , pyscreeze , pytweening , tkinter diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 2a55491ac0d71..37e6467c4a793 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.19"; + version = "2.0.23"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-HcUawiKlPS0zqB5kEScfV82xnLG0n62owzK5upOLn4I="; + hash = "sha256-+qJfqC6jLfrPwXl6zR7b21jY/s9leWeBxVgMa1IDRg4="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix index d08289d7573d5..5b2f3941b2b40 100644 --- a/pkgs/development/python-modules/pyscf/default.nix +++ b/pkgs/development/python-modules/pyscf/default.nix @@ -1,5 +1,4 @@ { buildPythonPackage -, python3 , lib , fetchFromGitHub , cmake diff --git a/pkgs/development/python-modules/pyvips/default.nix b/pkgs/development/python-modules/pyvips/default.nix index 5b84a4373d82c..4742143edad1f 100644 --- a/pkgs/development/python-modules/pyvips/default.nix +++ b/pkgs/development/python-modules/pyvips/default.nix @@ -5,7 +5,8 @@ , glib , vips , cffi -, pkgconfig +, pkgconfig # from pythonPackages +, pkg-config # from pkgs , lib }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { sha256 = "sha256-qMVoVzqXALhPWVKLzu+VqihHPN7J+pMhKnXdb+ow0zw="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig pkg-config ]; buildInputs = [ glib vips ]; diff --git a/pkgs/development/python-modules/reportengine/default.nix b/pkgs/development/python-modules/reportengine/default.nix new file mode 100644 index 0000000000000..6168f62d463d4 --- /dev/null +++ b/pkgs/development/python-modules/reportengine/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchPypi +, flit +, jinja2 +, ruamel-yaml +, matplotlib +, pandas +, pandoc +, pygments +, blessings +, curio +, hypothesis +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "reportengine"; + version = "0.30.dev0"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "eb612994b7f364e872301b4569b544648e95e587d803284ddb5610efc8f2170f"; + }; + + nativeBuildInputs = [ flit ]; + + propagatedBuildInputs = [ + jinja2 + ruamel-yaml + matplotlib + pandas + pygments + blessings + curio + ]; + + checkInputs = [ + hypothesis + pandoc + pytestCheckHook + ]; + + pythonImportsCheck = [ "reportengine" ]; + + meta = with lib; { + description = "A framework for declarative data analysis"; + homepage = "https://github.com/NNPDF/reportengine/"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ veprbl ]; + }; +} diff --git a/pkgs/development/python-modules/tempest/default.nix b/pkgs/development/python-modules/tempest/default.nix index 39f7a82cd9ec8..5a88c7e1222be 100644 --- a/pkgs/development/python-modules/tempest/default.nix +++ b/pkgs/development/python-modules/tempest/default.nix @@ -24,7 +24,7 @@ , hacking , oslotest , bash -, python3 +, python }: buildPythonApplication rec { @@ -76,8 +76,8 @@ buildPythonApplication rec { # Tests expect these applications available as such. mkdir -p bin export PATH="$PWD/bin:$PATH" - printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.main "$@"\n' > bin/tempest - printf '#!${bash}/bin/bash\nexec ${python3.interpreter} -m tempest.cmd.subunit_describe_calls "$@"\n' > bin/subunit-describe-calls + printf '#!${bash}/bin/bash\nexec ${python.interpreter} -m tempest.cmd.main "$@"\n' > bin/tempest + printf '#!${bash}/bin/bash\nexec ${python.interpreter} -m tempest.cmd.subunit_describe_calls "$@"\n' > bin/subunit-describe-calls chmod +x bin/* stestr --test-path tempest/tests run -e <(echo " diff --git a/pkgs/development/python-modules/tesla-powerwall/default.nix b/pkgs/development/python-modules/tesla-powerwall/default.nix new file mode 100644 index 0000000000000..a2a7b48937455 --- /dev/null +++ b/pkgs/development/python-modules/tesla-powerwall/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, pytestCheckHook +, responses +}: + +buildPythonPackage rec { + pname = "tesla-powerwall"; + version = "0.3.17"; + + format = "setuptools"; + + src = fetchPypi { + pname = "tesla_powerwall"; + inherit version; + sha256 = "09351e408e8e3cc03414944c1a487ef2178300829559e80835026acb84330cfd"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + pytestCheckHook + responses + ]; + + pytestFlagsArray = [ + "tests/unit" + ]; + + pythonImportsCheck = [ "tesla_powerwall" ]; + + meta = { + description = "API for Tesla Powerwall"; + homepage = "https://github.com/jrester/tesla_powerwall"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 806687361585f..2158cac9fa3b2 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -1,13 +1,18 @@ { lib -, python3Packages +, buildPythonPackage , fetchFromGitHub +, asgineer +, itemdb +, jinja2 +, markdown +, pscript +, pyjwt +, uvicorn , pytestCheckHook , requests -, pytest -, pythonOlder }: -python3Packages.buildPythonPackage rec { +buildPythonPackage rec { pname = "timetagger"; version = "22.4.2"; @@ -18,7 +23,7 @@ python3Packages.buildPythonPackage rec { sha256 = "sha256-CWY+5O4Y1dvKQNy1Cclqj4+U6q5vVVj9hZq41MYqXKs="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ asgineer itemdb jinja2 @@ -35,12 +40,8 @@ python3Packages.buildPythonPackage rec { checkInputs = [ pytestCheckHook requests - pytest ]; - # fails with `No module named pytest` on python version 3.10 - doCheck = pythonOlder "3.10"; - meta = with lib; { homepage = "https://timetagger.app"; license = licenses.gpl3Only; diff --git a/pkgs/development/python-modules/vallox-websocket-api/default.nix b/pkgs/development/python-modules/vallox-websocket-api/default.nix new file mode 100644 index 0000000000000..53af2f0dd9fcd --- /dev/null +++ b/pkgs/development/python-modules/vallox-websocket-api/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, construct +, websockets +, asynctest +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "vallox-websocket-api"; + version = "2.11.0"; + + disabled = pythonOlder "3.6"; + + format = "setuptools"; + + src = fetchFromGitHub { + owner = "yozik04"; + repo = "vallox_websocket_api"; + rev = version; + hash = "sha256-wZiPrPl9ESp43PFdRPvqB2nOg+ogfaArunZOR3Q9cvs="; + }; + + propagatedBuildInputs = [ + construct + websockets + ]; + + checkInputs = [ + asynctest + pytestCheckHook + ]; + + meta = { + description = "Async API for Vallox ventilation units"; + homepage = "https://github.com/yozik04/vallox_websocket_api"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/werkzeug/1.nix b/pkgs/development/python-modules/werkzeug/1.nix deleted file mode 100644 index ae7ce1f2b90a7..0000000000000 --- a/pkgs/development/python-modules/werkzeug/1.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi -, itsdangerous, hypothesis -, pytestCheckHook, requests -, pytest-timeout -, isPy3k - }: - -buildPythonPackage rec { - pname = "Werkzeug"; - version = "1.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c"; - }; - - propagatedBuildInputs = [ itsdangerous ]; - checkInputs = [ pytestCheckHook requests hypothesis pytest-timeout ]; - - postPatch = '' - # ResourceWarning causes tests to fail - rm tests/test_routing.py - ''; - - disabledTests = [ - "test_save_to_pathlib_dst" - "test_cookie_maxsize" - "test_cookie_samesite_attribute" - "test_cookie_samesite_invalid" - "test_range_parsing" - "test_content_range_parsing" - "test_http_date_lt_1000" - "test_best_match_works" - "test_date_to_unix" - "test_easteregg" - - # Seems to be a problematic test-case: - # - # > warnings.warn(pytest.PytestUnraisableExceptionWarning(msg)) - # E pytest.PytestUnraisableExceptionWarning: Exception ignored in: <_io.FileIO [closed]> - # E - # E Traceback (most recent call last): - # E File "/nix/store/cwv8aj4vsqvimzljw5dxsxy663vjgibj-python3.9-Werkzeug-1.0.1/lib/python3.9/site-packages/werkzeug/formparser.py", line 318, in parse_multipart_headers - # E return Headers(result) - # E ResourceWarning: unclosed file <_io.FileIO name=11 mode='rb+' closefd=True> - "test_basic_routing" - "test_merge_slashes_match" - "test_merge_slashes_build" - "TestMultiPart" - "TestHTTPUtility" - ] ++ lib.optionals stdenv.isDarwin [ - "test_get_machine_id" - ]; - - meta = with lib; { - homepage = "https://palletsprojects.com/p/werkzeug/"; - description = "A WSGI utility library for Python"; - license = licenses.bsd3; - maintainers = [ ]; - }; -} - |