diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5b5634a67887..fe22dbee1134 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14966,6 +14966,12 @@ githubId = 54669781; keys = [ { fingerprint = "293B 93D8 A471 059F 85D7 16A6 5BA9 2099 D9BE 2DAA"; } ]; }; + misilelab = { + name = "misilelab"; + email = "misileminecord@gmail.com"; + github = "misilelab"; + githubId = 74066467; + }; mislavzanic = { email = "mislavzanic3@gmail.com"; github = "mislavzanic"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ffa094489850..b9d78d1fb230 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,11 +27,11 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-O3OcgNyzHMJFB/MlTdwIN/t0bvE/fAlgYt4acZ4saIk=", + "hash": "sha256-rtqGkVtB69yt98bTb/g2iZtZNtCn7V5Q4uSBDx+/xGQ=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.31.0", + "rev": "v4.31.1", "spdx": "MIT", "vendorHash": "sha256-dIQ5WATs8HOjJpLyVPDgT+WZ8GkkSoNsmavxpCj4jmE=" }, @@ -81,11 +81,11 @@ "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE=" }, "artifactory": { - "hash": "sha256-bb0W1NjcF8JbWw9VEYD9fnw9WN7fCwIQISg9QZQD3YY=", + "hash": "sha256-xVblndBzxCtfM6yIKGYt08owo9z9ZdccbvdAXbB+mf0=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v12.7.0", + "rev": "v12.7.1", "spdx": "Apache-2.0", "vendorHash": "sha256-J+JBq8QybqIQp2j5EtZhpdGvDd84lwmzezcWl5pXxRs=" }, @@ -813,13 +813,13 @@ "vendorHash": "sha256-QxbZv6YMa5/I4bTeQBNdmG3EKtLEmstnH7HMiZzFJrI=" }, "migadu": { - "hash": "sha256-Z9doPI2ARlwqeeFai3ysyDk2f2FHrZUewqcz6IzaMHo=", + "hash": "sha256-Pmc09MRNxrJHXlb74EnHkmML90pbKSLCyTrFlI+j3d8=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2024.12.12", + "rev": "2024.12.26", "spdx": "0BSD", - "vendorHash": "sha256-Fc7ZoUtThsJd3rvn/j1gU4tpEj2ofg1pgCzQOYEdQFA=" + "vendorHash": "sha256-YFzYLUfyJglKaJSBksrI1DBHmK6+yoMIg9QlGIEZFkU=" }, "minio": { "hash": "sha256-aSEzsncqNLWfVnnGfz/fDpRw9w2muGnybX8WYd1tP/Y=", @@ -1120,11 +1120,11 @@ "vendorHash": "sha256-JytWDb7d2RW/fp5rptAzmfTTuytZ+lp6cB05ol9mhhM=" }, "sentry": { - "hash": "sha256-+Cmlkxr9wHHZ8wbohkxisqvf/JxpOBFAk/0MU+Xh0ho=", + "hash": "sha256-2JfzteVripOz96bAtQXC32wi8dWUQw8bry0HllNRQRA=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.14.2", + "rev": "v0.14.3", "spdx": "MIT", "vendorHash": "sha256-RbUBHX0/nUihgiK6ibbkR/2DKJOdJt9VYyCJgWsj2zo=" }, @@ -1246,13 +1246,13 @@ "vendorHash": "sha256-Q/fFd3ahIY1L2s8vE8KY/DtahS948qnoaFLQBQfyNH4=" }, "talos": { - "hash": "sha256-bOwvTIXYQwsyKPx6aMY+VzyVuCQimPK8UrPkeWpU48c=", + "hash": "sha256-7VBoihwejNDRnIYsFS/dAiCE+JaMALkuVVqHaKQYUGU=", "homepage": "https://registry.terraform.io/providers/siderolabs/talos", "owner": "siderolabs", "repo": "terraform-provider-talos", - "rev": "v0.6.0", + "rev": "v0.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-tb9raTGqEuvqfMO/5s4Oc7x/EAk4qBWWDiOgRMB3uAU=" + "vendorHash": "sha256-4jsFsHuKMujOkBMA/+rGcYmHinWLuhon10CoO01DZsY=" }, "temporalcloud": { "hash": "sha256-nAOHdok/nK33zyEYmyB2nA+y2/mpkigZk4WTyl2F7XA=", diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index c9df4e80e319..cf227a738186 100644 --- a/pkgs/by-name/ab/ab-av1/package.nix +++ b/pkgs/by-name/ab/ab-av1/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "ab-av1"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; rev = "v${version}"; - hash = "sha256-NzGhpj+INJ8iAXxWeaMJ1MbeCZ2nzx88vEkL/fW5OxU="; + hash = "sha256-xKZVvwRSCd4AxJnfEnRYuyB0yhxkg19a2tI0x2rcvWs="; }; - cargoHash = "sha256-PTLvZZmDdaGBTYZjSm9p6Sb5a2fBnxDFLS2GRgI/E2A="; + cargoHash = "sha256-nK3ye3wJBBv4ei41e9V/bj5kg5ujjzi0EvLwKKfvfUU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ab/abctl/package.nix b/pkgs/by-name/ab/abctl/package.nix index e691656b2fac..4b11e5c8bd12 100644 --- a/pkgs/by-name/ab/abctl/package.nix +++ b/pkgs/by-name/ab/abctl/package.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "abctl"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "airbytehq"; repo = "abctl"; rev = "refs/tags/v${version}"; - hash = "sha256-8zNXx0J+p1ARCxxnD3Bz95uDgPD8Cr8dL4oDlc1HPxI="; + hash = "sha256-O+ABjageccJudXtO5wUYLIT/kI04f68RLW0B7d//jdw="; }; checkFlags = @@ -33,7 +33,7 @@ buildGoModule rec { in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; - vendorHash = "sha256-pGNKrWgBjMeSUDE7hiJI0h1zytF+v7yuftKFxONsOHQ="; + vendorHash = "sha256-4pi5EX7N4zf72rez2aClFezgnT70A7Crd2YTasl5CvU="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index 964b879a5a21..0af6e6ce554c 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.42"; + version = "2.0.44"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HbBxzIuni106kz3YX68Mk+ecb605hugcMf/QMLzElKA="; + sha256 = "sha256-+DLuvB6jOgZwZVjztsTpZ5z8tQDlpWDQvtM6yW1y/O0="; }; - cargoHash = "sha256-JfEyak0ORuXwR+QwVS3sjIJ+/eZIpIvU0MBREv2EPdg="; + cargoHash = "sha256-73aBnRdcxdcYBuk8oe8AvAQ1T9GELniHqBMsuF3PJog="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/by-name/aw/aws-iam-authenticator/package.nix b/pkgs/by-name/aw/aws-iam-authenticator/package.nix index 376ddb7d5bbe..07e7d93a326c 100644 --- a/pkgs/by-name/aw/aws-iam-authenticator/package.nix +++ b/pkgs/by-name/aw/aws-iam-authenticator/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.28"; + version = "0.6.29"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+cMgB1FHNFtvDz6x3fPuzMkKLytlipX6CE5Xs2e9UCc="; + hash = "sha256-xjHwnzh22cGv1Q2civdgLz9sFoV5p3exyG8P26u4hi0="; }; - vendorHash = "sha256-gFz1QrzLGMPyjB8yo+/FscZEpb2msshoUfBGmNRbvJM="; + vendorHash = "sha256-TcEpIyBSXiKZxiVMWJycRLfNL6oogRo98yoza093AtQ="; ldflags = let diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 724f45587f78..b9c38cb12037 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-SI/Yxk3bJayXPIWlJLG/je7NBG0I+49cIIlfBeMhTBk="; + hash = "sha256-W+SeleZsQbHw0sS7du8AylERt1FBxxLUvnxfvS9YQGM="; }; - cargoHash = "sha256-5R+PWV34Ob9y/EtO+46kI/fzqYw6QI86bRVpvMznw9Y="; + cargoHash = "sha256-nFBLhCxHmdF7WvYcmt5aLVhCO/q1LLgMldc7nofX+CU="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index bd8770577e7d..57226fa3b297 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-Rz360/cq2orr3L1hvvtftJkRqPAg1ACthU4HHiPF9PU="; + hash = "sha256-VjyrW2PwJ8/36V9PnLoMzAhJW9rKyg12V2KChD10XEw="; }; vendorHash = null; diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 8aee9dfb5642..d47fe97efcc0 100644 --- a/pkgs/by-name/ca/cargo-binstall/package.nix +++ b/pkgs/by-name/ca/cargo-binstall/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.10.16"; + version = "1.10.17"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-a7EH6WvFJGzyFZ6qZEcMbo5JIsYhHWFMDB163g2Qges="; + hash = "sha256-MJMJWP3tISmlO4iUgkQf9veAJfLBCt2nS7LfZTicH/I="; }; - cargoHash = "sha256-gpwC3mDJ+tAOTojFfOhKWjVUuHcKZm8kOPHPf71wRUI="; + cargoHash = "sha256-zliUrsRt+ObcpswRl+qKoUxSMpgRqR5ltj905xx54KI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-features-manager/package.nix b/pkgs/by-name/ca/cargo-features-manager/package.nix index 4ca4ebf16a79..9291e14c0e91 100644 --- a/pkgs/by-name/ca/cargo-features-manager/package.nix +++ b/pkgs/by-name/ca/cargo-features-manager/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage rec { pname = "cargo-features-manager"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ToBinio"; repo = "cargo-features-manager"; rev = "v${version}"; - hash = "sha256-g4iJ9iZp7vmnSE/P76ocDu/XKeSbPjosB97ojLI30oE="; + hash = "sha256-NjXJCrLsX52M7CBg8wdgwlK3gaGiznfdRGz7BAbVVPk="; }; - cargoHash = "sha256-O0MQAgOZdiVW6GU69BAn2beDDqNNwijLlmfC7I3Qd0A="; + cargoHash = "sha256-vCV5b4ljlDgwsYvxrPFe9rsfJjHHBCcM3QoZ4t8ZdRw="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index f16f3f2970fb..4dc4c2319c27 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -14,16 +14,16 @@ let in buildGoModule rec { pname = "centrifugo"; - version = "5.4.8"; + version = "5.4.9"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${version}"; - hash = "sha256-B6V4Apnwcb/G//PYa/kHRcgRkYSM+fQmoRimNoe6yhY="; + hash = "sha256-FDtAkoN1bdqVUEP0obbXBfQfVRpZN5YXbU1KT1yXWuI="; }; - vendorHash = "sha256-n+5EsSA984VXd8G1eXlzBPjIlSQeL5fRcGIFIKZGQ4o="; + vendorHash = "sha256-WfYN7bhtOPDp2UeB/WqtN3dD3+WO9lIxnXe2iTqn000="; ldflags = [ "-s" diff --git a/pkgs/by-name/co/code-minimap/package.nix b/pkgs/by-name/co/code-minimap/package.nix index 726989ca8a94..749e2737b65a 100644 --- a/pkgs/by-name/co/code-minimap/package.nix +++ b/pkgs/by-name/co/code-minimap/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-d9qcSSiRv1I7NYuLrra5ShIUXT2HVeHGD0WPb+dnQCc="; + sha256 = "sha256-unf7gFc/tQiUw3VqQ0KC96Srxn1E27WsmJviSggaCF4="; }; - cargoHash = "sha256-5/UgEzkJw9XDgtS1jKyWh5ijTp3L+UQLuE5CXcyIgTs="; + cargoHash = "sha256-7RmYVg2mOGSdwvADXtbPupoRUUpyYUwYZFM7f24GxQU="; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index d76a0d806611..e43adbf78f9e 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -6,7 +6,6 @@ libevent, pkg-config, libprom, - libpromhttp, libmicrohttpd, sqlite, nixosTests, @@ -31,7 +30,6 @@ stdenv.mkDerivation rec { openssl (libevent.override { inherit openssl; }) libprom - libpromhttp libmicrohttpd sqlite.dev ]; diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 8500b45819bf..2f355e33d958 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.16.1"; + version = "2.16.2"; outputs = [ "out" @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "danmar"; repo = "cppcheck"; rev = finalAttrs.version; - hash = "sha256-rx/JtpNPo8uDr4MR6h0ANK0erK8oMhlJp+4BQtc/poc="; + hash = "sha256-awmWfVl7gMLROEkjYdSpbXnFaWQwEX9Ah8B9E0OOFm0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix index f25f63ce74f5..69d015ebd974 100644 --- a/pkgs/by-name/cs/csview/package.nix +++ b/pkgs/by-name/cs/csview/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "csview"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9rjrNxMUUuH3S6fVsooscgIP+oFeQ6/gBQmuUMPDfp0="; + sha256 = "sha256-JFuqaGwCSfEIncBgLu6gGaOvAC5vojKFjruWcuSghS0="; }; - cargoHash = "sha256-/0jviI91y4eAJ0uZDQqnw9htcl+j0aybY0U5gCc9DFg="; + cargoHash = "sha256-mH1YpuYahdHFS+1cK9dryHbUqjewdbkNGxRBUOd2Hws="; meta = with lib; { description = "High performance csv viewer with cjk/emoji support"; diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix index 3557406e52b0..70df85bbb630 100644 --- a/pkgs/by-name/cw/cwltool/package.nix +++ b/pkgs/by-name/cw/cwltool/package.nix @@ -6,39 +6,50 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +let + py = python3.override { + packageOverrides = final: prev: { + # Requires "pydot >= 1.4.1, <3", + pydot = prev.pydot.overridePythonAttrs (old: rec { + version = "2.0.0"; + src = old.src.override { + inherit version; + hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU="; + }; + doCheck = false; + }); + }; + }; +in +with py.pkgs; + +py.pkgs.buildPythonApplication rec { pname = "cwltool"; - version = "3.1.20241024121129"; + version = "3.1.20241217163858"; pyproject = true; src = fetchFromGitHub { owner = "common-workflow-language"; repo = "cwltool"; rev = "refs/tags/${version}"; - hash = "sha256-MocgfELgis9b+byeDU7mDQcXnLhaWBtvGbqm7MtRdf8="; + hash = "sha256-46x/7ewnt1eTu+1GdmPUExpiFfYE3mN8N8VFMM4r1Vk="; }; postPatch = '' substituteInPlace setup.py \ - --replace-fail "ruamel.yaml >= 0.16, < 0.19" "ruamel.yaml" \ --replace-fail "prov == 1.5.1" "prov" \ --replace-fail '"schema-salad >= 8.7, < 9",' '"schema-salad",' \ --replace-fail "PYTEST_RUNNER + " "" - substituteInPlace pyproject.toml \ - --replace-fail "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \ - --replace-fail "mypy==1.13.0" "mypy" ''; - nativeBuildInputs = - [ - git - ] - ++ (with python3.pkgs; [ - setuptools - setuptools-scm - ]); + build-system = with py.pkgs; [ + setuptools + setuptools-scm + ]; - dependencies = with python3.pkgs; [ + nativeBuildInputs = [ git ]; + + dependencies = with py.pkgs; [ argcomplete bagit coloredlogs @@ -50,6 +61,7 @@ python3.pkgs.buildPythonApplication rec { pydot rdflib requests + rich-argparse ruamel-yaml schema-salad shellescape @@ -60,7 +72,7 @@ python3.pkgs.buildPythonApplication rec { typing-extensions ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with py.pkgs; [ mock nodejs pytest-mock @@ -89,7 +101,7 @@ python3.pkgs.buildPythonApplication rec { description = "Common Workflow Language reference implementation"; homepage = "https://www.commonwl.org"; changelog = "https://github.com/common-workflow-language/cwltool/releases/tag/${version}"; - license = with licenses; [ asl20 ]; + license = licenses.asl20; maintainers = with maintainers; [ veprbl ]; mainProgram = "cwltool"; }; diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix index 23f8d0f995f0..7797bce15426 100644 --- a/pkgs/by-name/e1/e1s/package.nix +++ b/pkgs/by-name/e1/e1s/package.nix @@ -5,7 +5,7 @@ }: let pname = "e1s"; - version = "1.0.43"; + version = "1.0.44"; in buildGoModule { inherit pname version; @@ -14,7 +14,7 @@ buildGoModule { owner = "keidarcy"; repo = "e1s"; rev = "refs/tags/v${version}"; - hash = "sha256-1RyVgdtw6PLJKq8VZqGx9rHlO+mSs0zHzP816Y2pIQ0="; + hash = "sha256-cq2iv502Cr2r20/qba9+648yNmhNoEbaySNoijCbXcM="; }; vendorHash = "sha256-bBl4D7HNIiAym6BWSJ0x4LZnIEUMfECj6dDDVZIFrHA="; diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 2e0f1381cc83..a06f9fa607a9 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -15,18 +15,39 @@ nixosTests, }: -buildGoModule rec { - pname = "evcc"; - version = "0.131.12"; +let + version = "0.132.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; - rev = version; - hash = "sha256-wctSgB5NRuS1+g+MEiHDS4oyFVNdwP2WFJF5kj9nFig="; + tag = version; + hash = "sha256-9HF9Beu2nLUoRViFluEc4kqGah2NfN/K0hqTZ4Bmo5c="; }; - vendorHash = "sha256-xravbTVzmS7loLKtzuT3Yw7FkEnDFLw+GrwnAVV36Yw="; + vendorHash = "sha256-xxE/KBZvPBMd9cLE/uU74iyLaOYRd6m9HokTDi0FnRg="; + + commonMeta = with lib; { + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; + + decorate = buildGoModule { + pname = "evcc-decorate"; + inherit version src vendorHash; + + subPackages = "cmd/decorate"; + + meta = commonMeta // { + description = "EVCC decorate helper"; + homepage = "https://github.com/evcc-io/evcc/tree/master/cmd/decorate"; + }; + }; +in + +buildGoModule rec { + pname = "evcc"; + inherit version src vendorHash; npmDeps = fetchNpmDeps { inherit src; @@ -40,6 +61,7 @@ buildGoModule rec { overrideModAttrs = _: { nativeBuildInputs = [ + decorate enumer go git @@ -59,7 +81,7 @@ buildGoModule rec { ldflags = [ "-X github.com/evcc-io/evcc/server.Version=${version}" - "-X github.com/evcc-io/evcc/server.Commit=${src.rev}" + "-X github.com/evcc-io/evcc/server.Commit=${src.tag}" "-s" "-w" ]; @@ -82,17 +104,16 @@ buildGoModule rec { [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; passthru = { + inherit decorate; tests = { inherit (nixosTests) evcc; }; updateScript = nix-update-script { }; }; - meta = with lib; { + meta = commonMeta // { description = "EV Charge Controller"; homepage = "https://evcc.io"; changelog = "https://github.com/evcc-io/evcc/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; }; } diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix index ef6bb3d62e48..4fba79aff85f 100644 --- a/pkgs/by-name/ff/fflogs/package.nix +++ b/pkgs/by-name/ff/fflogs/package.nix @@ -6,10 +6,10 @@ let pname = "fflogs"; - version = "8.15.4"; + version = "8.15.13"; src = fetchurl { url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-/lpt4pZT7etNCmT1lg5Vfx0IP9pbaqBUppJlu8HN47E="; + hash = "sha256-bd3UtmRNbHmF7P46GNpNTsF5k0DiowPmN7Ul3cM0xkA="; }; extracted = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/gh/ghostty/linux.nix b/pkgs/by-name/gh/ghostty/linux.nix index 662e2932d0e6..ce2d6010f2b0 100644 --- a/pkgs/by-name/gh/ghostty/linux.nix +++ b/pkgs/by-name/gh/ghostty/linux.nix @@ -157,8 +157,7 @@ stdenv.mkDerivation (finalAttrs: { rmdir $out/share/vim ln -s $vim $out/share/vim-plugins - - remove-references-to -t ${finalAttrs.deps} $out/bin/ghostty + remove-references-to -t ${finalAttrs.deps} $out/bin/.ghostty-wrapped ''; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index abe1cef75350..623f81ed61d4 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "git-town"; - version = "17.0.0"; + version = "17.1.1"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; rev = "v${version}"; - hash = "sha256-fuA3LJBFROdClDzKntCz42lh4x9ZIStxav7FMLEvaM4="; + hash = "sha256-q9k9x3e20oPjladE1tUSqSVQ8kKbmSu9kbU13lJsVU8="; }; vendorHash = null; diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index 59519319accf..e69bdda80ace 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "glasgow"; - version = "0-unstable-2024-12-17"; + version = "0-unstable-2024-12-22"; # from `pdm show` realVersion = let tag = builtins.elemAt (lib.splitString "-" version) 0; @@ -22,8 +22,8 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "GlasgowEmbedded"; repo = "glasgow"; - rev = "999d6e7e3ba806acc9aac8c375c28358483583cc"; - sha256 = "sha256-bDn8v2kKgj0T1NItR1now4+uJp91bfiRRBpKEnKGLAs="; + rev = "a477a8729ca0232ca41d1463a1d95f49a5a1dbc9"; + sha256 = "sha256-cKQ/qnfGqiLsEy8lkcLPBJZvPDWwuAoCua/L1cfUS1k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gl/gltron/package.nix b/pkgs/by-name/gl/gltron/package.nix index 7ea01f14b729..1ceebc33f76a 100644 --- a/pkgs/by-name/gl/gltron/package.nix +++ b/pkgs/by-name/gl/gltron/package.nix @@ -39,6 +39,10 @@ stdenv.mkDerivation rec { # The build fails, unless we disable the default -Wall -Werror configureFlags = [ "--disable-warn" ]; + makeFlags = [ "AR=${stdenv.cc.targetPrefix}ar" ]; + + env.SDL_CONFIG = lib.getExe' SDL.dev "sdl-config"; + buildInputs = [ SDL libGLU @@ -50,6 +54,7 @@ stdenv.mkDerivation rec { SDL_sound ]; + strictDeps = true; enableParallelBuilding = true; meta = { diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index 6883f089600b..39d5656960d7 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-mockery"; - version = "2.50.0"; + version = "2.50.1"; src = fetchFromGitHub { owner = "vektra"; repo = "mockery"; rev = "v${version}"; - sha256 = "sha256-u60wwGqLMD8mh2yFZmNi36hT1rnL8VKnKzbtczvFFFI="; + sha256 = "sha256-WRzrWyBkngTlAh8Nu1dKht28A5R7mV/8pljtwh6SZQU="; }; preCheck = '' diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix index 12d24d88ca72..55303842e370 100644 --- a/pkgs/by-name/gq/gql/package.nix +++ b/pkgs/by-name/gq/gql/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gql"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "AmrDeveloper"; repo = "GQL"; rev = version; - hash = "sha256-0eySuZDSr8d91+OW4d+1HE+gYZmxkDvXTZfuwPvRfc4="; + hash = "sha256-I0ggNHvswuRhcUkndl0acEU3eOHGJqHB2csm9rXZ2sU="; }; - cargoHash = "sha256-uGRFXR8bD1TkxL9bGx9zAice+grEBxyuxnF0x7cfDvs="; + cargoHash = "sha256-yOf5kKHiPMvKi/+j6SCBZD1+gUBK4oR+H1JICPThwBA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hi/hishtory/package.nix b/pkgs/by-name/hi/hishtory/package.nix index b88d62f16a69..ecebae932cc0 100644 --- a/pkgs/by-name/hi/hishtory/package.nix +++ b/pkgs/by-name/hi/hishtory/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "hishtory"; - version = "0.320"; + version = "0.321"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-eUm545hb3pyvArkihYG/lBxBcLQVJ25NZBNmevFAozY="; + hash = "sha256-97+36uM6c9yDOnTaBnF3X0jDF6n+vJAnR4havXlXpF4="; }; vendorHash = "sha256-xDdK91/lQRpY7i13jnLwX2eVMb5mibHchnz7ASNzXmM="; diff --git a/pkgs/by-name/je/jet-pilot/package.nix b/pkgs/by-name/je/jet-pilot/package.nix index 24692eba7f7b..2798f4aed6c9 100644 --- a/pkgs/by-name/je/jet-pilot/package.nix +++ b/pkgs/by-name/je/jet-pilot/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "jet-pilot"; - version = "1.31.0"; + version = "1.31.1"; src = fetchurl { url = "https://github.com/unxsist/jet-pilot/releases/download/v${version}/jet-pilot_${version}_amd64.AppImage"; - hash = "sha256-jhy8BfCZ0Z4T3lGrxTmSGw+fSDVzTIuvyJftpwMcYo0="; + hash = "sha256-FKrqWhFX6we+NRIO7wcqkjlDj7oy0zrIhAXTOAoYxNw="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index 24a61d04053a..5a78fccf95f5 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; rev = "refs/tags/v${version}"; - hash = "sha256-HZVD7+EO1TvOSo4WV5BQxg+Cp2DnWeHcmBY/CXce/Ac="; + hash = "sha256-hArlgDBfqsnla55cctIMQjzY6GJJNLaFXC9EVyzrNms="; }; - vendorHash = "sha256-MNYiAUCLZmT2PHUCzy+v/nXA0PsPk0olqLeRY4Cr92A="; + vendorHash = "sha256-fwE7eZrqWnlHO7vtBZOxqzCJvyguKX7Pt9KL0yjfCUA="; ldflags = [ "-s" diff --git a/pkgs/by-name/le/leetgo/package.nix b/pkgs/by-name/le/leetgo/package.nix index 93cc8cd54151..8293ff5bd89a 100644 --- a/pkgs/by-name/le/leetgo/package.nix +++ b/pkgs/by-name/le/leetgo/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "leetgo"; - version = "1.4.11"; + version = "1.4.13"; src = fetchFromGitHub { owner = "j178"; repo = "leetgo"; rev = "v${version}"; - hash = "sha256-3euD5njhZowFOhR6sYym+qV2+ioYRXbdhSI1V4vhxxI="; + hash = "sha256-KEfRsaBsMCKO66HW71gNzHzZkun1yo6a05YqAvafomM="; }; - vendorHash = "sha256-VrCdDHqq1ZPyK1Izh+E4O3E/iXyAHNQ3ANiCF0PkVBo="; + vendorHash = "sha256-pdGsvwEppmcsWyXxkcDut0F2Ak1nO42Hnd36tnysE9w="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/li/libskk/package.nix b/pkgs/by-name/li/libskk/package.nix index 6bb44ce70d63..6ef8dcbe86f3 100644 --- a/pkgs/by-name/li/libskk/package.nix +++ b/pkgs/by-name/li/libskk/package.nix @@ -22,8 +22,14 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ueno"; repo = "libskk"; - rev = version; - sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5"; + tag = version; + hash = "sha256-xXed7mQqseefIldGjNsQf8n0YTcI9L9T1FkO/dhNR3g="; + }; + + env = { + NIX_CFLAGS_COMPILE = toString [ + "-Wno-error=int-conversion" + ]; }; patches = [ diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix index 70e132b2915e..53c3d5383de8 100644 --- a/pkgs/by-name/li/ligolo-ng/package.nix +++ b/pkgs/by-name/li/ligolo-ng/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ligolo-ng"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "tnpitsecurity"; repo = "ligolo-ng"; rev = "refs/tags/v${version}"; - hash = "sha256-rngV3/fziDaJoe5WJFR8gOVBhf6emAJL+UFRWKdOfh8="; + hash = "sha256-Qsz7eRy+gkmw+ORNlrtstiKjH6Cj6v76GDH3cQ/HoiU="; }; vendorHash = "sha256-v6lHY3s1TJh8u4JaTa9kcCj+1pl01zckvTVeLk8TZ+w="; diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 20726e8f7f9e..bc2c41acecc3 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -12,12 +12,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { name = "lug-helper"; - version = "3.5"; + version = "3.6"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-yaYSm2vft55koZeB32Gta7RCjFTEec481LhrVHGGMm4="; + hash = "sha256-k41aVNpgkrz06T33UOAzhj2EfJg+YoifYQoyxRQ9/hQ="; }; buildInputs = [ diff --git a/pkgs/by-name/ma/matio/package.nix b/pkgs/by-name/ma/matio/package.nix index 7b4953064e8e..f763608c3cb5 100644 --- a/pkgs/by-name/ma/matio/package.nix +++ b/pkgs/by-name/ma/matio/package.nix @@ -1,7 +1,14 @@ { fetchurl, + hdf5, lib, + matio, + nix-update-script, + pkgconf, stdenv, + testers, + validatePkgConfig, + zlib, }: stdenv.mkDerivation (finalAttrs: { @@ -13,13 +20,39 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-naaYk0ohVprwWOY0hWRmb0UCnmwrCHjKDY+WCb93uNg="; }; + configureFlags = [ "ac_cv_va_copy=1" ]; + + nativeBuildInputs = [ + pkgconf + validatePkgConfig + ]; + + buildInputs = [ + hdf5 + zlib + ]; + + passthru = { + tests = { + pkg-config = testers.hasPkgConfigModules { + package = matio; + versionCheck = true; + }; + version = testers.testVersion { + package = matio; + }; + }; + updateScript = nix-update-script { }; + }; + meta = { changelog = "https://sourceforge.net/p/matio/news/"; description = "C library for reading and writing Matlab MAT files"; homepage = "http://matio.sourceforge.net/"; license = lib.licenses.bsd2; - maintainers = [ ]; + maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "matdump"; platforms = lib.platforms.all; + pkgConfigModules = [ "matio" ]; }; }) diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix index 67d21b7a3726..7713aa87fb6d 100644 --- a/pkgs/by-name/me/melange/package.nix +++ b/pkgs/by-name/me/melange/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-VVEmW2NqSqJYvBTGkfgvBzViTKgIj1uWi5F0X1ztN1E="; + hash = "sha256-DlFGB0uVAPUd9EqTWEQm1AKtUbTgm1z5ftENzPMkAz4="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-5d6T6MUeKPypjHwe1efK8rAujz/uIxEanMWeGhYvbc0="; + vendorHash = "sha256-xOsxzDIk2tuPXDtf1k0604B3AYgxEH5iQ/YdDs2Aezs="; subPackages = [ "." ]; diff --git a/pkgs/by-name/na/nanosvg/package.nix b/pkgs/by-name/na/nanosvg/package.nix index 2c0f4bbc0a66..64a6ccd0f888 100644 --- a/pkgs/by-name/na/nanosvg/package.nix +++ b/pkgs/by-name/na/nanosvg/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "nanosvg"; - version = "0-unstable-2023-12-30"; + version = "0-unstable-2024-12-19"; src = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; - rev = "93ce879dc4c04a3ef1758428ec80083c38610b1f"; - hash = "sha256-ZtenaXJqMZr2+BxYENG1zUoQ+Qoxlxy0m/1YfJBKAFk="; + rev = "ea6a6aca009422bba0dbad4c80df6e6ba0c82183"; + hash = "sha256-QCjfaSm1/hstVGzkJc0gFnYhnU5I3oHSCTkAVG5gTt8="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix index 0c638bc1b8d5..c441d557998c 100644 --- a/pkgs/by-name/no/nomino/package.nix +++ b/pkgs/by-name/no/nomino/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "nomino"; - version = "1.3.7"; + version = "1.4.0"; src = fetchFromGitHub { owner = "yaa110"; repo = pname; rev = version; - hash = "sha256-rePNcO8vssCR7YfdDCV+YT1hqGKBeMCwWpGmBnKtl9w="; + hash = "sha256-mHw1nk5RtrOT1BUVzdfbnqzH9Ubk5fBwM6wxICJTWyM="; }; - cargoHash = "sha256-C+fcN3byvPFtgX/DYexNZryoirOAhSx0hhOYR2gdW3s="; + cargoHash = "sha256-A8Edb+30SXfaUC9yE8WPuk8rYEIP6uD/Lo1sn078Bv4="; meta = with lib; { description = "Batch rename utility for developers"; diff --git a/pkgs/by-name/nu/numbat/package.nix b/pkgs/by-name/nu/numbat/package.nix index 778f478c62de..bb0424d357e3 100644 --- a/pkgs/by-name/nu/numbat/package.nix +++ b/pkgs/by-name/nu/numbat/package.nix @@ -61,7 +61,5 @@ rustPlatform.buildRustPackage rec { giomf atemu ]; - # Failing tests on Darwin. - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix index b3b81b100680..39813f6eee9d 100644 --- a/pkgs/by-name/nw/nwg-dock-hyprland/package.nix +++ b/pkgs/by-name/nw/nwg-dock-hyprland/package.nix @@ -4,21 +4,22 @@ fetchFromGitHub, pkg-config, wrapGAppsHook3, + gobject-introspection, gtk-layer-shell, }: buildGoModule rec { pname = "nwg-dock-hyprland"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-dock-hyprland"; rev = "refs/tags/v${version}"; - hash = "sha256-pSkA4N/scVZgRQ2NL8iUUq7DmAhXVNS2o4lqDZDELE0="; + hash = "sha256-IKdXH2UK2CBZTHY8c9eN6JSbqsF4OpIHYH14XEKyrM0="; }; - vendorHash = "sha256-FBuk6qNfJ7mVzKoD6Q/O8zo+AfAPUyXExlLu5uGbHBk="; + vendorHash = "sha256-ZUk3Pust9+Ei7s4ArNtTqBIWhxlzFjXcmDePBUYCaEU="; ldflags = [ "-s" @@ -26,6 +27,7 @@ buildGoModule rec { ]; nativeBuildInputs = [ + gobject-introspection pkg-config wrapGAppsHook3 ]; diff --git a/pkgs/by-name/ok/okms-cli/package.nix b/pkgs/by-name/ok/okms-cli/package.nix index 1924b109e86b..1ee08adb8822 100644 --- a/pkgs/by-name/ok/okms-cli/package.nix +++ b/pkgs/by-name/ok/okms-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "okms-cli"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "ovh"; repo = "okms-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-qdMmSchLP4xDUgDFomwvRyiljIFrhT8ydH1kkmr7vvw="; + hash = "sha256-y7Oy2vCxq5nXOUZxawz5737/io1+e/jNjuv7bH97yKA="; }; - vendorHash = "sha256-cPPHzYNMEQEllz1yCQGiW/EYPVv3cfkOswqf+9d9Onw="; + vendorHash = "sha256-pJGhaNsJ69SDI+sBN4ELxckkX6v6DNC4U49bCff6Fsg="; ldflags = [ "-s" diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix index b15b3b3f88d6..39f11a15c51d 100644 --- a/pkgs/by-name/ol/ols/package.nix +++ b/pkgs/by-name/ol/ols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-11-30"; + version = "0-unstable-2024-12-28"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "be1f51929763e3910bb89e09d035dae9fbc01862"; - hash = "sha256-F6fcDSWZUs3vpNvcKab2dwdT1+5ASlABcQBwPEAE53g="; + rev = "fded19fc8ede748d31b67686941fbe33a8f77214"; + hash = "sha256-KuzYkCwcQ11vLaQ3Au+2sEADe4knWu/HAls7Qe0cr2A="; }; postPatch = '' diff --git a/pkgs/by-name/op/opensnitch/package.nix b/pkgs/by-name/op/opensnitch/package.nix index 7049120e3985..23f6590e37c4 100644 --- a/pkgs/by-name/op/opensnitch/package.nix +++ b/pkgs/by-name/op/opensnitch/package.nix @@ -31,13 +31,13 @@ let in buildGoModule rec { pname = "opensnitch"; - version = "1.6.6"; + version = "1.6.7"; src = fetchFromGitHub { owner = "evilsocket"; repo = "opensnitch"; rev = "refs/tags/v${version}"; - hash = "sha256-pJPpkXRp7cby6Mvc7IzxH9u6MY4PcrRPkimTw3je6iI="; + hash = "sha256-2BwFCRbVvs7pAM5SnhynWws2+QthB/F9V6DYPViDICU="; }; postPatch = '' diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix index b8b43dc9f7f3..800e8f457e31 100644 --- a/pkgs/by-name/pd/pdm/package.nix +++ b/pkgs/by-name/pd/pdm/package.nix @@ -8,31 +8,45 @@ pdm, }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = _: super: { + resolvelib = super.resolvelib.overridePythonAttrs (old: rec { + version = "1.1.0"; + src = old.src.override { + rev = version; + hash = "sha256-UBdgFN+fvbjz+rp8+rog8FW2jwO/jCfUPV7UehJKiV8="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.19.3"; + version = "2.22.1"; pyproject = true; - disabled = python3.pkgs.pythonOlder "3.8"; + disabled = python.pkgs.pythonOlder "3.8"; src = fetchFromGitHub { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-xgwIPHlTtmgCNN4R6/BJsqmI9hbA0wFAiq4YCa+r/UM="; + hash = "sha256-khAS/OpuvZTJGh9/lIGtKONajIonCwc/M9D9lSwzFvw="; }; pythonRelaxDeps = [ "hishel" ]; nativeBuildInputs = [ installShellFiles ]; - build-system = with python3.pkgs; [ + build-system = with python.pkgs; [ pdm-backend pdm-build-locked ]; dependencies = - with python3.pkgs; + with python.pkgs; [ blinker dep-logic @@ -74,7 +88,7 @@ python3.pkgs.buildPythonApplication rec { unset PDM_LOG_DIR ''; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python.pkgs; [ first pytestCheckHook pytest-mock @@ -117,6 +131,7 @@ python3.pkgs.buildPythonApplication rec { maintainers = with maintainers; [ cpcloud natsukium + misilelab ]; mainProgram = "pdm"; }; diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix index f08934bd5a26..1cfadf10613a 100644 --- a/pkgs/by-name/ph/phrase-cli/package.nix +++ b/pkgs/by-name/ph/phrase-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.35.2"; + version = "2.35.4"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-PK8qrV1L9OX9DzfXfuwl3Zknhi08JN2wPtvsTZ9reZI="; + sha256 = "sha256-PXeB4tSmRTPQDHG1YdXQ4GIotEsAV+kRUvyczamOtHc="; }; - vendorHash = "sha256-UnPHYzxUf4G034tXL53bC2k0CYDtCi/jgXTFI2chF2U="; + vendorHash = "sha256-iJ2QXLP3XYyPXKTY3879LwyjXL+Ifv7H8ibgfTBiaoA="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/pkgs/by-name/pl/plemoljp-hs/package.nix b/pkgs/by-name/pl/plemoljp-hs/package.nix index c459c6a39c04..0da758e64ead 100644 --- a/pkgs/by-name/pl/plemoljp-hs/package.nix +++ b/pkgs/by-name/pl/plemoljp-hs/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "plemoljp-hs"; - version = "1.7.1"; + version = "2.0.0"; src = fetchzip { url = "https://github.com/yuru7/PlemolJP/releases/download/v${version}/PlemolJP_HS_v${version}.zip"; - hash = "sha256-JbuKBU1TT0qE89N61jX+WF25PBRHo/RSAtdPa5Ni8og="; + hash = "sha256-0p1orGKMKYiIZymAtbHp87DoS89ir9SbYfhs1Ki1JbE="; }; installPhase = '' diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix index 179313d8fd79..de8b38dcb822 100644 --- a/pkgs/by-name/po/pocketbase/package.nix +++ b/pkgs/by-name/po/pocketbase/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.23.11"; + version = "0.23.12"; src = fetchFromGitHub { owner = "pocketbase"; repo = "pocketbase"; rev = "v${version}"; - hash = "sha256-hH6fQ2fWAdAQ5dM/wuKAmyBJx5qQkUbf8zsYNdXyyME="; + hash = "sha256-qYhy6fuyfgBd0Up9HXqnrXxoVqJD02r7IvtCpqGLNTg="; }; - vendorHash = "sha256-3R3z0gd84FxKiIR9sC1saaalyTX2r/VYLPkyP1nJTtM="; + vendorHash = "sha256-R/ZnPQSmiRSypCny/xnozUhEhVWpg0YkSbNJ6p6KV6Q="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; diff --git a/pkgs/by-name/po/polypane/package.nix b/pkgs/by-name/po/polypane/package.nix index 7777b7e1ad66..c002a89f57ea 100644 --- a/pkgs/by-name/po/polypane/package.nix +++ b/pkgs/by-name/po/polypane/package.nix @@ -6,12 +6,12 @@ let pname = "polypane"; - version = "22.1.0"; + version = "22.1.1"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-FxrL25NCYP0S0Ge/UegZzqzWMuU93+mROM9AVm3SD9o="; + sha256 = "sha256-QPKbiecwh0eqbQ5PaGf+yBPUbRR4CfgxN12UOWx+Z9U="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/pr/proto/package.nix b/pkgs/by-name/pr/proto/package.nix index c56f2858f689..f753f0ead366 100644 --- a/pkgs/by-name/pr/proto/package.nix +++ b/pkgs/by-name/pr/proto/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "proto"; - version = "0.43.2"; + version = "0.44.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = "proto"; rev = "v${version}"; - hash = "sha256-x7UtIfjapSTqSpewLUmF71Dbh5WKg4v+QkEtx0waWH4="; + hash = "sha256-TVyKnxS7XDDXxZNuw6Gp9iEsyJmQCn8tAcnkc8kbCJg="; }; - cargoHash = "sha256-vHj5ijc1Yk9q1m1w2wsRJq1Zk6BIlX8U5wf9HVifPek="; + cargoHash = "sha256-zYM4hEjcKo/ThbPcLjhmIBAPws8UKfEDnexycf5ke9o="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix index 32feb2509155..e35d29f22629 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-12-14 +# Last updated: 2024-12-30 { - version = "3.2.15-2024.12.10"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241210_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241210_arm64_01.deb"; - arm64_hash = "sha256-oQ3pP/9G7Xx3OO//Yl46DNxHsJ0bDwnwQHrtTdfQY6o="; - amd64_hash = "sha256-KvcJGLavX8riUsiV6R4xbEns+lu/fb2LXpcXtKW/Grs="; + version = "3.2.15-2024.12.24"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_amd64_01.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.15_241224_arm64_01.deb"; + arm64_hash = "sha256-2+IT7XsK5ziyG9/rihfDhTADwzJ8QDMBz0NyMjZHmzE="; + amd64_hash = "sha256-iBiyFK8sKmWUxntZREwdxWCXSSLB8jxiL4eqo2Qy0is="; } diff --git a/pkgs/by-name/ru/rutorrent/package.nix b/pkgs/by-name/ru/rutorrent/package.nix index 2e205b96069a..774cd0bc3961 100644 --- a/pkgs/by-name/ru/rutorrent/package.nix +++ b/pkgs/by-name/ru/rutorrent/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "rutorrent"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "Novik"; repo = "ruTorrent"; tag = "v${version}"; - hash = "sha256-QjnNLXn6BVLoqZLpIMbopiGro04cRnVS9WrRY5bB7r4="; + hash = "sha256-si/6iZMipfm18lrwjJvuL+vQco0l+HresUEv2gj1uRw="; }; installPhase = '' diff --git a/pkgs/by-name/sa/safeeyes/package.nix b/pkgs/by-name/sa/safeeyes/package.nix index 0873611cedc0..4400848d7b32 100644 --- a/pkgs/by-name/sa/safeeyes/package.nix +++ b/pkgs/by-name/sa/safeeyes/package.nix @@ -18,11 +18,11 @@ with python3.pkgs; buildPythonApplication rec { pname = "safeeyes"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - hash = "sha256-k/CNxLScZDCXiwJhP5qh5HD5VUKlOLaYV8ICYgz6NKI="; + hash = "sha256-VE+pcCSblj5CADJppyM1mUchOibUtr7NrVwINrSprY0="; }; postPatch = '' diff --git a/pkgs/by-name/sa/sane-airscan/package.nix b/pkgs/by-name/sa/sane-airscan/package.nix index c7d021678203..f7c0ed3ea8ac 100644 --- a/pkgs/by-name/sa/sane-airscan/package.nix +++ b/pkgs/by-name/sa/sane-airscan/package.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.30"; + version = "0.99.31"; nativeBuildInputs = [ meson @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-JNgKZZuNRB02c+nOjtFj8L5wDY8ErZcv00nYweYULaM="; + sha256 = "sha256-ZSmublTne8YZM8irowPedgEr2fzPzwt1QGWU+BBTAzA="; }; meta = with lib; { diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix index 61907d56367a..243aa86d184f 100644 --- a/pkgs/by-name/sl/slumber/package.nix +++ b/pkgs/by-name/sl/slumber/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "slumber"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "LucasPickering"; repo = "slumber"; rev = "refs/tags/v${version}"; - hash = "sha256-SietbNpS4AW6oyLmvm6kC2DtSlOjuWfZt+vXU8bRpyc="; + hash = "sha256-kZAcNQhLlSl3eX1K+NNzkRV8JK/yH3yzYcZPgUBnSBk="; }; - cargoHash = "sha256-bH8Bc6/Sq2IpVLQzQFjEUG4seVvWW88+MQwa50ElMf4="; + cargoHash = "sha256-xbMSPnG07hgBuTARa1L2mX3jk/69JkEDswQ9SuQl42o="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.AppKit ]; diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix index 08c4efd0e3b4..c1ae8dc29a53 100644 --- a/pkgs/by-name/st/stripe-cli/package.nix +++ b/pkgs/by-name/st/stripe-cli/package.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "stripe-cli"; - version = "1.22.0"; + version = "1.23.3"; src = fetchFromGitHub { owner = "stripe"; repo = "stripe-cli"; rev = "v${version}"; - hash = "sha256-h5Q9+WoMJ5swmyL4GIiWZ9HDnr/w23iBVtp4EQ1yYn0="; + hash = "sha256-4Bl8mC5dc2HTh8/7T1rZOFqjGMq0KwUZQRpIqRqazeM="; }; - vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58="; + vendorHash = "sha256-d5cHnZ0iBBpc1yIOhsCVjx3ef+CNDNs43fr1D+o1qCc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/te/testkube/package.nix b/pkgs/by-name/te/testkube/package.nix index 9ff36c4a269f..d4ae19720cdb 100644 --- a/pkgs/by-name/te/testkube/package.nix +++ b/pkgs/by-name/te/testkube/package.nix @@ -5,16 +5,16 @@ }: buildGoModule rec { pname = "testkube"; - version = "2.1.79"; + version = "2.1.83"; src = fetchFromGitHub { owner = "kubeshop"; repo = "testkube"; rev = "v${version}"; - hash = "sha256-CG1i+znv30i2FfGr5VeOt0FcvECsWMxsUF6os6KCsmk="; + hash = "sha256-JC31BsCqctpl2hx0RYkrUY5nrQdN22V6OzAfGK45SDc="; }; - vendorHash = "sha256-i4R3UlH0QmAHva1T5XkKhhOGT7BGZRpLD4jP8Z09IVk="; + vendorHash = "sha256-GCXbp8cJUji7vAEVpTP9T/mRIwfu5+TqEKtoOQWlxrY="; ldflags = [ "-X main.version=${version}" diff --git a/pkgs/by-name/ud/udev-gothic-nf/package.nix b/pkgs/by-name/ud/udev-gothic-nf/package.nix index 9e8d24aadb40..0d454cb339a6 100644 --- a/pkgs/by-name/ud/udev-gothic-nf/package.nix +++ b/pkgs/by-name/ud/udev-gothic-nf/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "udev-gothic-nf"; - version = "2.0.0"; + version = "2.1.0"; src = fetchzip { url = "https://github.com/yuru7/udev-gothic/releases/download/v${version}/UDEVGothic_NF_v${version}.zip"; - hash = "sha256-u3iv5IilWysw9v8v4AfN7ucNM+eNbKVR2kfQn7JH/AM="; + hash = "sha256-55SHOQD+6eJ2L3+95eofr18fp1nFeBKcZvZq8gfj7rA="; }; installPhase = '' diff --git a/pkgs/by-name/ud/udev-gothic/package.nix b/pkgs/by-name/ud/udev-gothic/package.nix index dfb24eac56d5..e325ce5e39db 100644 --- a/pkgs/by-name/ud/udev-gothic/package.nix +++ b/pkgs/by-name/ud/udev-gothic/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "udev-gothic"; - version = "2.0.0"; + version = "2.1.0"; src = fetchzip { url = "https://github.com/yuru7/udev-gothic/releases/download/v${version}/UDEVGothic_v${version}.zip"; - hash = "sha256-VA0EaoK411qjX/nQBPkK0G9jS31nb7U8fNHgiWg4PQY="; + hash = "sha256-9gwBT0GVNPVWoiFIKBUf5sNGkhfJCWhMFRRIGvj5Wto="; }; installPhase = '' diff --git a/pkgs/by-name/us/usbmuxd2/package.nix b/pkgs/by-name/us/usbmuxd2/package.nix index 4d3ac3daa3d5..788b54b58f7e 100644 --- a/pkgs/by-name/us/usbmuxd2/package.nix +++ b/pkgs/by-name/us/usbmuxd2/package.nix @@ -53,6 +53,9 @@ clangStdenv.mkDerivation rec { postPatch = '' # Checking for libgeneral version still fails sed -i 's/libgeneral >= $LIBGENERAL_MINVERS_STR/libgeneral/' configure.ac + + # Otherwise, it will complain about no matching function for call to 'find' + sed -i 1i'#include ' usbmuxd2/Muxer.cpp ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix index d08df26f7657..7f1ceb8bd801 100644 --- a/pkgs/by-name/wh/whoogle-search/package.nix +++ b/pkgs/by-name/wh/whoogle-search/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "whoogle-search"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; src = fetchPypi { pname = "whoogle_search"; inherit version; - hash = "sha256-JpTvt7A81gisijWaXu0Rh/vPwjA95hvmpzRBwjvByiI="; + hash = "sha256-4i/p18tu5q4yRBKQHRAyXaxYcPORbU9KyIzF2yW9VCk="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix index 68e8bc01a211..001ec595929d 100644 --- a/pkgs/by-name/yt/ytdl-sub/package.nix +++ b/pkgs/by-name/yt/ytdl-sub/package.nix @@ -6,13 +6,13 @@ }: python3Packages.buildPythonApplication rec { pname = "ytdl-sub"; - version = "2024.12.14"; + version = "2024.12.27"; pyproject = true; src = fetchPypi { inherit version; pname = "ytdl_sub"; - hash = "sha256-kCx/PlCmJesbsMv3bQ0BaTDfskP7XYE69VXdjPNfln4="; + hash = "sha256-7XZlKGzDLG/MVw198Ii+l29F+Lt53MY5QtHU8k9xJWA="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index ff0b276bebb4..3e9597a6ed29 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -5,6 +5,7 @@ boost, fetchFromGitHub, flex, + gtkwave, libffi, makeWrapper, pkg-config, @@ -80,13 +81,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "yosys"; - version = "0.47"; + version = "0.48"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-9u9aAPTZyt9vzZwryor3GRCGzs/mu2/XtM0XzV7uHfk="; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-LzBx1bxpiPOiRTPgBcjNnuQemZG5xfvtA/NgqUib/6g="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' @@ -160,7 +161,10 @@ stdenv.mkDerivation (finalAttrs: { checkTarget = "test"; doCheck = true; - nativeCheckInputs = [ iverilog ]; + nativeCheckInputs = [ + gtkwave + iverilog + ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/python-modules/apted/default.nix b/pkgs/development/python-modules/apted/default.nix new file mode 100644 index 000000000000..d2f93ddd6616 --- /dev/null +++ b/pkgs/development/python-modules/apted/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "apted"; + version = "1.0.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "JoaoFelipe"; + repo = "apted"; + rev = "828b3e3f4c053f7d35f0b55b0d5597e8041719ac"; + hash = "sha256-h8vJDC5TPpyhDxm1sHiXPegPB2eorEgyrNqzQOzSge8="; + }; + + build-system = [ setuptools ]; + pythonImportsCheck = [ "apted" ]; + nativeCheckInputs = [ unittestCheckHook ]; + + meta = { + description = "APTED algorithm for the Tree Edit Distance"; + homepage = "https://github.com/JoaoFelipe/apted"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.McSinyx ]; + }; +} diff --git a/pkgs/development/python-modules/chex/default.nix b/pkgs/development/python-modules/chex/default.nix index d9a4604ff255..d312d1114e28 100644 --- a/pkgs/development/python-modules/chex/default.nix +++ b/pkgs/development/python-modules/chex/default.nix @@ -18,6 +18,7 @@ cloudpickle, dm-tree, pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -51,6 +52,11 @@ buildPythonPackage rec { pytestCheckHook ]; + # AttributeError: module 'unittest' has no attribute 'makeSuite' + # https://github.com/google-deepmind/chex/issues/371 + # TODO: re-enable at next release + doCheck = pythonOlder "3.13"; + meta = { description = "Library of utilities for helping to write reliable JAX code"; homepage = "https://github.com/deepmind/chex"; diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix index 39c789f822be..b17a46cc3edc 100644 --- a/pkgs/development/python-modules/clarifai-grpc/default.nix +++ b/pkgs/development/python-modules/clarifai-grpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "clarifai-grpc"; - version = "10.9.10"; + version = "10.11.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Clarifai"; repo = "clarifai-python-grpc"; - rev = "refs/tags/${version}"; - hash = "sha256-XJqbZicRQCiykdXn2R8tOzWPbtrso9IwZYpcTcY7vio="; + tag = version; + hash = "sha256-Px7VisC2j5pJctzB713cdalEccGbBsSuQBqDarwUTLA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/clarifai-protocol/default.nix b/pkgs/development/python-modules/clarifai-protocol/default.nix new file mode 100644 index 000000000000..16efdbca2878 --- /dev/null +++ b/pkgs/development/python-modules/clarifai-protocol/default.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + buildPythonPackage, + fetchPypi, + python, + pypaInstallHook, + wheelUnpackHook, + grpcio, +}: + +let + pythonVersionNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + systemToPlatform = { + "aarch64-linux" = "manylinux_2_17_aarch64.manylinux2014_aarch64"; + "x86_64-linux" = "manylinux_2_17_x86_64.manylinux2014_x86_64"; + "aarch64-darwin" = "macosx_11_0_universal2"; + "x86_64-darwin" = "macosx_11_0_universal2"; + }; + + hashes = { + "39-x86_64-linux" = "sha256-uGbsxSHGfYVzRiy1YEkQMkJi2yPLdSj3fe3adp1WjP0="; + "310-x86_64-linux" = "sha256-1SO/1lpB3aRWisxFlt8K5lwFEOiDXjC4iQRai77L+8E="; + "311-x86_64-linux" = "sha256-99VdM1fAcuiblReWL5I8+H0psCKR00HYZr/wRGT7nd8="; + "312-x86_64-linux" = "sha256-bbggF4rGDrXOpSegreFHgK0H/z7xaR9hb7z6SYp7nlU="; + "313-x86_64-linux" = "sha256-M9/t7JgIjh7yiZeEq9K2tGQ4oLneVhXf0rUfL8p09Tg="; + "39-aarch64-linux" = "sha256-wuEncCbqWdqO72zovzHrmb34on73eaQgFBmQZdUnwkE="; + "310-aarch64-linux" = "sha256-uLHEEPcVakctNT428pNlaq0yKDpvMLynDP2lDobiebA="; + "311-aarch64-linux" = "sha256-d2A4mKP4Dlnm6J31wPyAHg8d5MjFF4wcREe5FVFeayU="; + "312-aarch64-linux" = "sha256-aW295fQogAjaVK6saHhduKsVsncIv4BsfRW6qHlyb3g="; + "313-aarch64-linux" = "sha256-mloW8TGkBJWXqO6xOqHhra3ZXuGQWf6dEGSrkdD0sb0="; + "39-darwin" = "sha256-uU9RGo5glYOPp8nEYqj4c1TB3Xa1KwrNWMqNDpJsSjY="; + "310-darwin" = "sha256-80U0geHKJLVhhmvHayXWHWaV9ifJjWtR9mbwCUDfPu0="; + "311-darwin" = "sha256-kM2YVzPa22QgIRV4zP4kcvTE8al/RW0Oo6lyxJl3JxU="; + "312-darwin" = "sha256-t4qbP5wqE8cgkvN+vG6zOeS+s5+U/GjmbeeHytIo9/o="; + "313-darwin" = "sha256-ds2kj87miODVUE8Lrjuzz8L+2HxaQ7jTxGQF0/Odrpg="; + }; +in +buildPythonPackage rec { + pname = "clarifai-protocol"; + version = "0.0.14"; + pyproject = false; + + src = fetchPypi { + pname = "clarifai_protocol"; + inherit version; + format = "wheel"; + python = "cp${pythonVersionNoDot}"; + abi = "cp${pythonVersionNoDot}"; + dist = "cp${pythonVersionNoDot}"; + platform = systemToPlatform.${stdenv.hostPlatform.system} or (throw "unsupported system"); + hash = + if stdenv.hostPlatform.isDarwin then + hashes."${pythonVersionNoDot}-darwin" + else + hashes."${pythonVersionNoDot}-${stdenv.hostPlatform.system}" + or (throw "unsupported system/python version combination"); + }; + + nativeBuildInputs = [ + pypaInstallHook + wheelUnpackHook + ]; + + dependencies = [ grpcio ]; + + # require clarifai and it causes a circular import + dontUsePythonImportsCheck = true; + + # no tests + doCheck = false; + + meta = { + description = "Clarifai Python Runner Protocol"; + homepage = "https://pypi.org/project/clarifai-protocol"; + license = lib.licenses.asl20; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ natsukium ]; + }; +} diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix index 124e5cd8d987..911a92ea5479 100644 --- a/pkgs/development/python-modules/clarifai/default.nix +++ b/pkgs/development/python-modules/clarifai/default.nix @@ -2,7 +2,10 @@ lib, buildPythonPackage, clarifai-grpc, + clarifai-protocol, + click, fetchFromGitHub, + fsspec, inquirerpy, numpy, pillow, @@ -20,7 +23,7 @@ buildPythonPackage rec { pname = "clarifai"; - version = "10.8.6"; + version = "10.11.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,12 +31,12 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Clarifai"; repo = "clarifai-python"; - rev = "refs/tags/${version}"; - hash = "sha256-/fHNRFtxyNa9VdEi5wQ+YA+9mFv3ZpRFJQnWkuxQd5I="; + tag = version; + hash = "sha256-dXsEYHkt4Z2YldqbCorNPG7rVSLfU8shYdk6lzFBz/M="; }; pythonRelaxDeps = [ - "clarifai-grpc" + "fsspec" "schema" ]; @@ -41,6 +44,9 @@ buildPythonPackage rec { dependencies = [ clarifai-grpc + clarifai-protocol + click + fsspec inquirerpy numpy pillow @@ -71,16 +77,19 @@ buildPythonPackage rec { disabledTestPaths = [ # Tests require network access and API key + "tests/cli/test_compute_orchestration.py" + "tests/runners/test_anymodel.py" + "tests/runners/test_textmodel.py" + "tests/runners/test_url_fetcher.py" "tests/test_app.py" "tests/test_data_upload.py" "tests/test_eval.py" "tests/test_model_predict.py" "tests/test_model_train.py" + "tests/test_rag.py" "tests/test_search.py" "tests/workflow/test_create_delete.py" "tests/workflow/test_predict.py" - "tests/test_rag.py" - "clarifai/models/model_serving/repo_build/static_files/base_test.py" ]; pythonImportsCheck = [ "clarifai" ]; diff --git a/pkgs/development/python-modules/cwl-upgrader/default.nix b/pkgs/development/python-modules/cwl-upgrader/default.nix index 8e5e2d1c3d24..509c2b7eb1da 100644 --- a/pkgs/development/python-modules/cwl-upgrader/default.nix +++ b/pkgs/development/python-modules/cwl-upgrader/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "cwl-upgrader"; - version = "1.2.11"; + version = "1.2.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "common-workflow-language"; repo = "cwl-upgrader"; rev = "refs/tags/v${version}"; - hash = "sha256-P8607Io/KIJqAnrValM+rRK59tQITcC/jyGwkge8qN0="; + hash = "sha256-cfEd1XAu31u+NO27d3RNA5lhCpRpYK8NeaCxhQ/1GNU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index d33143d829d5..f35ff2252362 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "keras-team"; repo = "keras"; - rev = "refs/tags/v${version}"; + tag = "v${version}"; hash = "sha256-qidY1OmlOYPKVoxryx1bEukA7IS6rPV4jqlnuf3y39w="; }; @@ -86,6 +86,10 @@ buildPythonPackage rec { # TypeError: this __dict__ descriptor does not support '_DictWrapper' objects "test_reloading_default_saved_model" + + # ValueError: The truth value of an empty array is ambiguous. + # Use `array.size > 0` to check that an array is not empty. + "test_min_max_norm" ] ++ lib.optionals stdenv.isDarwin [ # AttributeError: module 'numpy' has no attribute 'float128'. Did you mean: 'float16'? diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix index 5e2809133764..c292b993e232 100644 --- a/pkgs/development/python-modules/optimistix/default.nix +++ b/pkgs/development/python-modules/optimistix/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "optimistix"; - version = "0.0.9"; + version = "0.0.10"; pyproject = true; src = fetchFromGitHub { owner = "patrick-kidger"; repo = "optimistix"; - rev = "refs/tags/v${version}"; - hash = "sha256-s8MRPyPObTpgLRm4bxU8F4Su7FKH+MHqtQsxIHb/DN4="; + tag = "v${version}"; + hash = "sha256-stVPHzv0XNd0I31N2Cj0QYrMmhImyx0cablqZfKBFrM="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix index 511542d0a490..3f84d9b6367b 100644 --- a/pkgs/development/python-modules/orbax-checkpoint/default.nix +++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix @@ -13,12 +13,12 @@ humanize, importlib-resources, jax, - jaxlib, msgpack, nest-asyncio, numpy, protobuf, pyyaml, + simplejson, tensorstore, typing-extensions, @@ -26,20 +26,21 @@ chex, google-cloud-logging, mock, + optax, pytest-xdist, pytestCheckHook, }: buildPythonPackage rec { pname = "orbax-checkpoint"; - version = "0.6.4"; + version = "0.10.3"; pyproject = true; src = fetchFromGitHub { owner = "google"; repo = "orbax"; - rev = "refs/tags/v${version}"; - hash = "sha256-xd75/AKBFUdA6a8sQnCB2rVbHl/Foy4LTb07jnwrTjA="; + tag = "v${version}"; + hash = "sha256-BTg4kUz5jfoK2uR/deqqJb8PYoj+FfkuoMZAeSjKKnA="; }; sourceRoot = "${src.name}/checkpoint"; @@ -52,12 +53,12 @@ buildPythonPackage rec { humanize importlib-resources jax - jaxlib msgpack nest-asyncio numpy protobuf pyyaml + simplejson tensorstore typing-extensions ]; @@ -66,6 +67,7 @@ buildPythonPackage rec { chex google-cloud-logging mock + optax pytest-xdist pytestCheckHook ]; @@ -84,14 +86,19 @@ buildPythonPackage rec { disabledTestPaths = [ # Circular dependency flax + "orbax/checkpoint/_src/metadata/empty_values_test.py" + "orbax/checkpoint/_src/metadata/tree_rich_types_test.py" + "orbax/checkpoint/_src/metadata/tree_test.py" + "orbax/checkpoint/_src/testing/test_tree_utils.py" + "orbax/checkpoint/_src/tree/utils_test.py" + "orbax/checkpoint/single_host_test.py" "orbax/checkpoint/transform_utils_test.py" - "orbax/checkpoint/utils_test.py" ]; meta = { description = "Orbax provides common utility libraries for JAX users"; homepage = "https://github.com/google/orbax/tree/main/checkpoint"; - changelog = "https://github.com/google/orbax/releases/tag/v${version}"; + changelog = "https://github.com/google/orbax/blob/v${version}/checkpoint/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-linkplay/default.nix b/pkgs/development/python-modules/python-linkplay/default.nix index 775b6b2926fe..fc732afe83b0 100644 --- a/pkgs/development/python-modules/python-linkplay/default.nix +++ b/pkgs/development/python-modules/python-linkplay/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-linkplay"; - version = "0.1.1"; + version = "0.1.2"; pyproject = true; src = fetchFromGitHub { owner = "Velleman"; repo = "python-linkplay"; tag = "v${version}"; - hash = "sha256-voAhqqisBgBOTS9aPcAAFt6OeZ5Eb8RDH0xWjCbEryE="; + hash = "sha256-HXsE2DzCyTF9UPZvM3YrwclTzUor+XRuz5UFlixLmRA="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix index 406e61a05aac..996ad80573b4 100644 --- a/pkgs/development/python-modules/streamlit/default.nix +++ b/pkgs/development/python-modules/streamlit/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "streamlit"; - version = "1.40.1"; + version = "1.41.1"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-HysJ8Etq02aix7TUgQRpfRyLwz9Ivfftk5zATBLTrsY="; + hash = "sha256-ZibTKwmLoUWLce691jTGKvLdh2OA5ZxLah6CijnWLWk="; }; build-system = [ diff --git a/pkgs/development/python-modules/tensorstore/default.nix b/pkgs/development/python-modules/tensorstore/default.nix index 42693111f402..4af9405da391 100644 --- a/pkgs/development/python-modules/tensorstore/default.nix +++ b/pkgs/development/python-modules/tensorstore/default.nix @@ -17,20 +17,23 @@ let "aarch64-darwin" = "macosx_11_0_arm64"; }; hashes = { - "310-x86_64-linux" = "sha256-oB68FjYzmRARWpbajQuLpAzWwg9CCji4tLZRFCsztjk="; - "311-x86_64-linux" = "sha256-kGEecBu7b3TFGUIRirI9q2W3nipiQwsh/1OB92RqDB4="; - "312-x86_64-linux" = "sha256-Vw8sT5kahSN20BQs3MOYesSUZqk4CuvfZR1z5nAO7g8="; - "310-aarch64-linux" = "sha256-Ocfg3VArM/14a06cpMuJDYP/MIo9rCvtFO4Cd3AahA4="; - "311-aarch64-linux" = "sha256-hegFeV3m0jpjTXNU6ue/3kGe1Cy+Pfeh4GDe96dvL7o="; - "312-aarch64-linux" = "sha256-O0VVtSqSEd4dqjmaXMTRvf/Bcc9YR7zzbz9N/8GVcXk="; - "310-aarch64-darwin" = "sha256-2vuVxmJMx/GeaHgzUS6rRdysQFHreVzZ5IT5YSDUJro="; - "311-aarch64-darwin" = "sha256-0xRVDSDE9upz2yU7mzpa3Y6l6M5FWOMAPKWBC8eY3Eo="; - "312-aarch64-darwin" = "sha256-i2TmLOl2aHD5iyzF6YpjbHKFmBGPx5ixPYyNKKQfRNM="; + "310-x86_64-linux" = "sha256-GmzcxS5LhB0j5Qovoo4Bbm2fYdbqkYjUVV6hibBAoPY="; + "311-x86_64-linux" = "sha256-NzVYuAPYwsV/xhOxEAeuWBOfGaPN3UQ6DeXXtTIeWWE="; + "312-x86_64-linux" = "sha256-ztVDC836f8s6a9xEczF2FYy4d7Nb3SM8rILiW0zJTpI="; + "313-x86_64-linux" = "sha256-UrVG8Hayw78hfGDwXeQSTMEZfOkvjoJufsc64yQHSlo="; + "310-aarch64-linux" = "sha256-lQQbVaLshtH2aQUS0Yg1gbGPL09Gw9l4lK6wrC22r38="; + "311-aarch64-linux" = "sha256-ZcOhoqNaG1N0A/NkA9JYyqtHflZLwPZBCblBzHe08gM="; + "312-aarch64-linux" = "sha256-h6l6NLBHXdx9KvxA5d1/jRJSKqge37zMs5Yoz1kUVNU="; + "313-aarch64-linux" = "sha256-YnbiebRetdm5XE3z55ViVfQU/UsSjS3hbYrs3obDY1c"; + "310-aarch64-darwin" = "sha256-uWG7u3ocakjkwUBqmMrr60AEYeLnWgi23wwBMpQDehU="; + "311-aarch64-darwin" = "sha256-9A5zvNwzPfs/f+D88CO8vsQVM8mFZldxj/duzhoZAuA="; + "312-aarch64-darwin" = "sha256-06JP62GV8cIiFillwBB8n/VtMizKI+GfDmZjb264DxQ="; + "313-aarch64-darwin" = "sha256-3ohD+zRiiZ3nvN7qzLkjA6nWEAa8NjZN60qI30YyC6Q="; }; in buildPythonPackage rec { pname = "tensorstore"; - version = "0.1.65"; + version = "0.1.71"; format = "wheel"; # The source build involves some wonky Bazel stuff. diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix index aee2acbd9c52..ad1aae82f170 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-rime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "ibus-rime"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "rime"; repo = "ibus-rime"; rev = version; - sha256 = "0gdxg6ia0i31jn3cvh1nrsjga1j31hf8a2zfgg8rzn25chrfr319"; + sha256 = "sha256-6lqPdcIJmwHcr4G6BhIDMhEtEOpOPgWqfkKXqaDjUY0="; }; buildInputs = [ diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index 7063c11e409d..415781981086 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -8,18 +8,18 @@ rustPlatform.buildRustPackage rec { pname = "diskus"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "diskus"; rev = "v${version}"; - sha256 = "sha256-SKd2CU0F2iR4bSHntu2VKvZyjjf2XJeXJG6XS/fIBMU="; + sha256 = "sha256-88+U5Y2CC0PhikRO3VqoUwZEYZjwln+61OPWbLLb8T0="; }; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ]; - cargoHash = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50="; + cargoHash = "sha256-7xGt+HDX20Bxwdff0Ca/D6lcT3baumeiUmIPXSh5NYM="; meta = with lib; { description = "Minimal, fast alternative to 'du -sh'"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 879b3066d283..054a2f12ccb9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -744,6 +744,8 @@ self: super: with self; { apt-repo = callPackage ../development/python-modules/apt-repo { }; + apted = callPackage ../development/python-modules/apted { }; + apycula = callPackage ../development/python-modules/apycula { }; aqipy-atmotech = callPackage ../development/python-modules/aqipy-atmotech { }; @@ -2334,6 +2336,8 @@ self: super: with self; { clarifai-grpc = callPackage ../development/python-modules/clarifai-grpc { }; + clarifai-protocol = callPackage ../development/python-modules/clarifai-protocol { }; + claripy = callPackage ../development/python-modules/claripy { }; classify-imports = callPackage ../development/python-modules/classify-imports { };