diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ff468592120a..7a8b3d595c98 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2544,6 +2544,13 @@ githubId = 410028; name = "Tobias Bergkvist"; }; + berquist = { + name = "Eric Berquist"; + email = "eric.berquist@gmail.com"; + github = "berquist"; + githubId = 727571; + keys = [ { fingerprint = "AAD4 3B70 A504 9675 CFC8 B101 BAFD 205D 5FA2 B329"; } ]; + }; berryp = { email = "berryphillips@gmail.com"; github = "berryp"; diff --git a/pkgs/applications/file-managers/nnn/default.nix b/pkgs/applications/file-managers/nnn/default.nix index d8c10d783023..fe1cf6778027 100644 --- a/pkgs/applications/file-managers/nnn/default.nix +++ b/pkgs/applications/file-managers/nnn/default.nix @@ -20,9 +20,9 @@ }: # Mutually exclusive options -assert withIcons -> (withNerdIcons == false && withEmojis == false); -assert withNerdIcons -> (withIcons == false && withEmojis == false); -assert withEmojis -> (withIcons == false && withNerdIcons == false); +assert withIcons -> (!withNerdIcons && !withEmojis); +assert withNerdIcons -> (!withIcons && !withEmojis); +assert withEmojis -> (!withIcons && !withNerdIcons); stdenv.mkDerivation (finalAttrs: { pname = "nnn"; diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix index 8e74c7564683..7a802dd351bf 100644 --- a/pkgs/applications/networking/cluster/zarf/default.nix +++ b/pkgs/applications/networking/cluster/zarf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "zarf"; - version = "0.35.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "defenseunicorns"; repo = "zarf"; rev = "v${version}"; - hash = "sha256-HxHINy+zwkwLvckQUoDy1KqLhTYSH371+cucQGWJNIw="; + hash = "sha256-GgvpBYFPH1corqNCA6NQCg6Rkbdez9mFwv5HlmOCKvE="; }; - vendorHash = "sha256-+3VYBvcA8TzO9uBl0863uATOavPY9cjt8xtgW7N7C4w="; + vendorHash = "sha256-gLnUvNxuxrMu6i+b0jgindgcbGOA+tk4N5N4owGV7B8="; proxyVendor = true; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix index 776e4db734c9..0a27f5b81b9c 100644 --- a/pkgs/applications/networking/instant-messengers/feishu/default.nix +++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix @@ -65,12 +65,12 @@ let sources = { x86_64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/7e382fc2/Feishu-linux_x64-7.15.13.deb"; - sha256 = "sha256-CyQmQKfyYcWqpty5LxTNqm73AVnPdm7biBwICkbBEco="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/88a232d5/Feishu-linux_x64-7.18.11.deb"; + sha256 = "sha256-EneDVW8eQ6J+M49hn9xLtvlqiDOx4Rs8VMLt1cqSbak="; }; aarch64-linux = fetchurl { - url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/4c8c2fbf/Feishu-linux_arm64-7.15.13.deb"; - sha256 = "sha256-nxtu5xOafZ1tlN/f0+5VF2I6ISfHmPJTztOI+AQwp9c="; + url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f29ac73d/Feishu-linux_arm64-7.18.11.deb"; + sha256 = "sha256-ghAWPQgVEBSom7zBHUKb56O3EZR4rOnQlz9BRSJBNp4="; }; }; @@ -131,7 +131,7 @@ let ]; in stdenv.mkDerivation { - version = "7.15.13"; + version = "7.18.11"; pname = "feishu"; src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 9a50dcb17f17..192f8f02c71c 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.15.1"; + version = "0.16.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - hash = "sha256-QwbxGym0eesCzrT//1+Hcr15B4nFck5u1VNRU8xE3Qo="; + hash = "sha256-CJ9ZkoQmZlDI9mgZkEOWuJn66Dvt2f1DjPGf140qJDg="; }; modRoot = "./agent"; - vendorHash = "sha256-JlfQRYdmxghGrKGwrn8jK1m32EhskmhMiyxNHZma0N0="; + vendorHash = "sha256-QWscqQlkvpfvJnI4C74qqD2P9V7ZAY29kCLF1WTTJ7Q="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/pkgs/applications/virtualization/colima/default.nix b/pkgs/applications/virtualization/colima/default.nix index 0d37d9c9bce6..4338fccb6c6d 100644 --- a/pkgs/applications/virtualization/colima/default.nix +++ b/pkgs/applications/virtualization/colima/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "colima"; - version = "0.6.10"; + version = "0.7.0"; src = fetchFromGitHub { owner = "abiosoft"; repo = pname; rev = "v${version}"; - hash = "sha256-gXLKqSmlj3TJNmqYuByJ2CcUCV3xD239YeuWzrN97lo="; + hash = "sha256-fl1QtGbcaUwHDz4Jg+UgK27GPTHyJUyK76LXyaYj4Fo="; # We need the git revision leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/ei/eigenlayer/package.nix b/pkgs/by-name/ei/eigenlayer/package.nix index 03d524a0d8a9..92f1ed47cf39 100644 --- a/pkgs/by-name/ei/eigenlayer/package.nix +++ b/pkgs/by-name/ei/eigenlayer/package.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "eigenlayer"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "Layr-Labs"; repo = "eigenlayer-cli"; rev = "v${version}"; - hash = "sha256-KdSCXvzUCEw5BTvKOejxUP+KXKXCpXvtvFmZ2JmihK4="; + hash = "sha256-NUO6WgiBljd4mbz7K5XX/z27L0j5ZYcOvt97ERFYZts="; }; - vendorHash = "sha256-uC6HMIf+wbHx2/Ico1UOj+S27xtVe1mCrcBy1CacIVs="; + vendorHash = "sha256-nQcUyxrdGbwqaFeEEfoc15zffrQG6WuEhF7YZkpGADs="; ldflags = ["-s" "-w"]; subPackages = ["cmd/eigenlayer"]; diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index e0ac90ed64e9..d935cc70adaa 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -45,14 +45,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.14.26"; + version = "3.14.29"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; rev = "refs/tags/${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-vCPKySLB1D9oKgCrYrXqt/s0hV+/ocuWOrcDUzKbdKI="; + hash = "sha256-q3HEbFqUeNczKYUlou+quxawCTjpM5JNLrML84tZVYE="; }; patches = [ diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index 56aa51393cd3..dbd20c286667 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -8,14 +8,14 @@ }: python3.pkgs.buildPythonApplication rec { pname = "handheld-daemon"; - version = "3.3.3"; + version = "3.3.7"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; rev = "refs/tags/v${version}"; - hash = "sha256-n7UtzI4wYVMldDl7FcK9hhIOTl9jkvATGFjR+pV545U="; + hash = "sha256-nRI1YrKBg7J14PQbWLLNaCI9p3v6Yl+Q506EOlSqqVc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index c809d73c3897..763d8638fd58 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromSourcehut, harec, - gitUpdater, scdoc, tzdata, mailcap, @@ -154,7 +153,6 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { }; tests = lib.optionalAttrs enableCrossCompilation { crossCompilation = callPackage ./cross-compilation-tests.nix { hare = finalAttrs.finalPackage; }; diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix index 692ea76cb89e..c80e8cb0126b 100644 --- a/pkgs/by-name/ha/harec/package.nix +++ b/pkgs/by-name/ha/harec/package.nix @@ -1,4 +1,5 @@ { + _experimental-update-script-combinators, fetchFromSourcehut, gitUpdater, lib, @@ -52,7 +53,19 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gitUpdater { }; + updateScript = _experimental-update-script-combinators.sequence ( + builtins.map (item: item.command) [ + (gitUpdater { + attrPath = "harec"; + ignoredVersions = [ "-rc[0-9]{1,}" ]; + }) + (gitUpdater { + attrPath = "hare"; + url = "https://git.sr.ht/~sircmpwn/hare"; + ignoredVersions = [ "-rc[0-9]{1,}" ]; + }) + ] + ); # To be kept in sync with the hare package. inherit qbe; }; diff --git a/pkgs/by-name/mo/mokuro/package.nix b/pkgs/by-name/mo/mokuro/package.nix index 1fb6ca5443b4..7d8d44d6c5c3 100644 --- a/pkgs/by-name/mo/mokuro/package.nix +++ b/pkgs/by-name/mo/mokuro/package.nix @@ -6,26 +6,26 @@ python3Packages.buildPythonApplication rec { pname = "mokuro"; - version = "0.1.8"; + version = "0.2.1"; pyproject = true; src = fetchFromGitHub { owner = "kha-white"; repo = "mokuro"; rev = "v${version}"; - hash = "sha256-w+hhUt2fTl9zrca4xotK5eNhbfragYNC0u5WDwNGb7k="; + hash = "sha256-+hcc3spbpktavqJ8q4kuQFpkm0PYIru6UdpkU7L8XI4="; fetchSubmodules = true; }; postPatch = '' - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace-fail 'opencv-python' 'opencv' ''; pythonRelaxDeps = [ "torchvision" ]; - build-system = with python3Packages; [ setuptools ]; + build-system = with python3Packages; [ setuptools-scm ]; dependencies = with python3Packages; [ fire diff --git a/pkgs/by-name/op/opcua-commander/package.nix b/pkgs/by-name/op/opcua-commander/package.nix index 9cbf043832bd..be6a5569a994 100644 --- a/pkgs/by-name/op/opcua-commander/package.nix +++ b/pkgs/by-name/op/opcua-commander/package.nix @@ -8,16 +8,16 @@ }: buildNpmPackage rec { pname = "opcua-commander"; - version = "0.37.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "node-opcua"; repo = "opcua-commander"; rev = version; - hash = "sha256-wQXSSNinY85Ti+D/zklYP2N8IP3OsN9xQNJuuQr4kVU="; + hash = "sha256-7KYwIdrhlvGR9RHZBfMFOcBa+opwx7Q/crCdvwZD6Y8="; }; - npmDepsHash = "sha256-Ux1X/3sam9WHrTfqoWv1r9p3pJOs6BaeFsxHizAvjXA="; + npmDepsHash = "sha256-g4WFLh+UnziQR2NZ4eL84Vrk+Mz99kFQiBkdGmBEMHE="; nativeBuildInputs = [ esbuild typescript makeWrapper ]; postPatch = '' diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 5f0a07305d68..8621a5af5308 100644 --- a/pkgs/by-name/qq/qq/sources.nix +++ b/pkgs/by-name/qq/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-08-05 +# Last updated: 2024-08-10 { - version = "3.2.12-26740"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/769073aa/linuxqq_3.2.12-26740_amd64.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/769073aa/linuxqq_3.2.12-26740_arm64.deb"; - arm64_hash = "sha256-y2qWXNtqIinXB91nvIT0FC8fM1r71qX5fXjrBAjZxzA="; - amd64_hash = "sha256-SQQ6biLr1ZCpBq+2TzKpjipoCb1aFkxlr0CZYKmA8Zg="; + version = "3.2.12"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.12_240808_arm64_01.deb"; + arm64_hash = "sha256-fx1+CNabeWNCRHzYh/nRnnBeFt5WyrMBIfzuw7e/CTc="; + amd64_hash = "sha256-gzoM8xq51iUwzHWirXLd7LPMPQ36KxOyp0iS6az3y6E="; } diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix index 05a49ca3f08a..8e5c0cf9efb4 100644 --- a/pkgs/by-name/si/simdutf/package.nix +++ b/pkgs/by-name/si/simdutf/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simdutf"; - version = "5.3.1"; + version = "5.3.4"; src = fetchFromGitHub { owner = "simdutf"; repo = "simdutf"; rev = "v${finalAttrs.version}"; - hash = "sha256-3heABmBXz4lA43H+q26+HYg+SOsusIMiOfA3Pr4iV+s="; + hash = "sha256-zttqfzTF9P1czM2+HECcDC2j2XPfsJn0r+qpnNDfLWw="; }; # Fix build on darwin diff --git a/pkgs/by-name/te/tenv/package.nix b/pkgs/by-name/te/tenv/package.nix index 93ce7d68e809..9883449ab1c8 100644 --- a/pkgs/by-name/te/tenv/package.nix +++ b/pkgs/by-name/te/tenv/package.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tenv"; - version = "2.7.9"; + version = "3.0.0"; src = fetchFromGitHub { owner = "tofuutils"; repo = "tenv"; rev = "v${version}"; - hash = "sha256-oeMbpnYCkJ5GjfgOlNyQpwy80DbrupXIFS2dx4W2xo4="; + hash = "sha256-h380ZkVZS2NOTJvaxfqd2O5WEai0raFENqJQACC1Qtg="; }; - vendorHash = "sha256-/4RiOF9YU4GEZlJcx2S2bLhJ1Q6F+8To3XiyWzGGHUU="; + vendorHash = "sha256-BHr8n7GJmNV3kDYqVjpjGVNctIGsWh/UzAh0u8WSESs="; # Tests disabled for requiring network access to release.hashicorp.com doCheck = false; diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index ef1487fafaf5..12d00e5735c7 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20240726161926"; + version = "20240810010807"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-z0UVwobRvQW4R/5FItPNsw8SP9x92aBKB1QxRz/TTFI="; + hash = "sha256-pxb29QO1K9e4CwAAdNUi6jxoiXhJYELqnu/A7DuB0zQ="; }; vendorHash = "sha256-NLh14rXRci4hgDkBJVJDIDvobndB7KYRKAX7UjyqSsg="; meta = with lib; { diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix index 969641b487dc..6909db147de3 100644 --- a/pkgs/data/themes/whitesur/default.nix +++ b/pkgs/data/themes/whitesur/default.nix @@ -91,9 +91,9 @@ stdenv.mkDerivation rec { ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \ ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \ ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \ - ${lib.optionalString (roundedMaxWindow == true) "--roundedmaxwindow"} \ - ${lib.optionalString (nordColor == true) "--nordcolor"} \ - ${lib.optionalString (darkerColor == true) "--darkercolor"} \ + ${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \ + ${lib.optionalString nordColor "--nordcolor"} \ + ${lib.optionalString darkerColor "--darkercolor"} \ --dest $out/share/themes jdupes --quiet --link-soft --recurse $out/share diff --git a/pkgs/development/libraries/lightgbm/default.nix b/pkgs/development/libraries/lightgbm/default.nix index abb52eb5f0aa..86c85e66ace2 100644 --- a/pkgs/development/libraries/lightgbm/default.nix +++ b/pkgs/development/libraries/lightgbm/default.nix @@ -4,9 +4,9 @@ , rLibrary ? false, cudaPackages, opencl-headers, ocl-icd, boost , llvmPackages, openmpi, openjdk, swig, hadoop, R, rPackages, pandoc }: -assert doCheck -> mpiSupport != true; -assert openclSupport -> cudaSupport != true; -assert cudaSupport -> openclSupport != true; +assert doCheck -> !mpiSupport; +assert openclSupport -> !cudaSupport; +assert cudaSupport -> !openclSupport; stdenv.mkDerivation rec { pnameBase = "lightgbm"; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index e5432430cac3..2b96bede313d 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -22,7 +22,7 @@ assert ncclSupport -> (cudaSupport && !cudaPackages.nccl.meta.unsupported); # 2) the R package creates a different binary shared # object that isn't compatible with the regular CLI # tests. -assert rLibrary -> doCheck != true; +assert rLibrary -> !doCheck; let # This ensures xgboost gets the correct libstdc++ when diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index 662588be521c..027c80d02c86 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.1.1"; + version = "1.1.2"; in buildPecl { inherit version; @@ -15,7 +15,7 @@ buildPecl { owner = "nikic"; repo = "php-ast"; rev = "v${version}"; - sha256 = "sha256-ulMLufhLf9E11Z6+rVBZ14CY3ILp/NrhMjRXmrUHnBA="; + sha256 = "sha256-9HP+hKcpkWmvsx335JiCVjFG+xyAMEm5dWxWC1nZPxU="; }; meta = with lib; { diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 30714c3d3388..2f32df9c72b9 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -2,34 +2,30 @@ lib, aiohttp, aioresponses, - pydantic, buildPythonPackage, fetchFromGitHub, + mashumaro, poetry-core, pytest-aiohttp, + pytest-cov-stub, pytestCheckHook, pythonOlder, }: buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.16"; + version = "0.6.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-cSHqlFzZiQ0CCH+rPDqPulrLPuE6BB7Qd+wWb4ZWPtk="; + hash = "sha256-XvpSHxPCsfxgHdPVf8NGKPpCYbeZhVLwRtj6koAt/Rk="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" - ''; - pythonRelaxDeps = [ "pydantic" ]; build-system = [ poetry-core ]; @@ -37,12 +33,13 @@ buildPythonPackage rec { dependencies = [ aiohttp - pydantic + mashumaro ]; nativeCheckInputs = [ aioresponses pytest-aiohttp + pytest-cov-stub pytestCheckHook ]; diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix index 2498e6b5a751..c9642235e37e 100644 --- a/pkgs/development/python-modules/cffsubr/default.nix +++ b/pkgs/development/python-modules/cffsubr/default.nix @@ -1,40 +1,48 @@ { stdenv, lib, + afdko, buildPythonPackage, - fetchpatch, + cmake, + distutils, fetchPypi, fonttools, + ninja, pytestCheckHook, + scikit-build, + setuptools, setuptools-scm, - wheel, }: buildPythonPackage rec { pname = "cffsubr"; - version = "0.2.9.post1"; - format = "pyproject"; + version = "0.3.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-azFBLc9JyPqEZkvahn4u3cVbb+b6aW/yU8TxOp/y/Fw="; + hash = "sha256-d0UVC9uBZ5+s3RHB87hwlsT029SVfo/Ou4jEVoeVLvs="; }; - patches = [ - # https://github.com/adobe-type-tools/cffsubr/pull/23 - (fetchpatch { - name = "remove-setuptools-git-ls-files.patch"; - url = "https://github.com/adobe-type-tools/cffsubr/commit/887a6a03b1e944b82fcb99b797fbc2f3a64298f0.patch"; - hash = "sha256-LuyqBtDrKWwCeckr+YafZ5nfVw1XnELwFI6X8bGomhs="; - }) - ]; + postPatch = '' + substituteInPlace setup.py \ + --replace-fail 'afdko_output_dir = os.path.join(afdko_root_dir, "build", "bin")' \ + 'afdko_output_dir = "${lib.getBin afdko}/bin"' \ + --replace-fail 'build_cmd=build_release_cmd' 'build_cmd="true"' + ''; - nativeBuildInputs = [ + build-system = [ + cmake + distutils + ninja + scikit-build + setuptools setuptools-scm - wheel ]; - propagatedBuildInputs = [ fonttools ]; + dontUseCmakeConfigure = true; + + dependencies = [ fonttools ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -42,6 +50,7 @@ buildPythonPackage rec { meta = with lib; { broken = stdenv.isDarwin; + changelog = "https://github.com/adobe-type-tools/cffsubr/releases/tag/v${version}"; description = "Standalone CFF subroutinizer based on AFDKO tx"; mainProgram = "cffsubr"; homepage = "https://github.com/adobe-type-tools/cffsubr"; diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix index 39dafd2a9aa6..ea93ceeffda0 100644 --- a/pkgs/development/python-modules/dvc-task/default.nix +++ b/pkgs/development/python-modules/dvc-task/default.nix @@ -1,17 +1,17 @@ { lib, buildPythonPackage, - fetchFromGitHub, - pythonOlder, - setuptools-scm, - kombu, - shortuuid, celery, + fetchFromGitHub, funcy, + kombu, pytest-celery, pytest-mock, pytest-test-utils, pytestCheckHook, + pythonOlder, + setuptools-scm, + shortuuid, }: buildPythonPackage rec { @@ -31,10 +31,10 @@ buildPythonPackage rec { build-system = [ setuptools-scm ]; dependencies = [ - kombu - shortuuid celery funcy + kombu + shortuuid ]; nativeCheckInputs = [ @@ -46,11 +46,16 @@ buildPythonPackage rec { pythonImportsCheck = [ "dvc_task" ]; + disabledTests = [ + # Test is flaky + "test_start_already_exists" + ]; + meta = with lib; { description = "Celery task queue used in DVC"; homepage = "https://github.com/iterative/dvc-task"; changelog = "https://github.com/iterative/dvc-task/releases/tag/${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ fab ]; }; } diff --git a/pkgs/development/python-modules/graphrag/default.nix b/pkgs/development/python-modules/graphrag/default.nix index ef62b9eb8fc5..d00cc1b4b26e 100644 --- a/pkgs/development/python-modules/graphrag/default.nix +++ b/pkgs/development/python-modules/graphrag/default.nix @@ -14,6 +14,7 @@ environs, fastparquet, graspologic, + json-repair, lancedb, networkx, nltk, @@ -39,14 +40,14 @@ buildPythonPackage rec { pname = "graphrag"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; src = fetchFromGitHub { owner = "microsoft"; repo = "graphrag"; rev = "refs/tags/v${version}"; - hash = "sha256-VOcUjfRik4sdk6xbrAe5I7788d2/l4tuUByJajSjo4Q="; + hash = "sha256-X4mhnKSaQQo0i10EsdaDtMgKwfBxFvOOrkDrkUM2cQI="; }; build-system = [ @@ -57,9 +58,11 @@ buildPythonPackage rec { pythonRelaxDeps = [ "aiofiles" "azure-identity" + "json-repair" "lancedb" "scipy" "tenacity" + "textual" "tiktoken" ]; @@ -74,6 +77,7 @@ buildPythonPackage rec { environs fastparquet graspologic + json-repair lancedb networkx nltk diff --git a/pkgs/development/python-modules/highspy/default.nix b/pkgs/development/python-modules/highspy/default.nix new file mode 100644 index 000000000000..6d1847d100dd --- /dev/null +++ b/pkgs/development/python-modules/highspy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + pytestCheckHook, + pythonOlder, + scikit-build-core, + pybind11, + numpy, + cmake, + ninja, + pathspec, + highs, +}: +buildPythonPackage { + pname = "highspy"; + version = highs.version; + pyproject = true; + + disabled = pythonOlder "3.8"; + + inherit (highs) src; + + build-system = [ + cmake + ninja + pathspec + scikit-build-core + pybind11 + ]; + + dontUseCmakeConfigure = true; + + dependencies = [ numpy ]; + + pythonImportsCheck = [ "highspy" ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Linear optimization software"; + homepage = "https://github.com/ERGO-Code/HiGHS"; + license = licenses.mit; + maintainers = with maintainers; [ renesat ]; + }; +} diff --git a/pkgs/development/python-modules/ipydatawidgets/default.nix b/pkgs/development/python-modules/ipydatawidgets/default.nix index 635e55b53382..cacce82794b8 100644 --- a/pkgs/development/python-modules/ipydatawidgets/default.nix +++ b/pkgs/development/python-modules/ipydatawidgets/default.nix @@ -3,8 +3,7 @@ buildPythonPackage, fetchPypi, isPy27, - pytest, - pytest-cov-stub, + pytestCheckHook, nbval, jupyter-packaging, ipywidgets, @@ -37,13 +36,10 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ - pytest - pytest-cov-stub + pytestCheckHook nbval ]; - checkPhase = "pytest ipydatawidgets/tests"; - meta = { description = "Widgets to help facilitate reuse of large datasets across different widgets"; homepage = "https://github.com/vidartf/ipydatawidgets"; diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix new file mode 100644 index 000000000000..72037ce322b3 --- /dev/null +++ b/pkgs/development/python-modules/json-repair/default.nix @@ -0,0 +1,35 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "json-repair"; + version = "0.27.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "mangiucugna"; + repo = "json_repair"; + rev = "refs/tags/${version}"; + hash = "sha256-kaTwdS2zRt94pJko9AKEvszLR4z62u3ZrKlfXkJr5TQ="; + }; + + build-system = [ setuptools ]; + + nativeBuildInputs = [ pytestCheckHook ]; + + disabledTestPaths = [ "tests/test_performance.py" ]; + + pythonImportsCheck = [ "json_repair" ]; + + meta = with lib; { + homepage = "https://github.com/mangiucugna/json_repair/"; + description = "repair invalid JSON, commonly used to parse the output of LLMs"; + license = licenses.mit; + maintainers = with maintainers; [ greg ]; + }; +} diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 1b5cd1741572..6e07d603b1b4 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -34,8 +34,8 @@ cudaPackages, }: -assert gpuSupport -> cudaSupport != true; -assert cudaSupport -> gpuSupport != true; +assert gpuSupport -> !cudaSupport; +assert cudaSupport -> !gpuSupport; buildPythonPackage rec { pname = "lightgbm"; diff --git a/pkgs/development/python-modules/lox/default.nix b/pkgs/development/python-modules/lox/default.nix new file mode 100644 index 000000000000..c22162404997 --- /dev/null +++ b/pkgs/development/python-modules/lox/default.nix @@ -0,0 +1,61 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + + pathos, + pytestCheckHook, + pytest-mock, + setuptools, + tqdm, +}: + +buildPythonPackage rec { + pname = "lox"; + version = "0.12.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "BrianPugh"; + repo = "lox"; + rev = "refs/tags/v${version}"; + hash = "sha256-Iv3ZdfsvFLU6lhlH1n+eQ+KIrXESsnC1S2lVFnKFV08="; + }; + + build-system = [ setuptools ]; + + dependencies = [ pathos ]; + + pythonRemoveDeps = [ "sphinx-rtd-theme" ]; + + # setup.py requires pytest-runner for setuptools, which is wrong + postPatch = '' + substituteInPlace setup.py --replace-fail '"pytest-runner",' "" + ''; + + pythonImportsCheck = [ "lox" ]; + + disabledTests = [ + # Benchmark, performance testing + "test_perf_lock" + "test_perf_qlock" + + # time sensitive testing + "test_bathroom_example" + "test_RWLock_r" + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + tqdm + ]; + + meta = { + description = "Threading and Multiprocessing made easy"; + changelog = "https://github.com/BrianPugh/lox/releases/tag/v${version}"; + homepage = "https://github.com/BrianPugh/lox"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.greg ]; + }; +} diff --git a/pkgs/development/python-modules/mypy-boto3-builder/default.nix b/pkgs/development/python-modules/mypy-boto3-builder/default.nix index f93969c3d43b..409ea350ad24 100644 --- a/pkgs/development/python-modules/mypy-boto3-builder/default.nix +++ b/pkgs/development/python-modules/mypy-boto3-builder/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mypy-boto3-builder"; - version = "7.25.0"; + version = "7.25.3"; pyproject = true; disabled = pythonOlder "3.10"; @@ -30,12 +30,12 @@ buildPythonPackage rec { owner = "youtype"; repo = "mypy_boto3_builder"; rev = "refs/tags/${version}"; - hash = "sha256-uLatx9/nLIoB+CY/QrddBxaaa4TeAzVNu/Nl9wWUTz4="; + hash = "sha256-DHGeljGY8NRndlcDqvK1Noud90wUQrkaS54489b/6RQ="; }; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ black boto3 cryptography @@ -61,10 +61,10 @@ buildPythonPackage rec { meta = with lib; { description = "Type annotations builder for boto3"; - mainProgram = "mypy_boto3_builder"; homepage = "https://github.com/youtype/mypy_boto3_builder"; changelog = "https://github.com/youtype/mypy_boto3_builder/releases/tag/${version}"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "mypy_boto3_builder"; }; } diff --git a/pkgs/development/python-modules/numpy-groupies/default.nix b/pkgs/development/python-modules/numpy-groupies/default.nix new file mode 100644 index 000000000000..e09ce3abb7ba --- /dev/null +++ b/pkgs/development/python-modules/numpy-groupies/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + setuptools, + setuptools-scm, + numpy, + numba, + pandas, + gitUpdater, +}: + +buildPythonPackage rec { + pname = "numpy-groupies"; + version = "0.11.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ml31415"; + repo = "numpy-groupies"; + rev = "refs/tags/v${version}"; + hash = "sha256-Eu+5SR28jIasKe1p7rvbq2yo3PGZRQWWdG3A5vGhnyM="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ numpy ]; + + nativeCheckInputs = [ + pytestCheckHook + numba + pandas + ]; + + pythonImportsCheck = [ "numpy_groupies" ]; + + passthru.updateScript = gitUpdater { tagPrefix = "v"; }; + + meta = with lib; { + homepage = "https://github.com/ml31415/numpy-groupies"; + changelog = "https://github.com/ml31415/numpy-groupies/releases/tag/v${version}"; + description = "Optimised tools for group-indexing operations: aggregated sum and more"; + license = licenses.bsd2; + maintainers = [ maintainers.berquist ]; + }; +} diff --git a/pkgs/development/python-modules/qpsolvers/default.nix b/pkgs/development/python-modules/qpsolvers/default.nix index af4bdcacb252..468099e7b59e 100644 --- a/pkgs/development/python-modules/qpsolvers/default.nix +++ b/pkgs/development/python-modules/qpsolvers/default.nix @@ -16,6 +16,7 @@ osqp, quadprog, scs, + highspy, }: buildPythonPackage rec { pname = "qpsolvers"; @@ -45,7 +46,7 @@ buildPythonPackage rec { daqp = [ daqp ]; ecos = [ ecos ]; gurobi = [ gurobipy ]; - # highs = [ highspy ]; + highs = [ highspy ]; # mosek = [ cvxopt mosek ]; osqp = [ osqp ]; # piqp = [ piqp ]; @@ -59,8 +60,9 @@ buildPythonPackage rec { clarabel cvxopt daqp - ecos # highs osqp # piqp proxqp qpalm + ecos + highs quadprog scs ]; diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix index ef3696284307..7b37464a69be 100644 --- a/pkgs/development/python-modules/stups-cli-support/default.nix +++ b/pkgs/development/python-modules/stups-cli-support/default.nix @@ -2,18 +2,18 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, clickclick, dnspython, requests, - pytest, - pytest-cov, + pytestCheckHook, isPy3k, }: buildPythonPackage rec { pname = "stups-cli-support"; version = "1.1.20"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { @@ -23,7 +23,9 @@ buildPythonPackage rec { sha256 = "1r6g29gd009p87m8a6wv4rzx7f0564zdv67qz5xys4wsgvc95bx0"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ clickclick dnspython requests @@ -31,10 +33,7 @@ buildPythonPackage rec { preCheck = "export HOME=$TEMPDIR"; - nativeCheckInputs = [ - pytest - pytest-cov - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Helper library for all STUPS command line tools"; diff --git a/pkgs/development/python-modules/stups-fullstop/default.nix b/pkgs/development/python-modules/stups-fullstop/default.nix index 2b4efbaacb2f..494c8ecf1e9e 100644 --- a/pkgs/development/python-modules/stups-fullstop/default.nix +++ b/pkgs/development/python-modules/stups-fullstop/default.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, buildPythonPackage, + pythonAtLeast, requests, stups-cli-support, stups-zign, @@ -43,5 +44,8 @@ buildPythonPackage rec { homepage = "https://github.com/zalando-stups/stups-fullstop-cli"; license = licenses.asl20; maintainers = [ maintainers.mschuwalow ]; + # Uses regex patterns deprecated in 3.9: + # re.error: global flags not at the start of the expression at ... + broken = pythonAtLeast "3.11"; }; } diff --git a/pkgs/development/python-modules/stups-pierone/default.nix b/pkgs/development/python-modules/stups-pierone/default.nix index af90fcb19348..1415e07ab1af 100644 --- a/pkgs/development/python-modules/stups-pierone/default.nix +++ b/pkgs/development/python-modules/stups-pierone/default.nix @@ -2,11 +2,11 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, requests, stups-cli-support, stups-zign, - pytest, - pytest-cov, + pytestCheckHook, hypothesis, pythonOlder, }: @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "stups-pierone"; version = "1.1.51"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,11 @@ buildPythonPackage rec { hash = "sha256-OypGYHfiFUfcUndylM2N2WfPnfXXJ4gvWypUbltYAYE="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + pythonRelaxDeps = [ "stups-zign" ]; + + dependencies = [ requests stups-cli-support stups-zign @@ -36,8 +40,7 @@ buildPythonPackage rec { ''; nativeCheckInputs = [ - pytest - pytest-cov + pytestCheckHook hypothesis ]; diff --git a/pkgs/development/python-modules/stups-tokens/default.nix b/pkgs/development/python-modules/stups-tokens/default.nix index 6201fa99cab3..3d9c4cd07735 100644 --- a/pkgs/development/python-modules/stups-tokens/default.nix +++ b/pkgs/development/python-modules/stups-tokens/default.nix @@ -2,17 +2,17 @@ lib, fetchFromGitHub, buildPythonPackage, + setuptools, requests, mock, - pytest, - pytest-cov, + pytestCheckHook, isPy3k, }: buildPythonPackage rec { pname = "stups-tokens"; version = "1.1.19"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { @@ -22,12 +22,13 @@ buildPythonPackage rec { sha256 = "09z3l3xzdlwpivbi141gk1k0zd9m75mjwbdy81zc386rr9k8s0im"; }; - propagatedBuildInputs = [ requests ]; + build-system = [ setuptools ]; + + dependencies = [ requests ]; nativeCheckInputs = [ mock - pytest - pytest-cov + pytestCheckHook ]; meta = with lib; { diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index c6fb2495dd27..1c54cdb51212 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -3,17 +3,17 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + setuptools, stups-tokens, stups-cli-support, - pytest, - pytest-cov, + pytestCheckHook, isPy3k, }: buildPythonPackage rec { pname = "stups-zign"; version = "1.2"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; src = fetchFromGitHub { @@ -31,7 +31,9 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ stups-tokens stups-cli-support ]; @@ -40,10 +42,7 @@ buildPythonPackage rec { export HOME=$TEMPDIR "; - nativeCheckInputs = [ - pytest - pytest-cov - ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "OAuth2 token management command line utility"; diff --git a/pkgs/development/python-modules/torchcrepe/default.nix b/pkgs/development/python-modules/torchcrepe/default.nix new file mode 100644 index 000000000000..d292f0de81e1 --- /dev/null +++ b/pkgs/development/python-modules/torchcrepe/default.nix @@ -0,0 +1,51 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + librosa, + pytestCheckHook, + pythonOlder, + resampy, + scipy, + setuptools, + torch, + torchaudio, + tqdm, +}: + +buildPythonPackage { + pname = "torchcrepe"; + version = "0.0.23"; + pyproject = true; + build-system = [ setuptools ]; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "maxrmorrison"; + repo = "torchcrepe"; + # No releases: https://github.com/maxrmorrison/torchcrepe/commit/e2c305878ec7a89aec85a01f8d223a75a36d30b6 + rev = "e2c305878ec7a89aec85a01f8d223a75a36d30b6"; + hash = "sha256-fhBU5KFDNDG4g4KNivE/dRpMPyu1QNa9xKN6HIz3tK4="; + }; + + dependencies = [ + librosa + resampy + scipy + torch + torchaudio + tqdm + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "torchcrepe" ]; + + meta = { + description = "Pytorch implementation of the CREPE pitch tracker"; + homepage = "https://github.com/maxrmorrison/torchcrepe"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/development/python-modules/typesentry/default.nix b/pkgs/development/python-modules/typesentry/default.nix index 66c594720ff7..adb56fd0ad82 100644 --- a/pkgs/development/python-modules/typesentry/default.nix +++ b/pkgs/development/python-modules/typesentry/default.nix @@ -3,8 +3,7 @@ buildPythonPackage, fetchFromGitHub, colorama, - pytest, - pytest-cov, + pytestCheckHook, }: buildPythonPackage { @@ -21,13 +20,7 @@ buildPythonPackage { }; propagatedBuildInputs = [ colorama ]; - nativeCheckInputs = [ - pytest - pytest-cov - ]; - checkPhase = '' - pytest - ''; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Python 2.7 & 3.5+ runtime type-checker"; diff --git a/pkgs/development/python-modules/uvcclient/default.nix b/pkgs/development/python-modules/uvcclient/default.nix index 42f89f8d02fa..707a464d7e4f 100644 --- a/pkgs/development/python-modules/uvcclient/default.nix +++ b/pkgs/development/python-modules/uvcclient/default.nix @@ -2,36 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, + poetry-core, mock, + pytest-cov-stub, + pytest-xdist, pytestCheckHook }: buildPythonPackage rec { pname = "uvcclient"; - version = "0.11.1"; + version = "0.12.1"; pyproject = true; src = fetchFromGitHub { owner = "kk7ds"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-0OUdBygL2AAtccL5hdyL+0PIRK4o+lNN3droWDysDeI="; + rev = "refs/tags/v${version}"; + hash = "sha256-ilZTRoSuoJMWlyRfvY/PpTBbr+d6wx+T3cVyW3ZkXlY="; }; - postPatch = '' - substituteInPlace tests/test_camera.py \ - --replace-fail "assertEquals" "assertEqual" - ''; - - build-system = [ setuptools ]; + build-system = [ poetry-core ]; nativeCheckInputs = [ mock + pytest-cov-stub + pytest-xdist pytestCheckHook ]; meta = with lib; { + changelog = "https://github.com/uilibs/uvcclient/blob/${src.rev}/CHANGELOG.md"; description = "Client for Ubiquiti's Unifi Camera NVR"; mainProgram = "uvc"; homepage = "https://github.com/kk7ds/uvcclient"; diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index ce2f51f08382..4feef1dc27eb 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "6.4.3"; + version = "6.4.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs"; rev = "refs/tags/v${version}"; - hash = "sha256-LfK5xh1MBoWD3/Ae2Hxx0dOFoBkRZUqfudrleXluGzk="; + hash = "sha256-vW6BMb0aaGGsXwZci5FE9VuSB/hi0pltIVH/OcL0mnw="; }; postPatch = '' diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 173c87ca0a6a..87804dd7f720 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.26.4"; + version = "1.27.5"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-+vgP8Nu/t7pxU/YGIIi8zd0zuAzZFdpcZLGnjZgqYGM="; + hash = "sha256-FckWn8tHSuowhVSq1B/KqzXB4KlWMOWfmuVfKr/y7Hk="; }; - cargoHash = "sha256-WDBAuzUCjZxayXeEdxvWAHZyYRQLDMz3QkNO9QT/DyI="; + cargoHash = "sha256-rES9cHwOH/Zw0fYhYplQb8FJ/iOndFgskg5zRTMeMDI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 5787b3dd1c88..4ddf399f783f 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-07-22"; - cargoHash = "sha256-cimGPLp7TuAFvrr2i5zY5Q4GRxOfC1Vpe0qGHepBf5E="; + version = "2024-08-05"; + cargoHash = "sha256-6ZlC/zzPYvBbp2lsl8U2piHxPqCFVQ+AiNFbnPumAXo="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-LH3YPNUpJeCjiyf0yaYKxgCjUFtlB41Tr2tBTMGH//s="; + sha256 = "sha256-/Bd0VzlutcxTwSNouS/iC6BDv395NoO4XmBJaS2vQLg="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/supabase-cli/default.nix b/pkgs/development/tools/supabase-cli/default.nix index 339bdef2277b..6b351f69cef3 100644 --- a/pkgs/development/tools/supabase-cli/default.nix +++ b/pkgs/development/tools/supabase-cli/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "supabase-cli"; - version = "1.187.8"; + version = "1.188.0"; src = fetchFromGitHub { owner = "supabase"; repo = "cli"; rev = "v${version}"; - hash = "sha256-zwh+Hb1CwCz+/e9NyJfP+dojB21xKdYsjFISPm8NBGQ="; + hash = "sha256-egkph143V0WDxJTvB7fBj7F7+8fHVGAhJohCkIeDfz4="; }; - vendorHash = "sha256-+TQJgHOITKn9sFf8B86WHshITHh29EoDv8BLosrUPtA="; + vendorHash = "sha256-VhNGdax43GYtsZxsHqJWgwWa9/r+IWPg0WiA3jl3NN0="; ldflags = [ "-s" diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 5bc010663b0c..340a9dc36c15 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-platform"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor finalAttrs.version}/confluent-${finalAttrs.version}.tar.gz"; - hash = "sha256-bHT8VWSUqxiM/g7opRXZmEOAs2d61dWBTtuwwlzPgBc="; + hash = "sha256-w5dazjSZTv/zqNcOcmyUUu8z5wftsJtBeU3bO1WhQ6k="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/readarr/default.nix b/pkgs/servers/readarr/default.nix index f2f159f8e412..a0c1cea2c586 100644 --- a/pkgs/servers/readarr/default.nix +++ b/pkgs/servers/readarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-jnsIftFHc2UpmW3WBWCff+cUqN40u/xKfQRMS1iMu4M="; - arm64-linux_hash = "sha256-ATdE9wXpew1D0wd/j2ntXBVYj/dMm/rWZLfOBKdrmnY="; - x64-osx_hash = "sha256-2/cUd45vhqdXAsrVPKlRTwOMd+kamW1OIOaB9G7xnjc="; + x64-linux_hash = "sha256-qvq4Ivv9AKIljEwdMMKWjy5vZnZ4LPd0gxUUIHcEP7E="; + arm64-linux_hash = "sha256-MNJOIDNT+3ZZP7sTnTdiDFG+Q+42dUvEj6pGZ3LLS/4="; + x64-osx_hash = "sha256-DKPllZhtebuOfYrJVfhxfhPcoXSnozD2VM6+NP3azus="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "readarr"; - version = "0.3.29.2565"; + version = "0.3.32.2587"; src = fetchurl { url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 545ef57d4b08..67bb98474c9a 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromSavannah, flex, bison, python3, autoconf, automake, libtool, bash , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config +, help2man , fetchzip , buildPackages , nixosTests @@ -85,7 +86,7 @@ stdenv.mkDerivation rec { ''; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoconf automake ]; + nativeBuildInputs = [ bison flex python3 pkg-config gettext freetype autoconf automake help2man ]; buildInputs = [ ncurses libusb-compat-0_1 freetype lvm2 fuse libtool bash ] ++ lib.optional doCheck qemu ++ lib.optional zfsSupport zfs; diff --git a/pkgs/tools/misc/tremor-rs/default.nix b/pkgs/tools/misc/tremor-rs/default.nix index 65ba3a837474..f346db518047 100644 --- a/pkgs/tools/misc/tremor-rs/default.nix +++ b/pkgs/tools/misc/tremor-rs/default.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { }; # tests failed on x86_64-darwin with SIGILL: illegal instruction - doCheck = !(stdenv.system == "x86_64-darwin"); + doCheck = stdenv.system != "x86_64-darwin"; checkFlags = [ # all try to make a network access diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 38919532a556..5181f78e8a2e 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -8,7 +8,7 @@ , nixosTests }: -assert guiSupport -> enableMinimal == false; +assert guiSupport -> !enableMinimal; stdenv.mkDerivation rec { pname = "gnupg"; diff --git a/pkgs/tools/security/gnupg/24.nix b/pkgs/tools/security/gnupg/24.nix index b0ffe24a018f..ef1b2e1db518 100644 --- a/pkgs/tools/security/gnupg/24.nix +++ b/pkgs/tools/security/gnupg/24.nix @@ -9,7 +9,7 @@ , nixosTests }: -assert guiSupport -> enableMinimal == false; +assert guiSupport -> !enableMinimal; stdenv.mkDerivation rec { pname = "gnupg"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 14a7af7a40d7..c24f453d6f9a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5559,6 +5559,8 @@ self: super: with self; { highdicom = callPackage ../development/python-modules/highdicom { }; + highspy = callPackage ../development/python-modules/highspy { }; + hid = callPackage ../development/python-modules/hid { inherit (pkgs) hidapi; }; @@ -6373,6 +6375,8 @@ self: super: with self; { json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; + json-repair = callPackage ../development/python-modules/json-repair { }; + json-schema-for-humans = callPackage ../development/python-modules/json-schema-for-humans { }; json-stream = callPackage ../development/python-modules/json-stream { }; @@ -7299,6 +7303,8 @@ self: super: with self; { lottie = callPackage ../development/python-modules/lottie { }; + lox = callPackage ../development/python-modules/lox { }; + lpc-checksum = callPackage ../development/python-modules/lpc-checksum { }; lrcalc-python = callPackage ../development/python-modules/lrcalc-python { }; @@ -9259,6 +9265,8 @@ self: super: with self; { numpy_2 = callPackage ../development/python-modules/numpy/2.nix { }; numpy = if self.pythonOlder "3.13" then numpy_1 else numpy_2; + numpy-groupies = callPackage ../development/python-modules/numpy-groupies { }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; numpyro = callPackage ../development/python-modules/numpyro { }; @@ -15759,6 +15767,8 @@ self: super: with self; { cudaPackages = pkgs.cudaPackages_12; }; + torchcrepe = callPackage ../development/python-modules/torchcrepe { }; + torchdiffeq = callPackage ../development/python-modules/torchdiffeq { }; torchmetrics = callPackage ../development/python-modules/torchmetrics { };