diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix index 7c73e32be695..cba4f92abe82 100644 --- a/nixos/modules/virtualisation/hyperv-guest.nix +++ b/nixos/modules/virtualisation/hyperv-guest.nix @@ -56,8 +56,6 @@ in { systemd = { packages = [ config.boot.kernelPackages.hyperv-daemons.lib ]; - services.hv-vss.unitConfig.ConditionPathExists = [ "/dev/vmbus/hv_vss" ]; - targets.hyperv-daemons = { wantedBy = [ "multi-user.target" ]; }; diff --git a/nixos/tests/ntfy-sh.nix b/nixos/tests/ntfy-sh.nix index c0c289b904b6..9a36fcdf3922 100644 --- a/nixos/tests/ntfy-sh.nix +++ b/nixos/tests/ntfy-sh.nix @@ -1,4 +1,5 @@ import ./make-test-python.nix { + name = "ntfy-sh"; nodes.machine = { ... }: { services.ntfy-sh.enable = true; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index f1c72991a506..22caf6a1718e 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -94,5 +94,8 @@ in ''; }; - meta.maintainers = with lib.maintainers; [ figsoda ]; + meta = with lib; (super.nvim-treesitter.meta or { }) // { + license = licenses.asl20; + maintainers = with maintainers; [ figsoda ]; + }; } diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 39c5787e3823..f174424e265d 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -305,7 +305,7 @@ rec { if checkPhase == null then '' runHook preCheck ${stdenv.shellDryRun} "$target" - ${shellcheck}/bin/shellcheck "$target" + ${shellcheck.unwrapped}/bin/shellcheck "$target" runHook postCheck '' else checkPhase; diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 5333d2e29fa1..26a3d7451a94 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.28"; + version = "9.2.29"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-6+3lZygQEezEbGIMbB6NINjVDkgt5sYO2FV5wpienuY="; + hash = "sha256-Yso47p4d8buJTdXOrm7luvtxpFu+oTFhqTBueQaXqII="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix new file mode 100644 index 000000000000..ed6568ac7b34 --- /dev/null +++ b/pkgs/development/python-modules/aiohttp-openmetrics/default.nix @@ -0,0 +1,33 @@ +{ lib +, buildPythonPackage +, fetchPypi +, aiohttp +, prometheus-client +}: + +buildPythonPackage rec { + pname = "aiohttp-openmetrics"; + version = "0.0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-GIVUkjyn+iQSMZZ6dNmmimvbt+t+uxOYv2QEDk/dA+g="; + }; + + propagatedBuildInputs = [ + aiohttp + prometheus-client + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "aiohttp_openmetrics" ]; + + meta = with lib; { + description = "OpenMetrics provider for aiohttp"; + homepage = "https://github.com/jelmer/aiohttp-openmetrics/"; + license = licenses.asl20; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 6f3319e8375f..a9357f7943c8 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.28"; + version = "9.2.29"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-16/hocVfd2RI8qQ9Qt7EM/gGfyGpWabyZhtfwOscqQY="; + hash = "sha256-cAruoJhQpxK/+sRcyoLoBlG35b11UV2Tjwt2+QUx46E="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 0c81edc1cc22..714e57f6eb47 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.28"; + version = "9.2.29"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-LUrLO9BFbpB2p6PtTZPdpLsGHPh088aPHIyoxgv4dGg="; + hash = "sha256-kS7NTlZnWwcvuRV/Eq3K0MJ/bGYcR5BWIbdPONuTqII="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 5ccf2e257438..7fb0cba7820e 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.28"; + version = "9.2.29"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-CGYX8IzVBqhF0IenTFKtx79J81X6UGkvm/XvFovnHYE="; + hash = "sha256-X2c1TVbf/KTUOfjQ8Izt+vyxhQrAki3hCBBwKxgkxbw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 1a8a3f2b871e..9a4180f0fd08 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.28"; + version = "9.2.29"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-t3TO1rHf5iA+9WW3Adi37fL7XjRUZFPowUWchX9eEVI="; + hash = "sha256-fK0j6+UqQVadQPU34oLp50gB+/0YnNnNg/rGuIt5I54="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index e2e71e6b09b3..9fbedd76a6df 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "geopandas"; - version = "0.12.1"; + version = "0.12.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "geopandas"; repo = "geopandas"; rev = "refs/tags/v${version}"; - hash = "sha256-aLERNVojPgZ3Y7+CnirGvC4RfuQf+K3Oj2/0BqdorwI="; + hash = "sha256-ntOZ2WCoMz5ZpqPeupqPC3cN8mbQmEAvJGaFblu0ibY="; }; propagatedBuildInputs = [ @@ -62,6 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python geospatial data analysis framework"; homepage = "https://geopandas.org"; + changelog = "https://github.com/geopandas/geopandas/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index f271920706fa..2235cb909c01 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, attrs , django , pytestCheckHook , parso @@ -10,20 +11,23 @@ buildPythonPackage rec { pname = "jedi"; - version = "0.18.1"; + version = "0.18.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi"; rev = "v${version}"; - sha256 = "sha256-wWNPNi16WtefvB7GcQBnWMbHVlVzxSFs4TKRqEasuR0="; + hash = "sha256-hNRmUFpRzVKJQAtfsSNV4jeTR8vVj1+mGBIPO6tUGto="; fetchSubmodules = true; }; propagatedBuildInputs = [ parso ]; checkInputs = [ + attrs django pytestCheckHook ]; @@ -44,8 +48,9 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; + homepage = "https://github.com/davidhalter/jedi"; + changelog = "https://github.com/davidhalter/jedi/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 33257b3b44e6..cf7f909873fc 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "line-profiler"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.6" || isPyPy; @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "line_profiler"; inherit version; - hash = "sha256-eXlt/5BUxtIZDnRz3umqXqkYqDcgYX5+goSzwBmneek="; + hash = "sha256-JejJ1CSNxIkFgBhR/4p1ucdIJ6CHHRGNEQTY5D1/sPw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index abf52ceae1d6..ff92d814a099 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.18.8"; + version = "0.18.9"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-DRJhqHpeGbDzqhym6z9wCmzTz3VpnwJMdDKFT5vMVUE="; + hash = "sha256-Ihaz/izB9L6osu3CPwBWOwLZ2JOLKhsDuqOUf/B02qI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 3857ea2971d0..9c88db4f88de 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = "refs/tags/${version}"; - hash = "sha256-wzDi4C/XUykoTxgoDneQzWplTlo0bGUODM38Eza4fUY="; + hash = "sha256-PN09TaJZR/REQPIgrm9XR+mXvR1evMAWGQziAzpg+fE="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/metakernel/default.nix b/pkgs/development/python-modules/metakernel/default.nix index bb3d4b917f1f..b7cecc3ba3da 100644 --- a/pkgs/development/python-modules/metakernel/default.nix +++ b/pkgs/development/python-modules/metakernel/default.nix @@ -3,30 +3,46 @@ , fetchPypi , hatchling , ipykernel +, jedi +, jupyter_core +, pexpect +, pythonOlder }: buildPythonPackage rec { pname = "metakernel"; - version = "0.29.2"; + version = "0.29.4"; format = "pyproject"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-A++uLR4hhOQYmA6o9wBTejFju3CpbK0hwIs7XFscddQ="; + hash = "sha256-kxrF/Msxjht7zGs0aEcL/Sf0qwcLiSoDPDUlE7Lrcmg="; }; nativeBuildInputs = [ hatchling ]; - propagatedBuildInputs = [ ipykernel ]; + propagatedBuildInputs = [ + ipykernel + jedi + jupyter_core + pexpect + ]; # Tests hang, so disable doCheck = false; + pythonImportsCheck = [ + "metakernel" + ]; + meta = with lib; { description = "Jupyter/IPython Kernel Tools"; homepage = "https://github.com/Calysto/metakernel"; + changelog = "https://github.com/Calysto/metakernel/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; maintainers = with maintainers; [ thomasjm ]; }; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index d877db512122..71855b544dda 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "moderngl"; - version = "5.7.3"; + version = "5.7.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fi7pauMSUSGkSI2ifPg/q1MiApyUg1j2OERcuq20ncQ="; + hash = "sha256-IPghv2aygRvIZI189/ZEAq//dhn+onH0Km7oX+A+QEE="; }; buildInputs = [ diff --git a/pkgs/development/python-modules/omegaconf/default.nix b/pkgs/development/python-modules/omegaconf/default.nix index 1071a642ef10..5aa772310bd9 100644 --- a/pkgs/development/python-modules/omegaconf/default.nix +++ b/pkgs/development/python-modules/omegaconf/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "omegaconf"; - version = "2.2.3"; + version = "2.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "omry"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-sJUYi0M/6SBSeKVSJoNY7IbVmzRZVTlek8AyL2cOPAM="; + hash = "sha256-Qxa4uIiX5TAyQ5rFkizdev60S4iVAJ08ES6FpNqf8zI="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework for configuring complex applications"; homepage = "https://github.com/omry/omegaconf"; + changelog = "https://github.com/omry/omegaconf/blob/v${version}/NEWS.md"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index 69dde8ca38ed..725f9bd33358 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -1,24 +1,41 @@ -{ lib, buildPythonPackage, fetchPypi -, flake8, mock, nose, pytest +{ lib +, buildPythonPackage +, fetchPypi +, flake8 +, mock +, nose +, pytest , cryptography +, pythonOlder }: buildPythonPackage rec { pname = "py-vapid"; - version = "1.8.2"; + version = "1.9.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "874f21910f2103c56228cded941d6e733dd8f1eb12876137919533bfacb65a48"; + hash = "sha256-BmSreJl0LvKyhzl6TUYe9pHtDML1hyBRKNjPYX/9uRk="; }; - propagatedBuildInputs = [ cryptography ]; + propagatedBuildInputs = [ + cryptography + ]; - checkInputs = [ flake8 mock nose pytest ]; + checkInputs = [ + flake8 + mock + nose + pytest + ]; meta = with lib; { - description = "VAPID is a voluntary standard for WebPush subscription providers"; + description = "Library for VAPID header generation"; homepage = "https://github.com/mozilla-services/vapid"; license = licenses.mpl20; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index fc9b5e6f9c1b..58595980ad02 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pytest-remotedata"; - version = "0.3.3"; + version = "0.4.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "66920bf1c62928b079d0e611379111a0d49f10a9509ced54c8269514ccce6ee3"; + hash = "sha256-viHFWONNfBGw9q61CVbAlSC//NArf86cb46FMaQBocg="; }; nativeBuildInputs = [ @@ -48,6 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin for controlling remote data access"; homepage = "https://github.com/astropy/pytest-remotedata"; + changelog = "https://github.com/astropy/pytest-remotedata/blob/v${version}/CHANGES.rst"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b928c2a4549e..672a70e091de 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.28"; + version = "9.2.29"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-fDsJqilxIt/LApXVrTm3JyOrZ6BR0+IbnFux/huF2ZU="; + hash = "sha256-buqtEiifBKbR7FP08ne5v0nWqkO+d2cVHxNCCZJDrdU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 4c6d11ae5e15..fcf749a988d3 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.47.2"; + version = "0.47.3"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-OAL7sYR4SFFQbRhVTx3NAQiDTr5l/4ejtFTVnT1idCU="; + sha256 = "sha256-c82v/4+HdBLNsJM1kO6A6rfywU4J7a3h5LW/T731vxw="; }; vendorSha256 = null; diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index e85b596607b1..4bf5113ec1a6 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/pkgs/development/tools/shellcheck/default.nix @@ -37,6 +37,11 @@ let install -Dm644 shellcheck.1 $man/share/man/man1/shellcheck.1 mkdir $out ''; + + passthru = ShellCheck.passthru or {} // { + # pandoc takes long to build and documentation isn't needed for in nixpkgs usage + unwrapped = ShellCheck; + }; }; in diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 57515685a760..98fbc9051d1d 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -113,6 +113,9 @@ let mkdir -pv $out/share/minetest/games/minetest_game/ cp -rv ${sources.data}/* $out/share/minetest/games/minetest_game/ patchShebangs $out + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv $out/minetest.app $out/Applications ''; meta = with lib; { diff --git a/pkgs/os-specific/linux/hyperv-daemons/default.nix b/pkgs/os-specific/linux/hyperv-daemons/default.nix index a659908a7a09..12033063c165 100644 --- a/pkgs/os-specific/linux/hyperv-daemons/default.nix +++ b/pkgs/os-specific/linux/hyperv-daemons/default.nix @@ -73,9 +73,9 @@ in stdenv.mkDerivation { buildCommand = '' system=$lib/lib/systemd/system - install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service - install -Dm444 ${service "kvp" "key-value pair (KVP)" "" } $system/hv-kvp.service - install -Dm444 ${service "vss" "volume shadow copy (VSS)" "" } $system/hv-vss.service + install -Dm444 ${service "fcopy" "file copy (FCOPY)" "hv_fcopy" } $system/hv-fcopy.service + install -Dm444 ${service "kvp" "key-value pair (KVP)" "hv_kvp" } $system/hv-kvp.service + install -Dm444 ${service "vss" "volume shadow copy (VSS)" "hv_vss" } $system/hv-vss.service cat > $system/hyperv-daemons.target <