diff options
20 files changed, 179 insertions, 39 deletions
diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix new file mode 100644 index 000000000000..752c9b3c6172 --- /dev/null +++ b/pkgs/applications/networking/cluster/clusterctl/default.nix @@ -0,0 +1,41 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "clusterctl"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = "cluster-api"; + rev = "v${version}"; + sha256 = "sha256-EkBZZUkr1u0u75WDDFAdLLpS01+3+eyXpu4HRg2Q780="; + }; + + vendorSha256 = "sha256-VO1Z4NUWrd4JuFYFg0a01psqoIM8ps3vKd0djR5OELU="; + + subPackages = [ "cmd/clusterctl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = let t = "sigs.k8s.io/cluster-api/version"; in [ + "-X ${t}.gitMajor=${lib.versions.major version}" + "-X ${t}.gitMinor=${lib.versions.minor version}" + "-X ${t}.gitVersion=v${version}" + ]; + + postInstall = '' + # errors attempting to write config to read-only $HOME + export HOME=$(mktemp -d) + + installShellCompletion --cmd clusterctl \ + --bash <($out/bin/clusterctl completion bash) \ + --zsh <($out/bin/clusterctl completion zsh) + ''; + + meta = with lib; { + description = "Kubernetes cluster API tool"; + homepage = "https://cluster-api.sigs.k8s.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ zowoq ]; + }; +} diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 19adfb08cfa0..0292fb223e7c 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchurl, fetchpatch, buildPackages, autoreconfHook }: stdenv.mkDerivation rec { pname = "apr"; @@ -17,6 +17,16 @@ stdenv.mkDerivation rec { # convince fetchpatch to restore missing `a/`, `b/` to paths extraPrefix = ""; }) + + # Fix cross. + (fetchpatch { + url = "https://github.com/apache/apr/commit/374210c50ee9f4dbf265f0172dcf2d45b97d0550.patch"; + sha256 = "04k62c5dh043jhkgs5qma6yqkq4q7nh0zswr81il4l7q1zil581y"; + }) + (fetchpatch { + url = "https://github.com/apache/apr/commit/866e1df66be6704a584feaf5c3d241e3d631d03a.patch"; + sha256 = "0hhm5v5wx985c28dq6d9ngnyqihpsphq4mw7rwylk39k2p90ppcm"; + }) ] ++ lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ]; # This test needs the net @@ -35,19 +45,19 @@ stdenv.mkDerivation rec { configureFlags = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) [ "ac_cv_file__dev_zero=yes" "ac_cv_func_setpgrp_void=0" - "apr_cv_process_shared_works=1" "apr_cv_tcp_nodelay_with_cork=1" + "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc" ] ++ lib.optionals (stdenv.hostPlatform.system == "i686-cygwin") [ # Including the Windows headers breaks unistd.h. # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2 "ac_cv_header_windows_h=no" ]; - CPPFLAGS=lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) "-DAPR_IOVEC_DEFINED"; + # - Update libtool for macOS 11 support + # - Regenerate for cross fix patch + nativeBuildInputs = [ autoreconfHook ]; - nativeBuildInputs = - # Update libtool for macOS 11 support - lib.optional (stdenv.isDarwin && stdenv.isAarch64) [ autoreconfHook ]; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index a81c817e4e07..0af203d8fb7b 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.0.3"; + version = "0.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "15mdvrzvqpdvg9zkczzgzzc5v2ri3v5f17000mhxill1nhirxhqx"; + sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index c3b06b7d9caa..6336fc0bdc01 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "9.5.0"; + version = "9.6.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2e85c3ac476c80c78ce94cae8786cc82a615fc4d1b0d380f16b9665d2cc5d187"; + sha256 = "22469ea1ad51ffbb4af2b139ed0820ac5d0b78f1265b2a095ed5e5d5299aab91"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 25ad1128d66b..58f23fba931c 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "flux_led"; - version = "0.24.21"; + version = "0.24.24"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; rev = version; - sha256 = "sha256-d55FrCnEh6uS/2yL0HcaeqGjTzWmrwg6h5jKReyzJAw="; + sha256 = "sha256-99EHmhyc6lAjYPHFvvqnd5r8HeEEJM6W3VK0/yLsz7I="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 7ec27a12db2d..fc268ba05a88 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "frigidaire"; - version = "0.16"; + version = "0.17"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bm1549"; repo = pname; rev = version; - sha256 = "1yzwzvlxz28rhnwhwsn37v7l7fxikzr4j7m293db9452w340p0zl"; + sha256 = "sha256-R3OjZyQMUDu8+QPe9y2j1SoWi1b7z/OYWY4wFXGG3zA="; }; propagatedBuildInputs = [ @@ -34,7 +34,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "frigidaire" ]; + pythonImportsCheck = [ + "frigidaire" + ]; meta = with lib; { description = "Python API for the Frigidaire devices"; diff --git a/pkgs/development/python-modules/greeclimate/default.nix b/pkgs/development/python-modules/greeclimate/default.nix index d5cf044e4949..2fd95e676c96 100644 --- a/pkgs/development/python-modules/greeclimate/default.nix +++ b/pkgs/development/python-modules/greeclimate/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "greeclimate"; - version = "0.12.4"; + version = "0.12.5"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = "greeclimate"; rev = version; - sha256 = "sha256-8mrQTRR1erqo0oi9ltuiQX947qdvJLyF/nj80LvovV8="; + sha256 = "sha256-Lu6DxYrK3WgRC09QQXZLIgYSIaWydcEofNiA1PKP8Ek="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index ad591163f081..ede91e7df913 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "1.2.0"; + version = "1.2.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = version; - sha256 = "sha256-KPgBbYGbKpKEPMxywgRvJcSCEYSUQkiPEFqj+bB0g1s="; + sha256 = "sha256-hKEXTzJMSVBRDiqrN90/fETEhirwSWLdgRULRvlQjbY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/normality/default.nix b/pkgs/development/python-modules/normality/default.nix index ece47afad4e2..a91489f1aded 100644 --- a/pkgs/development/python-modules/normality/default.nix +++ b/pkgs/development/python-modules/normality/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { pname = "normality"; - version = "2.1.3"; + version = "2.2.5"; src = fetchFromGitHub { owner = "pudo"; repo = "normality"; rev = version; - sha256 = "WvpMs02vBGnCSPkxo6r6g4Di2fKkUr2SsBflTBxlhkU="; + sha256 = "n8Ycm5DeFItmMJTolazZKGIyN7CTg2ajDCwi/UqzVe8="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index d0ea1b198490..6241a7d86e46 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -27,12 +27,12 @@ let debuggerName = lib.strings.getName debugger; in buildPythonPackage rec { - version = "4.6.0"; + version = "4.7.0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FWnmE+XgbtRztgo/xxN2xK1bz1YhbqdywlrQIANHAww="; + sha256 = "sha256-dDiOKGdeehkp92PfWhzsaj1YlkEEm2z0drscVuxQqI4="; }; postPatch = '' diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index cd41899c5810..635f9cd13daf 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.4.1"; + version = "5.5.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "sha256-qmC7AL2ZNB0D5p3c8ozacNMKc2COzYzPJfz6KXwWsd0="; + sha256 = "sha256-K5rs3UEGN1BvWDDfJE9/dPDLsZ4EGSsEf6PXodvc2Bg="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytibber/default.nix b/pkgs/development/python-modules/pytibber/default.nix index 1ca78b51e983..9b3668b59783 100644 --- a/pkgs/development/python-modules/pytibber/default.nix +++ b/pkgs/development/python-modules/pytibber/default.nix @@ -12,7 +12,8 @@ buildPythonPackage rec { pname = "pytibber"; - version = "0.20.0"; + version = "0.21.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyTibber"; rev = version; - sha256 = "sha256-q7DNRCJrt4B/u7QV4MocxmlfEdLmJMP7umv3+PJjIoE="; + sha256 = "sha256-lUe79VHlK/2/1SZfC+Ha+27NUoIKoTlqn75XA/mPCNU="; }; propagatedBuildInputs = [ @@ -35,12 +36,16 @@ buildPythonPackage rec { pytestCheckHook ]; - pytestFlagsArray = [ "test/test.py" ]; + pytestFlagsArray = [ + "test/test.py" + ]; # tests access network doCheck = false; - pythonImportsCheck = [ "tibber" ]; + pythonImportsCheck = [ + "tibber" + ]; meta = with lib; { description = "Python library to communicate with Tibber"; diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index f422934f02fb..570654dc7e15 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "rebulk"; - version = "3.0.1"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "025d191c11abf9174c6aff0006579624047d3371a654333c4bf7a4b421552cdc"; + sha256 = "809de3a97c68afa831f7101b10d316fe62e061dc9f7f67a44b7738128721173a"; }; # Some kind of trickery with imports that doesn't work. diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 2be02376360f..173458a634b6 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.13.0"; + version = "0.13.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f2efc02011b7240a9e851acd76ab81150a07d35c97021cb0517887539a328f8a"; + sha256 = "006ec8d896d238873af8178d5475203844f2c391194ed8d42ddac37f5ff77a69"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/vehicle/default.nix b/pkgs/development/python-modules/vehicle/default.nix new file mode 100644 index 000000000000..b7b7fbc32738 --- /dev/null +++ b/pkgs/development/python-modules/vehicle/default.nix @@ -0,0 +1,61 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pydantic +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "vehicle"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "frenck"; + repo = "python-vehicle"; + rev = "v${version}"; + sha256 = "0yiavz5sw8fjrh6m3mr8gyds7h6vaja3xy1516ajgz0qvijhqylg"; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + pydantic + yarl + ]; + + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + postPatch = '' + # Upstream doesn't set a version for the pyproject.toml + substituteInPlace pyproject.toml \ + --replace "0.0.0" "${version}" \ + --replace "--cov" "" + ''; + + pythonImportsCheck = [ + "vehicle" + ]; + + meta = with lib; { + description = "Python client providing RDW vehicle information"; + homepage = "https://github.com/frenck/python-wled"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 3118946c6bf0..0bf46ed1b13e 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -56,13 +56,13 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.0.571"; + version = "2.0.574"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = version; - sha256 = "sha256-cmSZHqR1BfVWXoUSJ3Et5TTdeUWklNA4egKLP4xKjw8="; + sha256 = "sha256-DM7fPwJcWEyOu55ThK/jP9jIUbiVCfEtltSP7puCoxQ="; }; nativeBuildInputs = with py.pkgs; [ @@ -70,6 +70,9 @@ buildPythonApplication rec { ]; propagatedBuildInputs = with py.pkgs; [ + aiodns + aiohttp + aiomultiprocess bc-python-hcl2 boto3 cachetools @@ -98,7 +101,11 @@ buildPythonApplication rec { ]; checkInputs = with py.pkgs; [ + aioresponses jsonschema + mock + pytest-asyncio + pytest-mock pytest-xdist pytestCheckHook ]; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index b1a374f0349d..705b2397c6ac 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urlwatch"; - version = "2.23"; + version = "2.24"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "1ryygy7lalmwnv9kc8q4920gkdx878izy33a5dgxb780sy2qq8pg"; + sha256 = "sha256-H7dusAXVEGOUu2fr6UjiXjw13Gm9xNeJDQ4jqV+8QmU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 2d2816dac0f0..6bdf428b199b 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -19,12 +19,20 @@ in rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-ViXpoPkBznB0o/dc/l1r3m0y+z2w58wqlU8/cg8u7tI="; + postPatch = '' + # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working + # vaultwarden when using RUSTC_BOOTSTRAP=1 + sed -ri 's/^rust-version = .*//g' Cargo.toml + ''; + nativeBuildInputs = [ pkg-config ]; buildInputs = with lib; [ openssl ] ++ optionals stdenv.isDarwin [ libiconv Security CoreServices ] ++ optional (dbBackend == "mysql") libmysqlclient ++ optional (dbBackend == "postgresql") postgresql; + # vaultwarden depends on rocket v0.5.0-dev, which requires nightly features. + # This may be removed if https://github.com/dani-garcia/vaultwarden/issues/712 is fixed. RUSTC_BOOTSTRAP = 1; cargoBuildFlags = [ featuresFlag ]; @@ -42,6 +50,6 @@ in rustPlatform.buildRustPackage rec { description = "Unofficial Bitwarden compatible server written in Rust"; homepage = "https://github.com/dani-garcia/vaultwarden"; license = licenses.gpl3Only; - maintainers = with maintainers; [ msteen ]; + maintainers = with maintainers; [ msteen ivan ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e3e2b65bb0b..6b19e97f089b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2459,6 +2459,8 @@ with pkgs; clprover = callPackage ../applications/science/logic/clprover/clprover.nix { }; + clusterctl = callPackage ../applications/networking/cluster/clusterctl { }; + coloredlogs = with python3Packages; toPythonApplication coloredlogs; colord-kde = libsForQt5.callPackage ../tools/misc/colord-kde {}; @@ -15541,7 +15543,9 @@ with pkgs; appstream-glib = callPackage ../development/libraries/appstream-glib { }; - apr = callPackage ../development/libraries/apr { }; + apr = callPackage ../development/libraries/apr { + autoreconfHook = buildPackages.autoreconfHook269; + }; aprutil = callPackage ../development/libraries/apr-util { db = if stdenv.isFreeBSD then db4 else db; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 627fdbb039ae..24e242d3e1e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9696,6 +9696,8 @@ in { vdirsyncer = callPackage ../development/python-modules/vdirsyncer { }; + vehicle = callPackage ../development/python-modules/vehicle { }; + vega = callPackage ../development/python-modules/vega { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { }; |