c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2026-06-30 07:20:16 +00:00 • committed by GitHub
commit 0d19ffd8ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 333 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

20
nixos/modules/services/networking/cloudflared.nix
View file

@ -240,6 +240,25 @@ in
example = "auto";
};
protocol = lib.mkOption {
type = lib.types.enum [
"auto"
"http2"
"quic"
];
default = "auto";
description = ''
Specifies the protocol used to establish a connection between `cloudflared` and the Cloudflare global network.
The value `auto` lets `cloudflared` choose the protocol (currently QUIC, falling back to HTTP/2).
Set to `http2` to work around QUIC/UDP connectivity issues, such as restrictive firewalls, broken UDP path MTU, or QUIC interop bugs.
Set to `quic` to force QUIC.
See [Tunnel run parameters](https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/configure-tunnels/cloudflared-parameters/run-parameters/#protocol).
'';
example = "http2";
};
default = lib.mkOption {
type = lib.types.str;
description = ''
@ -397,6 +416,7 @@ in
environment = {
TUNNEL_ORIGIN_CERT = lib.mkIf (certFile != null) "%d/cert.pem";
TUNNEL_EDGE_IP_VERSION = tunnel.edgeIPVersion;
TUNNEL_TRANSPORT_PROTOCOL = tunnel.protocol;
};
}
) config.services.cloudflared.tunnels;

6
pkgs/applications/editors/android-studio/default.nix
View file

@ -26,9 +26,9 @@ let
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.8/android-studio-quail2-rc1-linux.tar.gz";
};
latestVersion = {
version = "2026.1.3.1"; # "Android Studio Quail 3 | 2026.1.3 Canary 1"
sha256Hash = "sha256-D7aSLkauEVB05/vhWxn7sfK2CoAzsvaxnkFViAuVIsc=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.1/android-studio-quail3-canary1-linux.tar.gz";
version = "2026.1.3.2"; # "Android Studio Quail 3 | 2026.1.3 Canary 2"
sha256Hash = "sha256-bGCLbl+b9vTml0m+uxBBWg99ikBAFfk5X+UnR+j2Ogw=";
url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.2/android-studio-quail3-canary2-linux.tar.gz";
};
in
{

4
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -526,11 +526,11 @@
"vendorHash": "sha256-9FzpBgb3BzIVhx8kqhyDJw/liH6X8jUhFmwtbic4uVw="
},
"hashicorp_azuread": {
"hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=",
"hash": "sha256-mEYEZIztDjyqWSJFoJPXtV0E9YikumtwGVtZA4Jfw3U=",
"homepage": "https://registry.terraform.io/providers/hashicorp/azuread",
"owner": "hashicorp",
"repo": "terraform-provider-azuread",
"rev": "v3.8.0",
"rev": "v3.9.0",
"spdx": "MPL-2.0",
"vendorHash": null
},

36
pkgs/build-support/build-mozilla-mach/153-cbindgen-0.29.4-compat.patch Normal file
View file

