Merge master into staging-nixos
This commit is contained in:
@@ -31,6 +31,7 @@ symlinkJoin {
|
||||
};
|
||||
|
||||
meta = wayfire.meta // {
|
||||
outputsToInstall = [ "out" ];
|
||||
# To prevent builds on hydra
|
||||
hydraPlatforms = [ ];
|
||||
# prefer wrapper over the package
|
||||
|
||||
@@ -5,15 +5,15 @@
|
||||
}:
|
||||
let
|
||||
pname = "ankama-launcher";
|
||||
version = "3.13.16";
|
||||
version = "3.13.18";
|
||||
|
||||
# The original URL for the launcher is:
|
||||
# https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage
|
||||
# As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL.
|
||||
# To update the client, head to web.archive.org and create a new snapshot of the download page.
|
||||
src = fetchurl {
|
||||
url = "https://web.archive.org/web/20250906013556/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
|
||||
hash = "sha256-wG7xg6uQJsdJR9Xu2T9PCVQb+LSyO10BveGftOrc2Uo=";
|
||||
url = "https://web.archive.org/web/20251121131316/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
|
||||
hash = "sha256-0GI3qBt/hwRqmfvg817C5IiD8s9AYzTX6w2UAmyR02I=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extract { inherit pname version src; };
|
||||
|
||||
@@ -0,0 +1,101 @@
|
||||
diff --git a/tests/test_support/audio_support.cc b/tests/test_support/audio_support.cc
|
||||
index c26022e9..5f50d035 100644
|
||||
--- a/tests/test_support/audio_support.cc
|
||||
+++ b/tests/test_support/audio_support.cc
|
||||
@@ -16,6 +16,7 @@
|
||||
// along with arc_unpacker. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include "test_support/audio_support.h"
|
||||
+#include <cstdlib>
|
||||
#include "algo/format.h"
|
||||
#include "algo/range.h"
|
||||
#include "dec/microsoft/wav_audio_decoder.h"
|
||||
@@ -44,13 +45,42 @@ res::Audio tests::get_test_audio()
|
||||
void tests::compare_audio(
|
||||
const res::Audio &actual, const res::Audio &expected)
|
||||
{
|
||||
+ // Allow for minor variances in audio samples within the specified
|
||||
+ // threshold. Floating point calculations in some audio decoders yields
|
||||
+ // slightly differing results across different CPU architectures.
|
||||
+ //
|
||||
+ // Affected tests:
|
||||
+ // * tests/dec/cri/hca_audio_decoder_test.cc
|
||||
+ // * tests/dec/entis/mio_audio_decoder_test.cc
|
||||
+ static constexpr int tolerance = 1;
|
||||
+
|
||||
REQUIRE(actual.codec == expected.codec);
|
||||
REQUIRE(actual.channel_count == expected.channel_count);
|
||||
REQUIRE(actual.sample_rate == expected.sample_rate);
|
||||
REQUIRE(actual.bits_per_sample == expected.bits_per_sample);
|
||||
REQUIRE(actual.extra_codec_headers == expected.extra_codec_headers);
|
||||
REQUIRE(actual.samples.size() == expected.samples.size());
|
||||
+
|
||||
+#ifdef __x86_64__
|
||||
tests::compare_binary(actual.samples, expected.samples);
|
||||
+#else
|
||||
+ tests::compare_binary(
|
||||
+ actual.samples,
|
||||
+ expected.samples,
|
||||
+ [](const bstr& bytes1, const bstr& bytes2) -> bool {
|
||||
+ const auto samples1 = reinterpret_cast<const s16*>(bytes1.c_str());
|
||||
+ const auto samples2 = reinterpret_cast<const s16*>(bytes2.c_str());
|
||||
+ const auto n_samples = bytes1.size() / sizeof(*samples1);
|
||||
+ // algo::range is a bit incomplete to work with std::all_of
|
||||
+ for (const int i : algo::range(n_samples)) {
|
||||
+ if (std::abs(samples1[i] - samples2[i]) > tolerance) {
|
||||
+ return false;
|
||||
+ }
|
||||
+ }
|
||||
+ return true;
|
||||
+ }
|
||||
+ );
|
||||
+#endif
|
||||
|
||||
REQUIRE(actual.loops.size() == expected.loops.size());
|
||||
for (const auto i : algo::range(expected.loops.size()))
|
||||
diff --git a/tests/test_support/common.cc b/tests/test_support/common.cc
|
||||
index b63ffa89..265ef7b1 100644
|
||||
--- a/tests/test_support/common.cc
|
||||
+++ b/tests/test_support/common.cc
|
||||
@@ -40,3 +40,19 @@ void au::tests::compare_binary(const bstr &actual, const bstr &expected)
|
||||
INFO(actual_dump << " != " << expected_dump);
|
||||
REQUIRE(actual == expected);
|
||||
}
|
||||
+
|
||||
+void au::tests::compare_binary(
|
||||
+ const bstr &actual,
|
||||
+ const bstr &expected,
|
||||
+ std::function<bool(const bstr &, const bstr &)> compare)
|
||||
+{
|
||||
+ const auto max_size = 10000;
|
||||
+ auto actual_dump = algo::hex(actual);
|
||||
+ auto expected_dump = algo::hex(expected);
|
||||
+ if (actual_dump.size() > max_size)
|
||||
+ actual_dump = actual_dump.substr(0, max_size) + "(...)";
|
||||
+ if (expected_dump.size() > max_size)
|
||||
+ expected_dump = expected_dump.substr(0, max_size) + "(...)";
|
||||
+ INFO(actual_dump << " != " << expected_dump);
|
||||
+ REQUIRE(compare(actual, expected));
|
||||
+}
|
||||
diff --git a/tests/test_support/common.h b/tests/test_support/common.h
|
||||
index 7d8be579..ecd5dcf8 100644
|
||||
--- a/tests/test_support/common.h
|
||||
+++ b/tests/test_support/common.h
|
||||
@@ -17,6 +17,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#include <functional>
|
||||
#include "io/path.h"
|
||||
#include "types.h"
|
||||
|
||||
@@ -27,4 +28,9 @@ namespace tests {
|
||||
|
||||
void compare_binary(const bstr &actual, const bstr &expected);
|
||||
|
||||
+ void compare_binary(
|
||||
+ const bstr &actual,
|
||||
+ const bstr &expected,
|
||||
+ std::function<bool(const bstr &, const bstr &)> compare);
|
||||
+
|
||||
} }
|
||||
@@ -5,6 +5,7 @@
|
||||
fetchpatch,
|
||||
cmake,
|
||||
makeWrapper,
|
||||
ninja,
|
||||
boost,
|
||||
libpng,
|
||||
libiconv,
|
||||
@@ -26,22 +27,14 @@ stdenv.mkDerivation {
|
||||
hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "failing_tests.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/failing_tests.patch?h=arc_unpacker-git&id=bda1ad9f69e6802e703b2e6913d71a36d76cfef9";
|
||||
hash = "sha256-bClACsf/+SktyLAPtt7EcSqprkw8JVIi1ZLpcJcv9IE=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "include_cstdint.patch";
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/include_cstdint.patch?h=arc_unpacker-git&id=8c5c5121b23813c7650db19cb617b409d8fdcc9f";
|
||||
hash = "sha256-3BQ1v7s9enUK/js7Jqrqo2RdSRvGVd7hMcY4iL51SiE=";
|
||||
})
|
||||
];
|
||||
patches = [ ./fix-test-float-variance.patch ];
|
||||
|
||||
postPatch = ''
|
||||
cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
|
||||
|
||||
# missing includes
|
||||
sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
|
||||
sed '1i#include <cstdint>' -i src/types.h # gcc13
|
||||
sed '1i#include <vector>' -i src/flow/cli_facade.h # gcc14
|
||||
|
||||
# cmake-4 support
|
||||
@@ -53,6 +46,7 @@ stdenv.mkDerivation {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
makeWrapper
|
||||
ninja
|
||||
catch2
|
||||
];
|
||||
|
||||
@@ -66,15 +60,30 @@ stdenv.mkDerivation {
|
||||
zlib
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
checkPhase =
|
||||
let
|
||||
checkTarget = [
|
||||
"~CatSystem INT archives"
|
||||
]
|
||||
++ lib.optionals (stdenv.hostPlatform.system == "aarch64-linux") [ "~Ivory WADY audio" ];
|
||||
in
|
||||
''
|
||||
# Specify test targets
|
||||
# https://catch2-temp.readthedocs.io/en/latest/command-line.html#specifying-which-tests-to-run
|
||||
checkTarget=(${lib.escapeShellArgs checkTarget})
|
||||
|
||||
pushd ..
|
||||
./build/run_tests
|
||||
popd
|
||||
runHook preCheck
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
local flagsArray=()
|
||||
concatTo flagsArray checkFlags checkFlagsArray checkTarget
|
||||
|
||||
pushd ..
|
||||
echoCmd 'check flags' "''${flagsArray[@]}"
|
||||
./build/run_tests "''${flagsArray[@]}"
|
||||
popd
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
@@ -88,8 +97,7 @@ stdenv.mkDerivation {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# A few tests fail on aarch64-linux
|
||||
doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
|
||||
doCheck = true;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Tool to extract files from visual novel archives";
|
||||
@@ -98,8 +106,5 @@ stdenv.mkDerivation {
|
||||
maintainers = with maintainers; [ midchildan ];
|
||||
platforms = platforms.all;
|
||||
mainProgram = "arc_unpacker";
|
||||
|
||||
# unit test failures
|
||||
broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -35,6 +35,8 @@ stdenv.mkDerivation rec {
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.3.0 FATAL_ERROR)" \
|
||||
"cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)" \
|
||||
--replace-fail "find_program ( SED NAMES gsed" "find_program ( SED NAMES sed"
|
||||
'';
|
||||
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
# Building this from source requires cross-compiling Rust to wasm32-wasip1.
|
||||
# An attempt to do so was made in https://github.com/NixOS/nixpkgs/pull/463349.
|
||||
# FIXME revisit once https://github.com/NixOS/nixpkgs/pull/463720 is merged
|
||||
|
||||
{
|
||||
autoPatchelfHook,
|
||||
fetchurl,
|
||||
lib,
|
||||
libgcc,
|
||||
stdenvNoCC,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
version = "1.5.1";
|
||||
tag = "v${version}";
|
||||
system = lib.replaceStrings [ "darwin" ] [ "macos" ] stdenvNoCC.hostPlatform.system;
|
||||
hashes = {
|
||||
aarch64-darwin = "sha256-BHld8Dwwd6fexc05oHOIawa5PtGZAI61wQGWE8T+iMs=";
|
||||
aarch64-linux = "sha256-KM3/y31OdLmEAcc48TSLmXei2GD6FhOHYlD7W/ErP+I=";
|
||||
x86_64-darwin = "sha256-cE0JJK92pTJyGnHEZ7wA6+dpMvVOTMzFM2Mkwfy5kbQ=";
|
||||
x86_64-linux = "sha256-9qSjqPFmUaUnpGQ/ldIpyFSgTWbUYozcckpYxpm5PJU=";
|
||||
};
|
||||
in
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "extism-js";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/extism/js-pdk/releases/download/${tag}/extism-js-${system}-${tag}.gz";
|
||||
hash = hashes.${stdenvNoCC.hostPlatform.system};
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
runHook preUnpack
|
||||
|
||||
gunzip -cf "$src" > extism-js
|
||||
|
||||
runHook postUnpack
|
||||
'';
|
||||
|
||||
nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
|
||||
libgcc
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -Dt $out/bin extism-js
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/extism/js-pdk/releases/tag/${tag}";
|
||||
description = "Write Extism plugins in JavaScript & TypeScript";
|
||||
homepage = "https://github.com/extism/js-pdk";
|
||||
license = lib.licenses.bsd3;
|
||||
mainProgram = "extism-js";
|
||||
maintainers = [ lib.maintainers.dotlambda ];
|
||||
platforms = lib.attrNames hashes;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
};
|
||||
}
|
||||
@@ -69,6 +69,13 @@ stdenv.mkDerivation rec {
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace lib/nitro/CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.2)' 'cmake_minimum_required(VERSION 3.10)'
|
||||
substituteInPlace lib/json/CMakeLists.txt \
|
||||
--replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.10)'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
nodejs,
|
||||
makeWrapper,
|
||||
stdenv,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -12,7 +13,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "immich-cli";
|
||||
version = "2.2.101";
|
||||
version = "2.2.103";
|
||||
inherit (immich) src pnpmDeps;
|
||||
|
||||
postPatch = ''
|
||||
@@ -51,6 +52,12 @@ stdenv.mkDerivation rec {
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
nativeInstallCheckInputs = [
|
||||
versionCheckHook
|
||||
];
|
||||
|
||||
meta = {
|
||||
description = "Self-hosted photo and video backup solution (command line interface)";
|
||||
homepage = "https://immich.app/docs/features/command-line-interface";
|
||||
|
||||
@@ -12,8 +12,10 @@
|
||||
# build-time deps
|
||||
pkg-config,
|
||||
makeWrapper,
|
||||
binaryen,
|
||||
curl,
|
||||
cacert,
|
||||
extism-js,
|
||||
unzip,
|
||||
# runtime deps
|
||||
cairo,
|
||||
@@ -111,20 +113,20 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "immich";
|
||||
version = "2.2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "immich-app";
|
||||
repo = "immich";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-OoToTRDPXWOa7d1j1xvkZt+vKWBX4eHDiIsFs3bIlvw=";
|
||||
hash = "sha256-K/E5bQraTlvNx1Cd0bKyY6ZhesafGccqVZ9Mu6Q0pZ0=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
pname = "immich";
|
||||
inherit (finalAttrs) version src;
|
||||
fetcherVersion = 2;
|
||||
hash = "sha256-igkO0ID0/9uPtFAXL2v5bcFbCpZK2lcYEctWBKtFKdU=";
|
||||
hash = "sha256-i0JHKjsQcdDUrDLK0hJGOvVRh/aOyvms/k+6WEPbyh8=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
@@ -195,6 +197,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
\) -exec rm -r {} +
|
||||
|
||||
mkdir -p "$packageOut/build"
|
||||
ln -s '${finalAttrs.passthru.plugins}' "$packageOut/build/corePlugin"
|
||||
ln -s '${finalAttrs.passthru.web}' "$packageOut/build/www"
|
||||
ln -s '${geodata}' "$packageOut/build/geodata"
|
||||
|
||||
@@ -228,6 +231,37 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
immich = finalAttrs.finalPackage;
|
||||
};
|
||||
|
||||
plugins = stdenv.mkDerivation {
|
||||
pname = "immich-plugins";
|
||||
inherit (finalAttrs) version src pnpmDeps;
|
||||
|
||||
nativeBuildInputs = [
|
||||
binaryen
|
||||
extism-js
|
||||
nodejs
|
||||
pnpm
|
||||
pnpm.configHook
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
pnpm --filter plugins build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
cd plugins
|
||||
mkdir $out
|
||||
cp -r dist manifest.json $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
};
|
||||
|
||||
web = stdenv.mkDerivation {
|
||||
pname = "immich-web";
|
||||
inherit (finalAttrs) version src pnpmDeps;
|
||||
|
||||
@@ -16,14 +16,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "lenspect";
|
||||
version = "1.0.2";
|
||||
version = "1.0.3";
|
||||
pyproject = false;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "vmkspv";
|
||||
repo = "lenspect";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-R3Y1t4qEXY7zuYZENzwiAoW1fDEN/YiatnFLPUOeRUE=";
|
||||
hash = "sha256-6CC7kTM+Ph/J+aKHCyBIGfKYQIU53t9J5+X4/sCwqJY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
diff --git a/backend/open_webui/retrieval/utils.py b/backend/open_webui/retrieval/utils.py
|
||||
index da570330b..6ea16e249 100644
|
||||
--- a/backend/open_webui/retrieval/utils.py
|
||||
+++ b/backend/open_webui/retrieval/utils.py
|
||||
@@ -10,7 +10,7 @@ import re
|
||||
|
||||
from urllib.parse import quote
|
||||
from huggingface_hub import snapshot_download
|
||||
-from langchain.retrievers import ContextualCompressionRetriever, EnsembleRetriever
|
||||
+from langchain_classic.retrievers import ContextualCompressionRetriever, EnsembleRetriever
|
||||
from langchain_community.retrievers import BM25Retriever
|
||||
from langchain_core.documents import Document
|
||||
|
||||
diff --git a/backend/open_webui/routers/retrieval.py b/backend/open_webui/routers/retrieval.py
|
||||
index f8147372f..363bb4706 100644
|
||||
--- a/backend/open_webui/routers/retrieval.py
|
||||
+++ b/backend/open_webui/routers/retrieval.py
|
||||
@@ -28,8 +28,7 @@ from pydantic import BaseModel
|
||||
import tiktoken
|
||||
|
||||
|
||||
-from langchain.text_splitter import RecursiveCharacterTextSplitter, TokenTextSplitter
|
||||
-from langchain_text_splitters import MarkdownHeaderTextSplitter
|
||||
+from langchain_text_splitters import MarkdownHeaderTextSplitter, RecursiveCharacterTextSplitter, TokenTextSplitter
|
||||
from langchain_core.documents import Document
|
||||
|
||||
from open_webui.models.files import FileModel, Files
|
||||
@@ -75,6 +75,8 @@ python3Packages.buildPythonApplication rec {
|
||||
|
||||
build-system = with python3Packages; [ hatchling ];
|
||||
|
||||
patches = [ ./langchain-v1.patch ];
|
||||
|
||||
# Not force-including the frontend build directory as frontend is managed by the `frontend` derivation above.
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
@@ -128,6 +130,7 @@ python3Packages.buildPythonApplication rec {
|
||||
iso-639
|
||||
itsdangerous
|
||||
langchain
|
||||
langchain-classic
|
||||
langchain-community
|
||||
langdetect
|
||||
ldap3
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
copyDesktopItems,
|
||||
}:
|
||||
let
|
||||
version = "2.64.2";
|
||||
version = "2.65.0";
|
||||
in
|
||||
python3Packages.buildPythonApplication rec {
|
||||
inherit version;
|
||||
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
|
||||
owner = "pyfa-org";
|
||||
repo = "Pyfa";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-82zXMcIQPXTjMnKwhfpkm2apwDXLwKpbyglah6yHz/E=";
|
||||
hash = "sha256-KMSIN8amXl7q9sSvJwDobJzRZL0s4NN4KQxI/gBglyk=";
|
||||
};
|
||||
|
||||
desktopItems = [
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rsop";
|
||||
version = "0.8.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "codeberg.org";
|
||||
owner = "heiko";
|
||||
repo = "rsop";
|
||||
rev = "rsop/v${version}";
|
||||
hash = "sha256-bbB2IefXauVV6LjpJxSNy4RVYjAGH0osTpUZGGscGec=";
|
||||
hash = "sha256-LlTKPiBqc0mED3co/d4elo/QkBOhjppOQrrsn3Kwfv4=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-P27PnFNArKn3CQtik6TaV7eW/8bQiOZ57ZbMth2pNiY=";
|
||||
cargoHash = "sha256-UFgGMmDeeIKK3L/1f+UCaZKykC7ORIFpMU31Pi1JtHQ=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -19,11 +19,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "tparted";
|
||||
version = "2025-10-31";
|
||||
version = "2025-11-02";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Kagamma/tparted/releases/download/${finalAttrs.version}/linux_x86-64_tparted_${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-uBuYZUiQB/RnAXRNqwkz87rYjBanqiJBbRFAPSmEmnw=";
|
||||
hash = "sha256-dVVNr8VL8SP2gCdysbE28QgKWGOzfGoIdVIzJRxRp9M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -3,23 +3,24 @@
|
||||
cargo,
|
||||
fetchFromGitHub,
|
||||
lib,
|
||||
nix-update-script,
|
||||
python3Packages,
|
||||
rustPlatform,
|
||||
scdoc,
|
||||
writableTmpDirAsHomeHook,
|
||||
withTruststore ? true,
|
||||
withDeltaUpdates ? true,
|
||||
versionCheckHook,
|
||||
nix-update-script,
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "umu-launcher-unwrapped";
|
||||
version = "1.2.9";
|
||||
version = "1.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Open-Wine-Components";
|
||||
repo = "umu-launcher";
|
||||
tag = version;
|
||||
hash = "sha256-nqI2XmMS28dvYrgD9kh7Xc510CvG7ifIybj+HlrU3qI=";
|
||||
hash = "sha256-ELFOffP3KabvyOu4Fl7Z4zvPhamZrmhuuqz1aTYdbnE=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
@@ -34,13 +35,15 @@ python3Packages.buildPythonPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
python3Packages.build
|
||||
python3Packages.installer
|
||||
python3Packages.hatchling
|
||||
python3Packages.hatch-vcs
|
||||
rustPlatform.cargoSetupHook
|
||||
scdoc
|
||||
];
|
||||
]
|
||||
++ (with python3Packages; [
|
||||
build
|
||||
hatchling
|
||||
hatch-vcs
|
||||
installer
|
||||
]);
|
||||
|
||||
pythonPath =
|
||||
with python3Packages;
|
||||
@@ -84,6 +87,9 @@ python3Packages.buildPythonPackage rec {
|
||||
"test_parse_args_noopts"
|
||||
];
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -15,14 +15,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vkd3d";
|
||||
version = "1.17";
|
||||
version = "1.18";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.winehq.org";
|
||||
owner = "wine";
|
||||
repo = "vkd3d";
|
||||
tag = "vkd3d-${finalAttrs.version}";
|
||||
hash = "sha256-jxQ9L1GL4j3P5/nb79qAXQp8/IStOWmiK/vvbFxeg1k=";
|
||||
hash = "sha256-KMnWKzWFagOnxU0oS11lpAj03bGUpAS4f/8ZHb0nOwA=";
|
||||
};
|
||||
|
||||
outputs = [
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "wazero";
|
||||
version = "1.9.0";
|
||||
version = "1.10.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tetratelabs";
|
||||
repo = "wazero";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-yxnHLc0PFxh8NRBgK2hvhKaxRM1w3IZ9TnfJM0+uadg=";
|
||||
hash = "sha256-VCbXPD34QXpcIdGL/vxD9d/+vmZXkZ5fCePktWZy6fM=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioautomower";
|
||||
version = "2.7.0";
|
||||
version = "2.7.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@@ -32,7 +32,7 @@ buildPythonPackage rec {
|
||||
owner = "Thomas55555";
|
||||
repo = "aioautomower";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-qhjfnneLJjdDDP4XrecSI/psqEqKGP5ziaPd/iRiZfM=";
|
||||
hash = "sha256-+OzCs+yNU7ni+Lua2gAhaqYdb8dQz3lhtEdhdDgvMxo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "87";
|
||||
version = "88";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.13";
|
||||
@@ -26,7 +26,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = "aiounifi";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-+aObnX82erFXAdQ5hdj/ebMj9Xm5ZCooprt+UensDpM=";
|
||||
hash = "sha256-nMx2mygHn27Y1LbTZR30lQ5p4LmEt5FxOAKr6rF82JI=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "go2rtc-client";
|
||||
version = "0.2.1";
|
||||
version = "0.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.12";
|
||||
@@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = "python-go2rtc-client";
|
||||
tag = version;
|
||||
hash = "sha256-d5N9IEmxCDKqDv4lD9tYyTPWtR6d86iCZzucx3Pbx7Y=";
|
||||
hash = "sha256-TJl4797z1q4fbjTX7d+KyWJukn6SwMwGUsNzuQg8hmc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
pythonOlder,
|
||||
hatchling,
|
||||
aiohttp,
|
||||
async-timeout,
|
||||
attrs,
|
||||
multidict,
|
||||
colorlog,
|
||||
@@ -58,6 +59,7 @@ buildPythonPackage rec {
|
||||
pytest-cov-stub
|
||||
pytest-randomly
|
||||
mock
|
||||
async-timeout
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "hikari" ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-deepseek";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-deepseek==${version}";
|
||||
hash = "sha256-sOJxtiYL/hgDEeWkCvHP3mfI4tmrBuQp1BYN5WX+npo=";
|
||||
hash = "sha256-9iLJ0+wSBdPJqu71waYlq2pZV594mSoZcewsnMOeT64=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/partners/deepseek";
|
||||
|
||||
@@ -3,22 +3,19 @@
|
||||
aiohttp,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
setuptools,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ohme";
|
||||
version = "1.5.2";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dan-r";
|
||||
repo = "ohmepy";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-r3pu+HAQc8hXF2aMuWuE151Lz4rbrVti8YBrm4CS8z4=";
|
||||
hash = "sha256-nMYtlJzSy7ymQeNKHR0d6gBfx3vBMk8nf6sJk2/FQLE=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
@@ -33,7 +30,7 @@ buildPythonPackage rec {
|
||||
meta = {
|
||||
description = "Module for interacting with the Ohme API";
|
||||
homepage = "https://github.com/dan-r/ohmepy";
|
||||
changelog = "https://github.com/dan-r/ohmepy/releases/tag/v${version}";
|
||||
changelog = "https://github.com/dan-r/ohmepy/releases/tag/${src.tag}";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
|
||||
@@ -9,14 +9,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "onedrive-personal-sdk";
|
||||
version = "0.0.16";
|
||||
version = "0.0.17";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zweckj";
|
||||
repo = "onedrive-personal-sdk";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-zGzJtfgOuEfAaL+26jnEZzhKJLhRpBTYPBWzIHqwtXw=";
|
||||
hash = "sha256-dJ8cFZKnSN8sQxe2wMqwPXf7CaFKUP6TZbS/J4Z0qa0=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
poetry-core,
|
||||
pytest-asyncio,
|
||||
pytest-aiohttp,
|
||||
pytestCheckHook,
|
||||
pythonOlder,
|
||||
@@ -13,39 +14,37 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "python-awair";
|
||||
version = "0.2.4";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.6";
|
||||
version = "0.2.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ahayworth";
|
||||
repo = "python_awair";
|
||||
rev = version;
|
||||
hash = "sha256-zdZyA6adM4bfEYupdZl7CzMjwyfRkQBrntNh0MusynE=";
|
||||
tag = version;
|
||||
hash = "sha256-ZET24T6MeCPPL1V84538U6Fb/ZVGv1hwcdTQi3Q+yMY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
dependencies = [
|
||||
aiohttp
|
||||
voluptuous
|
||||
];
|
||||
|
||||
# Failed: async def functions are not natively supported.
|
||||
doCheck = false;
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytest-aiohttp
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
vcrpy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "python_awair" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
changelog = "https://github.com/ahayworth/python_awair/releases/tag/${src.tag}";
|
||||
description = "Python library for the Awair API";
|
||||
homepage = "https://github.com/ahayworth/python_awair";
|
||||
license = with licenses; [ mit ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -41,14 +41,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "slack-bolt";
|
||||
version = "1.26.0";
|
||||
version = "1.27.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "slackapi";
|
||||
repo = "bolt-python";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-5VbljuIYuPNPVZ6OwK9GV0ZyCNtMH7aPogOoBaaVb5A=";
|
||||
hash = "sha256-3aYsISTNc2uexzpIiBNnw40XegczL5BdKqi6j9K/A80=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "tplink-omada-client";
|
||||
version = "1.4.4";
|
||||
version = "1.5.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -18,7 +18,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "tplink_omada_client";
|
||||
inherit version;
|
||||
hash = "sha256-6MiPgseHrqgD+DGth5rJ03HK+0YfBpmDPXybzrTDeeA=";
|
||||
hash = "sha256-JcH39WqEk0HNQIQ6jiN2Ml3PEX+mNLBVSaRENiut29A=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "universal-silabs-flasher";
|
||||
version = "0.0.37";
|
||||
version = "0.1.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "NabuCasa";
|
||||
repo = "universal-silabs-flasher";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-XvDzv39at+6h1Q2tmiYiNsLpcMTx+sOd958K+PB0WSc=";
|
||||
hash = "sha256-Qeudh75PzIxI4vr3H4nBULhM2X8WSPF8hrT2uMWopHQ=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@@ -15,8 +15,8 @@ let
|
||||
hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
|
||||
};
|
||||
"10" = {
|
||||
version = "10.22.0";
|
||||
hash = "sha256-BTqEk+jjKKPG1/9csHm+8ocZFSzPgx5GZrXAMyt3u4g=";
|
||||
version = "10.23.0";
|
||||
hash = "sha256-oc3XtGg4ap14oIHaBdYEnX5ZjbYqKZ25LfIacGKksYM=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# Do not edit!
|
||||
|
||||
{
|
||||
version = "2025.11.2";
|
||||
version = "2025.11.3";
|
||||
components = {
|
||||
"3_day_blinds" =
|
||||
ps: with ps; [
|
||||
|
||||
@@ -305,7 +305,7 @@ let
|
||||
extraBuildInputs = extraPackages python.pkgs;
|
||||
|
||||
# Don't forget to run update-component-packages.py after updating
|
||||
hassVersion = "2025.11.2";
|
||||
hassVersion = "2025.11.3";
|
||||
|
||||
in
|
||||
python.pkgs.buildPythonApplication rec {
|
||||
@@ -326,13 +326,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
owner = "home-assistant";
|
||||
repo = "core";
|
||||
tag = version;
|
||||
hash = "sha256-o4rpdnO/TslJWRj7HwTyWOS0NBVOfAeDfWiYvlx/jhw=";
|
||||
hash = "sha256-Wd+q2ooNguJMKnQ1uzLJtglAyBFXjBSj5hjEgY4bgzY=";
|
||||
};
|
||||
|
||||
# Secondary source is pypi sdist for translations
|
||||
sdist = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-j10a2GSnFau6KYMpFrFCrCTqsmy/D5p6BwQMvlOEe+w=";
|
||||
hash = "sha256-KxpjOPlusEHT+bRtgs/9EsIksTd4pRMKsXb7e5q+b2Q=";
|
||||
};
|
||||
|
||||
build-system = with python.pkgs; [
|
||||
|
||||
@@ -8,7 +8,7 @@ buildPythonPackage rec {
|
||||
# the frontend version corresponding to a specific home-assistant version can be found here
|
||||
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
|
||||
pname = "home-assistant-frontend";
|
||||
version = "20251105.0";
|
||||
version = "20251105.1";
|
||||
format = "wheel";
|
||||
|
||||
src = fetchPypi {
|
||||
@@ -16,7 +16,7 @@ buildPythonPackage rec {
|
||||
pname = "home_assistant_frontend";
|
||||
dist = "py3";
|
||||
python = "py3";
|
||||
hash = "sha256-sQp23ibdVQHEuP016pA1E1xxXB275YNPvDqEFfI15nk=";
|
||||
hash = "sha256-keqQTQyo06xMUsZLf920n1eyu/iPrI2cNkXYMThhGFI=";
|
||||
};
|
||||
|
||||
# there is nothing to strip in this package
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "homeassistant-stubs";
|
||||
version = "2025.11.2";
|
||||
version = "2025.11.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = python.version != home-assistant.python.version;
|
||||
@@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "KapJI";
|
||||
repo = "homeassistant-stubs";
|
||||
tag = version;
|
||||
hash = "sha256-xsFbgrXPWwA9c764Jp7fjsUjaG+C03zpdot/+mRAKgA=";
|
||||
hash = "sha256-Cl5wRdYGVGtDTsnlU5poHJA3F8wxh1e3Rb1Zhmfc2CI=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user