Merge master into staging-next
This commit is contained in:
nixpkgs-ci[bot]
@@ -0,0 +1,49 @@
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
pkg-config,
|
||||
gst_all_1,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "tauri-asset-gst-plugin";
|
||||
version = "0.1.0";
|
||||
|
||||
# From upstream PR https://github.com/tauri-apps/tauri/pull/14402
|
||||
src = fetchFromGitHub {
|
||||
owner = "aaalloc";
|
||||
repo = "tauri";
|
||||
rev = "bc502b45a6995aab5687ce3e50b3d218ca5ee105";
|
||||
hash = "sha256-H27n2rsqmGbk7ru8K7LhEvvftpz6mxgTow/18SpQn1Q=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-n9CZ92ezRP9i4JpARwLpW4KIo9/6cB481YuG3qN1BKo=";
|
||||
|
||||
cargoBuildFlags = [ "--package tauri-asset-gst-plugin" ];
|
||||
cargoTestFlags = finalAttrs.cargoBuildFlags;
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
gst_all_1.gstreamer
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
mkdir $out/lib/gstreamer-1.0
|
||||
mv $out/lib/*.so $out/lib/gstreamer-1.0/
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "GStreamer plugin to handle the tauri asset:// protocol";
|
||||
homepage = "https://github.com/tauri-apps/tauri/pull/14402";
|
||||
license = [
|
||||
lib.licenses.mit
|
||||
lib.licenses.asl20
|
||||
];
|
||||
maintainers = with lib.maintainers; [ snu ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
@@ -18,6 +18,9 @@ makeSetupHook {
|
||||
propagatedBuildInputs = [
|
||||
cargo
|
||||
cargo-tauri
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
cargo-tauri.gst-plugin
|
||||
];
|
||||
|
||||
substitutions = {
|
||||
@@ -33,6 +36,14 @@ makeSetupHook {
|
||||
}
|
||||
.${kernelName} or (throw "${kernelName} is not supported by cargo-tauri.hook");
|
||||
|
||||
fixupScript = lib.optionalString stdenv.hostPlatform.isLinux ''
|
||||
gappsWrapperArgs+=(
|
||||
--prefix WEBKIT_GST_ALLOWED_URI_PROTOCOLS : "asset"
|
||||
# Not picked up automatically by the wrappers from the propagatedBuildInputs.
|
||||
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${cargo-tauri.gst-plugin}/lib/gstreamer-1.0/"
|
||||
)
|
||||
'';
|
||||
|
||||
# $targetDir is the path to the build artifacts (i.e., `./target/release`)
|
||||
installScript =
|
||||
{
|
||||
|
||||
@@ -92,10 +92,19 @@ tauriInstallHook() {
|
||||
echo "Finished tauriInstallHook"
|
||||
}
|
||||
|
||||
tauriFixupHook() {
|
||||
# NOTE: This runs as a preFixupPhase and does not replace the original hook.
|
||||
@fixupScript@
|
||||
}
|
||||
|
||||
if [ -z "${dontTauriBuild:-}" ] && [ -z "${buildPhase:-}" ]; then
|
||||
buildPhase=tauriBuildHook
|
||||
fi
|
||||
|
||||
if [ -z "${dontTauriFixup:-}" ] && [ -z "${fixupPhase:-}" ]; then
|
||||
preFixupPhases+=(tauriFixupHook)
|
||||
fi
|
||||
|
||||
if [ -z "${dontTauriInstall:-}" ] && [ -z "${installPhase:-}" ]; then
|
||||
installPhase=tauriInstallHook
|
||||
fi
|
||||
|
||||
@@ -49,6 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
passthru = {
|
||||
# See ./doc/hooks/tauri.section.md
|
||||
hook = callPackage ./hook.nix { cargo-tauri = finalAttrs.finalPackage; };
|
||||
gst-plugin = callPackage ./gst-plugin.nix { };
|
||||
|
||||
tests = {
|
||||
hook = callPackage ./test-app.nix { cargo-tauri = finalAttrs.finalPackage; };
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fasmg";
|
||||
version = "l04h";
|
||||
version = "l2fx";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip";
|
||||
sha256 = "sha256-LPRDNtkNVlA2RFvIncFWaCtJ/gH7uApqJPizeO7BmrM=";
|
||||
sha256 = "sha256-np7HhVp1SaII25nPPJGtBB4325K/1S3rKqOudsBNeCk=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,10 +7,10 @@
|
||||
let
|
||||
pname = "lmstudio";
|
||||
|
||||
version_aarch64-darwin = "0.3.39-1";
|
||||
hash_aarch64-darwin = "sha256-A3TfbFr4H7NNXo9e7Ro3MkdJ/svF6PyeQT34VnMAs2I=";
|
||||
version_x86_64-linux = "0.3.39-1";
|
||||
hash_x86_64-linux = "sha256-XIwJ0Dgc34yKMsx2/eBAbdDz9MyKOCx7YpFtYBFWu0U=";
|
||||
version_aarch64-darwin = "0.4.0-17";
|
||||
hash_aarch64-darwin = "sha256-76Sf1Ew/9IoP0jum64XDiqVnRJNnR99yGzTO3Ys+znU=";
|
||||
version_x86_64-linux = "0.4.0-17";
|
||||
hash_x86_64-linux = "sha256-Su6AalleuxKA9PJiONKZoinCbEaGqgJUwIMA5Bisebs=";
|
||||
|
||||
meta = {
|
||||
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
|
||||
|
||||
@@ -5,25 +5,39 @@
|
||||
boost,
|
||||
cmake,
|
||||
git,
|
||||
versionCheckHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openttd-grfcodec";
|
||||
version = "unstable-2021-03-10";
|
||||
version = "6.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "OpenTTD";
|
||||
repo = "grfcodec";
|
||||
rev = "045774dee7cab1a618a3e0d9b39bff78a12b6efa";
|
||||
sha256 = "0b4xnnkqc01d3r834lhkq744ymar6c8iyxk51wc4c7hvz0vp9vmy";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-zIRHo2glD738Rmg4dhetIGtbIY/AgMKnzAJaP00lsqk=";
|
||||
leaveDotGit = true;
|
||||
postFetch = ''
|
||||
# git arguments taken from generate_version.cmake
|
||||
git_date=$(git -C $out show -s --pretty=%cd --date=short)
|
||||
echo "${finalAttrs.version};$git_date" > $out/.version
|
||||
rm -rf $out/.git
|
||||
'';
|
||||
};
|
||||
|
||||
buildInputs = [ boost ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
git
|
||||
];
|
||||
|
||||
nativeInstallCheckInputs = [ versionCheckHook ];
|
||||
|
||||
doInstallCheck = true;
|
||||
versionCheckProgram = "${placeholder "out"}/bin/grfcodec";
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp -a grfcodec grfid grfstrip nforenum $out/bin/
|
||||
@@ -35,4 +49,4 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.gpl2Plus;
|
||||
maintainers = with lib.maintainers; [ ToxicFrog ];
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
stdenv,
|
||||
libsForQt5,
|
||||
qt6Packages,
|
||||
coreutils,
|
||||
xdg-utils,
|
||||
bash,
|
||||
@@ -13,20 +13,21 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "qdirstat";
|
||||
version = "1.9";
|
||||
version = "2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shundhammer";
|
||||
repo = "qdirstat";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
|
||||
hash = "sha256-qkXu3W6umAlSVlTXaQT/UmC3gzVt6BVy4EZzLBYI94s=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
]
|
||||
++ (with libsForQt5; [
|
||||
++ (with qt6Packages; [
|
||||
qmake
|
||||
qt5compat
|
||||
wrapQtAppsHook
|
||||
]);
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "rerun";
|
||||
version = "0.28.2";
|
||||
version = "0.29.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "rerun-io";
|
||||
repo = "rerun";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-4zijWVLXnNQLqEMWnO1o/fnCoBjESDbn14CQyCP2o2s=";
|
||||
hash = "sha256-15wYH+MhrAaW7MPl7Kkh7u5SzxIGXTj2HkhJGZ38kMo=";
|
||||
};
|
||||
|
||||
# The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
|
||||
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-FrOo4+5S8JAlQSmDvH0omhOsG9PjZMvRejk9VHEucVY=";
|
||||
cargoHash = "sha256-TVsPS1jzDzRSY9b636Tv30WupCnyfADeA+8pYn8STIs=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package rerun-cli"
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
appimageTools.wrapType2 rec {
|
||||
pname = "tutanota-desktop";
|
||||
version = "319.260107.1";
|
||||
version = "325.260127.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
|
||||
hash = "sha256-alp8+6tk+EfUSQZOjuQk83b3UPPkz9FnQblWcNyAWz4=";
|
||||
hash = "sha256-WZYJ5C8xVoD+XMbjcKcIQw3C8YObinK6wBWBMd6bssU=";
|
||||
};
|
||||
|
||||
extraPkgs = pkgs: [ pkgs.libsecret ];
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "vivaldi";
|
||||
version = "7.7.3851.67";
|
||||
version = "7.8.3925.56";
|
||||
|
||||
suffix =
|
||||
{
|
||||
@@ -79,8 +79,8 @@ stdenv.mkDerivation rec {
|
||||
url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-1_${suffix}.deb";
|
||||
hash =
|
||||
{
|
||||
aarch64-linux = "sha256-oNElLW9J010JIhvbocVd+mbK8w2oZVnbfmyi5DjjouQ=";
|
||||
x86_64-linux = "sha256-bvc5QVt+Qcaw9Za36S6TugfXLAj75bu8F72nS6F0pvE=";
|
||||
aarch64-linux = "sha256-ZfxeBtArPGxvM6ocCEbcM8afTcLTl0TM2xCILNDB1Bo=";
|
||||
x86_64-linux = "sha256-j1u0WlOqRPh+/NjowpAXKRPACxmdImi9ma2ILFDgWpQ=";
|
||||
}
|
||||
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
};
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wingpanel-quick-settings";
|
||||
version = "1.3.0";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elementary";
|
||||
repo = "quick-settings";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-82XlZDnXuUB0PPmInrSQh1vrwnOYt9RplKWwYxIirVo=";
|
||||
hash = "sha256-J40h/4xhs12FmaaBpQ+0/KGCtRLmP592TS3xHeoxGIE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
{
|
||||
"version": "3.41.0-0.1.pre",
|
||||
"engineVersion": "d8756bc5ef1a76d727745d21fd1cf195340c1020",
|
||||
"version": "3.41.0-0.2.pre",
|
||||
"engineVersion": "15d137647e372c59e8dcb78f670ab7686a0d1031",
|
||||
"engineSwiftShaderHash": "sha256-qbtCl2nTpmtp9dnaoXc7rF3RqLnAZEmzw1BzPoCRWrc=",
|
||||
"engineSwiftShaderRev": "794b0cfce1d828d187637e6d932bae484fbe0976",
|
||||
"channel": "beta",
|
||||
"engineHashes": {
|
||||
"aarch64-linux": {
|
||||
"aarch64-linux": "sha256-yYYGQB2KKjbZxeAiq22sNUcendh3MKy6fGWU9BGyQ+U=",
|
||||
"x86_64-linux": "sha256-yYYGQB2KKjbZxeAiq22sNUcendh3MKy6fGWU9BGyQ+U="
|
||||
"aarch64-linux": "sha256-bRebKpS4FiIdhnTIsv0KfV3GqtRPrYZJrKq4R67iFpA=",
|
||||
"x86_64-linux": "sha256-bRebKpS4FiIdhnTIsv0KfV3GqtRPrYZJrKq4R67iFpA="
|
||||
},
|
||||
"x86_64-linux": {
|
||||
"aarch64-linux": "sha256-q/KfydE5uUMXAu2tF2xTrkBlTnbnrNN6XZbd0ExOdtk=",
|
||||
"x86_64-linux": "sha256-q/KfydE5uUMXAu2tF2xTrkBlTnbnrNN6XZbd0ExOdtk="
|
||||
"aarch64-linux": "sha256-zvyMMc5vmtyl0W3H14JcxhyxAOYtRfqohb6F0hYFRcM=",
|
||||
"x86_64-linux": "sha256-zvyMMc5vmtyl0W3H14JcxhyxAOYtRfqohb6F0hYFRcM="
|
||||
}
|
||||
},
|
||||
"dartVersion": "3.11.0-296.4.beta",
|
||||
@@ -21,53 +21,53 @@
|
||||
"x86_64-darwin": "sha256-/hifcVYo3B18i/77KCtYfHb1kj4ZdcIIaKBpo04BW/Q=",
|
||||
"aarch64-darwin": "sha256-HRucig/9pSM9Z2EbRRjyL3/3BNz+63J76dMwBnjVuPY="
|
||||
},
|
||||
"flutterHash": "sha256-7y48/WTa3updXsMCXUUuEwucLPYD8SErAyr0CAvrNKU=",
|
||||
"flutterHash": "sha256-thAwWiddq13E/s8MOMzqIC7xtVcZI8RwFB1qwiUTIjw=",
|
||||
"artifactHashes": {
|
||||
"android": {
|
||||
"aarch64-darwin": "sha256-CjNjxLgC89UkhAAkMtId5aMt41KxORT/IIn3U3NUF3g=",
|
||||
"aarch64-linux": "sha256-KyDzSlQoZvnJA5UHstizry6nt7fr9xvEuHHnLlYO47I=",
|
||||
"x86_64-darwin": "sha256-CjNjxLgC89UkhAAkMtId5aMt41KxORT/IIn3U3NUF3g=",
|
||||
"x86_64-linux": "sha256-KyDzSlQoZvnJA5UHstizry6nt7fr9xvEuHHnLlYO47I="
|
||||
"aarch64-darwin": "sha256-RfHYnEbc2Plwe9/qJ1qgWLPheYodrA8TiKohpjh0q8c=",
|
||||
"aarch64-linux": "sha256-uUXiXB5Ar4VN25vaBoHTI+HuC8QLQ5YCcjPUMF+753A=",
|
||||
"x86_64-darwin": "sha256-RfHYnEbc2Plwe9/qJ1qgWLPheYodrA8TiKohpjh0q8c=",
|
||||
"x86_64-linux": "sha256-uUXiXB5Ar4VN25vaBoHTI+HuC8QLQ5YCcjPUMF+753A="
|
||||
},
|
||||
"fuchsia": {
|
||||
"aarch64-darwin": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw=",
|
||||
"aarch64-linux": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw=",
|
||||
"x86_64-darwin": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw=",
|
||||
"x86_64-linux": "sha256-La0NcuyWFmm+9hbqSueEH64Y5eS8qQIOMPFm4Fhpabw="
|
||||
"aarch64-darwin": "sha256-wwORZIhIAGvH0ksdyLRUIsmoQFz3sWp/zZ7Md6hbkFQ=",
|
||||
"aarch64-linux": "sha256-wwORZIhIAGvH0ksdyLRUIsmoQFz3sWp/zZ7Md6hbkFQ=",
|
||||
"x86_64-darwin": "sha256-wwORZIhIAGvH0ksdyLRUIsmoQFz3sWp/zZ7Md6hbkFQ=",
|
||||
"x86_64-linux": "sha256-wwORZIhIAGvH0ksdyLRUIsmoQFz3sWp/zZ7Md6hbkFQ="
|
||||
},
|
||||
"ios": {
|
||||
"aarch64-darwin": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8=",
|
||||
"aarch64-linux": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8=",
|
||||
"x86_64-darwin": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8=",
|
||||
"x86_64-linux": "sha256-e1ZS2zS++jsYC9KgPSvLO4flwc60PGAPA7Kn1fFnSa8="
|
||||
"aarch64-darwin": "sha256-fRHm09zjIC9oyHOpc2o/KQg8xCII+iaB4/CErKlItF4=",
|
||||
"aarch64-linux": "sha256-fRHm09zjIC9oyHOpc2o/KQg8xCII+iaB4/CErKlItF4=",
|
||||
"x86_64-darwin": "sha256-fRHm09zjIC9oyHOpc2o/KQg8xCII+iaB4/CErKlItF4=",
|
||||
"x86_64-linux": "sha256-fRHm09zjIC9oyHOpc2o/KQg8xCII+iaB4/CErKlItF4="
|
||||
},
|
||||
"linux": {
|
||||
"aarch64-darwin": "sha256-LSkd7OoN0znxoqklUFAkP2U9N10CPs+0YOcCS/WgUPs=",
|
||||
"aarch64-linux": "sha256-LSkd7OoN0znxoqklUFAkP2U9N10CPs+0YOcCS/WgUPs=",
|
||||
"x86_64-darwin": "sha256-5Zy1Oksof7z00f1j2IMiQFIqrvAMx/L7pFbUb7vh3AE=",
|
||||
"x86_64-linux": "sha256-5Zy1Oksof7z00f1j2IMiQFIqrvAMx/L7pFbUb7vh3AE="
|
||||
"aarch64-darwin": "sha256-Zx9zWR0eOsiQGjnN8CIxKRNE0w7ck2ZzVEK71mqXMmc=",
|
||||
"aarch64-linux": "sha256-Zx9zWR0eOsiQGjnN8CIxKRNE0w7ck2ZzVEK71mqXMmc=",
|
||||
"x86_64-darwin": "sha256-jw+ZD2QIQsg6LbUchkDkMgyYKU+b/G9ZNVNCewBS0E4=",
|
||||
"x86_64-linux": "sha256-jw+ZD2QIQsg6LbUchkDkMgyYKU+b/G9ZNVNCewBS0E4="
|
||||
},
|
||||
"macos": {
|
||||
"aarch64-darwin": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60=",
|
||||
"aarch64-linux": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60=",
|
||||
"x86_64-darwin": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60=",
|
||||
"x86_64-linux": "sha256-7ZvSoZX/I4DarIHMIJMcWZFvvj499iPu6nIL7iqQq60="
|
||||
"aarch64-darwin": "sha256-OTUv/k3Nts5BBzz+dWQq6EeBPeMzfUvIo3A39K5xRgA=",
|
||||
"aarch64-linux": "sha256-OTUv/k3Nts5BBzz+dWQq6EeBPeMzfUvIo3A39K5xRgA=",
|
||||
"x86_64-darwin": "sha256-OTUv/k3Nts5BBzz+dWQq6EeBPeMzfUvIo3A39K5xRgA=",
|
||||
"x86_64-linux": "sha256-OTUv/k3Nts5BBzz+dWQq6EeBPeMzfUvIo3A39K5xRgA="
|
||||
},
|
||||
"universal": {
|
||||
"aarch64-darwin": "sha256-0konzDQ0QMyBuycsY5hvynWaPpZymHcPxamRGS67fDc=",
|
||||
"aarch64-linux": "sha256-kbEu2lIoxKNv5l1HSdCyUOc/azqFrRrAIVdeJ8PImJY=",
|
||||
"x86_64-darwin": "sha256-A21agBBzBU08eQcR2yHGxN7rKlbh8uxXZDPHTLwK1CE=",
|
||||
"x86_64-linux": "sha256-2gXvsNQFsTUbGVhqm6ngBa+dCv+ZN42zCHpIoheBFLg="
|
||||
"aarch64-darwin": "sha256-nWjUPgVwG0TJyTP1VpsJMI51/flfQyBhcsgv1DJpnZE=",
|
||||
"aarch64-linux": "sha256-qmfIGpAqJl8giZrv918oJP04AD03XXXb18KPB2aP30U=",
|
||||
"x86_64-darwin": "sha256-+L49rfv8uhBvqi5ezzOF16QFKgkxX/cleZDlt8NR5Oc=",
|
||||
"x86_64-linux": "sha256-ifFFlLsgN7et/hpBQewYYeN7EzCUQAGUj5nlJgNt2UI="
|
||||
},
|
||||
"web": {
|
||||
"aarch64-darwin": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A=",
|
||||
"aarch64-linux": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A=",
|
||||
"x86_64-darwin": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A=",
|
||||
"x86_64-linux": "sha256-kRfdhiSstiC6IFgYIhOCz5SgJdqcx9mPcq0AFqNUr1A="
|
||||
"aarch64-darwin": "sha256-ReQNXUPZHGfL0grqK0cjc7xppYvxwFxJQl/FFGAqeDQ=",
|
||||
"aarch64-linux": "sha256-ReQNXUPZHGfL0grqK0cjc7xppYvxwFxJQl/FFGAqeDQ=",
|
||||
"x86_64-darwin": "sha256-ReQNXUPZHGfL0grqK0cjc7xppYvxwFxJQl/FFGAqeDQ=",
|
||||
"x86_64-linux": "sha256-ReQNXUPZHGfL0grqK0cjc7xppYvxwFxJQl/FFGAqeDQ="
|
||||
},
|
||||
"windows": {
|
||||
"x86_64-darwin": "sha256-tGpjWn6XrOQkGDKn0eu39gBQREaYsiK3ygE/SAF0Jag=",
|
||||
"x86_64-linux": "sha256-tGpjWn6XrOQkGDKn0eu39gBQREaYsiK3ygE/SAF0Jag="
|
||||
"x86_64-darwin": "sha256-u77tk4Spp8AyujimnFAop2o5Orm5OlaBZ6bmbO2OG9w=",
|
||||
"x86_64-linux": "sha256-u77tk4Spp8AyujimnFAop2o5Orm5OlaBZ6bmbO2OG9w="
|
||||
}
|
||||
},
|
||||
"pubspecLock": {
|
||||
|
||||
@@ -14,14 +14,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "elevenlabs";
|
||||
version = "2.31.0";
|
||||
version = "2.33.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elevenlabs";
|
||||
repo = "elevenlabs-python";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-5FETnLnmFqJ+AKey2dckTLgjwyaAAbB1BZUT8T9Tujo=";
|
||||
hash = "sha256-fOVoKiAQfZ3+59onGzkTmXAhgJnoDQJvMBrwIIgZwhY=";
|
||||
};
|
||||
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "irm-kmi-api";
|
||||
version = "1.1.0";
|
||||
version = "1.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jdejaegh";
|
||||
repo = "irm-kmi-api";
|
||||
tag = version;
|
||||
hash = "sha256-E8lf2TpeA91mRbxXYCsuum0mJdE5XLXX0l8CKEl5SFw=";
|
||||
hash = "sha256-RJMIXisgG4ybynsm7kCrN8zOU0EJv7a1Q74l+edxH/E=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -37,14 +37,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain-core";
|
||||
version = "1.2.5";
|
||||
version = "1.2.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain-core==${version}";
|
||||
hash = "sha256-gHIJO5O9AxtROdDuo2UhdkW6p3+4dOJaO6iKelA26gE=";
|
||||
hash = "sha256-X/gT+OtA9bQR0vvsfzT3881WUkbRmcY1Ahqk8kT6M9s=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/core";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonAtLeast,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
@@ -35,27 +36,20 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "langchain-mongodb";
|
||||
version = "0.10.0";
|
||||
version = "0.11.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain-mongodb";
|
||||
tag = "libs/langchain-mongodb/v${finalAttrs.version}";
|
||||
hash = "sha256-MRvj6RJ6N+u1wA+zkyWhe4tnGaC4FduPl+k7AhBIwLI=";
|
||||
hash = "sha256-dO0dASjyNMxnbxZ/ry8lcJxedPdrv6coYiTjOcaT8/0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/libs/langchain-mongodb";
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# Each component release requests the exact latest core.
|
||||
# That prevents us from updating individual components.
|
||||
"langchain-core"
|
||||
"numpy"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
langchain
|
||||
langchain-classic
|
||||
@@ -91,6 +85,10 @@ buildPythonPackage (finalAttrs: {
|
||||
pytestFlags = [
|
||||
# DeprecationWarning: 'asyncio.get_event_loop_policy' is deprecated
|
||||
"-Wignore::DeprecationWarning"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# UserWarning: Core Pydantic V1 functionality isn't compatible with Python 3.14
|
||||
"-Wignore::UserWarning"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "langchain_mongodb" ];
|
||||
|
||||
@@ -9,20 +9,18 @@
|
||||
# dependencies
|
||||
httpx,
|
||||
langchain-core,
|
||||
syrupy,
|
||||
pytest-benchmark,
|
||||
pytest-codspeed,
|
||||
numpy,
|
||||
pytest-asyncio,
|
||||
pytest-recording,
|
||||
pytest-socket,
|
||||
syrupy,
|
||||
vcrpy,
|
||||
|
||||
# buildInputs
|
||||
pytest,
|
||||
pytestCheckHook,
|
||||
|
||||
# tests
|
||||
numpy,
|
||||
pytest-asyncio_0,
|
||||
pytest-socket,
|
||||
pytestCheckHook,
|
||||
pytest-benchmark,
|
||||
|
||||
# passthru
|
||||
gitUpdater,
|
||||
@@ -44,35 +42,37 @@ buildPythonPackage rec {
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"pytest-benchmark"
|
||||
"pytest-codspeed"
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
# Each component release requests the exact latest core.
|
||||
# That prevents us from updating individual components.
|
||||
"langchain-core"
|
||||
"numpy"
|
||||
"syrupy"
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
httpx
|
||||
langchain-core
|
||||
pytest-asyncio_0
|
||||
numpy
|
||||
pytest-asyncio
|
||||
pytest-benchmark
|
||||
pytest-codspeed
|
||||
pytest-recording
|
||||
pytest-socket
|
||||
syrupy
|
||||
vcrpy
|
||||
];
|
||||
|
||||
buildInputs = [ pytest ];
|
||||
|
||||
pythonImportsCheck = [ "langchain_tests" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
numpy
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestMarks = [
|
||||
"benchmark"
|
||||
];
|
||||
|
||||
passthru = {
|
||||
# python updater script sets the wrong tag
|
||||
skipBulkUpdate = true;
|
||||
|
||||
@@ -2,41 +2,40 @@
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
pythonOlder,
|
||||
|
||||
# build-system
|
||||
hatchling,
|
||||
|
||||
# dependencies
|
||||
aiohttp,
|
||||
async-timeout,
|
||||
langchain-core,
|
||||
langchain-text-splitters,
|
||||
langgraph,
|
||||
langsmith,
|
||||
numpy,
|
||||
pydantic,
|
||||
pyyaml,
|
||||
requests,
|
||||
sqlalchemy,
|
||||
tenacity,
|
||||
|
||||
# Optional dependencies
|
||||
langchain-anthropic,
|
||||
langchain-aws,
|
||||
langchain-community,
|
||||
langchain-deepseek,
|
||||
langchain-fireworks,
|
||||
langchain-google-genai,
|
||||
langchain-groq,
|
||||
langchain-huggingface,
|
||||
langchain-mistralai,
|
||||
langchain-ollama,
|
||||
langchain-openai,
|
||||
langchain-perplexity,
|
||||
langchain-xai,
|
||||
|
||||
# runtime
|
||||
runtimeShell,
|
||||
|
||||
# tests
|
||||
blockbuster,
|
||||
freezegun,
|
||||
httpx,
|
||||
langchain-tests,
|
||||
lark,
|
||||
pandas,
|
||||
pytest-asyncio,
|
||||
pytest-mock,
|
||||
pytest-socket,
|
||||
pytest-xdist,
|
||||
pytestCheckHook,
|
||||
requests-mock,
|
||||
responses,
|
||||
syrupy,
|
||||
toml,
|
||||
|
||||
@@ -46,14 +45,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "langchain";
|
||||
version = "1.2.0";
|
||||
version = "1.2.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langchain";
|
||||
tag = "langchain==${version}";
|
||||
hash = "sha256-DximXCwrDSUVXZenUrubuGcxdnRCPCPMgdW9UJnkGnE=";
|
||||
hash = "sha256-vwd8FoXeMLQyFcEViXx/3LqpNieyp4HHevMAv2AxNVY=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/langchain_v1";
|
||||
@@ -74,37 +73,38 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
langchain-core
|
||||
langchain-text-splitters
|
||||
langgraph
|
||||
langsmith
|
||||
numpy
|
||||
pydantic
|
||||
pyyaml
|
||||
requests
|
||||
sqlalchemy
|
||||
tenacity
|
||||
]
|
||||
++ lib.optional (pythonOlder "3.11") async-timeout;
|
||||
];
|
||||
|
||||
optional-dependencies = {
|
||||
numpy = [ numpy ];
|
||||
anthropic = [ langchain-anthropic ];
|
||||
aws = [ langchain-aws ];
|
||||
# azure-ai = [langchain-azure-ai];
|
||||
community = [ langchain-community ];
|
||||
deepseek = [ langchain-deepseek ];
|
||||
fireworks = [ langchain-fireworks ];
|
||||
google-genai = [ langchain-google-genai ];
|
||||
# google-vertexai = [langchain-google-vertexai];
|
||||
groq = [ langchain-groq ];
|
||||
huggingface = [ langchain-huggingface ];
|
||||
mistralai = [ langchain-mistralai ];
|
||||
ollama = [ langchain-ollama ];
|
||||
openai = [ langchain-openai ];
|
||||
perplexity = [ langchain-perplexity ];
|
||||
# together = [langchain-together];
|
||||
xai = [ langchain-xai ];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
blockbuster
|
||||
freezegun
|
||||
httpx
|
||||
lark
|
||||
langchain-tests
|
||||
pandas
|
||||
# langchain-openai -- causes recursion error
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytest-socket
|
||||
pytest-xdist
|
||||
pytestCheckHook
|
||||
requests-mock
|
||||
responses
|
||||
syrupy
|
||||
toml
|
||||
];
|
||||
@@ -113,6 +113,7 @@ buildPythonPackage rec {
|
||||
"--only-core"
|
||||
];
|
||||
|
||||
# Note: Not testing with optional dependencies due to mutual recursion
|
||||
enabledTestPaths = [
|
||||
# integration_tests require network access, database access and require `OPENAI_API_KEY`, etc.
|
||||
"tests/unit_tests"
|
||||
|
||||
@@ -31,14 +31,14 @@
|
||||
# It exists so the langgraph team can iterate on it without having to rebuild langgraph.
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph-prebuilt";
|
||||
version = "1.0.6";
|
||||
version = "1.0.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = "prebuilt==${version}";
|
||||
hash = "sha256-IE9Y+kFkDN49SuwvTNwa2kK+Hig18sJPZmZCqHUP3DM=";
|
||||
hash = "sha256-gwug+eVzFa0mL+dvASHQ/cLq4/nIzl6CvigPIep7v1E=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/libs/prebuilt";
|
||||
|
||||
@@ -40,14 +40,14 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "langgraph";
|
||||
version = "1.0.5";
|
||||
version = "1.0.7";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "langchain-ai";
|
||||
repo = "langgraph";
|
||||
tag = version;
|
||||
hash = "sha256-QvnBb69JxOVfZ/22igX+WVatJNAUrHUrh3aIpztYmmc=";
|
||||
hash = "sha256-gwug+eVzFa0mL+dvASHQ/cLq4/nIzl6CvigPIep7v1E=";
|
||||
};
|
||||
|
||||
postgresqlTestSetupPost = ''
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pytun-pmd3";
|
||||
version = "3.0.2";
|
||||
version = "3.0.3";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "doronz88";
|
||||
repo = "pytun-pmd3";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-3x+z+O6isgVRbPK+INfG5nG/+Tb2CWvPHg4TosH91so=";
|
||||
hash = "sha256-7kkQB+3MFq283JI2lbEBmpuV0S4KADibgIRBJWVp5Ug=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -36,9 +36,23 @@ buildPythonPackage {
|
||||
src
|
||||
version
|
||||
cargoDeps
|
||||
postPatch
|
||||
;
|
||||
|
||||
postPatch =
|
||||
(rerun.postPatch or "")
|
||||
|
||||
# error: failed to parse contents of PYO3_CONFIG_FILE
|
||||
#
|
||||
# The pyo3 config file is supposed to be generated beforehand by invoking pixi.
|
||||
# As the only goal of this file is to enhance build caching, it is not worth bothering with it.
|
||||
# See https://github.com/rerun-io/rerun/blob/0.29.0/BUILD.md#pythonpyo3-configuration-important
|
||||
+ ''
|
||||
substituteInPlace .cargo/config.toml \
|
||||
--replace-fail \
|
||||
"PYO3_CONFIG_FILE" \
|
||||
"# PYO3_CONFIG_FILE"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkgs.protobuf # for protoc
|
||||
rerun
|
||||
|
||||
Reference in New Issue
Block a user