diff options
Diffstat (limited to 'pkgs/development')
6 files changed, 44 insertions, 27 deletions
diff --git a/pkgs/development/python-modules/python-osc/default.nix b/pkgs/development/python-modules/python-osc/default.nix index 500e6beb0b0ef..86c5894d81789 100644 --- a/pkgs/development/python-modules/python-osc/default.nix +++ b/pkgs/development/python-modules/python-osc/default.nix @@ -1,22 +1,39 @@ { lib , buildPythonPackage , fetchPypi +, pytestCheckHook +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "python-osc"; version = "1.8.3"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-pc4bpWyNgt9Ryz8pRrXdM6cFInkazEuFZOYtKyCtnKo="; }; - pythonImportsCheck = [ "pythonosc" ]; + nativeBuildInputs = [ + setuptools + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pythonosc" + ]; meta = with lib; { description = "Open Sound Control server and client in pure python"; homepage = "https://github.com/attwad/python-osc"; + changelog = "https://github.com/attwad/python-osc/blob/v${version}/CHANGELOG.md"; license = licenses.unlicense; maintainers = with maintainers; [ anirrudh ]; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 1378b7a1add78..6d8588aa8ef26 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.25"; + version = "3.1.26"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-DNMS22IatzdaqHDDNVnhdAGvXGcgnU6lnaLrhESh2x4="; + hash = "sha256-EUfrIrn8vRAKN0RShiWDYd5L9/7cgmNJZT9lM/ee5/s="; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 4195a8453033f..aa507496478e5 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -32,6 +32,10 @@ , git , openssh , setuptools +, croniter +, importlib-resources +, packaging +, unidiff , pythonRelaxDepsHook , glibcLocales , nixosTests @@ -67,14 +71,14 @@ let package = buildPythonApplication rec { pname = "buildbot"; - version = "3.9.2"; + version = "3.10.0"; format = "pyproject"; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7QhIMUpzmxbh8qjz0hgqzibLkWADhTV523neo1wpGSA="; + hash = "sha256-Jlppe6LgDQKQgywINkOX9zKWTomzIz28M5scrj3H94Y="; }; propagatedBuildInputs = [ @@ -91,6 +95,10 @@ let pyjwt pyyaml setuptools + croniter + importlib-resources + packaging + unidiff ] # tls ++ twisted.optional-dependencies.tls; diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 2af7289000e2c..33a42c01707df 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-HmkJHN81AcQdKrA/XnH3REURCssXnzmoKjcmvinfzFo="; + hash = "sha256-ZGkM2/1/qiVkzpJ7FZNbIEwgCrpxPGyBjREqeqwDD0k="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 429c19ecfceeb..82c1f364cfc61 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-fwWzgIf0/+UiKRyiFUKPN4WUbmxQE5sU/ChAOqqLHE4="; + hash = "sha256-ycjmkzKBYdCmJe5Ofjn4q1tg66oVXC2Oaq2qBaZbmwg="; }; # Remove unnecessary circular dependency on buildbot @@ -32,23 +32,15 @@ www-react = buildPythonPackage rec { pname = "buildbot-www-react"; inherit (buildbot-pkg) version; - format = "wheel"; - # fetchpypy returns a 404 for the wheel? - # normal source release doesn't have any assets - src = fetchurl { - url = "https://github.com/buildbot/buildbot/releases/download/v${version}/buildbot_www_react-${version}-py3-none-any.whl"; - hash = "sha256-pEzuMiDhGQtIWQm80lgKIcTjnS7Z8UJhH9plJup5O84="; + src = fetchPypi { + inherit pname version; + hash = "sha256-2fMqgM83ANHx7+MWUF0eALOaliwVkCSumnw+bLZR+tw="; }; - # Remove unneccessary circular dependency on buildbot + # Remove unnecessary circular dependency on buildbot postPatch = '' - pushd dist - unzip buildbot_www_react-${version}-py3-none-any.whl - sed -i "s/Requires-Dist: buildbot//" buildbot_www_react-${version}.dist-info/METADATA - chmod -R u+w buildbot_www_react-${version}-py3-none-any.whl - zip -r buildbot_www_react-${version}-py3-none-any.whl buildbot_www_react-${version}.dist-info - popd + sed -i "s/'buildbot'//" setup.py ''; buildInputs = [ buildbot-pkg ]; @@ -71,7 +63,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-ghCmbUw/Gj23J5X3fDn/FGkVvXUE9QWrPFTRXSsxEZ4="; + hash = "sha256-0VW7tRT9yvVvh9x+2bG3b4q0yqgq9g2OyI0MELPxo4M="; }; buildInputs = [ buildbot-pkg ]; @@ -93,7 +85,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-B+xUsZBQWt4TwiBqukHO6o0R0XbjLxbCxQKLaWW0/Fw="; + hash = "sha256-92CNfBIGciv1mx948ha1YgvFGhx5hJsbn1n/BIXmPT8="; }; buildInputs = [ buildbot-pkg ]; @@ -115,7 +107,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-LFZ3VquRHAHkRcQbw9apOlGlWCK42WT1tPGhW8zSXyo="; + hash = "sha256-hdF1KopG4nqzHWLpTcYGnhEM6tfYc5WjYaz5xadL3ow="; }; buildInputs = [ buildbot-pkg ]; @@ -137,7 +129,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-NGI4T0eVV4MxYpD7+BTKbi3r6USt28lXXInrgSd4ASU="; + hash = "sha256-X1gPrwkHVdOdOpu/rVnAn5aZPbhye27udkfzI3aY+WI="; }; buildInputs = [ buildbot-pkg ]; @@ -159,7 +151,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-BtKA8zuJEyg3q3GnHS4XSGBLBk3IqCR8NOKui2rIn6Q="; + hash = "sha256-OXzgS+duQaDR8+lUzSnR85PIIIe9om/lvP9czRE1Ih0="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 29d0bcf7fb739..38a0bdb7d4531 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -27,7 +27,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-jI38ZhCcHbjah6lST6YtSZAwaeZPBWsgY3VTUf6s2x8="; + hash = "sha256-aAwrIYJRNbvZEV3kkCWnfyuZAMeyynZkOkxQ0wDatxU="; }; postPatch = '' |