diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix index 58a8dad6be99..7757310817a1 100644 --- a/nixos/modules/services/audio/music-assistant.nix +++ b/nixos/modules/services/audio/music-assistant.nix @@ -16,6 +16,7 @@ let ; inherit (types) + bool listOf enum str @@ -54,6 +55,15 @@ in ''; }; + openFirewall = lib.mkOption { + type = bool; + default = false; + description = '' + Whether to open required ports for the configured providers. + Currently airplay and sendspin need port to be opened to function. + ''; + }; + providers = mkOption { type = listOf (enum cfg.package.providerNames); default = [ ]; @@ -68,6 +78,31 @@ in }; config = mkIf cfg.enable { + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = + lib.optional cfg.enable 8097 # Music Assistant stream port + ++ lib.optional (lib.elem "airplay" cfg.providers) 7000 + ++ lib.optional (lib.elem "sendspin" cfg.providers) 8927; + # The information published by Apple 1 seem to not apply to libraop. + # The closest we could find that represents the port range being used as observed by tcpdump is the ephemeral port range. + # 1: https://support.apple.com/en-us/103229#:~:text=49152%E2%80%93-,65535,-TCP%2C%20UDP + # 2: https://en.wikipedia.org/wiki/Ephemeral_port#Range + allowedUDPPortRanges = lib.mkIf (lib.elem "airplay" cfg.providers) [ + { + from = 32768; + to = 65535; + } + ]; + }; + + services.avahi = lib.mkIf (lib.elem "airplay_receiver" cfg.providers) { + enable = true; + publish = { + enable = true; + userServices = true; + }; + }; + systemd.services.music-assistant = { description = "Music Assistant"; documentation = [ "https://music-assistant.io" ]; @@ -87,6 +122,13 @@ in [ lsof ] + ++ lib.optionals (lib.elem "airplay" cfg.providers) [ + cliairplay + libraop + ] + ++ lib.optionals (lib.elem "airplay_receiver" cfg.providers) [ + shairport-sync + ] ++ lib.optionals (lib.elem "spotify" cfg.providers) [ librespot-ma ] diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index c8dadd09e9ce..413429f582de 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -291,13 +291,20 @@ let sectionVLAN = checkUnitConfig "VLAN" [ (assertOnlyFields [ "Id" + "Protocol" "GVRP" "MVRP" "LooseBinding" "ReorderHeader" + "EgressQOSMaps" + "IngressQOSMaps" ]) (assertInt "Id") (assertRange "Id" 0 4094) + (assertValueOneOf "Protocol" [ + "802.1q" + "802.1ad" + ]) (assertValueOneOf "GVRP" boolValues) (assertValueOneOf "MVRP" boolValues) (assertValueOneOf "LooseBinding" boolValues) diff --git a/nixos/tests/beszel.nix b/nixos/tests/beszel.nix index d97108ac2c00..fbc6418c985a 100644 --- a/nixos/tests/beszel.nix +++ b/nixos/tests/beszel.nix @@ -114,6 +114,6 @@ agentHost.succeed("/run/current-system/specialisation/agent/bin/switch-to-configuration switch") agentHost.wait_for_unit("beszel-agent.service") agentHost.wait_until_succeeds("journalctl -eu beszel-agent --grep 'SSH connection established'") - agentHost.wait_until_succeeds(f'curl -H \'Authorization: {user["token"]}\' -f ${agentCfg.environment.HUB_URL}/api/collections/systems/records | grep agentHost') + agentHost.wait_until_succeeds(f'curl -H \'Authorization: {user["token"]}\' -f ${agentCfg.environment.HUB_URL}/api/collections/systems/records | jq -e \'.items[].status == "up"\' ') ''; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5c199aa23ca9..7717970d9263 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -365,8 +365,8 @@ let mktplcRef = { name = "nix-env-selector"; publisher = "arrterian"; - version = "1.1.0"; - hash = "sha256-c5WX5L1hufKwBX64UiaLWOQaZTYma+6AbOphLPEQ9C8="; + version = "1.2.0"; + hash = "sha256-dvJmBoljMNS7I7c1DicIWW0t4GQvBFF9jAz2Z2v4lXw="; }; meta = { license = lib.licenses.mit; @@ -5019,6 +5019,8 @@ let }; }; + vitest.explorer = callPackage ./vitest.explorer { }; + vlanguage.vscode-vlang = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-vlang"; @@ -5219,8 +5221,8 @@ let mktplcRef = { name = "gitblame"; publisher = "waderyan"; - version = "12.1.0"; - sha256 = "sha256-S+OeS7YlygElzO/jgHidlIMLFmAOL3tQPcv/063LIEM="; + version = "13.0.0"; + sha256 = "sha256-I6b4GDM8Ogf+ZH2lD2g4fUkQY9ktuO1xqxfSH6vAMVk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix index 5fe3da3cabb0..19546d9bd0ca 100644 --- a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix @@ -4,6 +4,12 @@ wasm-language-tools, }: +# The update script for the wasm-language-tools package itself updates this +# package too, so we disable nixpkgs-update for this package to avoid sometimes +# accidentally updating just this package by itself. + +# nixpkgs-update: no auto update + vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "gplane"; diff --git a/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix b/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix new file mode 100644 index 000000000000..725208505379 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/vitest.explorer/default.nix @@ -0,0 +1,17 @@ +{ lib, vscode-utils }: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "explorer"; + publisher = "vitest"; + version = "1.48.2"; + hash = "sha256-EaybAznwFjeFEmVW0v9iYCfqvqUKGkjmRBx7mZxvxWw="; + }; + meta = { + changelog = "https://github.com/vitest-dev/vscode/releases"; + description = "Vitest extension for Visual Studio Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=vitest.explorer"; + homepage = "https://github.com/vitest-dev/vscode"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 571d835b518e..87d6be06fdd3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -128,13 +128,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite_buildkite": { - "hash": "sha256-0FtTYHRWUJk2c/4f8bvF8mU1L7L8rFK6YyKqSX6EHFg=", + "hash": "sha256-RNWcVLpgBmwcHuopPRy0NkXXjmFUcWLn+GJy504J0ZA=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.31.2", + "rev": "v1.31.4", "spdx": "MIT", - "vendorHash": "sha256-fRDthgXec+AdKDx0n2/8msa78bd1cUSDPx7VJ+UP8oI=" + "vendorHash": "sha256-CdaYWCQQ0L1LprQ5G/aXoA5GCQWCxOkkiDbMd20r7rs=" }, "camptocamp_pass": { "hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=", @@ -400,13 +400,13 @@ "vendorHash": null }, "fastly_fastly": { - "hash": "sha256-qEBjalezQhcDDeAW/GGf8d70A5iWpWU4C0ABN5HZpAM=", + "hash": "sha256-PCfCsr4FMbMT+BKP+U1Ji51heTmXrOQ/vCgnQYN2u3k=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v8.7.2", + "rev": "v8.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-I+8Ql0/m/vYchnGsg0ADX/wpWwgH79ALN8Cl6gzcS2c=" + "vendorHash": "sha256-WF+9Piyx+6vaUVujmlD3mKIEw/8KNJnlx7RlEWELbRg=" }, "flexibleenginecloud_flexibleengine": { "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=", @@ -715,11 +715,11 @@ "vendorHash": "sha256-rd7QuDdq7xRMyaQIDyXY1DI2Tt/wy3oXan/nE0HIyT0=" }, "huaweicloud_huaweicloud": { - "hash": "sha256-uhhtNjVd4Jp8xYdwWX7XCepFcqZZ0ya/ekadmPvqgMU=", + "hash": "sha256-dBjanfq9CghhGV8L4So3fV2LFw/Yx7g8lLPLWY3GVUI=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.87.0", + "rev": "v1.88.0", "spdx": "MPL-2.0", "vendorHash": null }, diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index de40bb9a3e5a..d39d347770e0 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.27"; + version = "2.28"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-XzP5IKhlYi+ZBpWrKO7xc2Nb4i0ylYctd2aUG8S31DQ="; + hash = "sha256-y5joXR+QZAyYniRSHpD+vJjtjuPyZj2Lg6RFsVvMg9M="; }; # required for build time tool `./tools/translate.c` @@ -55,11 +55,6 @@ stdenv.mkDerivation (finalAttrs: { export USER=nonexistent-but-specified-user ''; - # see https://fossil-scm.org/home/vinfo/4619d2efab946460?diff=1 - preCheck = '' - mv test/settings.test test/settings.test.off - ''; - installPhase = '' mkdir -p $out/bin INSTALLDIR=$out/bin make install diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 1e275362345f..880c138d21c5 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "aliyun-cli"; - version = "3.3.1"; + version = "3.3.3"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-yCHxFJyh4TpQ4Me/WR5YKc7ff7m+qidIWQyKOC8umI0="; + hash = "sha256-v44QWIpFTfUD7gOaQGwJ12MvtO4rMS69rCZr4Hv/e3k="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ar/argonaut/package.nix b/pkgs/by-name/ar/argonaut/package.nix index 4625009caec2..b9ab3c821b17 100644 --- a/pkgs/by-name/ar/argonaut/package.nix +++ b/pkgs/by-name/ar/argonaut/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "argonaut"; - version = "2.14.1"; + version = "2.15.0"; src = fetchFromGitHub { owner = "darksworm"; repo = "argonaut"; tag = "v${finalAttrs.version}"; - hash = "sha256-vD7XDgENQWexNNMq41W0eC0snUA+JUZeXIBTCH1lbks="; + hash = "sha256-LDw2/8l/jipCVIMYeco08LukIfx3Kk1ROXkvU69SK5g="; }; vendorHash = "sha256-xln/WmZbi0+rHqMMHRgt0ar/EaBDNscCsd/NckJZnMw="; diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index 341d843a2df2..b6a486444dde 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "arkade"; - version = "0.11.88"; + version = "0.11.91"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; tag = finalAttrs.version; - hash = "sha256-ISito/qTolDRyYSn3z/J6Zc07RlaKWm7t1ugUt3bDkI="; + hash = "sha256-9X+JVCtvkSU1JE1ZjpMIOedwIhoryWFe25hGWKyjecU="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 7557d14a22b6..027114392ff2 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -125,9 +125,15 @@ py.pkgs.buildPythonApplication rec { ]; postInstall = '' + cat > aws.zsh < filen-version << EOF + #!/bin/sh + exec $out/bin/filen --skip-update "\$@" + EOF + chmod +x filen-version + versionCheckProgram="$(pwd)/filen-version" + ''; + + doInstallCheck = true; meta = { description = "CLI tool for interacting with the Filen cloud"; homepage = "https://github.com/FilenCloudDienste/filen-cli"; - changelog = "https://github.com/FilenCloudDienste/filen-cli/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/FilenCloudDienste/filen-cli/releases/tag/v${version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ eilvelia ]; mainProgram = "filen"; + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; }; -}) +} diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix index 78a5ae9970c3..b3373d8a6f59 100644 --- a/pkgs/by-name/fo/fosrl-olm/package.nix +++ b/pkgs/by-name/fo/fosrl-olm/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "olm"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "fosrl"; repo = "olm"; tag = finalAttrs.version; - hash = "sha256-2FqtucYOfnyOcsEivhZFh18gofcqCGOMhPrr2V91OAM="; + hash = "sha256-G2kYzYg4RUFHgW9z44PcQPK85FsD5SVBefpzBKIwUw0="; }; vendorHash = "sha256-D93SPwXAeoTLCbScjyH8AB9TJIF2b/UbLNMIQYi+B+c="; diff --git a/pkgs/by-name/ge/genemichaels/package.nix b/pkgs/by-name/ge/genemichaels/package.nix index 532aef28d5a6..c992d35bd362 100644 --- a/pkgs/by-name/ge/genemichaels/package.nix +++ b/pkgs/by-name/ge/genemichaels/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "genemichaels"; - version = "0.9.5"; + version = "0.9.6"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-KaGG2amPk/+fL7xLAfZw4SmCzXc+hS/9IkBG7G6sngI="; + hash = "sha256-H/IqREaLvfKQZGOioIJ7t3GdNzTTiE3fYlMOaxXASr4="; }; - cargoHash = "sha256-RkGKzE/EKA1VUkVTTMdMKhtUrs3kmy4uDAHq2hJs5yk="; + cargoHash = "sha256-16axK0kQnkr99x13OvAqhCQz7hT1rRMZIRW4MgNOo40="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index af8512eaaf00..7174fc1fca70 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -1,25 +1,25 @@ { lib, fetchFromGitHub, - buildGo126Module, + buildGoModule, installShellFiles, stdenv, testers, gh, }: -buildGo126Module (finalAttrs: { +buildGoModule (finalAttrs: { pname = "gh"; - version = "2.88.1"; + version = "2.89.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-aM5hpkI4MTQ6eNUB4FVNQRSNUmwI84dTdVMUANtrnJk="; + hash = "sha256-SiPcji8CbJd6GwWmsIFWq3874Mr9/VggOATX9yKYjow="; }; - vendorHash = "sha256-RD40Lqg6EF0T12JJ7Y4B5L2KIvwRHcgGRU1UMiU3qTo="; + vendorHash = "sha256-Sko+jTkGUTiR66Mv/p5INv/CLID1EK2v9fY0GfIeckg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gi/github-copilot-cli/sources.json b/pkgs/by-name/gi/github-copilot-cli/sources.json index b9d904295900..6107f20f7847 100644 --- a/pkgs/by-name/gi/github-copilot-cli/sources.json +++ b/pkgs/by-name/gi/github-copilot-cli/sources.json @@ -1,19 +1,19 @@ { - "version": "1.0.4", + "version": "1.0.9", "x86_64-linux": { "name": "copilot-linux-x64", - "hash": "sha256-xZkPmwKuakDB887hcCdBZF3uwQIhrl9ao4E6EOg4JnA=" + "hash": "sha256-FwRLHgibSeqOuq142SRIuPbIw8YVHgSgmwuH41kvWD0=" }, "aarch64-linux": { "name": "copilot-linux-arm64", - "hash": "sha256-ssw8hqcPWkNsHTrYgkGZrE8ft5NU6rukOEidY60FOfk=" + "hash": "sha256-YFaVWsztnMBG3xo4DSAPzlEAMTPLRCYUt34G8M7/yls=" }, "x86_64-darwin": { "name": "copilot-darwin-x64", - "hash": "sha256-Ea4+5mb3D+uOMed2kitUg6NVrKgL8kRQAcA4cdY80ME=" + "hash": "sha256-YdraXVwpfVMPVnzuDCHTdKmuHlgjlAPzwagzDKW5RsE=" }, "aarch64-darwin": { "name": "copilot-darwin-arm64", - "hash": "sha256-TYhpNTp14OiQoa6Ep8wpNsMBYUeQN0TWZPkXcZBjWo8=" + "hash": "sha256-pzXgRrr9dryBVaM2taf1JSidG2zgDa9Sx66Mew4zQZU=" } } diff --git a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix index 1e2ad910c82c..69819d96a2d1 100644 --- a/pkgs/by-name/gr/grafana-dash-n-grab/package.nix +++ b/pkgs/by-name/gr/grafana-dash-n-grab/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "grafana-dash-n-grab"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { rev = "v${finalAttrs.version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-fKLyUaKcZfrBarKumjLmK+g9C0VZOYixxNXP7rU83co="; + sha256 = "sha256-K8/NhTFfYk9oL2wpRxFLobEx3aW6fx7PzLxf5wFNbFY="; }; - vendorHash = "sha256-MXWJ/riQTzAgUNJWvAzSvdHTAzRymlHheeNyJoKGAF4="; + vendorHash = "sha256-8ZIu9U6OFRD4pu8K/AUBesX/SRyMkOKi8cdScHBdKnk="; ldflags = [ "-s" diff --git a/pkgs/by-name/gs/gsender/package.nix b/pkgs/by-name/gs/gsender/package.nix new file mode 100644 index 000000000000..d8909ad9b07d --- /dev/null +++ b/pkgs/by-name/gs/gsender/package.nix @@ -0,0 +1,41 @@ +{ + lib, + appimageTools, + fetchurl, +}: + +let + version = "1.5.7"; + pname = "gsender"; + + src = fetchurl { + url = "https://github.com/Sienci-Labs/gsender/releases/download/v${version}/gSender-${version}-Linux-Intel-64Bit.AppImage"; + hash = "sha256-J+GpDJ1PU07sxAmLON3GLE6RnsrSGPYfhsdESsFU/jQ="; + }; + + appimageContents = appimageTools.extractType2 { inherit pname version src; }; + +in +appimageTools.wrapType2 rec { + inherit pname version src; + + extraInstallCommands = '' + install -Dm444 ${appimageContents}/gsender.desktop -t $out/share/applications/ + install -Dm444 ${appimageContents}/gsender.png -t $out/share/icons/hicolor/512x512/apps/ + + substituteInPlace $out/share/applications/gsender.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=${meta.mainProgram}' + ''; + + meta = { + description = "G-code sender for grbl and grblHAL-based CNCs"; + homepage = "https://sienci.com/gsender/"; + downloadPage = "https://resources.sienci.com/view/gs-installation/"; + changelog = "https://github.com/Sienci-Labs/gsender/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + maintainers = with lib.maintainers; [ FlorisMenninga ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "gsender"; + }; +} diff --git a/pkgs/by-name/ha/harsh/package.nix b/pkgs/by-name/ha/harsh/package.nix index a2dff0649e2a..6010dec3d1f2 100644 --- a/pkgs/by-name/ha/harsh/package.nix +++ b/pkgs/by-name/ha/harsh/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "harsh"; - version = "0.13.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "wakatara"; repo = "harsh"; tag = "v${finalAttrs.version}"; - hash = "sha256-QaHZg/qssHuxp+flSXqwlbTtB8H/zsfwn+yaw0tOb9o="; + hash = "sha256-Dyq6/Soc6J8rmqwvRtgz/H/l9gtSkEb6Ep/CxUteln4="; }; - vendorHash = "sha256-cjlpCTIugNjgY4RKrjJZd4TSM5BqgSKwpd2HJP6V9i4="; + vendorHash = "sha256-yMiw/D1poesgkvJa4jUclityEfhBxhLUTffBnkoWLHw="; nativeCheckInputs = [ writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/hy/hyprspace/config_generated.go b/pkgs/by-name/hy/hyprspace/config_generated.go index 1578bd9d50fd..8da04a859018 100644 --- a/pkgs/by-name/hy/hyprspace/config_generated.go +++ b/pkgs/by-name/hy/hyprspace/config_generated.go @@ -36,9 +36,9 @@ type ConfigPeersElemRoutesElem struct { } // UnmarshalJSON implements json.Unmarshaler. -func (j *ConfigPeersElemRoutesElem) UnmarshalJSON(b []byte) error { +func (j *ConfigPeersElemRoutesElem) UnmarshalJSON(value []byte) error { var raw map[string]interface{} - if err := json.Unmarshal(b, &raw); err != nil { + if err := json.Unmarshal(value, &raw); err != nil { return err } if _, ok := raw["net"]; raw != nil && !ok { @@ -46,7 +46,7 @@ func (j *ConfigPeersElemRoutesElem) UnmarshalJSON(b []byte) error { } type Plain ConfigPeersElemRoutesElem var plain Plain - if err := json.Unmarshal(b, &plain); err != nil { + if err := json.Unmarshal(value, &plain); err != nil { return err } *j = ConfigPeersElemRoutesElem(plain) @@ -54,9 +54,9 @@ func (j *ConfigPeersElemRoutesElem) UnmarshalJSON(b []byte) error { } // UnmarshalJSON implements json.Unmarshaler. -func (j *ConfigPeersElem) UnmarshalJSON(b []byte) error { +func (j *ConfigPeersElem) UnmarshalJSON(value []byte) error { var raw map[string]interface{} - if err := json.Unmarshal(b, &raw); err != nil { + if err := json.Unmarshal(value, &raw); err != nil { return err } if _, ok := raw["id"]; raw != nil && !ok { @@ -64,7 +64,7 @@ func (j *ConfigPeersElem) UnmarshalJSON(b []byte) error { } type Plain ConfigPeersElem var plain Plain - if err := json.Unmarshal(b, &plain); err != nil { + if err := json.Unmarshal(value, &plain); err != nil { return err } if v, ok := raw["name"]; !ok || v == nil { @@ -78,12 +78,53 @@ func (j *ConfigPeersElem) UnmarshalJSON(b []byte) error { } // The services this node provides via the Service Network. -type ConfigServices map[string]string +type ConfigServices map[string]struct { + // Acl corresponds to the JSON schema field "acl". + Acl *ConfigServicesValueAcl `json:"acl,omitempty"` + + // Target address. + Target string `json:"target"` +} + +type ConfigServicesValueAcl struct { + // List of peers that are explicitly not allowed to connect. + Blacklist []string `json:"blacklist,omitempty"` + + // Whether to enable whitelist enforcement. + EnableWhitelist bool `json:"enableWhitelist,omitempty"` + + // List of peers that are allowed to connect. + Whitelist []string `json:"whitelist,omitempty"` +} // UnmarshalJSON implements json.Unmarshaler. -func (j *Config) UnmarshalJSON(b []byte) error { +func (j *ConfigServicesValueAcl) UnmarshalJSON(value []byte) error { var raw map[string]interface{} - if err := json.Unmarshal(b, &raw); err != nil { + if err := json.Unmarshal(value, &raw); err != nil { + return err + } + type Plain ConfigServicesValueAcl + var plain Plain + if err := json.Unmarshal(value, &plain); err != nil { + return err + } + if v, ok := raw["blacklist"]; !ok || v == nil { + plain.Blacklist = []string{} + } + if v, ok := raw["enableWhitelist"]; !ok || v == nil { + plain.EnableWhitelist = false + } + if v, ok := raw["whitelist"]; !ok || v == nil { + plain.Whitelist = []string{} + } + *j = ConfigServicesValueAcl(plain) + return nil +} + +// UnmarshalJSON implements json.Unmarshaler. +func (j *Config) UnmarshalJSON(value []byte) error { + var raw map[string]interface{} + if err := json.Unmarshal(value, &raw); err != nil { return err } if _, ok := raw["privateKey"]; raw != nil && !ok { @@ -91,7 +132,7 @@ func (j *Config) UnmarshalJSON(b []byte) error { } type Plain Config var plain Plain - if err := json.Unmarshal(b, &plain); err != nil { + if err := json.Unmarshal(value, &plain); err != nil { return err } if v, ok := raw["listenAddresses"]; !ok || v == nil { @@ -106,7 +147,7 @@ func (j *Config) UnmarshalJSON(b []byte) error { plain.Peers = []ConfigPeersElem{} } if v, ok := raw["services"]; !ok || v == nil { - plain.Services = map[string]string{} + plain.Services = ConfigServices{} } *j = Config(plain) return nil diff --git a/pkgs/by-name/hy/hyprspace/package.nix b/pkgs/by-name/hy/hyprspace/package.nix index 9444accc3d12..efefaeb3bc27 100644 --- a/pkgs/by-name/hy/hyprspace/package.nix +++ b/pkgs/by-name/hy/hyprspace/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "hyprspace"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "hyprspace"; repo = "hyprspace"; tag = "v${finalAttrs.version}"; - hash = "sha256-VOufAPhCbLzVxrj/XKwunJkxUx0EAovV4+adrQLwcoI="; + hash = "sha256-AsOgnnYZRoB/t2XwrTMD8XIHoy/bl6bqUvIT5e02uNo="; }; env.CGO_ENABLED = "0"; diff --git a/pkgs/by-name/li/libraop/link-libssl.diff b/pkgs/by-name/li/libraop/link-libssl.diff new file mode 100644 index 000000000000..975826c30276 --- /dev/null +++ b/pkgs/by-name/li/libraop/link-libssl.diff @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index 7d735b8..c3ea73a 100644 +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,9 @@ OBJECTS_BIN += $(patsubst %.cpp,$(BUILDDIR)/%.o,$(filter %.cpp,$(SOURCES_BIN))) + + LIBRARY = $(CODECS)/$(HOST)/$(PLATFORM)/libcodecs.a $(MDNS)/$(HOST)/$(PLATFORM)/libmdns.a + +-ifneq ($(STATIC),) ++ifeq ($(STATIC),) ++LDFLAGS += -lcrypto ++else + LIBRARY += $(OPENSSL)/libopenssl.a + DEFINES += -DSSL_STATIC_LIB + endif diff --git a/pkgs/by-name/li/libraop/package.nix b/pkgs/by-name/li/libraop/package.nix new file mode 100644 index 000000000000..036cc1e311da --- /dev/null +++ b/pkgs/by-name/li/libraop/package.nix @@ -0,0 +1,83 @@ +{ + lib, + fetchFromGitHub, + openssl, + stdenv, +}: + +let + host = + if stdenv.hostPlatform.isLinux then + "linux" + else if stdenv.hostPlatform.isDarwin then + "macos" + else + throw "libraop does not support this platform, yet"; +in +stdenv.mkDerivation { + pname = "libraop"; + version = "0-unstable-2026-02-09"; + + src = fetchFromGitHub { + owner = "music-assistant"; + repo = "libraop"; + # we try to closely match the commit used in the last music-assistant release from + # https://github.com/music-assistant/server/tree/stable/music_assistant/providers/airplay/bin + rev = "f49284282ea4ea740d07fabc230b4182f8c69a74"; + fetchSubmodules = true; + hash = "sha256-m1ll5vRZx4d/5IWCG24yY/SWEIIz2k/iU84vQKHlCdo="; + }; + + patches = [ + # https://github.com/philippe44/libraop/pull/48 + ./link-libssl.diff + ]; + + postPatch = '' + # the most security critical part we build ourself + rm -r libopenssl/ + + # do not confuse the prebuilt binaries with the ones we build + rm bin/* + + # easen debugging and we strip ourselves, too + substituteInPlace Makefile \ + --replace-fail "LDFLAGS += -s" "LDFLAGS +=" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # on darwin the direct dlopen to system libcrypto crashes with + # WARNING: /nix/store/.../bin/cliraop is loading libcrypto in an unsafe way + # Abort trap: 6 + substituteInPlace crosstools/src/cross_ssl.c \ + --replace-fail '"libcrypto.dylib"' '"${lib.getLib openssl}/lib/libcrypto.dylib"' \ + --replace-fail '"libssl.dylib"' '"${lib.getLib openssl}/lib/libssl.dylib"' + ''; + + buildInputs = [ + openssl + ]; + + makeFlags = [ + "HOST=${host}" + "PLATFORM=${stdenv.hostPlatform.uname.processor}" + ]; + + installPhase = '' + mkdir -p $out/bin + cp bin/cliraop-${host}-${stdenv.hostPlatform.uname.processor} $out/bin/cliraop + ''; + + meta = { + description = "RAOP player and library (AirPlay)"; + homepage = "https://github.com/music-assistant/libraop"; + # https://github.com/philippe44/libraop/issues/36 + license = with lib.licenses; [ + gpl2Only + mit + ]; + maintainers = with lib.maintainers; [ SuperSandro2000 ]; + mainProgram = "cliraop"; + platforms = with lib.platforms; linux ++ darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/ma/mailutils/package.nix b/pkgs/by-name/ma/mailutils/package.nix index 10e2b3c8b142..33011d4ddf08 100644 --- a/pkgs/by-name/ma/mailutils/package.nix +++ b/pkgs/by-name/ma/mailutils/package.nix @@ -25,7 +25,6 @@ system-sendmail, libxcrypt, mkpasswd, - nss_wrapper, pythonSupport ? true, guileSupport ? true, @@ -113,21 +112,8 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dejagnu mkpasswd - nss_wrapper ]; - preCheck = '' - # The nix sandbox's /etc/passwd has literal quotes around the home directory - # (e.g. "/build" instead of /build). imap4d's mu_homedir_assert (new in - # 3.21) calls stat() on this path, which fails because no directory named - # '"/build"' exists. Use nss_wrapper to provide a fixed passwd to the tests. - sed 's/"//g' /etc/passwd > "$TMPDIR/passwd" - sed 's/"//g' /etc/group > "$TMPDIR/group" 2>/dev/null || echo "nixbld:x:100:" > "$TMPDIR/group" - export LD_PRELOAD="${nss_wrapper}/lib/libnss_wrapper.so" - export NSS_WRAPPER_PASSWD="$TMPDIR/passwd" - export NSS_WRAPPER_GROUP="$TMPDIR/group" - ''; - doCheck = !stdenv.hostPlatform.isDarwin; # ERROR: All 46 tests were run, 46 failed unexpectedly. meta = { diff --git a/pkgs/by-name/md/mdq/package.nix b/pkgs/by-name/md/mdq/package.nix index d91c0553c703..2886191d740c 100644 --- a/pkgs/by-name/md/mdq/package.nix +++ b/pkgs/by-name/md/mdq/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdq"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "yshavit"; repo = "mdq"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ys5Ol/j4IZ4SNp6TjryfHCIgWoEu3ToNp7ffiTZp5BE="; + hash = "sha256-3WIw0n7fRJqOYpkdLh949JpbKKGUVcnnc+On2aWBXTE="; }; - cargoHash = "sha256-fwFi/OYlTqRuDDE2TKuvf9T7u0hLyrDejhOwjFDYHAk="; + cargoHash = "sha256-3HXPN0E4HRMVtHZbmmUO+2bPd2C8rTjTVHGcFPM2OFY="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix index 17c1b6ba0d9b..8d25a5c9bc0d 100644 --- a/pkgs/by-name/mo/models-dev/package.nix +++ b/pkgs/by-name/mo/models-dev/package.nix @@ -9,12 +9,12 @@ }: let pname = "models-dev"; - version = "0-unstable-2026-03-17"; + version = "0-unstable-2026-03-26"; src = fetchFromGitHub { owner = "anomalyco"; repo = "models.dev"; - rev = "7d3cc61a48f545739f05042b43110ea11147ac03"; - hash = "sha256-Iyg1IAp3AiqxPqYil/ZhH7dXxkwxW9B3t3LwYMTiRjE="; + rev = "62015086c67bd76ebeb29cecb468834c9e17b938"; + hash = "sha256-fIqUY3usE8pf10Q0SmLUZ9VB6TXeyiXcX4j97NRS4u4="; }; node_modules = stdenvNoCC.mkDerivation { diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix index 0c612503572e..896dbb72a08f 100644 --- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix +++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "mongodb-atlas-cli"; - version = "1.53.0"; + version = "1.53.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongodb-atlas-cli"; tag = "atlascli/v${finalAttrs.version}"; - hash = "sha256-BOqXkm7PJAZUx1fuuTXhrubgWcI6MNiS6nBIRQEILVY="; + hash = "sha256-njclhtUYLya51mZSb4VKdR0CslaVGpFbYPw4v9qMEjo="; }; - vendorHash = "sha256-ANwv4OGmMcdPssMzDIYGPPDjdQqqlCqxx9UR5nMf3Jo="; + vendorHash = "sha256-5P5wiWY4KnSR2T67BT/9d1xKPZdCZ7SE6oYjWmMcN/Q="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 01acc164013f..698a8dda011a 100644 --- a/pkgs/by-name/ms/msolve/package.nix +++ b/pkgs/by-name/ms/msolve/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msolve"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; tag = "v${finalAttrs.version}"; - hash = "sha256-wlZLmX4a3QjBWraM3DS++YaO1FSzMbvi2wWgrxnwm8U="; + hash = "sha256-zty220Elqa8SACM9OlemVNEMbMx9DkhjJjUekZFR67A="; }; postPatch = '' diff --git a/pkgs/by-name/mu/music-assistant/cliraop-cliap2.patch b/pkgs/by-name/mu/music-assistant/cliraop-cliap2.patch new file mode 100644 index 000000000000..33b856711eed --- /dev/null +++ b/pkgs/by-name/mu/music-assistant/cliraop-cliap2.patch @@ -0,0 +1,29 @@ +diff --git a/music_assistant/providers/airplay/helpers.py b/music_assistant/providers/airplay/helpers.py +index c5fef7eb..a628622d 100644 +--- a/music_assistant/providers/airplay/helpers.py ++++ b/music_assistant/providers/airplay/helpers.py +@@ -6,6 +6,7 @@ + import os + import platform + import time ++from shutil import which + from typing import TYPE_CHECKING + + from zeroconf import IPVersion +@@ -176,7 +177,6 @@ async def check_binary(cli_path: str) -> str | None: + pass + return None + +- base_path = os.path.join(os.path.dirname(__file__), "bin") + system = platform.system().lower().replace("darwin", "macos") + architecture = platform.machine().lower() + +@@ -188,7 +188,7 @@ async def check_binary(cli_path: str) -> str | None: + raise RuntimeError(f"Unsupported streaming protocol requested: {protocol}") + + if bridge_binary := await check_binary( +- os.path.join(base_path, f"{package}-{system}-{architecture}") ++ which(package) + ): + return bridge_binary + diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index da451012f6aa..bf28c26fbe79 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -40,11 +40,6 @@ let pythonPath = python.pkgs.makePythonPath providerDependencies; in - -assert - (lib.elem "airplay" providers) - -> throw "music-assistant: airplay support is missing libraop, a library we will not package because it depends on OpenSSL 1.1."; - python.pkgs.buildPythonApplication rec { pname = "music-assistant"; version = "2.7.11"; @@ -66,6 +61,12 @@ python.pkgs.buildPythonApplication rec { # Look up librespot from PATH at runtime ./librespot.patch + # Look up shairport-sync from PATH at runtime + ./shairport-sync.patch + + # Look up cliraop/cliap2 from PATH at runtime + ./cliraop-cliap2.patch + # Disable interactive dependency resolution, which clashes with the immutable Python environment ./dont-install-deps.patch @@ -91,7 +92,16 @@ python.pkgs.buildPythonApplication rec { substituteInPlace pyproject.toml \ --replace-fail "get-mac" "getmac" - rm -rv music_assistant/providers/spotify/bin + rm -rv \ + music_assistant/providers/airplay/bin/{cliap2-*,cliraop-*} \ + music_assistant/providers/airplay_receiver/bin/{build_binaries.sh,shairport-sync-*} \ + music_assistant/providers/spotify/bin + + found_bins=$(find music_assistant/ -wholename '*/bin/*' -type f -executable -print0 | tr '\0' ' ') + if [[ -n $found_bins ]]; then + echo "Found binaries that should be replaced with packages built from source: $found_bins" + exit 2 + fi ''; build-system = with python.pkgs; [ @@ -192,11 +202,6 @@ python.pkgs.buildPythonApplication rec { pythonImportsCheck = [ "music_assistant" ]; - postFixup = '' - # binary native code, segfaults when autopatchelf'd, requires openssl 1.1 to build - rm $out/${python3.sitePackages}/music_assistant/providers/airplay/bin/cliraop-* - ''; - passthru = { inherit python diff --git a/pkgs/by-name/mu/music-assistant/shairport-sync.patch b/pkgs/by-name/mu/music-assistant/shairport-sync.patch new file mode 100644 index 000000000000..298d06f59449 --- /dev/null +++ b/pkgs/by-name/mu/music-assistant/shairport-sync.patch @@ -0,0 +1,20 @@ +diff --git a/music_assistant/providers/airplay_receiver/helpers.py b/music_assistant/providers/airplay_receiver/helpers.py +index 6f2b35df..dd839b73 100644 +--- a/music_assistant/providers/airplay_receiver/helpers.py ++++ b/music_assistant/providers/airplay_receiver/helpers.py +@@ -22,15 +22,9 @@ async def check_shairport_sync(shairport_path: str) -> str | None: + except OSError: + return None + +- # First, check if bundled binary exists +- base_path = os.path.join(os.path.dirname(__file__), "bin") + system = platform.system().lower().replace("darwin", "macos") + architecture = platform.machine().lower() + +- if shairport_binary := await check_shairport_sync( +- os.path.join(base_path, f"shairport-sync-{system}-{architecture}") +- ): +- return shairport_binary + + # If no bundled binary, check system PATH + if system_binary := shutil.which("shairport-sync"): diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix index 386a15f54d18..18fdd1b7dd0a 100644 --- a/pkgs/by-name/na/nats-top/package.nix +++ b/pkgs/by-name/na/nats-top/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "nats-top"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats-top"; tag = "v${finalAttrs.version}"; - hash = "sha256-NOU0U1hyP9FCSLK0ulf28cx1K0/KWKQd+t3KtaVqWWo="; + hash = "sha256-yewSURZ5uFfDiSRjLmv8QU7XxTVsnZK2RvsPQ/ZEkRw="; }; - vendorHash = "sha256-BQzOlX7Zrtlcd6+O92JoouzC1QCCbgRAeJoYn/runYA="; + vendorHash = "sha256-BY2WPwU6my1cqddgZvZl36KXKCpMo5RLT4bhk/b+xCM="; ldflags = [ "-s" diff --git a/pkgs/by-name/ne/netifd/package.nix b/pkgs/by-name/ne/netifd/package.nix index fc00cd29eb3f..0e96efa1ca96 100644 --- a/pkgs/by-name/ne/netifd/package.nix +++ b/pkgs/by-name/ne/netifd/package.nix @@ -3,10 +3,11 @@ stdenv, cmake, fetchgit, - libnl, + libnl-tiny, libubox, uci, ubus, + ucode, json_c, pkg-config, udebug, @@ -14,19 +15,20 @@ stdenv.mkDerivation { pname = "netifd"; - version = "unstable-2023-11-27"; + version = "0-unstable-2026-02-26"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; - rev = "02bc2e14d1d37500e888c0c53ac41398a56b5579"; - hash = "sha256-aMs/Y50+1Yk/j5jGubjBCRcPGw03oIitvEygaxRlr90="; + rev = "69a5afc9713adf31edbf3228a7a372ada7bba449"; + hash = "sha256-R/ryiFiKNM7zrIgzlalAK0lNJF/vzWL56E9CbptJtmI="; }; buildInputs = [ - libnl.dev + libnl-tiny libubox uci ubus + ucode json_c udebug ]; @@ -45,11 +47,11 @@ stdenv.mkDerivation { sed "s|./ethtool-modes.h|$PWD/ethtool-modes.h|g" -i CMakeLists.txt ''; - env.NIX_CFLAGS_COMPILE = toString ( - lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ - "-Wno-error=maybe-uninitialized" - ] - ); + cmakeFlags = [ + (lib.cmakeFeature "LIBNL_LIBS" "-lnl-tiny") + ]; + + env.NIX_CFLAGS_COMPILE = "-I${libnl-tiny}/include/libnl-tiny"; meta = { description = "OpenWrt Network interface configuration daemon"; diff --git a/pkgs/by-name/nh/nhentai/package.nix b/pkgs/by-name/nh/nhentai/package.nix index dc42621d9d6a..ac88077ebddc 100644 --- a/pkgs/by-name/nh/nhentai/package.nix +++ b/pkgs/by-name/nh/nhentai/package.nix @@ -57,6 +57,7 @@ python.pkgs.buildPythonApplication rec { ]; pythonRelaxDeps = [ + "tabulate" "urllib3" ]; diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix index 9164119c64bb..8d34b98d578a 100644 --- a/pkgs/by-name/no/node-red/package.nix +++ b/pkgs/by-name/no/node-red/package.nix @@ -9,16 +9,16 @@ buildNpmPackage rec { pname = "node-red"; - version = "4.1.7"; + version = "4.1.8"; src = fetchFromGitHub { owner = "node-red"; repo = "node-red"; tag = version; - hash = "sha256-J7LwIXicEMlWtnO1dXjipVOOQQKUB2bc8uJu0Yd/J7s="; + hash = "sha256-IjV3hS1v+KgtXbXO2/Nr4GpABK+l2HXfqsPukGD7ViQ="; }; - npmDepsHash = "sha256-OiaUGSpSiQoQlwh28FZcKD1lPjt6VrTLu0KuOfAg2IE="; + npmDepsHash = "sha256-eFRA3oJeuxHWrZepWyGztvNdJ3QKG+J6pAxQhdVqxxw="; nativeBuildInputs = [ jq ]; diff --git a/pkgs/by-name/on/onednn/package.nix b/pkgs/by-name/on/onednn/package.nix index 297ca30b7747..88d5544d993e 100644 --- a/pkgs/by-name/on/onednn/package.nix +++ b/pkgs/by-name/on/onednn/package.nix @@ -11,13 +11,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation (finalAttrs: { pname = "onednn"; - version = "3.10.2"; + version = "3.11.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${finalAttrs.version}"; - hash = "sha256-/e57voLBNun/2koTF3sEb0Z/nDjCwq9NJVk7TaTSvMY="; + hash = "sha256-1U932f5RgXT0DVg0rk2GwbdVqtkibctsTYTX7ey9HVY="; }; outputs = [ diff --git a/pkgs/by-name/os/ostui/package.nix b/pkgs/by-name/os/ostui/package.nix index 178be739e526..51a739a57f6f 100644 --- a/pkgs/by-name/os/ostui/package.nix +++ b/pkgs/by-name/os/ostui/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "ostui"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromSourcehut { owner = "~ser"; repo = "ostui"; rev = "v${finalAttrs.version}"; - hash = "sha256-efX19jkJnXyO4iuY2EZqhtLJZ7R/Q2JQZf72gyLgY8k="; + hash = "sha256-85vCyKcQIGjO6raYgKUt4D3N9UjbBJmEKkWxUB4Av48="; }; - vendorHash = "sha256-Vmjd0bbeR9+PZCjh1cczE5MWeH5PDVE6obJLmV0wCLQ="; + vendorHash = "sha256-3FP+qZChS9A8R6il282pkyFweeOolrAu0L0WFcnrdKI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ou/ouch-rar/package.nix b/pkgs/by-name/ou/ouch-rar/package.nix new file mode 100644 index 000000000000..2bf91a102512 --- /dev/null +++ b/pkgs/by-name/ou/ouch-rar/package.nix @@ -0,0 +1 @@ +{ ouch }: ouch.override { enableUnfree = true; } diff --git a/pkgs/by-name/ow/owocr/package.nix b/pkgs/by-name/ow/owocr/package.nix index 9ab0eb7eddd3..782c77fca9eb 100644 --- a/pkgs/by-name/ow/owocr/package.nix +++ b/pkgs/by-name/ow/owocr/package.nix @@ -5,14 +5,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "owocr"; - version = "1.26.5"; + version = "1.26.7"; pyproject = true; src = fetchFromGitHub { owner = "AuroraWright"; repo = "owocr"; tag = finalAttrs.version; - hash = "sha256-ZISL0K16Ilmne8SZ5+L7FSxjZJd8j7tDklUOjPvw7HM="; + hash = "sha256-OdGYxyJiIfkDxz6RyR9IrdO8ILCNHqb8CjSaUylauZA="; }; # we use pystray directly to avoid making a new package diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix index 9648411c4756..ae901d69ff7d 100644 --- a/pkgs/by-name/ox/oxlint/package.nix +++ b/pkgs/by-name/ox/oxlint/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "oxlint"; - version = "1.56.0"; + version = "1.57.0"; src = fetchFromGitHub { owner = "oxc-project"; repo = "oxc"; tag = "oxlint_v${finalAttrs.version}"; - hash = "sha256-AgOfOuZRzT/sq1LpdiH8p6ib5+dDTs6FnQIiehC2Iic="; + hash = "sha256-IMGrnOZlNmVDBlyWnXflm3G7A4w3uBWc9thOjTELmVs="; }; - cargoHash = "sha256-n8i3zF0WnLAenFU3NbUla3pVYxxr5r2IPwRTGCxSCAI="; + cargoHash = "sha256-ptLprKpkyAx+5/13MsH6lpnF9gznhsWQbcdoCOiPSXQ="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/po/pods/cve-2025-62516.patch b/pkgs/by-name/po/pods/cve-2025-62516.patch deleted file mode 100644 index 6163c8b82b18..000000000000 --- a/pkgs/by-name/po/pods/cve-2025-62516.patch +++ /dev/null @@ -1,200 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index e799bfd1..efd6601a 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -86,6 +86,21 @@ dependencies = [ - "zbus", - ] - -+[[package]] -+name = "astral-tokio-tar" -+version = "0.5.6" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ec179a06c1769b1e42e1e2cbe74c7dcdb3d6383c838454d063eaac5bbb7ebbe5" -+dependencies = [ -+ "filetime", -+ "futures-core", -+ "libc", -+ "portable-atomic", -+ "rustc-hash", -+ "tokio", -+ "tokio-stream", -+] -+ - [[package]] - name = "async-broadcast" - version = "0.7.2" -@@ -147,12 +162,6 @@ version = "0.13.1" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - --[[package]] --name = "bitflags" --version = "1.3.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -- - [[package]] - name = "bitflags" - version = "2.9.0" -@@ -213,7 +222,7 @@ version = "0.20.7" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7" - dependencies = [ -- "bitflags 2.9.0", -+ "bitflags", - "cairo-sys-rs", - "glib", - "libc", -@@ -833,7 +842,7 @@ version = "0.20.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686" - dependencies = [ -- "bitflags 2.9.0", -+ "bitflags", - "futures-channel", - "futures-core", - "futures-executor", -@@ -1368,9 +1377,9 @@ version = "0.1.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" - dependencies = [ -- "bitflags 2.9.0", -+ "bitflags", - "libc", -- "redox_syscall 0.5.10", -+ "redox_syscall", - ] - - [[package]] -@@ -1488,7 +1497,7 @@ version = "0.29.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" - dependencies = [ -- "bitflags 2.9.0", -+ "bitflags", - "cfg-if", - "cfg_aliases", - "libc", -@@ -1842,6 +1851,7 @@ version = "2.2.0" - dependencies = [ - "anyhow", - "ashpd", -+ "astral-tokio-tar", - "futures", - "gettext-rs", - "gtk4", -@@ -1860,11 +1870,16 @@ dependencies = [ - "syslog", - "tokio", - "tokio-stream", -- "tokio-tar", - "vte", - "vte4", - ] - -+[[package]] -+name = "portable-atomic" -+version = "1.11.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483" -+ - [[package]] - name = "powerfmt" - version = "0.2.0" -@@ -1973,22 +1988,13 @@ dependencies = [ - "getrandom 0.3.2", - ] - --[[package]] --name = "redox_syscall" --version = "0.3.5" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" --dependencies = [ -- "bitflags 1.3.2", --] -- - [[package]] - name = "redox_syscall" - version = "0.5.10" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" - dependencies = [ -- "bitflags 2.9.0", -+ "bitflags", - ] - - [[package]] -@@ -2026,6 +2032,12 @@ version = "0.1.24" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - -+[[package]] -+name = "rustc-hash" -+version = "2.1.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" -+ - [[package]] - name = "rustc_version" - version = "0.4.1" -@@ -2041,7 +2053,7 @@ version = "1.0.3" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96" - dependencies = [ -- "bitflags 2.9.0", -+ "bitflags", - "errno", - "libc", - "linux-raw-sys", -@@ -2434,20 +2446,6 @@ dependencies = [ - "tokio", - ] - --[[package]] --name = "tokio-tar" --version = "0.3.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75" --dependencies = [ -- "filetime", -- "futures-core", -- "libc", -- "redox_syscall 0.3.5", -- "tokio", -- "tokio-stream", --] -- - [[package]] - name = "toml" - version = "0.8.20" -@@ -2862,7 +2860,7 @@ version = "0.39.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" - dependencies = [ -- "bitflags 2.9.0", -+ "bitflags", - ] - - [[package]] -diff --git a/Cargo.toml b/Cargo.toml -index 9a0b95d7..7d818fbf 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -8,6 +8,7 @@ edition = "2024" - adw = { version = "0.7", package = "libadwaita", features = ["v1_7"] } - anyhow = "1" - ashpd = { version = "0.11", default-features = false, features = ["gtk4", "tokio"] } -+astral-tokio-tar = { version = "0.5.6", default-features = false } - futures = { version = "0.3", default-features = false } - gettext-rs = { version = "=0.7.0", features = ["gettext-system"] } - gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] } -@@ -25,7 +26,6 @@ sourceview5 = { version = "0.9" } - syslog = "7" - tokio = "1" - tokio-stream = { version = "0.1", default-features = false } --tokio-tar = { version = "0.3", default-features = false } - vte = { version = "0.15", default-features = false } - vte4 = "0.8" - diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix index fe70abdc40e6..96bbdc2008a1 100644 --- a/pkgs/by-name/po/pods/package.nix +++ b/pkgs/by-name/po/pods/package.nix @@ -2,8 +2,7 @@ lib, stdenv, fetchFromGitHub, - applyPatches, - fetchpatch2, + blueprint-compiler, cargo, desktop-file-utils, glib, @@ -24,29 +23,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "pods"; - version = "2.2.0"; + version = "2.3.0"; - src = applyPatches { - name = "pods-patched"; - src = fetchFromGitHub { - owner = "marhkb"; - repo = "pods"; - tag = "v${finalAttrs.version}"; - hash = "sha256-m+0XjxY0nDAJbVX3r/Jfg+G+RU8Q51e0ZXxkdH69SiQ="; - }; - - # Based on upstream PR: https://github.com/marhkb/pods/pull/895 - # which cannot be merged into 2.2.0 because dependencies were bumped since its release. - # Hopefully 2.2.1 will be released soon - patches = [ ./cve-2025-62516.patch ]; + src = fetchFromGitHub { + owner = "marhkb"; + repo = "pods"; + tag = "v${finalAttrs.version}"; + hash = "sha256-JWOxp3J+7k0ikdFJ8SDFcspuM5SO5rQm5/21G4FAAag="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-GBWaGCNXYCiT/favrIYB30VGMMoQQk1iUh4GTNPerK8="; + hash = "sha256-UkXBlqFmODlJEm2NBHdKoO5Yc086NAHjo9HOuWb3Jq0="; }; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils glib gtk4 @@ -70,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; - passthru = { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Podman desktop application"; diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix index 48b4d7353561..415c77e9b913 100644 --- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix +++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rabbitmqadmin-ng"; - version = "2.26.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "rabbitmq"; repo = "rabbitmqadmin-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-tc4ihqSZ+lIGg4PXzsLp51fMgYi2frsv6rxkOgp8J9k="; + hash = "sha256-On4eUeFM4/GDfbGJ7249LTAu3srAbxU6vizsGP3sXj4="; }; - cargoHash = "sha256-V1ANIUTLYOfFEzIzEMFHiQD5hKFhv6maK5+bRS9TXTg="; + cargoHash = "sha256-Xr6j5lCdl0CXj3nWBMawHAWoizrMR7KABC3nIFc9kgk="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ra/rarcrack/package.nix b/pkgs/by-name/ra/rarcrack/package.nix index 655abf31b7ea..c2d9d940098e 100644 --- a/pkgs/by-name/ra/rarcrack/package.nix +++ b/pkgs/by-name/ra/rarcrack/package.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation { substituteInPlace rarcrack.c --replace "file -i" "${file}/bin/file -i" ''; + env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + preInstall = '' mkdir -p $out/bin ''; diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix index 2999eda5dab1..a23e04803f80 100644 --- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix +++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "rust-analyzer-unwrapped"; - version = "2026-03-16"; + version = "2026-03-23"; cargoHash = "sha256-osoNyx4UEbq0J2fx7WMJBfIRV3mhsO+OSBNrvu060IM="; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "rust-lang"; repo = "rust-analyzer"; rev = finalAttrs.version; - hash = "sha256-CKmkYqUi2pI1uDGDfpK0mkZbRLyjUKCpYDU3eMHtmks="; + hash = "sha256-aEIdkqB8gtQZtEbogdUb5iyfcZpKIlD3FkG8ANu73/I="; }; cargoBuildFlags = [ diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index 2b9897c5e937..d699824507c5 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -27,6 +27,7 @@ soxr, alac, sndio, + enableAvahi ? true, enableAirplay2 ? false, enableStdout ? true, enableAlsa ? true, @@ -45,6 +46,7 @@ enableAlac ? true, enableConvolution ? true, enableLibdaemon ? false, + enableTinySVCmDNS ? true, }: let @@ -79,10 +81,10 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ openssl - avahi popt libconfig ] + ++ optional enableAvahi avahi ++ optional enableLibdaemon libdaemon ++ optional enableAlsa alsa-lib ++ optional enableSndio sndio @@ -115,9 +117,8 @@ stdenv.mkDerivation (finalAttrs: { "--without-configfiles" "--sysconfdir=/etc" "--with-ssl=openssl" - "--with-stdout" - "--with-avahi" ] + ++ optional enableAvahi "--with-avahi" ++ optional enablePulse "--with-pa" ++ optional enablePipewire "--with-pw" ++ optional enableAlsa "--with-alsa" @@ -134,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optional enableMetadata "--with-metadata" ++ optional enableMpris "--with-mpris-interface" ++ optional enableMqttClient "--with-mqtt-client" + ++ optional enableTinySVCmDNS "--with-tinysvcmdns" ++ optional enableLibdaemon "--with-libdaemon" ++ optional enableAirplay2 "--with-airplay-2"; diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix index 0ed59725427a..90d7ceb8ccb6 100644 --- a/pkgs/by-name/si/sing-box/package.nix +++ b/pkgs/by-name/si/sing-box/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "sing-box"; - version = "1.13.3"; + version = "1.13.4"; src = fetchFromGitHub { owner = "SagerNet"; repo = "sing-box"; tag = "v${finalAttrs.version}"; - hash = "sha256-Kf9aVnCvN6wSegBzFyix+sUtvl/b+zUrbXDf7baxfNo="; + hash = "sha256-4u1GgIBXkFrorcZ9Z+83peaIlZHmUp6zmsZWC4k9GkY="; }; - vendorHash = "sha256-oQst3UHdQ2aHc/yS2w72mSu8Set+CsgNZgYLnwUcmNo="; + vendorHash = "sha256-mfgCwTXwd6T1mzmHR3tTF4aKtfn4ehztVyeXrtEKDsk="; tags = [ "with_gvisor" diff --git a/pkgs/by-name/si/sirit/package.nix b/pkgs/by-name/si/sirit/package.nix index 05d19cf15f18..c50f977610c5 100644 --- a/pkgs/by-name/si/sirit/package.nix +++ b/pkgs/by-name/si/sirit/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "sirit"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "eden-emulator"; repo = "sirit"; tag = "v${finalAttrs.version}"; - hash = "sha256-ThyUaoVmnYz9eQ1a19BbLhqfOpPxRjSovBl2wvlfRoI="; + hash = "sha256-eiuAdnPBJAMCRbkwJkqjyaskBCa2/Cm0F3gqFwe3ePg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/so/softether/package.nix b/pkgs/by-name/so/softether/package.nix index e01d86549033..ac3a60810c37 100644 --- a/pkgs/by-name/so/softether/package.nix +++ b/pkgs/by-name/so/softether/package.nix @@ -53,6 +53,10 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" "-Wno-implicit-function-declaration" + + # Fix build with gcc15 (-std=gnu23) + "-std=gnu17" + ]; meta = { diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix index 32aed5579138..e212a8bdcf61 100644 --- a/pkgs/by-name/sp/spaceship-prompt/package.nix +++ b/pkgs/by-name/sp/spaceship-prompt/package.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "spaceship-prompt"; - version = "4.22.0"; + version = "4.22.1"; src = fetchFromGitHub { owner = "denysdovhan"; repo = "spaceship-prompt"; rev = "v${version}"; - sha256 = "sha256-+2Nlao4w3DoAqIMgc68iyUAXdTyPGrW9cfG1brELlyo="; + sha256 = "sha256-shZf1IfSkHnaHnQ4idiDrmaJYXtViwGntpfEOBUDyBk="; }; strictDeps = true; diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix index a37b4ba47b91..221077f0aea8 100644 --- a/pkgs/by-name/su/supercronic/package.nix +++ b/pkgs/by-name/su/supercronic/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "supercronic"; - version = "0.2.43"; + version = "0.2.44"; src = fetchFromGitHub { owner = "aptible"; repo = "supercronic"; rev = "v${finalAttrs.version}"; - hash = "sha256-X6Q/TiABNVVgsKZOzWhiaKhhHFindWgrX721mfO5b3Q="; + hash = "sha256-xtTQ5T+/kVnh4sjIN/N9HN9MeEd2ekAzSkvYdei0dKA="; }; - vendorHash = "sha256-w7BL/OgNbm4mMZ6x4zZhN7kYFmUOEX7ixYzocAFzAcU="; + vendorHash = "sha256-azjkMzmAhAKyHx/43cP0kpgo0mKM8Yh+LWHiR7audQw="; excludedPackages = [ "cronexpr/cronexpr" ]; diff --git a/pkgs/by-name/ta/talm/package.nix b/pkgs/by-name/ta/talm/package.nix index b144626690dd..3d331423c1c3 100644 --- a/pkgs/by-name/ta/talm/package.nix +++ b/pkgs/by-name/ta/talm/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "talm"; - version = "0.22.3"; + version = "0.22.4"; src = fetchFromGitHub { owner = "cozystack"; repo = "talm"; tag = "v${finalAttrs.version}"; - hash = "sha256-/veCnApXSX5ubfOb2g8MkLtN5Ejt7hdINwuHX/0JUYA="; + hash = "sha256-9CUr49uKvVwjU9rJpt0Y4BNtBUQiJxNcU8YMlNhyd/g="; }; vendorHash = "sha256-jDp1WVETDbCtSq+v0BrIiTqoR2cnmI7JXdy5ydnt5wA="; diff --git a/pkgs/by-name/ta/taproot-assets/package.nix b/pkgs/by-name/ta/taproot-assets/package.nix index 9cdf1c600535..f842eddb0227 100644 --- a/pkgs/by-name/ta/taproot-assets/package.nix +++ b/pkgs/by-name/ta/taproot-assets/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "taproot-assets"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "taproot-assets"; rev = "v${finalAttrs.version}"; - hash = "sha256-F/I/h80+QEUpxF1fS90hgCXMubU4Hdk0ECGosSvdC1E="; + hash = "sha256-HFWSO5h/hp/XGCQ9MEqwe++P12XPbxv878xcJhUZTpQ="; }; - vendorHash = "sha256-W6wAa1KAE0gBWkXeZ0VEQFyRle/qT/O3CvVAmm1nQfs="; + vendorHash = "sha256-sKyaj/PiNz0VbzWon4g5jIKcYAUdlXwBQwJoWEkMYsM="; subPackages = [ "cmd/tapcli" diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix index 424d29c7cb58..a827d501b0dd 100644 --- a/pkgs/by-name/te/terragrunt/package.nix +++ b/pkgs/by-name/te/terragrunt/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "terragrunt"; - version = "0.99.4"; + version = "0.99.5"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "terragrunt"; tag = "v${finalAttrs.version}"; - hash = "sha256-PuAV0RtWTdFM96LVL6i+RMrRF+H0HujgHtTCsrvyCoo="; + hash = "sha256-VlJRuW8TAlwszp2GzVC/7FY1jhq/7NHi/i5xPnw1nec="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index 88b6226f9eff..adb370bf4e65 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -52,14 +52,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.16.0"; + version = "1.16.1"; pname = "tigervnc"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; tag = "v${finalAttrs.version}"; - hash = "sha256-aIQcFX4GQ0VniacjYherpUSgzM55Han9oMvbjMUYgfE="; + hash = "sha256-mK9WjnAyEqikykCa6AzB6aB+QTZtxyCBmZV+rNbLxYM="; }; postPatch = diff --git a/pkgs/by-name/tu/turn-rs/package.nix b/pkgs/by-name/tu/turn-rs/package.nix index 38be941b6373..33ef996f32d1 100644 --- a/pkgs/by-name/tu/turn-rs/package.nix +++ b/pkgs/by-name/tu/turn-rs/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "turn-rs"; - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "mycrl"; repo = "turn-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-HYrFnwxj4BRk2PGK52il5Bh5hxvWHJNQ/5Y0u5FSTwY="; + hash = "sha256-CtDlkHHOkU0mwNiyP9PNw/40szBNKeGYvVep9Z/aoDg="; }; - cargoHash = "sha256-q1kq2ISzKZfJfKTRkMrVMQqngAqG2INfej9lGoll5c0="; + cargoHash = "sha256-x45GDuhxqoB/DZvccdzxBoS/7nnFvHtjkRgfM/LOOE8="; # By default, no features are enabled # https://github.com/mycrl/turn-rs?tab=readme-ov-file#features-1 diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix index e2d99b9f5714..ff31a75a9f20 100644 --- a/pkgs/by-name/tu/turso-cli/package.nix +++ b/pkgs/by-name/tu/turso-cli/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "turso-cli"; - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-3u5yc49v0vwNKaI5GcE+rDEoscbQqpnaN11Bax0SEtE="; + hash = "sha256-mWX7cJK4TX2JXHYQ4d5WaS/ZwlEkXJaiNM7zx/w+n9c="; }; vendorHash = "sha256-Cb4/KA9jfI/pNHbJqLWtm9oEXfMHGBS46J9o3lL4/Tk="; diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix index 9c3709207328..ef0cd4bfb355 100644 --- a/pkgs/by-name/ty/ty/package.nix +++ b/pkgs/by-name/ty/ty/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ty"; - version = "0.0.25"; + version = "0.0.26"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ty"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-KMv/l4jGOJdL+KlTOrVRGMdAgleW/mXk7CWDd8Vlwig="; + hash = "sha256-Q4xYL+MbFnzLFUbfqY5yrepBD7tIujwr9tTPp0H2J/U="; }; # For Darwin platforms, remove the integration test for file notifications, diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix index 16fefd106161..f179066c1f0c 100644 --- a/pkgs/by-name/un/unrar/package.nix +++ b/pkgs/by-name/un/unrar/package.nix @@ -6,12 +6,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "unrar"; - version = "7.2.4"; + version = "7.2.5"; src = fetchzip { url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz"; stripRoot = false; - hash = "sha256-Rzab8jvER5fJpNXHCSi5FCYR9LfMX2Y/kP5JshYqTU0="; + hash = "sha256-UVoxvF3U4TKZ0kQ9+fEMAoZJwAa+e/XDS7JqXoo3GeA="; }; sourceRoot = finalAttrs.src.name; diff --git a/pkgs/by-name/vi/vit/package.nix b/pkgs/by-name/vi/vit/package.nix index d0ca54807a2f..ab99ca305fd3 100644 --- a/pkgs/by-name/vi/vit/package.nix +++ b/pkgs/by-name/vi/vit/package.nix @@ -10,13 +10,13 @@ with python3Packages; buildPythonApplication (finalAttrs: { pname = "vit"; - version = "2.3.3"; + version = "2.3.4"; pyproject = true; disabled = lib.versionOlder python.version "3.7"; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-+lrXGfhoB4z5IWkJTXMIm3GGVPfNGO9lUB3uFTx8hDY="; + hash = "sha256-NGohCqDedUz3ra9zcjv30syO51Tut4XrGDcNM/dOXOI="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/wa/wasm-language-tools/package.nix b/pkgs/by-name/wa/wasm-language-tools/package.nix index 362d3f2efad0..028de3651040 100644 --- a/pkgs/by-name/wa/wasm-language-tools/package.nix +++ b/pkgs/by-name/wa/wasm-language-tools/package.nix @@ -3,7 +3,9 @@ rustPlatform, fetchFromGitHub, versionCheckHook, + _experimental-update-script-combinators, nix-update-script, + vscode-extension-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -23,7 +25,16 @@ rustPlatform.buildRustPackage (finalAttrs: { versionCheckProgram = "${placeholder "out"}/bin/wat_server"; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (vscode-extension-update-script { + attrPath = "vscode-extensions.gplane.wasm-language-tools"; + extraArgs = [ + "--override-filename" + "pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix" + ]; + }) + ]; meta = { description = "Language server and other tools for WebAssembly"; diff --git a/pkgs/by-name/xp/xpipe/package.nix b/pkgs/by-name/xp/xpipe/package.nix index 3c5d673b962c..b950e4e780cb 100644 --- a/pkgs/by-name/xp/xpipe/package.nix +++ b/pkgs/by-name/xp/xpipe/package.nix @@ -39,7 +39,7 @@ let hash = { - x86_64-linux = "sha256-ehuEEoU+RZpYXjvdcF3Mx9oF+Q4ltPxZn7fG24jRVHQ="; + x86_64-linux = "sha256-mHKQKGhqJ80JHWxixC7IbEHMsLMP7ETcGswOonwCo1U="; } .${system} or throwSystem; @@ -48,7 +48,7 @@ let in stdenvNoCC.mkDerivation rec { pname = "xpipe"; - version = "21.6"; + version = "22.0"; src = fetchzip { url = "https://github.com/xpipe-io/xpipe/releases/download/${version}/xpipe-portable-linux-${arch}.tar.gz"; diff --git a/pkgs/by-name/ze/zed-discord-presence/package.nix b/pkgs/by-name/ze/zed-discord-presence/package.nix index 3d99195c7d62..a1eecfd62e74 100644 --- a/pkgs/by-name/ze/zed-discord-presence/package.nix +++ b/pkgs/by-name/ze/zed-discord-presence/package.nix @@ -7,17 +7,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "zed-discord-presence"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "xhyrom"; repo = "zed-discord-presence"; tag = "v${finalAttrs.version}"; - hash = "sha256-HmSJipRWVB1rXyO5ZK1ksyCLDzSJD820Klo88A7NLx4="; + hash = "sha256-Y7Tns5UwYzDKKgo1AvLDTFxdpJrnXg5QBWhGsyecAXU="; }; cargoBuildFlags = [ "--package discord-presence-lsp" ]; - cargoHash = "sha256-x9sB90jW7v2SGggLILgLbBfFV7DkJazcrUiKAfIroMA="; + cargoHash = "sha256-z7SXterBkLT88LxgmcGFkUEWGBf2rSCgvd2NjMJuSOM="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix index 222788b00c75..c015ce038bc9 100644 --- a/pkgs/by-name/zo/zoekt/package.nix +++ b/pkgs/by-name/zo/zoekt/package.nix @@ -8,16 +8,16 @@ buildGoModule { pname = "zoekt"; - version = "0-unstable-2026-01-14"; + version = "0-unstable-2026-03-25"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "zoekt"; - rev = "c747a3bccc2a4a427204ac08eea62a522df6d2ec"; - hash = "sha256-fIvDxOTPbtRqBX39Lfezy/q235/nPhog/UIEncdV9UQ="; + rev = "a0f5789d25cb80a36bfb0b85cde2f004880bcbeb"; + hash = "sha256-y1BskdsrPrIRDFj9n7H6Dl17tS+4epwvShMe/i1I7KA="; }; - vendorHash = "sha256-1QM6OVFXS88IryKuNJKcbgYZcRZ+E6Na5NqItAlicXw="; + vendorHash = "sha256-WaO8/33pPmGh6tO/poD5epBknZjyzydG9dRuD67dYEw="; nativeCheckInputs = [ gitMinimal diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix index 895fd5853341..9c16c19ded5d 100644 --- a/pkgs/development/cuda-modules/packages/nsight_systems.nix +++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix @@ -69,7 +69,7 @@ buildRedist ( ]; # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them. - prePatch = '' + prePatch = lib.optionalString (lib.versionOlder finalAttrs.version "2025.5.2.26") '' if [[ -d bin ]]; then nixLog "Removing bin wrapper scripts" for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cb6cd01b488b..8c596d8e66bb 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -442,10 +442,10 @@ builtins.intersectAttrs super { src = pkgs.fetchFromGitHub { repo = "nix-serve-ng"; owner = "aristanetworks"; - rev = "1d21f73a2d563ffbb924a4244c29b35e898caefe"; - hash = "sha256-N6c3NozYqAGwmjf+k5GHOZzlcquDntrJwsZQ7O2sqtQ="; + rev = "f63998a6c81fab86e840dbab483d387dee5ffc0a"; + hash = "sha256-paUnCU08wDZ3bS0Fa4QhtjWMcpWgcTRwO/ee3wT28Nw="; }; - version = "1.0.1-unstable-2025-05-28"; + version = "1.1.0-unstable-2026-03-26"; }) (overrideCabal (old: { diff --git a/pkgs/development/interpreters/octave/build-octave-package.nix b/pkgs/development/interpreters/octave/build-octave-package.nix index ba60b3872902..58a998116a88 100644 --- a/pkgs/development/interpreters/octave/build-octave-package.nix +++ b/pkgs/development/interpreters/octave/build-octave-package.nix @@ -81,6 +81,7 @@ let "nativeBuildInputs" "nativeOctavePkgTestInputs" "passthru" + "env" ]; in stdenv.mkDerivation ( @@ -96,7 +97,9 @@ stdenv.mkDerivation ( # packages are installed into octave during the environment building phase. isOctavePackage = true; - OCTAVE_HISTFILE = "/dev/null"; + env = attrs.env or { } // { + OCTAVE_HISTFILE = "/dev/null"; + }; inherit src; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 915ad886485c..0adeef13b04f 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -179,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: { installedTests = nixosTests.installed-tests.xdg-desktop-portal; validate-icon = runCommand "test-icon-validation" { } '' - ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../applications/audio/zynaddsubfx/ZynLogo.svg} > "$out" + ${finalAttrs.finalPackage}/libexec/xdg-desktop-portal-validate-icon --ruleset=desktop --sandbox --path=${../../../by-name/zy/zynaddsubfx/ZynLogo.svg} > "$out" grep format=svg "$out" ''; }; diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 2851cef8ca6c..a1418bfa0c2d 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -32,7 +32,7 @@ buildPythonPackage (finalAttrs: { pname = "ansible-core"; - version = "2.20.3"; + version = "2.20.4"; pyproject = true; disabled = pythonOlder "3.12"; @@ -41,7 +41,7 @@ buildPythonPackage (finalAttrs: { owner = "ansible"; repo = "ansible"; tag = "v${finalAttrs.version}"; - hash = "sha256-WLfLbQYYJOdMHApNnFZYiET4es3z2SeeLP0jbrFqxrU="; + hash = "sha256-7KsxZH1d5FfdnsYfKSNGCmdYuBi8KzZxyZbG2WNAM9Y="; }; # ansible_connection is already wrapped, so don't pass it through diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix index 00c597008bb6..3fa66c2160f7 100644 --- a/pkgs/development/python-modules/blinkpy/default.nix +++ b/pkgs/development/python-modules/blinkpy/default.nix @@ -15,19 +15,19 @@ buildPythonPackage rec { pname = "blinkpy"; - version = "0.25.3"; + version = "0.25.5"; pyproject = true; src = fetchFromGitHub { owner = "fronzbot"; repo = "blinkpy"; tag = "v${version}"; - hash = "sha256-1MROZbA6NDZ5mKmvcjyrYAx+tEP6Cyj2k1754v2W1Mw="; + hash = "sha256-wtuegaYB7/lh9d5kKgSEwCztLpaKcwHi9+ryMvGXVg8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "wheel~=0.40.0" wheel \ + --replace-fail "wheel>=0.40,<0.47" wheel \ --replace-fail "setuptools>=68,<81" setuptools ''; diff --git a/pkgs/development/python-modules/cantools/default.nix b/pkgs/development/python-modules/cantools/default.nix index 8d09bba81dcc..97a441062849 100644 --- a/pkgs/development/python-modules/cantools/default.nix +++ b/pkgs/development/python-modules/cantools/default.nix @@ -16,14 +16,14 @@ textparser, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cantools"; - version = "41.2.1"; + version = "41.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; - hash = "sha256-HxdoK91A9oALjuiW0aGFM/5mRdbeb8j8T3J2n/uuLR4="; + inherit (finalAttrs) pname version; + hash = "sha256-VRuYBZLGbmsSX4xF8Styb6hzUrKTG5AmsHY2o3dQSp4="; }; build-system = [ @@ -47,16 +47,16 @@ buildPythonPackage rec { pytest-freezegun pytestCheckHook ] - ++ optional-dependencies.plot; + ++ finalAttrs.passthru.optional-dependencies.plot; pythonImportsCheck = [ "cantools" ]; meta = { description = "Tools to work with CAN bus"; homepage = "https://github.com/cantools/cantools"; - changelog = "https://github.com/cantools/cantools/releases/tag/${version}"; + changelog = "https://github.com/cantools/cantools/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ gray-heron ]; mainProgram = "cantools"; }; -} +}) diff --git a/pkgs/development/python-modules/django-ical/default.nix b/pkgs/development/python-modules/django-ical/default.nix new file mode 100644 index 000000000000..09f8e8a6c271 --- /dev/null +++ b/pkgs/development/python-modules/django-ical/default.nix @@ -0,0 +1,57 @@ +{ + buildPythonPackage, + django, + fetchFromGitHub, + lib, + pytest-django, + pytestCheckHook, + setuptools-scm, + icalendar, + django-recurrence, +}: +buildPythonPackage (finalAttrs: { + pname = "django-ical"; + version = "1.9.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "jazzband"; + repo = "django-ical"; + tag = finalAttrs.version; + hash = "sha256-DUe0loayGcUS7MTyLn+g0KBxbIY7VsaoQNHGSMbMI3U="; + }; + + build-system = [ setuptools-scm ]; + + dependencies = [ + django + django-recurrence + icalendar + ]; + + preCheck = '' + export DJANGO_SETTINGS_MODULE=test_settings + ''; + + disabledTestPaths = [ + # AssertionError: 'Japan' != 'JST': there seems to be wrong raw data feed + "django_ical/tests/test_feed.py::ICal20FeedTest::test_timezone" + ]; + + pythonImportsCheck = [ + "django_ical" + ]; + + nativeCheckInputs = [ + pytest-django + pytestCheckHook + ]; + + meta = { + description = "iCal feeds for Django based on Django's syndication feed framework"; + homepage = "https://github.com/jazzband/django-ical"; + changelog = "https://github.com/jazzband/django-ical/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kurogeek ]; + }; +}) diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix index 8a7d3d10a595..155ee5cc4313 100644 --- a/pkgs/development/python-modules/elevenlabs/default.nix +++ b/pkgs/development/python-modules/elevenlabs/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "elevenlabs"; - version = "2.39.1"; + version = "2.40.0"; pyproject = true; src = fetchFromGitHub { owner = "elevenlabs"; repo = "elevenlabs-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lx5bRl7Atwme+PHkyF0+CgQi0KB3qDCpoLG7JzFM3oE="; + hash = "sha256-1t+CJ+gHnF8wpq6/NpbuophKczXE/usKwwYCrgAZqsY="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix index 268ec30ab89d..79d8045bdb0b 100644 --- a/pkgs/development/python-modules/fastbencode/default.nix +++ b/pkgs/development/python-modules/fastbencode/default.nix @@ -12,19 +12,19 @@ buildPythonPackage rec { pname = "fastbencode"; - version = "0.3.9"; + version = "0.3.10"; pyproject = true; src = fetchFromGitHub { owner = "breezy-team"; repo = "fastbencode"; tag = "v${version}"; - hash = "sha256-TZGIFcWm037h4Xs6e5a9j24FqhNxP9H71QVtL1homjQ="; + hash = "sha256-e+Ei+UIJ5sve6k3ApPJ2nswTgZLkzxZmpthK/f/rfCs="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-4DP8WOho4CKESfQHynZlosafcGPFqjpaOiZfLkcML3A="; + hash = "sha256-dqD/QF6/XCB9H/QkEobfIOo9S663fh9AHUuHqCoEcLM="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 5b5e88c3d081..2c642a01f9df 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -13,19 +13,19 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "google-cloud-netapp"; - version = "3.31.3"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "googleapis"; repo = "google-cloud-python"; - tag = "google-cloud-build-v${version}"; - hash = "sha256-qQ+8X6I8lt4OTgbvODsbdab2dYUk0wxWsbaVT2T651U="; + tag = "google-cloud-netapp-v${finalAttrs.version}"; + hash = "sha256-uUBId7RxVfOPtemZYUqJXd4hw2/CU2cogZL39MrKehk="; }; - sourceRoot = "${src.name}/packages/google-cloud-netapp"; + sourceRoot = "${finalAttrs.src.name}/packages/google-cloud-netapp"; build-system = [ setuptools ]; @@ -52,15 +52,19 @@ buildPythonPackage rec { "google.cloud.netapp_v1" ]; - passthru.updateScript = gitUpdater { - rev-prefix = "google-cloud-netapp-v"; + passthru = { + # builkupdater selects wrong tag + skipBulkUpdate = true; + updateScript = gitUpdater { + rev-prefix = "google-cloud-netapp-v"; + }; }; meta = { description = "Python Client for NetApp API"; homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-netapp"; - changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-${src.tag}/packages/google-cloud-netapp/CHANGELOG.md"; + changelog = "https://github.com/googleapis/google-cloud-python/blob/${finalAttrs.src.tag}/packages/google-cloud-netapp/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.sarahec ]; }; -} +}) diff --git a/pkgs/development/python-modules/huum/default.nix b/pkgs/development/python-modules/huum/default.nix index cae8c5b3c33e..8ef21f5b760f 100644 --- a/pkgs/development/python-modules/huum/default.nix +++ b/pkgs/development/python-modules/huum/default.nix @@ -9,16 +9,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "huum"; - version = "0.8.1"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { owner = "frwickst"; repo = "pyhuum"; - tag = version; - hash = "sha256-8wldXJAdo1PK4bKX0rKJjNwwTS5FSgr9RcwiyVhESb8="; + tag = finalAttrs.version; + hash = "sha256-PM1At/AqKZ0QIJWlQeeTYqnQqK1wOnd4eRLyd7MvFLk="; }; build-system = [ poetry-core ]; @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "Library for Huum saunas"; homepage = "https://github.com/frwickst/pyhuum"; - changelog = "https://github.com/frwickst/pyhuum/releases/tag/${src.tag}"; + changelog = "https://github.com/frwickst/pyhuum/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index f504cbc670cc..babc789dbe47 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202603251"; + version = "0.1.202603261"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-co6eQx2gI5UBH8cx4xgH//Qtf3m0HmCkPYdNpk2h/qE="; + hash = "sha256-ghj/GfymySYV7kiBFEkNk9G7lF/lfsWWCMMAnumNelI="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix index 909c7b8031ac..ace43f0e7b08 100644 --- a/pkgs/development/python-modules/karton-core/default.nix +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -9,16 +9,16 @@ unittestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "karton-core"; - version = "5.9.0"; + version = "5.9.1"; pyproject = true; src = fetchFromGitHub { owner = "CERT-Polska"; repo = "karton"; - tag = "v${version}"; - hash = "sha256-m7A7Fbl6VZtgR4+FhmV2T+K6kgHRNtdeyin1uhvw04U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-b/wOkOk6LB8uTDsXJrNQ2iru2H6mgaMhIyWSU5y2mx0="; }; build-system = [ setuptools ]; @@ -41,11 +41,11 @@ buildPythonPackage rec { meta = { description = "Distributed malware processing framework"; homepage = "https://karton-core.readthedocs.io/"; - changelog = "https://github.com/CERT-Polska/karton/releases/tag/${src.tag}"; + changelog = "https://github.com/CERT-Polska/karton/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ chivay fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/kmock/default.nix b/pkgs/development/python-modules/kmock/default.nix new file mode 100644 index 000000000000..153c92cf1f39 --- /dev/null +++ b/pkgs/development/python-modules/kmock/default.nix @@ -0,0 +1,78 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + setuptools-scm, + + # dependencies + aiohttp, + attrs, + jsonpatch, + yarl, + typing-extensions, + + # tests + pytestCheckHook, + pytest-asyncio, + looptime, + aresponses, +}: + +buildPythonPackage (finalAttrs: { + pname = "kmock"; + version = "0.6"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nolar"; + repo = "kmock"; + tag = finalAttrs.version; + hash = "sha256-qpRuSWwaPEgfE+wN1ADSyn2AbXPDzZfZ7dOf8Vw0zJA="; + }; + + build-system = [ + setuptools + setuptools-scm + ]; + + dependencies = [ + aiohttp + attrs + jsonpatch + yarl + typing-extensions + ]; + + pythonImportsCheck = [ "kmock" ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + aresponses + looptime + ]; + + disabledTests = [ + # Could not contact DNS servers + "test_bare_host_resolution" + # Cannot connect to host clients3.google.com + "test_hostname_interception" + # Timeout + "test_arbitrary_stream" + "test_kubernetes_watch_stream" + # assert 0 == 1 + "test_sync_condition_notifying" + ]; + + __darwinAllowLocalNetworking = true; + + meta = { + description = "HTTP/API/Kubernetes Mock Server in Python"; + changelog = "https://github.com/nolar/kmock/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +}) diff --git a/pkgs/development/python-modules/kopf/default.nix b/pkgs/development/python-modules/kopf/default.nix index 51e42eb0bd91..520c602fbd31 100644 --- a/pkgs/development/python-modules/kopf/default.nix +++ b/pkgs/development/python-modules/kopf/default.nix @@ -10,9 +10,10 @@ aiohttp, iso8601, python-json-logger, - clickclick, - typing-extensions, + click, + jsonpatch, + kmock, pytest-mock, pytest-timeout, pytest-asyncio, @@ -20,18 +21,19 @@ freezegun, certvalidator, aresponses, + looptime, }: buildPythonPackage rec { pname = "kopf"; - version = "1.40.0"; + version = "1.44.4"; pyproject = true; src = fetchFromGitHub { owner = "nolar"; repo = "kopf"; tag = version; - hash = "sha256-AXaEV3+p5NytKhuUkoaWBG4oNhPKQwoCRTmUkmb26RQ="; + hash = "sha256-AwIaWAwBBmQqxNQqFS8qNDlA+pjw5mQG3XKwamS3oQo="; }; build-system = [ @@ -44,8 +46,8 @@ buildPythonPackage rec { python-json-logger aiohttp iso8601 - clickclick - typing-extensions + jsonpatch + click ]; nativeCheckInputs = [ @@ -54,9 +56,11 @@ buildPythonPackage rec { pytest-timeout pytest-asyncio pytest-mock + kmock freezegun certvalidator aresponses + looptime ]; disabledTestPaths = [ @@ -64,12 +68,20 @@ buildPythonPackage rec { "tests/admission/test_certificates.py" "tests/e2e/test_examples.py" - #Module certbuilder unavailable in nixpkgs + # Module certbuilder unavailable in nixpkgs "tests/admission/test_webhook_detection.py" "tests/admission/test_webhook_ngrok.py" "tests/admission/test_webhook_server.py" + "tests/authentication/test_credentials.py" ]; + disabledTests = [ + # assert [] to due missing certificate + "test_connection_info_as_ssl_context_when_insecure" + ]; + + pytestFlags = [ "-Wignore::pytest.PytestUnraisableExceptionWarning" ]; + __darwinAllowLocalNetworking = true; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix index 14d61d68dbab..ea327290d0ec 100644 --- a/pkgs/development/python-modules/langsmith/default.nix +++ b/pkgs/development/python-modules/langsmith/default.nix @@ -31,14 +31,14 @@ buildPythonPackage (finalAttrs: { pname = "langsmith"; - version = "0.7.18"; + version = "0.7.22"; pyproject = true; src = fetchFromGitHub { owner = "langchain-ai"; repo = "langsmith-sdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-praKCpNzZ8e+QEU9Ji9ryspzIiF9X98rUOvMbwjMZho="; + hash = "sha256-raotchNZFcQPUvQckq4Z6ntvh4tviCjTLv2s5Ueulqw="; }; sourceRoot = "${finalAttrs.src.name}/python"; diff --git a/pkgs/development/python-modules/linearmodels/default.nix b/pkgs/development/python-modules/linearmodels/default.nix index 1e54b035f249..9a5ae03ffe5f 100644 --- a/pkgs/development/python-modules/linearmodels/default.nix +++ b/pkgs/development/python-modules/linearmodels/default.nix @@ -2,20 +2,27 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system cython, + meson-python, + numpy, + setuptools-scm, + + # dependencies formulaic, mypy-extensions, - numpy, pandas, pyhdfe, - pytestCheckHook, scipy, - setuptools, - setuptools-scm, statsmodels, + + # tests + pytestCheckHook, + xarray, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "linearmodels"; version = "7.0"; pyproject = true; @@ -23,24 +30,23 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bashtage"; repo = "linearmodels"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-/unFszNGaEPsoXDtaS3tsLnsX4A6e7Y88O8pDrf4nKc="; }; postPatch = '' - substituteInPlace requirements.txt \ - --replace-fail "setuptools_scm[toml]>=8.0.0,<9.0.0" "setuptools_scm[toml]" substituteInPlace pyproject.toml \ - --replace-fail "setuptools_scm[toml]>=8,<9" "setuptools_scm[toml]" + --replace-fail "setuptools_scm>=9.2.0,<10" "setuptools_scm" ''; build-system = [ - setuptools - setuptools-scm cython + meson-python + numpy + setuptools-scm ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; dependencies = [ formulaic @@ -52,10 +58,17 @@ buildPythonPackage rec { statsmodels ]; - nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ "linearmodels" ]; + nativeCheckInputs = [ + pytestCheckHook + xarray + ]; + + preCheck = '' + rm linearmodels/__init__.py + ''; + disabledTestPaths = [ # Skip long-running tests "linearmodels/tests/panel/test_panel_ols.py" @@ -64,8 +77,8 @@ buildPythonPackage rec { meta = { description = "Models for panel data, system regression, instrumental variables and asset pricing"; homepage = "https://bashtage.github.io/linearmodels/"; - changelog = "https://github.com/bashtage/linearmodels/releases/tag/${src.tag}"; + changelog = "https://github.com/bashtage/linearmodels/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ jherland ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix deleted file mode 100644 index 016731daf7f1..000000000000 --- a/pkgs/development/python-modules/llama-cloud-services/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ - lib, - buildPythonPackage, - click, - eval-type-backport, - fetchFromGitHub, - gitUpdater, - llama-cloud, - llama-index-core, - platformdirs, - hatchling, - pydantic, - python-dotenv, -}: - -buildPythonPackage (finalAttrs: { - pname = "llama-cloud-services"; - version = "0.6.94"; - pyproject = true; - - src = fetchFromGitHub { - owner = "run-llama"; - repo = "llama_cloud_services"; - tag = "llama-cloud-services-py%40${finalAttrs.version}"; - hash = "sha256-BjwXdv7ekehYGGnKk0ElVlxmGkmtam9RLECgxfM7lYc="; - }; - - sourceRoot = "${finalAttrs.src.name}/py"; - - pythonRelaxDeps = [ "llama-cloud" ]; - - build-system = [ hatchling ]; - - dependencies = [ - click - eval-type-backport - llama-cloud - llama-index-core - platformdirs - pydantic - python-dotenv - ]; - - # Missing dependency autoevals - doCheck = false; - - pythonImportsCheck = [ "llama_cloud_services" ]; - - # update script sets wrong version - passthru = { - skipBulkUpdate = true; - updateScript = gitUpdater { - rev-prefix = "llama-cloud-services-py@"; - }; - }; - - meta = { - description = "Knowledge Agents and Management in the Cloud"; - homepage = "https://github.com/run-llama/llama_cloud_services"; - changelog = "https://github.com/run-llama/llama_cloud_services/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; -}) diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix index 15ba862789b8..36d6f9150c96 100644 --- a/pkgs/development/python-modules/llama-cloud/default.nix +++ b/pkgs/development/python-modules/llama-cloud/default.nix @@ -2,31 +2,67 @@ lib, buildPythonPackage, fetchPypi, + hatchling, + hatch-fancy-pypi-readme, + pythonOlder, + pythonAtLeast, + + # Dependencies httpx, - poetry-core, pydantic, + anyio, + distro, + sniffio, + + # Test dependencies + pytestCheckHook, + pytest-asyncio, + pytest-xdist, + dirty-equals, + respx, + llama-index-core, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-cloud"; - version = "0.1.45"; + version = "1.6.0"; pyproject = true; src = fetchPypi { pname = "llama_cloud"; - inherit version; - hash = "sha256-FAJEAIzFcQ4xrpfGBDlzo6mWmlGw84FV+jOoQ0B46Ko="; + inherit (finalAttrs) version; + hash = "sha256-sAx133a1m+zKcvJix1WllSnwwJ8M2nnghu7e/GLVmsg="; }; - build-system = [ poetry-core ]; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "hatchling==1.26.3" "hatchling>=1.26.3" + ''; + + build-system = [ + hatchling + hatch-fancy-pypi-readme + ]; dependencies = [ httpx pydantic + distro + sniffio + anyio ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + pytest-asyncio + pytest-xdist + dirty-equals + respx + ] + ++ lib.optional (pythonOlder "3.14") llama-index-core; + + # Transitively requires google-pasta (broken on 3.14) through llama-index-core + disabledTestPaths = lib.optional (pythonAtLeast "3.14") "tests/test_index.py"; pythonImportsCheck = [ "llama_cloud" ]; @@ -36,4 +72,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix index 527883d53771..c0f0ad00bfcb 100644 --- a/pkgs/development/python-modules/llama-index-cli/default.nix +++ b/pkgs/development/python-modules/llama-index-cli/default.nix @@ -6,18 +6,17 @@ llama-index-core, llama-index-embeddings-openai, llama-index-llms-openai, - llama-index-vector-stores-chroma, }: buildPythonPackage (finalAttrs: { pname = "llama-index-cli"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; src = fetchPypi { pname = "llama_index_cli"; inherit (finalAttrs) version; - hash = "sha256-ot5aIvZ19gkIyM0f2HPxMs8r/fNGL6ee9fvmuVcnows="; + hash = "sha256-ThTQcv6/Ym0F+CHQSoWN6N2cx8mDdmWKCrmEifWmvPc="; }; build-system = [ hatchling ]; @@ -26,7 +25,6 @@ buildPythonPackage (finalAttrs: { llama-index-core llama-index-embeddings-openai llama-index-llms-openai - llama-index-vector-stores-chroma ]; # Tests are only available in the mono repo diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix index 3abc057181ab..706003773906 100644 --- a/pkgs/development/python-modules/llama-index-core/default.nix +++ b/pkgs/development/python-modules/llama-index-core/default.nix @@ -31,24 +31,25 @@ spacy, sqlalchemy, tenacity, + tinytag, tiktoken, tree-sitter, typing-inspect, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-core"; - version = "0.14.12"; + version = "0.14.19"; pyproject = true; src = fetchFromGitHub { owner = "run-llama"; repo = "llama_index"; - tag = "v${version}"; - hash = "sha256-grF9IToAMc3x5/40+u3lHU9RyjROWu1e3M6N1owq0f4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-xcssJPBXq3bjSD13nsR6jRTmTWPVks8aKHZCZ3lSKY4="; }; - sourceRoot = "${src.name}/${pname}"; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.pname}"; # When `llama-index` is imported, it uses `nltk` to look for the following files and tries to # download them if they aren't present. @@ -96,6 +97,7 @@ buildPythonPackage rec { spacy sqlalchemy tenacity + tinytag tiktoken typing-inspect ]; @@ -133,6 +135,8 @@ buildPythonPackage rec { "tests/tools/" "tests/schema/" "tests/multi_modal_llms/" + "tests/prompts/" + "tests/base/llms/" ]; disabledTests = [ @@ -160,8 +164,8 @@ buildPythonPackage rec { meta = { description = "Data framework for your LLM applications"; homepage = "https://github.com/run-llama/llama_index/"; - changelog = "https://github.com/run-llama/llama_index/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/run-llama/llama_index/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix index 883650ecab4f..c46ea3491bca 100644 --- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix @@ -3,23 +3,27 @@ buildPythonPackage, fetchPypi, llama-index-core, + openai, hatchling, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "llama-index-embeddings-openai"; - version = "0.5.2"; + version = "0.6.0"; pyproject = true; src = fetchPypi { pname = "llama_index_embeddings_openai"; - inherit version; - hash = "sha256-CRvQw+kYJ0jogn3n15cTohnV9eDcl9G7eycc9SRSDks="; + inherit (finalAttrs) version; + hash = "sha256-6z5mBr6By4kSUHPiPJfAphGdq7SCetvRRpfCAprXPyk="; }; build-system = [ hatchling ]; - dependencies = [ llama-index-core ]; + dependencies = [ + llama-index-core + openai + ]; # Tests are only available in the mono repo doCheck = false; @@ -32,4 +36,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix deleted file mode 100644 index 10d11c058b89..000000000000 --- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - deprecated, - hatchling, - llama-cloud, - llama-index-core, -}: - -buildPythonPackage rec { - pname = "llama-index-indices-managed-llama-cloud"; - version = "0.9.4"; - pyproject = true; - - src = fetchPypi { - pname = "llama_index_indices_managed_llama_cloud"; - inherit version; - hash = "sha256-teAHUqswVkq/GcV1laIQf1aXw7A7CFgXtPyoSjjrvVk="; - }; - - pythonRelaxDeps = [ - "deprecated" - "llama-cloud" - ]; - - build-system = [ hatchling ]; - - dependencies = [ - deprecated - llama-cloud - llama-index-core - ]; - - # Tests are only available in the mono repo - doCheck = false; - - pythonImportsCheck = [ "llama_index.indices.managed.llama_cloud" ]; - - meta = { - description = "LlamaCloud Index and Retriever"; - homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/indices/llama-index-indices-managed-llama-cloud"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix index 4dc1405a9ffb..97016414c49b 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix @@ -5,18 +5,17 @@ hatchling, llama-index-core, llama-index-llms-openai, - transformers, }: buildPythonPackage (finalAttrs: { pname = "llama-index-llms-openai-like"; - version = "0.6.0"; + version = "0.7.1"; pyproject = true; src = fetchPypi { pname = "llama_index_llms_openai_like"; inherit (finalAttrs) version; - hash = "sha256-aTjP7WLHeHa6Q/JlGaq/VVd1/Y4Ofhry3fN6n8kdyjI="; + hash = "sha256-znzvNoax5i18CBNLTYylZwbMqBbkxAmOrt4zACgppvk="; }; build-system = [ hatchling ]; @@ -24,7 +23,6 @@ buildPythonPackage (finalAttrs: { dependencies = [ llama-index-core llama-index-llms-openai - transformers ]; # Tests are only available in the mono repo diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix index 06ce990b16e2..3a41a6d30825 100644 --- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix +++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix @@ -9,20 +9,15 @@ buildPythonPackage (finalAttrs: { pname = "llama-index-llms-openai"; - version = "0.6.26"; + version = "0.7.2"; pyproject = true; src = fetchPypi { pname = "llama_index_llms_openai"; inherit (finalAttrs) version; - hash = "sha256-NHRgLsvDDIiotYXP1XN4kdRdp4JRpeBnxNvC08w9CNs="; + hash = "sha256-NnpHdp9jqfZi5uP6kCT/27Q0nXbWZ+zeTAaDYNzJ3oM="; }; - pythonRemoveDeps = [ - # Circular dependency - "llama-index-agent-openai" - ]; - build-system = [ hatchling ]; dependencies = [ diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix deleted file mode 100644 index be55162974e6..000000000000 --- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - hatchling, - llama-index-core, - llama-index-llms-openai, -}: - -buildPythonPackage rec { - pname = "llama-index-multi-modal-llms-openai"; - version = "0.6.2"; - pyproject = true; - - src = fetchPypi { - pname = "llama_index_multi_modal_llms_openai"; - inherit version; - hash = "sha256-4znltqFodiuXkTN51b6PqdZj/SF435/YmAH5P4fMnRk="; - }; - - build-system = [ hatchling ]; - - dependencies = [ - llama-index-core - llama-index-llms-openai - ]; - - # Tests are only available in the mono repo - doCheck = false; - - pythonImportsCheck = [ "llama_index.multi_modal_llms.openai" ]; - - meta = { - description = "LlamaIndex Multi-Modal-Llms Integration for OpenAI"; - homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/multi_modal_llms/llama-index-multi-modal-llms-openai"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix deleted file mode 100644 index aff6d3285119..000000000000 --- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - llama-index-core, - llama-parse, - hatchling, -}: - -buildPythonPackage rec { - pname = "llama-index-readers-llama-parse"; - version = "0.6.0"; - pyproject = true; - - src = fetchPypi { - pname = "llama_index_readers_llama_parse"; - inherit version; - hash = "sha256-bghrcDSgAbsCBONDHLHO5bbsE/kwrL+aboLGSu1ysJ4="; - }; - - pythonRelaxDeps = [ "llama-parse" ]; - - build-system = [ hatchling ]; - - propagatedBuildInputs = [ - llama-parse - llama-index-core - ]; - - # Tests are only available in the mono repo - doCheck = false; - - pythonImportsCheck = [ "llama_index.readers.llama_parse" ]; - - meta = { - description = "LlamaIndex Readers Integration for files"; - homepage = "https://github.com/run-llama/llama_index/tree/main/llama-index-integrations/readers/llama-index-readers-llama-parse"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/llama-index/default.nix b/pkgs/development/python-modules/llama-index/default.nix index c0c36f235dd0..89dc79fcbc18 100644 --- a/pkgs/development/python-modules/llama-index/default.nix +++ b/pkgs/development/python-modules/llama-index/default.nix @@ -4,12 +4,8 @@ llama-index-cli, llama-index-core, llama-index-embeddings-openai, - llama-index-indices-managed-llama-cloud, - llama-index-legacy, llama-index-llms-openai, - llama-index-multi-modal-llms-openai, - llama-index-readers-file, - llama-index-readers-llama-parse, + nltk, }: buildPythonPackage { @@ -21,21 +17,14 @@ buildPythonPackage { build-system = [ hatchling ]; - pythonRelaxDeps = [ - "llama-index-core" - "llama-index-multi-modal-llms-openai" - ]; + pythonRelaxDeps = [ "llama-index-core" ]; dependencies = [ llama-index-cli llama-index-core llama-index-embeddings-openai - llama-index-indices-managed-llama-cloud - llama-index-legacy llama-index-llms-openai - llama-index-multi-modal-llms-openai - llama-index-readers-file - llama-index-readers-llama-parse + nltk ]; pythonImportsCheck = [ "llama_index" ]; diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix deleted file mode 100644 index 365d60aafbe9..000000000000 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - llama-cloud-services, - hatchling, -}: - -buildPythonPackage rec { - pname = "llama-parse"; - version = "0.6.90"; - pyproject = true; - - src = fetchPypi { - pname = "llama_parse"; - inherit version; - hash = "sha256-7OqBGrj6lKe4Y90NNYQRPGMFRRM2i64ix6LYtnzPOu0="; - }; - - build-system = [ hatchling ]; - - dependencies = [ llama-cloud-services ]; - - # llama-cloud-services fails to read - pythonRelaxDeps = [ "llama-cloud-services" ]; - - pythonImportsCheck = [ "llama_parse" ]; - - meta = { - description = "Parse files into RAG-Optimized formats"; - homepage = "https://pypi.org/project/llama-parse/"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ fab ]; - }; -} diff --git a/pkgs/development/python-modules/loqedapi/default.nix b/pkgs/development/python-modules/loqedapi/default.nix index 4b58b061a009..453ced453d90 100644 --- a/pkgs/development/python-modules/loqedapi/default.nix +++ b/pkgs/development/python-modules/loqedapi/default.nix @@ -5,27 +5,23 @@ buildPythonPackage, fetchFromGitHub, setuptools, - wheel, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "loqedapi"; - version = "2.1.10"; + version = "2.1.11"; pyproject = true; src = fetchFromGitHub { owner = "cpolhout"; repo = "loqedAPI"; - tag = "v${version}"; - hash = "sha256-IYzrGqql6mmm+FmasxFJvKgHvg7n81WOu+GGAEQ1+Os="; + tag = "v${finalAttrs.version}"; + hash = "sha256-DLnjIq0YQIspPWYP9KT0UZ9UPGg5SOjYuVM7XqCUqTo="; }; - nativeBuildInputs = [ - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp async-timeout ]; @@ -38,8 +34,8 @@ buildPythonPackage rec { meta = { description = "Module to interact with the Loqed Smart Door Lock API"; homepage = "https://github.com/cpolhout/loqedAPI"; - changelog = "https://github.com/cpolhout/loqedAPI/releases/tag/v${version}"; + changelog = "https://github.com/cpolhout/loqedAPI/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index df554a9b6079..34bbea6e9e64 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -47,6 +47,7 @@ buildPythonPackage (finalAttrs: { "bleak" "packaging" "protobuf" + "tabulate" ]; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix index 88b99c0da802..fb1b06509b2d 100644 --- a/pkgs/development/python-modules/mhcflurry/default.nix +++ b/pkgs/development/python-modules/mhcflurry/default.nix @@ -3,53 +3,48 @@ buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, + # dependencies appdirs, - keras, mhcgnomes, numpy, pandas, pyyaml, scikit-learn, - tensorflow, - tf-keras, + torch, tqdm, # tests pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "mhcflurry"; - version = "2.1.5"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "openvax"; repo = "mhcflurry"; - tag = "v${version}"; - hash = "sha256-TNb3oKZvgBuXoSwsTuEJjFKEVZyHynazuPInj7wVKs8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-xtxPQg4Hsu7PzbXdjf0MlEaOYeAZaMG3gSNsa6l9RiM="; }; - # pipes has been removed in python 3.13 - postPatch = '' - substituteInPlace mhcflurry/downloads.py \ - --replace-fail \ - "from pipes import quote" \ - "from shlex import quote" - ''; + build-system = [ + setuptools + ]; # keras and tensorflow are not in the official setup.py requirements but are required for the CLI utilities to run. dependencies = [ appdirs - keras mhcgnomes numpy pandas pyyaml scikit-learn - tensorflow - tf-keras + torch tqdm ]; @@ -62,27 +57,32 @@ buildPythonPackage rec { "test_a1_mage_epitope_downloaded_models" "test_a1_titin_epitope_downloaded_models" "test_a2_hiv_epitope_downloaded_models" + "test_allele_specific_affinity_predictions" "test_basic" "test_caching" "test_class1_neural_network_a0205_training_accuracy" "test_commandline_sequences" "test_correlation" "test_csv" + "test_downloaded_predictor" "test_downloaded_predictor_gives_percentile_ranks" "test_downloaded_predictor_invalid_peptides" "test_downloaded_predictor_is_savable" "test_downloaded_predictor_is_serializable" "test_downloaded_predictor_small" - "test_downloaded_predictor" + "test_fasta" "test_fasta_50nm" "test_fasta_best" - "test_fasta" "test_merge" "test_no_csv" "test_on_hpv" + "test_pan_allele_affinity_predictions" + "test_presentation_predictions" "test_run_cluster_parallelism" "test_run_parallel" "test_run_serial" + "test_selected_peptides_mhcflurry_matches_csv" + "test_selected_peptides_netmhcpan_affinity_close" "test_speed_allele_specific" "test_speed_pan_allele" ]; @@ -99,8 +99,8 @@ buildPythonPackage rec { meta = { description = "Peptide-MHC I binding affinity prediction"; homepage = "https://github.com/openvax/mhcflurry"; - changelog = "https://github.com/openvax/mhcflurry/releases/tag/v${version}"; + changelog = "https://github.com/openvax/mhcflurry/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ]; }; -} +}) diff --git a/pkgs/development/python-modules/mhcgnomes/default.nix b/pkgs/development/python-modules/mhcgnomes/default.nix index b5a1660e5774..f963f94a3b56 100644 --- a/pkgs/development/python-modules/mhcgnomes/default.nix +++ b/pkgs/development/python-modules/mhcgnomes/default.nix @@ -1,38 +1,52 @@ { + lib, buildPythonPackage, fetchFromGitHub, - lib, + + # build-system + setuptools, + + # dependencies pandas, pyyaml, - serializable, + numpy, + + # tests + pytestCheckHook, }: -buildPythonPackage { +buildPythonPackage (finalAttrs: { pname = "mhcgnomes"; - version = "1.8.6"; - format = "setuptools"; + version = "3.15.1"; + pyproject = true; src = fetchFromGitHub { owner = "pirl-unc"; repo = "mhcgnomes"; - # See https://github.com/pirl-unc/mhcgnomes/issues/20. As of 2023-07-13, - # they do no have version tags. - rev = "c7e779b60e35a031f6e0f0ea6ae70e8a8e7671c6"; - hash = "sha256-KKiBlnFlavRnaQnOpAzG0dyxmFB+zF9L6t/H05LkFZE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-tcJfGIJsbCdN+U/+2zsYBhKEJNy55QMf7eu9Z4nuXlk="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ pandas pyyaml - serializable + numpy ]; pythonImportsCheck = [ "mhcgnomes" ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + meta = { description = "Parsing MHC nomenclature in the wild"; homepage = "https://github.com/pirl-unc/mhcgnomes"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ samuela ]; }; -} +}) diff --git a/pkgs/development/python-modules/mkdocs-simple-blog/default.nix b/pkgs/development/python-modules/mkdocs-simple-blog/default.nix index af5a3a47e9aa..95b6d7c5c8ad 100644 --- a/pkgs/development/python-modules/mkdocs-simple-blog/default.nix +++ b/pkgs/development/python-modules/mkdocs-simple-blog/default.nix @@ -9,14 +9,14 @@ }: buildPythonPackage rec { pname = "mkdocs-simple-blog"; - version = "0.3.0"; + version = "0.4.1"; pyproject = true; src = fetchFromGitHub { owner = "FernandoCelmer"; repo = "mkdocs-simple-blog"; tag = "v${version}"; - hash = "sha256-1RzorEsGXA8mRzMSS9S5vbPqJXK0vPMlRixo+Yrq27U="; + hash = "sha256-lp0+mJYyP7Qz/gJCI7+tKh9fZArWs2u1ZusnVUax7A4="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/nvdlfw-inspect/default.nix b/pkgs/development/python-modules/nvdlfw-inspect/default.nix index ab7f1db22e2f..76aa000c5c67 100644 --- a/pkgs/development/python-modules/nvdlfw-inspect/default.nix +++ b/pkgs/development/python-modules/nvdlfw-inspect/default.nix @@ -3,6 +3,9 @@ buildPythonPackage, fetchFromGitHub, + # build-system + setuptools, + # dependencies pyyaml, torch, @@ -27,6 +30,10 @@ buildPythonPackage (finalAttrs: { hash = "sha256-qLyPzdwIIXHUDeP226w4yo2B1fqOKZ3yeSXrG3pNQyk="; }; + build-system = [ + setuptools + ]; + dependencies = [ pyyaml torch diff --git a/pkgs/development/python-modules/oca-port/default.nix b/pkgs/development/python-modules/oca-port/default.nix index fef883bb91d2..0a96a77efc26 100644 --- a/pkgs/development/python-modules/oca-port/default.nix +++ b/pkgs/development/python-modules/oca-port/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "oca-port"; - version = "0.19"; + version = "0.21"; pyproject = true; src = fetchFromGitHub { @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "OCA"; repo = "oca-port"; tag = "v${version}"; - hash = "sha256-5Iw9gbc8+x82huAMrqMHKXmJ12Drtaz3USdCucx1ruY="; + hash = "sha256-zewR/ArgNSXK2+S90UveELyeqIaqM3gquos0rQOTXag="; }; build-system = [ diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix index ea5066b7ad5d..5183b8b9d9a4 100644 --- a/pkgs/development/python-modules/price-parser/default.nix +++ b/pkgs/development/python-modules/price-parser/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "price-parser"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "scrapinghub"; repo = "price-parser"; tag = version; - hash = "sha256-1aMWRyrmvilON+crWibrREIN2Rf3hCzewI+vmRppvrg="; + hash = "sha256-QM8kmfxExD7r4kX73QBT028zGbZosXtncCqguLj8Q4U="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index 4a00b7de772b..da6f484b11f5 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildPythonPackage, fetchPypi, numpy, @@ -20,6 +21,14 @@ buildPythonPackage rec { hash = "sha256-UyPQ8aTNmZviRqkNWAyeHptYS5iIf2KY05dhEIfvhgs="; }; + # removed by next version, https://github.com/pyamg/pyamg/pull/420 + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail \ + 'setuptools_scm[toml]==8.3.0' \ + 'setuptools_scm>=8.3.0' \ + ''; + nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ @@ -50,6 +59,7 @@ buildPythonPackage rec { homepage = "https://github.com/pyamg/pyamg"; changelog = "https://github.com/pyamg/pyamg/blob/v${version}/changelog.md"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ stephen-huan ]; + broken = stdenv.hostPlatform.isDarwin && lib.versionAtLeast python.version "3.14"; }; } diff --git a/pkgs/development/python-modules/pyarlo/default.nix b/pkgs/development/python-modules/pyarlo/default.nix index 3b2b78843416..7952d46aee34 100644 --- a/pkgs/development/python-modules/pyarlo/default.nix +++ b/pkgs/development/python-modules/pyarlo/default.nix @@ -6,22 +6,25 @@ pytestCheckHook, requests, requests-mock, + setuptools, sseclient-py, }: -buildPythonPackage rec { +buildPythonPackage (finalattrs: { pname = "pyarlo"; version = "0.2.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "tchellomello"; repo = "python-arlo"; - rev = version; + tag = finalattrs.version; sha256 = "0pp7y2llk4xnf6zh57j5xas0gw5zqm42qaqssd8p4qa3g5rds8k3"; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ requests sseclient-py ]; @@ -37,7 +40,8 @@ buildPythonPackage rec { meta = { description = "Python library to work with Netgear Arlo cameras"; homepage = "https://github.com/tchellomello/python-arlo"; - license = with lib.licenses; [ lgpl3Plus ]; + changelog = "https://github.com/tchellomello/python-arlo/releases/tag/${finalattrs.src.tag}"; + license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyaxencoapi/default.nix b/pkgs/development/python-modules/pyaxencoapi/default.nix index a03546fc4f42..9053e8b558e4 100644 --- a/pkgs/development/python-modules/pyaxencoapi/default.nix +++ b/pkgs/development/python-modules/pyaxencoapi/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "pyaxencoapi"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchFromGitHub { owner = "AXENCO-FR"; repo = "ha-py-axenco-api"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tr5HPNUrbpapOcI8pyKnN25RgXh5AokWGQCe3X4645g="; + hash = "sha256-Ml58+kstIpqQUXDt/jpZeR8ueu5U3nnH7hiUcZxveAM="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pyiceberg-core/default.nix b/pkgs/development/python-modules/pyiceberg-core/default.nix index e251ad4b6778..877ee439f169 100644 --- a/pkgs/development/python-modules/pyiceberg-core/default.nix +++ b/pkgs/development/python-modules/pyiceberg-core/default.nix @@ -18,14 +18,14 @@ buildPythonPackage (finalAttrs: { pname = "pyiceberg-core"; - version = "0.8.0"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "apache"; repo = "iceberg-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-q5eghj469gT9FkbBMgrHcV1bMCTAgAzz1ir7zEx1DAk="; + hash = "sha256-O7Vw31UbnxJxnxrdbORiMyodZFqDwmcA8H/WiIBhwOk="; }; sourceRoot = "${finalAttrs.src.name}/bindings/python"; @@ -37,7 +37,7 @@ buildPythonPackage (finalAttrs: { src sourceRoot ; - hash = "sha256-R/SgYjlxRvlkgn/n8O87Nko0BxenioACqonGa1c9h9E="; + hash = "sha256-AMP58JrlKP16PT43U2pPORWBtITlULTGjQtmuR/hK4U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyroaring/default.nix b/pkgs/development/python-modules/pyroaring/default.nix index 5e3c55ad477c..95c55c276806 100644 --- a/pkgs/development/python-modules/pyroaring/default.nix +++ b/pkgs/development/python-modules/pyroaring/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyroaring"; - version = "1.0.3"; + version = "1.0.4"; pyproject = true; src = fetchFromGitHub { owner = "Ezibenroc"; repo = "PyRoaringBitMap"; tag = version; - hash = "sha256-of4BuTHtIIwdpWUm0d9CByWc8YiaxXNQ1oDXUZYWRjU="; + hash = "sha256-7oHnYN44NVf2mjvHXaRgKtHFHMTQohpGEuQJjc9NGzw="; }; build-system = [ diff --git a/pkgs/development/python-modules/pystardict/default.nix b/pkgs/development/python-modules/pystardict/default.nix index d6ed140de4ba..4e13dd385adc 100644 --- a/pkgs/development/python-modules/pystardict/default.nix +++ b/pkgs/development/python-modules/pystardict/default.nix @@ -2,8 +2,8 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - setuptools-scm, + hatchling, + hatch-vcs, six, pytestCheckHook, }: @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pystardict"; version = "0.9"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "lig"; @@ -20,13 +20,13 @@ buildPythonPackage rec { hash = "sha256-VWOxggAKifN5f6nSN1xsSbg0hpKzrHDw+UqnAOzsXj0="; }; - propagatedBuildInputs = [ six ]; - - nativeBuildInputs = [ - setuptools - setuptools-scm + build-system = [ + hatchling + hatch-vcs ]; + dependencies = [ six ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pystardict" ]; diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix index 628547e877f2..86f3423a6a13 100644 --- a/pkgs/development/python-modules/rocketchat-api/default.nix +++ b/pkgs/development/python-modules/rocketchat-api/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "rocketchat-api"; - version = "3.1.0"; + version = "3.4.0"; pyproject = true; src = fetchFromGitHub { owner = "jadolg"; repo = "rocketchat_API"; tag = version; - hash = "sha256-K3b50mknji+pRTHfLdOBfvvr/zI8knjAzt5/0jhn3Tg="; + hash = "sha256-DA4CBgtcg0TOLm5HrDxbyQK/qOfgwIFw86Yk1s4pBFM="; }; build-system = [ diff --git a/pkgs/development/python-modules/sseclient-py/default.nix b/pkgs/development/python-modules/sseclient-py/default.nix index a74fc325b226..30803aaa6b10 100644 --- a/pkgs/development/python-modules/sseclient-py/default.nix +++ b/pkgs/development/python-modules/sseclient-py/default.nix @@ -2,32 +2,33 @@ lib, buildPythonPackage, fetchFromGitHub, + hatchling, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "sseclient-py"; version = "1.9.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mpetazzoni"; repo = "sseclient"; - tag = "sseclient-py-${version}"; + tag = "sseclient-py-${finalAttrs.version}"; hash = "sha256-AIldZFElGgSbw38aZWCWI1N35MiE+b9D1s/XhD7aIvo="; }; + build-system = [ hatchling ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "sseclient" ]; - enabledTestPaths = [ "tests/unittests.py" ]; - meta = { description = "Pure-Python Server Side Events (SSE) client"; homepage = "https://github.com/mpetazzoni/sseclient"; - changelog = "https://github.com/mpetazzoni/sseclient/releases/tag/sseclient-py-${src.tag}"; + changelog = "https://github.com/mpetazzoni/sseclient/releases/tag/sseclient-py-${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jamiemagee ]; }; -} +}) diff --git a/pkgs/development/python-modules/trino-python-client/default.nix b/pkgs/development/python-modules/trino-python-client/default.nix index dcac97f86a56..86b10c9c09c1 100644 --- a/pkgs/development/python-modules/trino-python-client/default.nix +++ b/pkgs/development/python-modules/trino-python-client/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "trino-python-client"; - version = "0.336.0"; + version = "0.337.0"; pyproject = true; src = fetchFromGitHub { repo = "trino-python-client"; owner = "trinodb"; tag = version; - hash = "sha256-Vii9WMcOQZy93Dlc6d0qzswQTdcYyHoRVuCqcbWUF4s="; + hash = "sha256-q080IbPeck5Ru+3T2jChhNXi05CYPSO8ncf3KI62cRw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/yagrc/default.nix b/pkgs/development/python-modules/yagrc/default.nix index e92154003513..fb85b5fee809 100644 --- a/pkgs/development/python-modules/yagrc/default.nix +++ b/pkgs/development/python-modules/yagrc/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "yagrc"; - version = "1.1.2"; + version = "1.1.3"; pyproject = true; src = fetchFromGitHub { owner = "sparky8512"; repo = "yagrc"; tag = "v${version}"; - hash = "sha256-nqUzDJfLsI8n8UjfCuOXRG6T8ibdN6fSGPPxm5RJhQk="; + hash = "sha256-7Bfelh4U/TyKkFzu/orBZ2BwI3CrXMgfzh9psTgF4vQ="; }; build-system = [ diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix index 12c3cb106eec..debe38b82b7d 100644 --- a/pkgs/development/python-modules/yolink-api/default.nix +++ b/pkgs/development/python-modules/yolink-api/default.nix @@ -9,7 +9,7 @@ tenacity, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "yolink-api"; version = "0.6.3"; pyproject = true; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "YoSmart-Inc"; repo = "yolink-api"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-m/AYuGZNXGk7h0YL4p6jRnqbY/XV91u73lpdgSpstnE="; }; @@ -38,8 +38,8 @@ buildPythonPackage rec { meta = { description = "Library to interface with Yolink"; homepage = "https://github.com/YoSmart-Inc/yolink-api"; - changelog = "https://github.com/YoSmart-Inc/yolink-api/releases/tag/${src.tag}"; + changelog = "https://github.com/YoSmart-Inc/yolink-api/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix index 872c74a23e57..ec8b8bfea2c2 100644 --- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix @@ -2,8 +2,8 @@ grafanaPlugin { pname = "volkovlabs-echarts-panel"; - version = "7.2.2"; - zipHash = "sha256-4y7L8SSqjtQ2bk+v8FeZsZ8gTd9qnBvi2F9cNLPjKGE="; + version = "7.2.4"; + zipHash = "sha256-ZqTGG3UlRqpSCITBFB5g7gIE9vxHS8VZ0Gchcfr9Dko="; meta = { description = "Visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard"; license = lib.licenses.asl20; diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix index e307fcf7e7be..1d95ef9a66ee 100644 --- a/pkgs/tools/package-management/lix/default.nix +++ b/pkgs/tools/package-management/lix/default.nix @@ -131,9 +131,8 @@ let nix-serve-ng = lib.pipe (nix-serve-ng.override { nix = self.lix; }) [ (haskell.lib.compose.enableCabalFlag "lix") (haskell.lib.compose.overrideCabal (drv: { - # https://github.com/aristanetworks/nix-serve-ng/issues/46 # Resetting (previous) broken flag since it may be related to C++ Nix - broken = lib.versionAtLeast self.lix.version "2.93"; + broken = false; })) ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index ec00adf12f0b..30c4895720c1 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -290,6 +290,11 @@ mapAliases { line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29 linear-garage-door = throw "'linear-garage-door' has been superseded by 'nice-go'"; # Added 2025-11-16 linear_operator = throw "'linear_operator' has been renamed to/replaced by 'linear-operator'"; # Converted to throw 2025-10-29 + llama-cloud-services = throw "'llama-cloud-services' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # Added 2026-03-25 + llama-index-indices-managed-llama-cloud = throw "'llama-index-indices-managed-llama-cloud' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # Added 2026-03-24 + llama-index-multi-modal-llms-openai = throw "'llama-index-multi-modal-llms-openai' has been removed as it was deprecated in favor of 'llama-index-llms-openai'"; # added 2026-03-25 + llama-index-readers-llama-parse = throw "'llama-index-readers-llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25 + llama-parse = throw "'llama-parse' has been removed as it was deprecated upstream in favor of 'llama-cloud'"; # added 2026-03-25 lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29 logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29 loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4640b26e4b9b..335e3a9bcffd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4206,6 +4206,8 @@ self: super: with self; { django-i18nfield = callPackage ../development/python-modules/django-i18nfield { }; + django-ical = callPackage ../development/python-modules/django-ical { }; + django-import-export = callPackage ../development/python-modules/django-import-export { }; django-ipware = callPackage ../development/python-modules/django-ipware { }; @@ -8297,6 +8299,8 @@ self: super: with self; { kml2geojson = callPackage ../development/python-modules/kml2geojson { }; + kmock = callPackage ../development/python-modules/kmock { }; + kmsxx = toPythonModule ( pkgs.kmsxx.override { withPython = true; @@ -9003,8 +9007,6 @@ self: super: with self; { llama-cloud = callPackage ../development/python-modules/llama-cloud { }; - llama-cloud-services = callPackage ../development/python-modules/llama-cloud-services { }; - llama-cpp-python = callPackage ../development/python-modules/llama-cpp-python { }; llama-index = callPackage ../development/python-modules/llama-index { }; @@ -9045,10 +9047,6 @@ self: super: with self; { callPackage ../development/python-modules/llama-index-graph-stores-neptune { }; - llama-index-indices-managed-llama-cloud = - callPackage ../development/python-modules/llama-index-indices-managed-llama-cloud - { }; - llama-index-instrumentation = callPackage ../development/python-modules/llama-index-instrumentation { }; @@ -9063,10 +9061,6 @@ self: super: with self; { callPackage ../development/python-modules/llama-index-llms-openai-like { }; - llama-index-multi-modal-llms-openai = - callPackage ../development/python-modules/llama-index-multi-modal-llms-openai - { }; - llama-index-node-parser-docling = callPackage ../development/python-modules/llama-index-node-parser-docling { }; @@ -9083,10 +9077,6 @@ self: super: with self; { llama-index-readers-json = callPackage ../development/python-modules/llama-index-readers-json { }; - llama-index-readers-llama-parse = - callPackage ../development/python-modules/llama-index-readers-llama-parse - { }; - llama-index-readers-s3 = callPackage ../development/python-modules/llama-index-readers-s3 { }; llama-index-readers-twitter = @@ -9121,8 +9111,6 @@ self: super: with self; { llama-index-workflows = callPackage ../development/python-modules/llama-index-workflows { }; - llama-parse = callPackage ../development/python-modules/llama-parse { }; - llama-stack-client = callPackage ../development/python-modules/llama-stack-client { }; llamaindex-py-client = callPackage ../development/python-modules/llamaindex-py-client { };