@ -0,0 +1,36 @@
commit c4aab1ba6aadd6985fcd271679d2118f094ec876
Author: Emilio Cobos Álvarez <emilio@crisal.io>
Date: Tue Jun 9 22:04:44 2026 +0000
Bug 2046162 - Remove some redundant pub qualifiers. r=gfx-reviewers,aosmond
The enum is not public so this doesn't change behavior but a patch I'm
working on in cbindgen gets a bit confused with this.
Differential Revision: https://phabricator.services.mozilla.com/D305678
diff --git a/gfx/wr/webrender/src/texture_cache.rs b/gfx/wr/webrender/src/texture_cache.rs
index e14c26bd3190..77e1f3a312ac 100644
--- a/gfx/wr/webrender/src/texture_cache.rs
+++ b/gfx/wr/webrender/src/texture_cache.rs
@@ -273,9 +273,9 @@ enum BudgetType {
}
impl BudgetType {
- pub const COUNT: usize = 7;
+ const COUNT: usize = 7;
- pub const VALUES: [BudgetType; BudgetType::COUNT] = [
+ const VALUES: [BudgetType; BudgetType::COUNT] = [
BudgetType::SharedColor8Linear,
BudgetType::SharedColor8Nearest,
BudgetType::SharedColor8Glyphs,
@@ -285,7 +285,7 @@ impl BudgetType {
BudgetType::Standalone,
];
- pub const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [
+ const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [
profiler::ATLAS_COLOR8_LINEAR_PRESSURE,
profiler::ATLAS_COLOR8_NEAREST_PRESSURE,
profiler::ATLAS_COLOR8_GLYPHS_PRESSURE,

5
pkgs/build-support/build-mozilla-mach/default.nix
View file

@ -341,6 +341,11 @@ buildStdenv.mkDerivation {
# https://bugzilla.mozilla.org/show_bug.cgi?id=1985509
./140-bindgen-string-view.patch
]
++ lib.optionals (lib.versionAtLeast version "140" && lib.versionOlder version "140.13") [
# https://github.com/mozilla/cbindgen/issues/1165
# https://bugzilla.mozilla.org/show_bug.cgi?id=2046162
./153-cbindgen-0.29.4-compat.patch
]
++ extraPatches;
postPatch = ''

6
pkgs/by-name/gn/gnucash/package.nix
View file

@ -37,12 +37,12 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gnucash";
version = "5.15";
version = "5.16";
# raw source code doesn't work out of box; fetchFromGitHub not usable
src = fetchurl {
url = "https://github.com/Gnucash/gnucash/releases/download/${finalAttrs.version}/gnucash-${finalAttrs.version}.tar.bz2";
hash = "sha256-sL1K9Dtr3jRUIn1LOY6ex6Db1RQ0acE3P8gkw8qrCQk=";
hash = "sha256-u5tsZ+u2o+Btn/T04EF6l77wFZ0mkSvpsOdaMpAf1JM=";
};
nativeBuildInputs = [
@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "Gnucash";
repo = "gnucash-docs";
tag = finalAttrs.version;
hash = "sha256-EI/By0Ek3qDCmi6svX96Wg78UnmsDZzQLRSqErPUuxA=";
hash = "sha256-KC2POdwKma2CWpom3kN4X4MAItJFeWHl4SIV7sb+KCo=";
};
nativeBuildInputs = [ cmake ];

10
pkgs/by-name/im/immich-machine-learning/package.nix
View file

@ -1,5 +1,6 @@
{
lib,
fetchpatch2,
immich,
python3,
nixosTests,
@ -16,6 +17,15 @@ python.pkgs.buildPythonApplication rec {
src = "${immich.src}/machine-learning";
pyproject = true;
patches = [
(fetchpatch2 {
name = "fix_tests_with_openvino_ep.patch";
relative = "machine-learning";
url = "https://github.com/immich-app/immich/commit/7f611d90317d75ac3d75adf428f367376171e106.patch?full_index=1";
hash = "sha256-dntL5AZS3VIp7++yUec4HWIdtwltrnIePNFPJaiZdy4=";
})
];
pythonRelaxDeps = [
"huggingface-hub"
"insightface"

6
pkgs/by-name/js/jsonschema-cli/package.nix
View file

@ -9,15 +9,15 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "jsonschema-cli";
version = "0.46.5";
version = "0.46.6";
src = fetchCrate {
pname = "jsonschema-cli";
inherit (finalAttrs) version;
hash = "sha256-/0ADUfUoGB6i8L8FahjwafsjxXsRx0B0SnZH1FhUGxs=";
hash = "sha256-IMhobv10ru+7WBpdrv9Pt1s/E2oO8yxPv3oCRx3jov4=";
};
cargoHash = "sha256-+V42oG6PYSmWKG6Dv2zllTxObeQqCABBcUOAvuLqAZ4=";
cargoHash = "sha256-MKSSvJQWwUGwJr0z6/QvWLXQDMVj/7iv+Szr/r+blkA=";
preCheck = ''
export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt

8
pkgs/by-name/ki/kiro-cli/package.nix
View file

@ -14,23 +14,23 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "kiro-cli";
version = "2.8.1";
version = "2.10.0";
src =
let
darwinDmg = fetchurl {
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg";
hash = "sha256-nN3GHnAdjgIplKgbPgtis4M1lRhyH5s8ilHMjKAuRJU=";
hash = "sha256-NDeyXQO9NBsK3xqAEcO1gGn9ta+ZVQ1GNwZ4hbGUe3Q=";
};
in
{
x86_64-linux = fetchurl {
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz";
hash = "sha256-6HAczZP8cCChkZ4rN3I+15vwABHm1LvSu+CKgIbNqRM=";
hash = "sha256-cJl6CyYCzbLpB6m+W9Tx7enaPzijgjOBjdmG6CPMM8k=";
};
aarch64-linux = fetchurl {
url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz";
hash = "sha256-dnTr+VGe30hB/LRo7whzRTt1m6cOwsorf7CebN/eock=";
hash = "sha256-39hKSRi1l5ruSqObViksJkufiCOvLTaIkQzT3sNQFQQ=";
};
x86_64-darwin = darwinDmg;
aarch64-darwin = darwinDmg;

64
pkgs/by-name/ku/kulala-fmt/package.nix
View file

@ -1,17 +1,18 @@
{
lib,
stdenv,
bun,
fetchFromGitHub,
fetchPnpmDeps,
kulala-core,
makeBinaryWrapper,
nodejs,
writableTmpDirAsHomeHook,
pnpm_11,
pnpmConfigHook,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "kulala-fmt";
version = "3.1.0";
version = "4.3.4";
strictDeps = true;
__structuredAttrs = true;
@ -20,66 +21,27 @@ stdenv.mkDerivation (finalAttrs: {
owner = "mistweaverco";
repo = "kulala-fmt";
tag = "v${finalAttrs.version}";
hash = "sha256-4rVsw3dyoKrC6lj8m2R42iZmBk5G2LIVtV6Ro9pHSBo=";
hash = "sha256-sARZDtrF8JihVuE2Ix/f4h/OWIbdGW48xpVJlVmTdYY=";
};
node_modules = stdenv.mkDerivation {
pname = "${finalAttrs.pname}-node_modules";
inherit (finalAttrs) version src;
strictDeps = true;
__structuredAttrs = true;
nativeBuildInputs = [
bun
writableTmpDirAsHomeHook
];
dontConfigure = true;
buildPhase = ''
runHook preBuild
bun install \
--cpu="*" \
--frozen-lockfile \
--ignore-scripts \
--no-progress \
--os="*"
runHook postBuild
'';
installPhase = ''
runHook preInstall
mkdir -p $out
cp -R node_modules $out/
runHook postInstall
'';
dontFixup = true;
outputHash = "sha256-z+jQC2RCav3VG/agWizcWFat8KgkGdBzaGQriviEbyo=";
outputHashAlgo = "sha256";
outputHashMode = "recursive";
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
pnpm = pnpm_11;
fetcherVersion = 4;
hash = "sha256-wPMWFYRd3R570oAMORHTKamE0qcmIT+LFRuTiXFX97M=";
};
nativeBuildInputs = [
bun
makeBinaryWrapper
nodejs
pnpm_11
pnpmConfigHook
];
dontConfigure = true;
buildPhase = ''
runHook preBuild
cp -R ${finalAttrs.node_modules}/node_modules .
patchShebangs node_modules
bun run build
pnpm run build
runHook postBuild
'';

4
pkgs/by-name/me/melos/package.nix
View file

@ -5,12 +5,12 @@
}:
buildDartApplication (finalAttrs: {
pname = "melos";
version = "7.8.2";
version = "8.0.0";
src = fetchFromGitHub {
owner = "invertase";
repo = "melos";
tag = "melos-v${finalAttrs.version}";
hash = "sha256-5HLd0NUaRd0zl8WtTOGX4nHXwzCOOvCQcUW8GmmBqEw=";
hash = "sha256-txT2xIvhhmL9i8gE6uUzDa6/k5ZzDBsiPZ1V4Gc4U/I=";
};
patches = [

12
pkgs/by-name/me/melos/pubspec.lock.json
View file

@ -604,31 +604,31 @@
"dependency": "transitive",
"description": {
"name": "test",
"sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f",
"sha256": "0d5ba5602ec3baa28c8ce365e1efc5575969c765f45c554a3e167dc7945b9c30",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "1.31.1"
"version": "1.31.2"
},
"test_api": {
"dependency": "transitive",
"description": {
"name": "test_api",
"sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11",
"sha256": "475610b2aa23c19687cce2961e44b0cc57cafe220f67c2b80201231b2a07fbe7",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.7.12"
"version": "0.7.13"
},
"test_core": {
"dependency": "transitive",
"description": {
"name": "test_core",
"sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5",
"sha256": "a39c204a4fc7a7ccb04a2b985e359fda3cc37e45e0b8ac61c3fb1a05aa832132",
"url": "https://pub.dev"
},
"source": "hosted",
"version": "0.6.18"
"version": "0.6.19"
},
"typed_data": {
"dependency": "transitive",

22
pkgs/by-name/on/onnxruntime/package.nix
View file

@ -25,10 +25,12 @@
pythonSupport ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform),
cudaSupport ? config.cudaSupport,
ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
openvinoSupport ? stdenv.isLinux,
rocmSupport ? config.rocmSupport,
coremlSupport ? stdenv.hostPlatform.isDarwin,
withFullProtobuf ? false,
cudaPackages ? { },
openvino,
rocmPackages,
}@inputs:
@ -234,6 +236,9 @@ effectiveStdenv.mkDerivation (finalAttrs: {
rocmPackages.rocm-smi
rocmPackages.roctracer
]
++ lib.optionals openvinoSupport [
openvino
]
++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
(darwinMinVersionHook "13.3")
];
@ -292,6 +297,23 @@ effectiveStdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "onnxruntime_USE_COREML" coremlSupport)
(lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
]
++ lib.optionals openvinoSupport [
(lib.cmakeBool "onnxruntime_USE_OPENVINO" true)
(lib.cmakeFeature "onnxruntime_USE_OPENVINO_AUTO" (
if effectiveStdenv.hostPlatform.system == "x86_64-linux" then "NPU,GPU,CPU" else "GPU"
))
(lib.cmakeBool "onnxruntime_USE_OPENVINO_GPU" true)
(lib.cmakeBool "onnxruntime_USE_OPENVINO_CPU" (
effectiveStdenv.hostPlatform.system == "x86_64-linux"
))
(lib.cmakeBool "onnxruntime_USE_OPENVINO_NPU" (
effectiveStdenv.hostPlatform.system == "x86_64-linux"
))
(lib.cmakeFeature "OpenVINO_DIR" "${lib.getDev openvino}/runtime/cmake")
# RTTI is disabled in default non-python builds (https://onnxruntime.ai/docs/build/custom.html#basic),
# but disabling it with OpenVINO will fail with `error: cannot use 'typeid' with '-fno-rtti'`
(lib.cmakeBool "onnxruntime_DISABLE_RTTI" false)
]
++ lib.optionals pythonSupport [
(lib.cmakeBool "onnxruntime_ENABLE_PYTHON" true)
]

156
pkgs/by-name/op/openvino/cmake-install-paths.patch Normal file
View file

@ -0,0 +1,156 @@
--- a/cmake/developer_package/packaging/archive.cmake
+++ b/cmake/developer_package/packaging/archive.cmake
@@ -25,14 +25,15 @@ endif()
macro(ov_archive_cpack_set_dirs)
# common "archive" package locations
# TODO: move current variables to OpenVINO specific locations
- set(OV_CPACK_INCLUDEDIR runtime/include)
- set(OV_CPACK_OPENVINO_CMAKEDIR runtime/cmake)
- set(OV_CPACK_DOCDIR docs)
- set(OV_CPACK_LICENSESDIR licenses)
- set(OV_CPACK_SAMPLESDIR samples)
+ set(OV_CPACK_INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
+ set(OV_CPACK_OPENVINO_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/openvino")
+ set(OV_CPACK_DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/openvino")
+ set(OV_CPACK_LICENSESDIR "${CMAKE_INSTALL_DATAROOTDIR}/licenses/openvino")
+ set(OV_CPACK_SAMPLESDIR "${CMAKE_INSTALL_DATAROOTDIR}/openvino/samples")
set(OV_CPACK_WHEELSDIR wheels)
set(OV_CPACK_DEVREQDIR tools)
- set(OV_CPACK_PYTHONDIR python)
+ find_package(Python QUIET REQUIRED COMPONENTS Interpreter Development)
+ set(OV_CPACK_PYTHONDIR "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages")
if(USE_BUILD_TYPE_SUBFOLDER)
set(build_type ${CMAKE_BUILD_TYPE})
@@ -49,11 +50,11 @@ macro(ov_archive_cpack_set_dirs)
set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER}/${build_type})
set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER}/${build_type})
else()
- set(OV_CPACK_LIBRARYDIR runtime/lib/${ARCH_FOLDER})
- set(OV_CPACK_RUNTIMEDIR runtime/lib/${ARCH_FOLDER})
- set(OV_CPACK_ARCHIVEDIR runtime/lib/${ARCH_FOLDER})
+ set(OV_CPACK_LIBRARYDIR "${CMAKE_INSTALL_LIBDIR}")
+ set(OV_CPACK_RUNTIMEDIR "${CMAKE_INSTALL_LIBDIR}")
+ set(OV_CPACK_ARCHIVEDIR "${CMAKE_INSTALL_LIBDIR}")
endif()
- set(OV_CPACK_PLUGINSDIR ${OV_CPACK_RUNTIMEDIR})
+ set(OV_CPACK_PLUGINSDIR "${OV_CPACK_RUNTIMEDIR}/openvino")
endmacro()
ov_archive_cpack_set_dirs()
@@ -78,9 +79,9 @@ macro(ov_define_component_include_rules)
# licensing
unset(OV_CPACK_COMP_LICENSING_EXCLUDE_ALL)
# samples
- unset(OV_CPACK_COMP_CPP_SAMPLES_EXCLUDE_ALL)
- unset(OV_CPACK_COMP_C_SAMPLES_EXCLUDE_ALL)
- unset(OV_CPACK_COMP_PYTHON_SAMPLES_EXCLUDE_ALL)
+ set(OV_CPACK_COMP_CPP_SAMPLES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
+ set(OV_CPACK_COMP_C_SAMPLES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
+ set(OV_CPACK_COMP_PYTHON_SAMPLES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
# python
unset(OV_CPACK_COMP_PYTHON_OPENVINO_EXCLUDE_ALL)
unset(OV_CPACK_COMP_BENCHMARK_APP_EXCLUDE_ALL)
@@ -92,8 +93,8 @@ macro(ov_define_component_include_rules)
# nodejs
set(OV_CPACK_COMP_NPM_EXCLUDE_ALL EXCLUDE_FROM_ALL)
# scripts
- unset(OV_CPACK_COMP_INSTALL_DEPENDENCIES_EXCLUDE_ALL)
- unset(OV_CPACK_COMP_SETUPVARS_EXCLUDE_ALL)
+ set(OV_CPACK_COMP_INSTALL_DEPENDENCIES_EXCLUDE_ALL EXCLUDE_FROM_ALL)
+ set(OV_CPACK_COMP_SETUPVARS_EXCLUDE_ALL EXCLUDE_FROM_ALL)
# pkgconfig
set(OV_CPACK_COMP_PKG_CONFIG_EXCLUDE_ALL ${OV_CPACK_COMP_CORE_DEV_EXCLUDE_ALL})
# symbolic links
--- a/src/common/util/src/file_util.cpp
+++ b/src/common/util/src/file_util.cpp
@@ -215,7 +215,7 @@ std::filesystem::path ov::util::get_compiled_plugin_path(const std::filesystem::
const auto ov_library_path = get_ov_lib_path();
// plugin can be found either:
- const std::filesystem::path sub_folder_path{std::string("openvino-") + OpenVINO_VERSION};
+ const std::filesystem::path sub_folder_path{std::string("openvino")};
if (auto plugin_path = ov_library_path / sub_folder_path / plugin; ov::util::file_exists(plugin_path)) {
return plugin_path;
--- a/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt
+++ b/src/plugins/intel_npu/tools/compile_tool/CMakeLists.txt
@@ -31,7 +31,7 @@ ov_add_target(TYPE EXECUTABLE
npu_tools_utils)
set_target_properties(${TARGET_NAME} PROPERTIES
- FOLDER intel_npu_tools
+ FOLDER intel_npu_tools OUTPUT_NAME ov-${TARGET_NAME}
CXX_STANDARD 17)
# TODO: fix warnings and remove this exception
@@ -44,13 +44,13 @@ endif()
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
+ DESTINATION "${OV_CPACK_DOCDIR}" RENAME README-${TARGET_NAME}.md
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
endif()
--- a/src/plugins/intel_npu/tools/protopipe/CMakeLists.txt
+++ b/src/plugins/intel_npu/tools/protopipe/CMakeLists.txt
@@ -67,7 +67,7 @@ ov_add_target(TYPE EXECUTABLE
LINK_LIBRARIES PRIVATE ${DEPENDENCIES})
set_target_properties(${TARGET_NAME} PROPERTIES
- FOLDER intel_npu_tools
+ FOLDER intel_npu_tools OUTPUT_NAME ov-${TARGET_NAME}
CXX_STANDARD 17)
if (WIN32)
@@ -79,13 +79,13 @@ endif()
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
+ DESTINATION "${OV_CPACK_DOCDIR}" RENAME README-${TARGET_NAME}.md
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
endif()
--- a/src/plugins/intel_npu/tools/single-image-test/CMakeLists.txt
+++ b/src/plugins/intel_npu/tools/single-image-test/CMakeLists.txt
@@ -52,7 +52,7 @@ ov_add_target(TYPE EXECUTABLE
ov_set_threading_interface_for(${TARGET_NAME})
set_target_properties(${TARGET_NAME} PROPERTIES
- FOLDER intel_npu_tools
+ FOLDER intel_npu_tools OUTPUT_NAME ov-${TARGET_NAME}
CXX_STANDARD 17)
# TODO: fix warnings and remove this exception
@@ -65,13 +65,13 @@ endif()
#
install(TARGETS ${TARGET_NAME}
- RUNTIME DESTINATION "tools/${TARGET_NAME}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/README.md"
- DESTINATION "tools/${TARGET_NAME}"
+ DESTINATION "${OV_CPACK_DOCDIR}" RENAME README-${TARGET_NAME}.md
COMPONENT ${NPU_INTERNAL_COMPONENT}
${OV_CPACK_COMP_NPU_INTERNAL_EXCLUDE_ALL})
endif()

23
pkgs/by-name/op/openvino/package.nix
View file

@ -68,12 +68,16 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [
"out"
"dev"
"lib"
"python"
];
nativeBuildInputs = [
addDriverRunpath
# order matters here: autoAddDriverRunpath must run after autoPatchelfHook, otherwise the RUNPATH will end up being wrong
autoPatchelfHook
addDriverRunpath
cmake
git
libarchive
@ -87,6 +91,11 @@ stdenv.mkDerivation (finalAttrs: {
cudaPackages.cuda_nvcc
];
patches = [
# https://aur.archlinux.org/cgit/aur.git/tree/010-openvino-change-install-paths.patch?h=openvino
./cmake-install-paths.patch
];
dontUseSconsCheck = true;
dontUseSconsBuild = true;
dontUseSconsInstall = true;
@ -161,16 +170,14 @@ stdenv.mkDerivation (finalAttrs: {
enableParallelBuilding = true;
postInstall = ''
mkdir -p $python
mv $out/python/* $python/
rmdir $out/python
mkdir -p $python/lib
mv $lib/lib/python* $python/lib/
'';
postFixup = ''
# Link to OpenCL
find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
addDriverRunpath "$lib"
done
substituteInPlace $dev/lib/pkgconfig/openvino.pc \
--replace-fail "include_prefix=\''${prefix}/" "include_prefix=" \
--replace-fail "exec_prefix=\''${prefix}/" "exec_prefix="
'';
meta = {

4
pkgs/by-name/pi/pixinsight/default.nix
View file

@ -10,12 +10,12 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pixinsight";
version = "1.9.4-20260522";
version = "1.9.4-20260621";
src = requireFile {
name = "PI-linux-x64-${finalAttrs.version}-c.tar.xz";
url = "http://pixinsight.com";
hash = "sha256-+mMVAleBO5zVAOLfbvi2xedF5aTxzZoZl3UY6HzWW7I=";
hash = "sha256-ITJq6q7rLBYe1+6jk2ZtpOSu5M5Z5bRzFPu06PPd7UI=";
};
nativeBuildInputs = [

4
pkgs/by-name/po/podman-tui/package.nix
View file

@ -9,13 +9,13 @@
buildGoModule (finalAttrs: {
pname = "podman-tui";
version = "1.11.2";
version = "1.11.3";
src = fetchFromGitHub {
owner = "containers";
repo = "podman-tui";
tag = "v${finalAttrs.version}";
hash = "sha256-+yi9t+NHieYvNKgmIgExotESFk8qvnYV11uuHMuV/No=";
hash = "sha256-qeUYn9FDhuLaNjeJekmQYjR1PJJx4/sKBuxT5qOLCj8=";
};
vendorHash = null;

6
pkgs/by-name/re/render-cli/package.nix
View file

@ -6,16 +6,16 @@
buildGoModule rec {
pname = "render-cli";
version = "2.20.0";
version = "2.21.0";
src = fetchFromGitHub {
owner = "render-oss";
repo = "cli";
rev = "v${version}";
hash = "sha256-2pKZQsL/MffTaz4ZPj2IPjNFgObPPotJOTNB+VsHxns=";
hash = "sha256-f5Knj3yirUHjQ9+4wxJYRwrsSpvb1lvQbnxaRlHUC6s=";
};
vendorHash = "sha256-F7wI/u1LgBJkcOAJe/Xcgf3v5H6qfRn3fFLdj9Jlftc=";
vendorHash = "sha256-ywUuD8ZtfPAtVcHOrEIuXBncqWENTb++Spc4cp2LUOM=";
# Tests require network access
doCheck = false;

6
pkgs/by-name/ru/rust-cbindgen/package.nix
View file

@ -14,16 +14,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rust-cbindgen";
version = "0.29.3";
version = "0.29.4";
src = fetchFromGitHub {
owner = "mozilla";
repo = "cbindgen";
rev = "v${finalAttrs.version}";
hash = "sha256-d0rY7Sk37s8HEZlQq9Sbjj1P+DgygD0Yjx8cXlFKEIA=";
hash = "sha256-leeHOwpzXuzg2cTjXehBnCsS+dvU4eIIFtWKeCee20U=";
};
cargoHash = "sha256-UeierkQpfCiB5ES9ZW9hO+0AcI9Ip8qSJ/Nd+I1xrmQ=";
cargoHash = "sha256-f6YoDoiVoh0BVPYHFO1FsdI4OCsF+LY72QaD57StdIQ=";
nativeCheckInputs = [
cmake

6
pkgs/by-name/to/torrserver/package.nix
View file

@ -7,15 +7,15 @@
}:
buildGo126Module rec {
pname = "torrserver";
version = "141.5";
version = "141.9";
src = fetchFromGitHub {
owner = "YouROK";
repo = "TorrServer";
tag = "MatriX.${version}";
sha256 = "sha256-f1D6ZeIa5Uw6I/dG4OCN2ZbRudftaMlgQx+NuQVTWIA=";
sha256 = "sha256-wgchuTLcTHCS8ab5zRTtEIxuLVSCQddgCcuWJ0WOg6s=";
};
vendorHash = "sha256-AHkSemWYa4w20YKUyfhD1Liw9AwbgCxq+UmqVW0G70g=";
vendorHash = "sha256-+blfgKId2LtnSBpbcYgYHRHuubfrT7xcVfddzQMd0KU=";
modRoot = "server";
subPackages = [ "cmd" ];

6
pkgs/by-name/ws/wstunnel/package.nix
View file

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "wstunnel";
version = "10.5.5";
version = "10.6.1";
src = fetchFromGitHub {
owner = "erebe";
repo = "wstunnel";
tag = "v${finalAttrs.version}";
hash = "sha256-iPCyS+VkFfOBHiZfUtgseSDSoHL/aK1LoFk4mdZNjqo=";
hash = "sha256-iQ1GmLhljUnf4FiK21phPxKUP5Wn0Si3ldC9Coxnv2E=";
};
cargoHash = "sha256-KhuLV89LTiyofx57Vc5fub3vipRB7jqt28lgQnMwq7M=";
cargoHash = "sha256-hBzaMhNV1fat0I2UCcXndA/DOQkK96SVBm69VQlvBtY=";
cargoBuildFlags = [ "--package wstunnel-cli" ];

8
pkgs/development/python-modules/ai-edge-litert/default.nix
View file

@ -49,6 +49,10 @@ buildPythonPackage {
nativeBuildInputs = [ autoPatchelfHook ];
buildInputs = [
openvino-native
];
dependencies = [
backports-strenum
flatbuffers
@ -72,10 +76,6 @@ buildPythonPackage {
"backports.strenum"
];
postFixup = ''
addAutoPatchelfSearchPath ${openvino-native}/runtime/lib/
'';
pythonImportsCheck = [
"ai_edge_litert"
"ai_edge_litert.interpreter"

2
pkgs/development/python-modules/onnxruntime/default.nix
View file

@ -10,6 +10,7 @@
re2,
# dependencies
openvino,
coloredlogs,
numpy,
packaging,
@ -76,6 +77,7 @@ buildPythonPackage {
++ lib.optionals onnxruntime.passthru.ncclSupport [
nccl # libnccl.so.XX
]
++ lib.optionals stdenv.hostPlatform.isLinux [ openvino ]
);
dependencies = [

11
pkgs/development/python-modules/openvino/default.nix
View file

@ -3,7 +3,7 @@
buildPythonPackage,
openvino-native,
numpy,
python,
packaging,
}:
buildPythonPackage {
@ -13,13 +13,16 @@ buildPythonPackage {
src = openvino-native.python;
propagatedBuildInputs = [ numpy ];
dependencies = [
numpy
packaging
];
installPhase = ''
runHook preInstall
mkdir -p $out/${python.sitePackages}
cp -Rv * $out/${python.sitePackages}/
mkdir -p $out
cp -Rv * $out/
runHook postInstall
'';

6
pkgs/servers/home-assistant/custom-lovelace-modules/sonos-card/package.nix
View file

@ -6,13 +6,13 @@
buildNpmPackage rec {
pname = "sonos-card";
version = "10.7.0";
version = "10.7.1";
src = fetchFromGitHub {
owner = "punxaphil";
repo = "custom-sonos-card";
tag = "v${version}";
hash = "sha256-Qm/9U/STCqfQknbHr2F2YExwXfzh8TbWKtzA0KMCRhA=";
hash = "sha256-xwSWQqJ3lbkVkorjbQPrDaW/MgCHQFBm9VEV+YKVMxk=";
};
postPatch = ''
@ -21,7 +21,7 @@ buildNpmPackage rec {
--replace-fail "&& bash create-dist-maxi-media-player.sh" ""
'';
npmDepsHash = "sha256-rd1T8dUUr4XvWiRWf7PDEMAlNBzZ4fhL58pNUdcZERU=";
npmDepsHash = "sha256-vrF7i2zaWuGe2OAhhrhPkKZRUqtc+/tLUVoPKgHtEpI=";
installPhase = ''
runHook preInstall

1
pkgs/top-level/python-packages.nix
View file

@ -11840,6 +11840,7 @@ self: super: with self; {
python3Packages = self;
pythonSupport = true;
};
inherit (pkgs) openvino;
};
onnxruntime-tools = callPackage ../development/python-modules/onnxruntime-tools { };