diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 215372083654b..c85109b1479ed 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -82,7 +82,7 @@ let basePackage = cfg.package; localConfig = dokuwikiLocalConfig hostName cfg; pluginsConfig = dokuwikiPluginsLocalConfig hostName cfg; - aclConfig = if cfg.aclUse && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; + aclConfig = if cfg.settings.useacl && cfg.acl != null then dokuwikiAclAuthConfig hostName cfg else null; }; aclOpts = { ... }: { diff --git a/pkgs/applications/file-managers/felix-fm/default.nix b/pkgs/applications/file-managers/felix-fm/default.nix index f299d9fe3fa13..069e6f63cc223 100644 --- a/pkgs/applications/file-managers/felix-fm/default.nix +++ b/pkgs/applications/file-managers/felix-fm/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "felix"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "kyoheiu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KuEuWZSxh04NefkkJBYClnKs+UP7VwlyPElACjNZ5k8="; + sha256 = "sha256-qN/aOOiSj+HrjZQaDUkps0NORIdCBIevVjTYQm2G2Fg="; }; - cargoSha256 = "sha256-jYDe/3PDGCweNgHb+8i9az7J7BATlRjd3yha0nOc/gc="; + cargoSha256 = "sha256-xqWDWN3xkzBwgW0f64QhYHfsOS3Ed50jlQFuHG81/KY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2a9b047723342..fba5d36a42564 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.145.2"; + version = "0.150.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI="; + sha256 = "sha256-7wCt+JAuozsd+LifLArfPNwiKK/tDvgwpIwVCW4nU3Y="; }; - vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q="; + vendorSha256 = "sha256-vLLS+/Xfnlt6cvkNvXKX3DVLku1Q4bRCiv2vMTfOnfw="; doCheck = false; @@ -23,8 +23,9 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd helmfile \ - --bash ./autocomplete/helmfile_bash_autocomplete \ - --zsh ./autocomplete/helmfile_zsh_autocomplete + --bash <($out/bin/helmfile completion bash) \ + --fish <($out/bin/helmfile completion fish) \ + --zsh <($out/bin/helmfile completion zsh) ''; meta = { diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index dea70ffacdce1..850692f185474 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.download.synology.com/download/Utility/SynologyDriveClient"; - version = "3.2.0-13258"; + version = "3.2.1-13272"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -29,7 +29,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/x86_64/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-jnMwhirZphguW+hluhzD9aXDTQ9RuJgAtjh+Iy23c3w="; + sha256 = "sha256-olORBipyAv3jYQ7Gv8i4dHoCAdMcTcJR72/UYCPAVt0="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -59,7 +59,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "0hv0vgbvgqhzayc4przqhnkyvsykhw40hrwk6imvla00nix853wy"; + sha256 = "sha256-oNo/2Fim63xiWiVuY99Q18dHOPHydQJr7C9tib8LLOE="; }; nativeBuildInputs = [ cpio xar undmg ]; diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix index c2885ba03a0a1..f219a3fd1fdfb 100644 --- a/pkgs/applications/video/kodi/addons/invidious/default.nix +++ b/pkgs/applications/video/kodi/addons/invidious/default.nix @@ -1,13 +1,18 @@ -{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "invidious"; namespace = "plugin.video.invidious"; - version = "0.1.0+matrix.1"; + version = "unstable-2022-11-28"; - src = fetchzip { - url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM="; + # video search doesn't work for the version on kodi.tv + # if the result contains channels + # https://github.com/TheAssassin/kodi-invidious-plugin/issues/17 + src = fetchFromGitHub { + owner = "TheAssassin"; + repo = "kodi-invidious-plugin"; + rev = "85b66525632d94630c9301d9c490fc002a335d77"; + hash = "sha256-DpsAQUOUYCs3rpWwsk82+00KME4J+Iocu/v781dyyws="; }; propagatedBuildInputs = [ @@ -18,9 +23,6 @@ buildKodiAddon rec { passthru = { pythonPath = "resources/lib"; - updateScript = addonUpdateScript { - attrPath = "kodi.packages.invidious"; - }; }; meta = with lib; { diff --git a/pkgs/development/compilers/circt/default.nix b/pkgs/development/compilers/circt/default.nix index a8e36cbc785f2..7bf6a64eeb84c 100644 --- a/pkgs/development/compilers/circt/default.nix +++ b/pkgs/development/compilers/circt/default.nix @@ -13,12 +13,12 @@ let in stdenv.mkDerivation rec { pname = "circt"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "llvm"; repo = "circt"; rev = "firtool-${version}"; - sha256 = "sha256-HsXwh98RZuXvK/KkZ2NAGwWNLxUAQVj+WKzZXd4C4Is="; + sha256 = "sha256-VP1QwY/gA8wxjpzbAlEV5r2Q8sTt3K2sGdKmxr6ndB8="; fetchSubmodules = true; }; diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 54979dbd7ba4f..105ebc9188eaa 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -3,31 +3,43 @@ , buildPythonPackage , fetchFromGitHub , msgpack +, pythonOlder }: buildPythonPackage rec { pname = "aiocache"; - version = "0.11.1"; + version = "0.12.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "aio-libs"; repo = pname; - rev = version; - sha256 = "1czs8pvhzi92qy2dch2995rb62mxpbhd80dh2ir7zpa9qcm6wxvx"; + rev = "refs/tags/v${version}"; + hash = "sha256-jNfU5jT2xLgwVeVp8jXrQ6QQuUDwMOxf+hZ7VFsMFpM="; }; - propagatedBuildInputs = [ - aioredis - msgpack - ]; + passthru.optional-dependencies = { + redis = [ + aioredis + ]; + msgpack = [ + msgpack + ]; + }; # aiomcache would be required but last release was in 2017 doCheck = false; - pythonImportsCheck = [ "aiocache" ]; + + pythonImportsCheck = [ + "aiocache" + ]; meta = with lib; { description = "Python API Rate Limit Decorator"; - homepage = "https://github.com/tomasbasham/ratelimit"; + homepage = "https://github.com/aio-libs/aiocache"; + changelog = "https://github.com/aio-libs/aiocache/releases/tag/v${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 2b63ee846b840..82522db24ae24 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.1"; + version = "0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wal451pQSLuoM9kNbnSKVZUMqLWfEukXwqLI58p+tvU="; + hash = "sha256-V465xHANZwXXH7yNfVe8os2Yfsos7B2ed7ngcC2x5W8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 094b3370c5122..94654f310e3e8 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -2,7 +2,6 @@ , stdenv , buildPythonPackage , fetchPypi -, fetchpatch , pythonOlder # Build dependencies @@ -28,26 +27,15 @@ buildPythonPackage rec { pname = "ipython"; - version = "8.4.0"; + version = "8.10.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "f2db3a10254241d9b447232cec8b424847f338d9d36f9a577a6192c332a46abd"; + hash = "sha256-sTodbB9YGL04jbU7cQfRdFQSmnDeK4dIHVVdrt5etJ4="; }; - patches = [ - (fetchpatch { - # The original URL might not be very stable, so let's prefer a copy. - urls = [ - "https://raw.githubusercontent.com/bmwiedemann/openSUSE/9b35e4405a44aa737dda623a7dabe5384172744c/packages/p/python-ipython/ipython-pr13714-xxlimited.patch" - "https://github.com/ipython/ipython/pull/13714.diff" - ]; - sha256 = "XPOcBo3p8mzMnP0iydns9hX8qCQXTmRgRD0TM+FESCI="; - }) - ]; - nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyflunearyou/default.nix b/pkgs/development/python-modules/pyflunearyou/default.nix index ea59fa0dc10f3..cd04d00ee32e5 100644 --- a/pkgs/development/python-modules/pyflunearyou/default.nix +++ b/pkgs/development/python-modules/pyflunearyou/default.nix @@ -9,6 +9,7 @@ , pytest-aiohttp , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , msgpack , ujson }: @@ -27,13 +28,14 @@ buildPythonPackage rec { sha256 = "sha256-Q65OSE4qckpvaIvZULBR434i7hwuVM97eSq1Blb1oIU="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'ujson = ">=1.35,<5.0"' 'ujson = "*"' - ''; + pythonRelaxDeps = [ + "aiocache" + "ujson" + ]; nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 84c894a57fcff..3b35207e84991 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.48.6"; + version = "0.49.0"; src = fetchFromGitHub { owner = "Qovery"; repo = pname; rev = "v${version}"; - hash = "sha256-y6dhp5CUq9fJq7Vjib1g1P0TMCeBIcR32LHqNvMgjZI="; + hash = "sha256-O5JUWD7Wbe/5BM5fr6z76Re7PpRwFJV++lze+pv5el0="; }; - vendorHash = "sha256-9BXuxeLL3MwefhtV2SLplAgY/KQI1crWrTNSSC4hUXw="; + vendorHash = "sha256-Hb4bqOK4h68ZCN/bTPQLd4hC7oZUrj21DupVA4GrlNA="; nativeBuildInputs = [ installShellFiles ];