Merge master into staging-next
This commit is contained in:
@@ -275,7 +275,10 @@ in
|
||||
ProtectKernelModules = true;
|
||||
ProtectKernelTunables = true;
|
||||
ProtectProc = "invisible";
|
||||
ProtectSystem = "full";
|
||||
ProtectSystem = "strict";
|
||||
ReadWritePaths = [
|
||||
cfg.home
|
||||
];
|
||||
RemoveIPC = true;
|
||||
RestrictAddressFamilies = [
|
||||
"AF_UNIX"
|
||||
|
||||
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
|
||||
mktplcRef = {
|
||||
name = "mongodb-vscode";
|
||||
publisher = "mongodb";
|
||||
version = "1.14.6";
|
||||
hash = "sha256-MACP/IvSk4JwD9DUWRD6pGYbgVQVzuCz8FvXdfHcphs=";
|
||||
version = "1.15.1";
|
||||
hash = "sha256-wdZ4Ro+L6We9GScVIlOBghPFv41xJD7x11Ni3iPshOI=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "all-the-package-names";
|
||||
version = "2.0.2379";
|
||||
version = "2.0.2387";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nice-registry";
|
||||
repo = "all-the-package-names";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-W1c0xFm6ZIpykfMegmc3PAX8X1SNhSpsN37ZhXn4424=";
|
||||
hash = "sha256-0DuHzZdPjzoUXGgn7Kt7CGjvNXuYYAZqpuuQS86ECXM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-3sWgNa6ez5lZHQj6tThxXTYVpkDXHulb7mkiqVVyTlg=";
|
||||
npmDepsHash = "sha256-CzWF/CbyVGGogeEFQOjldBWGP98q4q/x/KukAE4EJPo=";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
|
||||
@@ -14,11 +14,11 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "crowdin-cli";
|
||||
version = "4.14.0";
|
||||
version = "4.14.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
|
||||
hash = "sha256-rNtCCnssMQgiTU4BrH8uUHjOuTyvrHqlKKFclhRrnZE=";
|
||||
hash = "sha256-zlouZc7DtMYTHiDOLSCtawEKTMOKgqJe01gieRxeiFI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dpkg";
|
||||
version = "1.23.5";
|
||||
version = "1.23.7";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.launchpad.net/ubuntu/+source/dpkg";
|
||||
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rm -rf .git
|
||||
popd
|
||||
'';
|
||||
hash = "sha256-Ug82hdskTvWSzMZ8l+EdWhWAmt9OhS2pUpwOYa/9FLw=";
|
||||
hash = "sha256-8Joo/pcizlbtuuiUL8ev6/00ru+lh8/hzEPsO7fm2R0=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "dprint";
|
||||
version = "0.52.0";
|
||||
version = "0.52.1";
|
||||
|
||||
# Prefer repository rather than crate here
|
||||
# - They have Cargo.lock in the repository
|
||||
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
owner = "dprint";
|
||||
repo = "dprint";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-IVqHaqpoMXM1xHFCyh1lbRjKQbt7ZuX4u9Q9AoWOyWU=";
|
||||
hash = "sha256-CV0txMWYL9s11pA59D/RCt/s8GZ9LpUqOpEhK0yOhfA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-eLIkzAWt/7G73Fr2EXdVTYFd2QXqaYJvMM8SrKowbmU=";
|
||||
cargoHash = "sha256-ca5e5wWRfMz+qCMbAUlMls8u+txcHgZ0R9dzN+dm1L4=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
commit 5bf22927f9e83dc3043e09370bb54815085a00ba
|
||||
Author: complexlogic <complexlogic@users.noreply.github.com>
|
||||
Date: Tue Aug 12 07:19:29 2025 -0700
|
||||
|
||||
Replace deprecated FFmpeg functions
|
||||
|
||||
diff --git a/src/config.hpp b/src/config.hpp
|
||||
index ea9723c..1f6cc30 100644
|
||||
--- a/src/config.hpp
|
||||
+++ b/src/config.hpp
|
||||
@@ -133,7 +133,11 @@ struct Config {
|
||||
};
|
||||
FDK fdk;
|
||||
LAVC lavc;
|
||||
+#if LIBAVCODEC_VERSION_MAJOR >= 62
|
||||
+ int profile = AV_PROFILE_AAC_LOW;
|
||||
+#else
|
||||
int profile = FF_PROFILE_AAC_LOW;
|
||||
+#endif
|
||||
};
|
||||
struct OGG {
|
||||
int quality = VORBIS_DEFAULT_QUALITY;
|
||||
diff --git a/src/transcode.cpp b/src/transcode.cpp
|
||||
index 1ea286c..a0d6292 100644
|
||||
--- a/src/transcode.cpp
|
||||
+++ b/src/transcode.cpp
|
||||
@@ -171,7 +171,16 @@ bool Transcoder::OutputFile::open(Codec out_codec, const InputFile &in_file, con
|
||||
const auto &preset = config.opus.get_preset();
|
||||
codec_ctx->bit_rate = determine_bitrate(preset.bit_rate, codec_ctx->ch_layout.nb_channels);
|
||||
}
|
||||
+#if LIBAVCODEC_VERSION_MAJOR >= 62
|
||||
+ AVSampleFormat *fmts = nullptr;
|
||||
+ if ((avcodec_get_supported_config(codec_ctx, codec, AV_CODEC_CONFIG_SAMPLE_FORMAT, 0, const_cast<const void**>(reinterpret_cast<void**>(&fmts)), nullptr) < 0) || !fmts) {
|
||||
+ transcoder->logger.error("Could not find a valid sample format for the encoder");
|
||||
+ return false;
|
||||
+ }
|
||||
+ codec_ctx->sample_fmt = fmts[0];
|
||||
+#else
|
||||
codec_ctx->sample_fmt = codec->sample_fmts[0];
|
||||
+#endif
|
||||
stream->time_base.den = codec_ctx->sample_rate;
|
||||
stream->time_base.num = 1;
|
||||
|
||||
diff --git a/src/util.cpp b/src/util.cpp
|
||||
index 6a52903..fa69d3a 100644
|
||||
--- a/src/util.cpp
|
||||
+++ b/src/util.cpp
|
||||
@@ -158,13 +158,19 @@ int determine_sample_rate(Codec codec, const AVCodec *avcodec, int in_rate)
|
||||
{
|
||||
if (codec == Codec::MP3)
|
||||
return std::min(48000, in_rate);
|
||||
- if (!avcodec->supported_samplerates)
|
||||
+ int *supported_samplerates = nullptr;
|
||||
+#if LIBAVCODEC_VERSION_MAJOR >= 62
|
||||
+ if ((avcodec_get_supported_config(nullptr, avcodec, AV_CODEC_CONFIG_SAMPLE_RATE, 0, const_cast<const void**>(reinterpret_cast<void**>(&supported_samplerates)), nullptr) < 0) || !supported_samplerates)
|
||||
+#else
|
||||
+ supported_samplerates = avcodec->supported_samplerates;
|
||||
+ if (!supported_samplerates)
|
||||
+#endif
|
||||
return in_rate;
|
||||
|
||||
- const int *rate = avcodec->supported_samplerates;
|
||||
+ const int *rate = supported_samplerates;
|
||||
while (*(rate + 1))
|
||||
rate++;
|
||||
- while (rate > avcodec->supported_samplerates && (*rate - in_rate < 0))
|
||||
+ while (rate > supported_samplerates && (*rate - in_rate < 0))
|
||||
rate--;
|
||||
return *rate;
|
||||
}
|
||||
@@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
./0001-fix-project-name.patch
|
||||
./0003-fix-darwin-app.patch
|
||||
./0004-force-qt6.patch
|
||||
# This has been committed upstream, but hasn't been released
|
||||
# https://github.com/complexlogic/EasyAudioSync/commit/5bf22927f9e83dc3043e09370bb54815085a00ba
|
||||
./0005-fix-ffmpeg-dep-functions.patch
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -10,13 +10,13 @@
|
||||
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "ferron";
|
||||
version = "2.5.5";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ferronweb";
|
||||
repo = "ferron";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-ljAt3ntKY0OR56QVWb1UQ/Id1OJaoM7CwkkAdNVs2sI=";
|
||||
hash = "sha256-pKZ/oWmPzVvnGXTyTQ3VcgISH3hSReR+RdIvD4tzPso=";
|
||||
};
|
||||
|
||||
# ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md
|
||||
@@ -25,7 +25,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
|
||||
--replace-fail '#![doc = include_str!("../../README.md")]' ""
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-/ffeFawpcHA/wfrKY+Ub0EHeMMJb8+W4lhlVMAgICNQ=";
|
||||
strictDeps = true;
|
||||
|
||||
cargoHash = "sha256-FimBeq21JhCSSkkSmSO3i7UEqOzJY2r36GXJFcorRT0=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "lazyworktree";
|
||||
version = "1.38.1";
|
||||
version = "1.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chmouel";
|
||||
repo = "lazyworktree";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-rNTzmvfVAToPzOvP+3wnL+zyQzL2mXQCnRY0cLKuQ6c=";
|
||||
hash = "sha256-fzYUQY6MbKRM7lSjBlhWx3U2J53EkJqSBeC/+V1Xkmg=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Y4TZZ7Fhn1YSxG6YH0l0y0iWxgml93gOwKyTXWkjpqg=";
|
||||
vendorHash = "sha256-EZY4flrYM3JRY5i1qsjp5vvGW32IvDHeINdYuQJgUuQ=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@@ -47,14 +47,14 @@ in
|
||||
# as bootloader for various platforms and corresponding binary and helper files.
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "limine";
|
||||
version = "10.8.3";
|
||||
version = "10.8.5";
|
||||
|
||||
# We don't use the Git source but the release tarball, as the source has a
|
||||
# `./bootstrap` script performing network access to download resources.
|
||||
# Packaging that in Nix is very cumbersome.
|
||||
src = fetchurl {
|
||||
url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-6MAlspPwPIdHbhAOPufUASckRFcuBA2c6HwyKw8DQpo=";
|
||||
hash = "sha256-+56yc0JYpq/TXxKdrCnASHm5bSkwr5QPSWC+ILMDPs4=";
|
||||
};
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
@@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "luau";
|
||||
version = "0.709";
|
||||
version = "0.712";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "luau-lang";
|
||||
repo = "luau";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-qqexX0d/YFBbn/l59l3OI7KMpwScAtdmeJbGWk8ZEuE=";
|
||||
hash = "sha256-pReKrGXO7cZrSCO9ZKv4ikzs45ApZlJ0mvZPUt6+TOU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -12,14 +12,14 @@
|
||||
|
||||
let
|
||||
pname = "mochi";
|
||||
version = "1.20.10";
|
||||
version = "1.21.1";
|
||||
|
||||
linux = appimageTools.wrapType2 rec {
|
||||
inherit pname version meta;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://download.mochi.cards/releases/Mochi-${version}.AppImage";
|
||||
hash = "sha256-oC53TXgK6UUgsHbLo0Ri/+2/UajYwpoXxHwqO1xY91U=";
|
||||
hash = "sha256-JgKzq4iUqpFiB6TpC5Wv7vx+pjeqr9EzNwftiNjEl/I=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
@@ -44,9 +44,9 @@ let
|
||||
url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg";
|
||||
hash =
|
||||
if stdenv.hostPlatform.isAarch64 then
|
||||
"sha256-nLz73G6vthiXex7+y6bLVhe/RvK3fE3UHuzHf8lcilE="
|
||||
"sha256-b6lANyQWbovy2XegEJ/cNFrhh3YA4G6jzl5rpexi0oQ="
|
||||
else
|
||||
"sha256-MuvzijF2eDELcSfOyqffKk5tx2a51vU8cGV2/ShSfTg=";
|
||||
"sha256-iHNBD8MDmH+OzM2xUVOErB3aPypFN0wCkLKgfSjzfSQ=";
|
||||
};
|
||||
|
||||
sourceRoot = ".";
|
||||
@@ -74,7 +74,10 @@ let
|
||||
license = lib.licenses.unfree;
|
||||
mainProgram = "mochi";
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with lib.maintainers; [ poopsicles ];
|
||||
maintainers = with lib.maintainers; [
|
||||
piotrkwiecinski
|
||||
poopsicles
|
||||
];
|
||||
platforms = lib.platforms.linux ++ lib.platforms.darwin;
|
||||
};
|
||||
in
|
||||
|
||||
@@ -23,13 +23,13 @@
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${pname}${lib.optionalString withGnome "-gnome"}-${version}";
|
||||
pname = "NetworkManager-l2tp";
|
||||
version = "1.20.22";
|
||||
version = "1.52.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nm-l2tp";
|
||||
repo = "network-manager-l2tp";
|
||||
rev = version;
|
||||
hash = "sha256-TuYLNjogR3psb1B9zonHzRQext0ROS4ueD2WcWkseJk=";
|
||||
hash = "sha256-5EIG/5fexhrcOOQE+31+TJKMtINGVL+EI32m9tEhYVo=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -6,13 +6,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "nuclei-templates";
|
||||
version = "10.3.9";
|
||||
version = "10.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "projectdiscovery";
|
||||
repo = "nuclei-templates";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-ORKHxs2IdbQIc668A23BKkz3lPUodBEwI07dNfxLuDk=";
|
||||
hash = "sha256-XhzaBVNIKJ5khNNER69tqBYCMzc7G+pDiibgyNRWwEA=";
|
||||
};
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "opencode";
|
||||
version = "1.2.26";
|
||||
version = "1.2.27";
|
||||
src = fetchFromGitHub {
|
||||
owner = "anomalyco";
|
||||
repo = "opencode";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-+bQEfrqv9tAmXUMcvyUM0hJGpXgt09IWoKYt8I/jBlU=";
|
||||
hash = "sha256-JUlFfILzcUCME3mOxdxDbcCXphNVEfVGIKhwAwtJPl8=";
|
||||
};
|
||||
|
||||
node_modules = stdenvNoCC.mkDerivation {
|
||||
|
||||
@@ -14,12 +14,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "openimagedenoise";
|
||||
version = "2.3.3";
|
||||
version = "2.4.1";
|
||||
|
||||
# The release tarballs include pretrained weights, which would otherwise need to be fetched with git-lfs
|
||||
src = fetchzip {
|
||||
url = "https://github.com/RenderKit/oidn/releases/download/v${finalAttrs.version}/oidn-${finalAttrs.version}.src.tar.gz";
|
||||
sha256 = "sha256-JzAd47fYGLT6DeOep8Wag29VY9HOTpqf0OSv1v0kGQU=";
|
||||
sha256 = "sha256-SM0Bn4qgeqRJAXr2MMjNjfWJVTcciERZxMHiyx4Z1hA=";
|
||||
};
|
||||
|
||||
patches = lib.optional cudaSupport ./cuda.patch;
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
{
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
typescript-go,
|
||||
nix-update-script,
|
||||
versionCheckHook,
|
||||
writableTmpDirAsHomeHook,
|
||||
ripgrep,
|
||||
makeBinaryWrapper,
|
||||
}:
|
||||
buildNpmPackage (finalAttrs: {
|
||||
pname = "pi-coding-agent";
|
||||
version = "0.58.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "badlogic";
|
||||
repo = "pi-mono";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-3GrE60n+EY5G50iRrbH7R74e+LQIy1M9+huZTp0ZTns=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-EC5fXZTtBTRkYXLg5p4xWE/ghi2iw30XwnSqJs/PT8I=";
|
||||
|
||||
npmWorkspace = "packages/coding-agent";
|
||||
|
||||
# Skip native module rebuild for unneeded workspaces (e.g. canvas from web-ui)
|
||||
npmRebuildFlags = [ "--ignore-scripts" ];
|
||||
|
||||
nativeBuildInputs = [
|
||||
typescript-go
|
||||
makeBinaryWrapper
|
||||
];
|
||||
|
||||
# Build workspace dependencies in order, then the coding-agent.
|
||||
# We invoke tsgo directly for workspace deps to skip pi-ai's
|
||||
# generate-models script which requires network access
|
||||
# (models.generated.ts is committed to the repo).
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
tsgo -p packages/ai/tsconfig.build.json
|
||||
tsgo -p packages/tui/tsconfig.build.json
|
||||
tsgo -p packages/agent/tsconfig.build.json
|
||||
npm run build --workspace=packages/coding-agent
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
# npm workspace symlinks in the output point into packages/ which
|
||||
# doesn't exist there. Replace runtime deps with built content and
|
||||
# delete the rest.
|
||||
postInstall = ''
|
||||
local nm="$out/lib/node_modules/pi-monorepo/node_modules"
|
||||
|
||||
# Replace workspace deps needed at runtime with real copies
|
||||
for ws in @mariozechner/pi-ai:packages/ai \
|
||||
@mariozechner/pi-agent-core:packages/agent \
|
||||
@mariozechner/pi-tui:packages/tui; do
|
||||
IFS=: read -r pkg src <<< "$ws"
|
||||
rm "$nm/$pkg"
|
||||
cp -r "$src" "$nm/$pkg"
|
||||
done
|
||||
|
||||
# Delete remaining workspace symlinks
|
||||
find "$nm" -type l -lname '*/packages/*' -delete
|
||||
|
||||
# Clean up now-dangling .bin symlinks
|
||||
find "$nm/.bin" -xtype l -delete
|
||||
'';
|
||||
postFixup = "wrapProgram $out/bin/pi --prefix PATH : ${lib.makeBinPath [ ripgrep ]}";
|
||||
|
||||
doInstallCheck = true;
|
||||
nativeInstallCheckInputs = [
|
||||
writableTmpDirAsHomeHook
|
||||
versionCheckHook
|
||||
];
|
||||
versionCheckKeepEnvironment = [ "HOME" ];
|
||||
versionCheckProgram = "${placeholder "out"}/bin/pi";
|
||||
versionCheckProgramArg = "--version";
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = {
|
||||
description = "Coding agent CLI with read, bash, edit, write tools and session management";
|
||||
homepage = "https://shittycodingagent.ai/";
|
||||
downloadPage = "https://www.npmjs.com/package/@mariozechner/pi-coding-agent";
|
||||
changelog = "https://github.com/badlogic/pi-mono/blob/main/packages/coding-agent/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ munksgaard ];
|
||||
mainProgram = "pi";
|
||||
};
|
||||
})
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
let
|
||||
pname = "postman";
|
||||
version = "11.87.4";
|
||||
version = "11.88.3";
|
||||
|
||||
src =
|
||||
let
|
||||
@@ -27,10 +27,10 @@ let
|
||||
name = "postman-${version}.${if stdenvNoCC.hostPlatform.isLinux then "tar.gz" else "zip"}";
|
||||
url = "https://dl.pstmn.io/download/version/${version}/${system}";
|
||||
hash = selectSystem {
|
||||
aarch64-darwin = "sha256-1ilYfvduHTh5tvIrIXmrwQgfiWnYhdXhNv/o19wUNrE=";
|
||||
aarch64-linux = "sha256-JdO/gBT7B+FQ8mguyw7oD2hfQACfyDVxF714iVkTW2I=";
|
||||
x86_64-darwin = "sha256-Sb66zJQJzixk032fsdAfU88Yw9t7xeFoPBlQ+pRcdmU=";
|
||||
x86_64-linux = "sha256-a8jsIFlJD12tydTZM9Mibv+m7bcSqAN4JVQgQxB4WJo=";
|
||||
aarch64-darwin = "sha256-BYdEwE96SdxPwn8bTcIZcHcClAjPgrFd2rSO1zs/X5Y=";
|
||||
aarch64-linux = "sha256-nWS4cPV6m/h1+RLkl1i9FZxCol/GPxFb2S+GRoL87QM=";
|
||||
x86_64-darwin = "sha256-8lDFOysRuJMEJ5Ff2mkTZx+Mu+duiDq8EAdibi7yYL8=";
|
||||
x86_64-linux = "sha256-98NRSIOpgsDZ9tehbgQi1Ms5U04ylWIh4A2qY0yasPA=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "pyradio";
|
||||
version = "0.9.3.11.27";
|
||||
version = "0.9.3.11.28";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = "pyradio";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-0NcVjXkGhWYqgllEsbV+I8RzDgPn8CTPkRWRPUsmw0M=";
|
||||
hash = "sha256-a5nRSpGEbRNCZY5q2/QdlksuIXv+31OpifXY1a449ls=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "retool";
|
||||
version = "2.4.8";
|
||||
version = "2.4.9";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "unexpectedpanda";
|
||||
repo = "retool";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-SSSHYwQtDtCONvM5Ze3G5JJ4TW5aCziS3EbxhliXx+g=";
|
||||
hash = "sha256-FVBqmhU7nZpoFJSZBCtkmkcSLCAysNgwzOYyOwfOuGA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@@ -26,14 +26,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "s7";
|
||||
version = "11.7-unstable-2026-03-07";
|
||||
version = "11.7-unstable-2026-03-14";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
domain = "cm-gitlab.stanford.edu";
|
||||
owner = "bil";
|
||||
repo = "s7";
|
||||
rev = "5dfb990344f8edb463591e2e444daa1e004eb25f";
|
||||
hash = "sha256-XFzhMWfzQXrA87zioes+MzHjLnu+wseQTWJCPORkoU8=";
|
||||
rev = "18e645b614e053482a8721a0c84c4621586a1676";
|
||||
hash = "sha256-8FGb12BSKZkx9oKg2D2udP7j4V9ZLAhVtWICIDSp7v0=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage (finalAttrs: {
|
||||
pname = "see-cat";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "guilhermeprokisch";
|
||||
repo = "see";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Ej8lk9btUcIhhgpSmnHo2n33wQtyEkmuWVFoahYgAaI=";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-BlceC8XgKvSLOTKHlfQHxn0rhaFKL8rHqUcYBNntB5s=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-gADA6Ioxz8YM/SRYsT+43bKNS2Ov1XtTElDr7vx8T14=";
|
||||
cargoHash = "sha256-ccSuJqENO8DElZM5Nz+/rt7yAIMipcVJ3qOi9JR0CQY=";
|
||||
|
||||
meta = {
|
||||
description = "Cute cat(1) for the terminal";
|
||||
|
||||
@@ -12,18 +12,18 @@
|
||||
|
||||
buildGoModule (finalAttrs: {
|
||||
pname = "shellhub-agent";
|
||||
version = "0.21.5";
|
||||
version = "0.22.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "shellhub-io";
|
||||
repo = "shellhub";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-0adBDz9oHb+Wo1/BucMPavX/4xZidjQYNVA3O475JEo=";
|
||||
hash = "sha256-Ngb6n1P5Bb11et5x1mTF4rQjx/TdfE93nLc2NRz4aSg=";
|
||||
};
|
||||
|
||||
modRoot = "./agent";
|
||||
|
||||
vendorHash = "sha256-zBT3kQhn6RhgcP/5FBEhKo1oPl9GgFQqWGsBUgrDwW4=";
|
||||
vendorHash = "sha256-FlbSHLkJlOdbgfS+B5f8GLihw2KNQCh3G8kt8E+eb3w=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@@ -8,12 +8,12 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "snakefmt";
|
||||
version = "0.11.4";
|
||||
version = "0.11.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit (finalAttrs) pname version;
|
||||
hash = "sha256-LfJVYdViI88L/DtfUD1znBHUiLQb7MKhyJ2jhFCW4+Y=";
|
||||
hash = "sha256-27tt5KlTrpc463j5m6pUz89S6FqIKrtT9PA5EXeC1pM=";
|
||||
};
|
||||
|
||||
build-system = with python3.pkgs; [ hatchling ];
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
python3Packages.buildPythonApplication (finalAttrs: {
|
||||
pname = "sqlfluff";
|
||||
version = "4.0.0";
|
||||
version = "4.0.4";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sqlfluff";
|
||||
repo = "sqlfluff";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-hXiy3PGoBe6O9FaACN31Tss3xMBfiw4YuVLxbGi+/tA=";
|
||||
hash = "sha256-0Zu3hx35LPG6+v1D7fAenuh8tI6M4oJw6XxKU833cr8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "click" ];
|
||||
|
||||
@@ -23,12 +23,12 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "swaylock-plugin";
|
||||
version = "1.8.5";
|
||||
version = "1.8.6";
|
||||
src = fetchFromGitHub {
|
||||
owner = "mstoeckl";
|
||||
repo = "swaylock-plugin";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-CdxOOfKqPm/rWuZjaLOGcFaJpvdjT7GIhx24etPHH5I=";
|
||||
hash = "sha256-JSFxWpSUt6ekX/owk9I6CdGBTF6F1pOTtFAls7kZrsc=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@@ -6,21 +6,21 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication (finalAttrs: {
|
||||
pname = "theharvester";
|
||||
version = "4.10.0";
|
||||
version = "4.10.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "laramies";
|
||||
repo = "theharvester";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-PDFKDm1amqmdYo/avxudWZ9Xhp16Cw4ejmUAQ+BlvC0=";
|
||||
hash = "sha256-ajXGf8wH8WoVGNHDAUJ+fC3FN2OtUuKaIrXJ4KuRif0=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
pythonRemoveDeps = [ "winloop" ];
|
||||
|
||||
build-system = with python3.pkgs; [ setuptools ];
|
||||
build-system = with python3.pkgs; [ flit-core ];
|
||||
|
||||
dependencies = with python3.pkgs; [
|
||||
aiodns
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
diff --git a/appleutils.mm b/appleutils.mm
|
||||
index 52058b5..afc568f 100644
|
||||
--- a/appleutils.mm
|
||||
+++ b/appleutils.mm
|
||||
@@ -45,7 +45,11 @@ extern "C" void *makeViewMetalCompatible(void* handle)
|
||||
NSView* view = (__bridge NSView*)handle;
|
||||
assert([view isKindOfClass:[NSView class]]);
|
||||
|
||||
- void *pLayer = (__bridge void *)view.layer;
|
||||
+ // In Qt 6.10+, the window has an intermediate QContainerLayer in which
|
||||
+ // the actual Metal CALayer is nested.
|
||||
+ // https://github.com/qt/qtbase/commit/0bdbf4688e4265a1ddf42efbe4c780770809d365
|
||||
+ id containerLayer = view.layer;
|
||||
+ void *pLayer = (__bridge void*)[containerLayer contentLayer];
|
||||
return pLayer;
|
||||
#endif
|
||||
}
|
||||
+49
-21
@@ -2,48 +2,73 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
qmake,
|
||||
qt6,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
wrapQtAppsHook,
|
||||
xcbuild,
|
||||
|
||||
waylandSupport ? lib.meta.availableOn stdenv.hostPlatform wayland,
|
||||
x11Support ? !stdenv.hostPlatform.isDarwin,
|
||||
qtx11extras,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vulkan-caps-viewer";
|
||||
version = "4.03";
|
||||
version = "4.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "SaschaWillems";
|
||||
repo = "VulkanCapsViewer";
|
||||
rev = version;
|
||||
hash = "sha256-LaZdQ5w7QYaD3Nxl9ML30kGws8Yyr3c0jzO3ElUvJ/I=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-Vc4zK1Kurirp+xK7A2D3CC4veJSghE9mS7YzRA3CnHM=";
|
||||
# Note: this derivation strictly requires vulkan-header to be the same it was developed against.
|
||||
# To help us, they've put it in a git-submodule.
|
||||
# The result will work with any vulkan-loader version.
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
patches = [
|
||||
# In Qt 6.10+, the path of the Metal layer has changed.
|
||||
# Without this patch, the application fails to launch on darwin.
|
||||
# Upstream PR: https://github.com/SaschaWillems/VulkanCapsViewer/pull/270
|
||||
./Fix-darwin-metal-layer.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# These paths are appended to the install target, so we strip the /usr/ prefix
|
||||
substituteInPlace vulkanCapsViewer.pro \
|
||||
--replace-fail '/usr/' '/' \
|
||||
--replace-fail '$(VULKAN_SDK)/lib/libvulkan.dylib' '${lib.getLib vulkan-loader}/lib/libvulkan.dylib'
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
qmake
|
||||
wrapQtAppsHook
|
||||
qt6.qmake
|
||||
qt6.wrapQtAppsHook
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
xcbuild
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
vulkan-loader
|
||||
]
|
||||
++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform wayland) [ wayland ]
|
||||
++ lib.lists.optionals x11Support [ qtx11extras ];
|
||||
|
||||
patchPhase = ''
|
||||
substituteInPlace vulkanCapsViewer.pro \
|
||||
--replace-fail '/usr/' "/" \
|
||||
--replace-fail '$(VULKAN_SDK)/lib/libvulkan.dylib' '${lib.getLib vulkan-loader}/lib/libvulkan.dylib'
|
||||
'';
|
||||
++ lib.optionals waylandSupport [
|
||||
wayland
|
||||
];
|
||||
|
||||
qmakeFlags = [
|
||||
"CONFIG+=release"
|
||||
]
|
||||
# The README incorrectly states that these should not be defined simultaneously.
|
||||
# Enabling both WAYLAND and X11 at the same time doesn't cause any issues
|
||||
# and is actually required to automatically fallback to the X11 surface test
|
||||
# when no Wayland display is available.
|
||||
# These two variables only control the surface presentation tests for the
|
||||
# queue families of a GPU and are not related to how the Qt application is rendered.
|
||||
++ lib.optionals waylandSupport [
|
||||
"DEFINES+=WAYLAND"
|
||||
]
|
||||
++ lib.optionals x11Support [
|
||||
"DEFINES+=X11"
|
||||
];
|
||||
|
||||
installFlags = [ "INSTALL_ROOT=$(out)" ];
|
||||
@@ -62,8 +87,11 @@ stdenv.mkDerivation rec {
|
||||
'';
|
||||
homepage = "https://vulkan.gpuinfo.org/";
|
||||
platforms = lib.platforms.unix;
|
||||
license = lib.licenses.gpl2Only;
|
||||
maintainers = with lib.maintainers; [ pedrohlc ];
|
||||
changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${version}";
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = with lib.maintainers; [
|
||||
pedrohlc
|
||||
niklaskorz
|
||||
];
|
||||
changelog = "https://github.com/SaschaWillems/VulkanCapsViewer/releases/tag/${finalAttrs.version}";
|
||||
};
|
||||
}
|
||||
})
|
||||
@@ -358,13 +358,13 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.42.67";
|
||||
version = "1.42.68";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "boto3_stubs";
|
||||
inherit (finalAttrs) version;
|
||||
hash = "sha256-wN6+zsf6+sQbeXcGjSuw1uGdCEh7PScvzUrV1aSwRcQ=";
|
||||
hash = "sha256-lq0QIHNWGUg/ubTael5pS0YL8uGPhKNNXRddD/6MRlM=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -22,14 +22,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "cyclopts";
|
||||
version = "4.8.0";
|
||||
version = "4.10.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BrianPugh";
|
||||
repo = "cyclopts";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-pup2QOn9vqi5hIM+ei+TXQ5Bo/KMxZp+BXETqpguMBI=";
|
||||
hash = "sha256-wUNqysXUP0vzQBgb6EOVBh/3/bJf2Tgf5lHeNXucyPk=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
{
|
||||
lib,
|
||||
buildPythonPackage,
|
||||
poetry-core,
|
||||
fetchFromGitHub,
|
||||
pytestCheckHook,
|
||||
click,
|
||||
fetchFromGitHub,
|
||||
hatchling,
|
||||
pytestCheckHook,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "kml2geojson";
|
||||
version = "5.1.0";
|
||||
version = "5.1.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mrcagney";
|
||||
repo = "kml2geojson";
|
||||
rev = version;
|
||||
hash = "sha256-iJEcXpvy+Y3MkxAF2Q1Tkcx8GxUVjeVzv6gl134zdiI=";
|
||||
tag = finalAttrs.version;
|
||||
hash = "sha256-50hKosd4tgTV5GUXHAdTsz4S5QFtM7FTqUHy5TGcq0c=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ poetry-core ];
|
||||
build-system = [ hatchling ];
|
||||
|
||||
propagatedBuildInputs = [ click ];
|
||||
dependencies = [ click ];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
@@ -29,9 +29,9 @@ buildPythonPackage rec {
|
||||
|
||||
meta = {
|
||||
description = "Library to convert KML to GeoJSON";
|
||||
mainProgram = "k2g";
|
||||
homepage = "https://github.com/mrcagney/kml2geojson";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ fab ];
|
||||
mainProgram = "k2g";
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@@ -42,21 +42,21 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "lancedb";
|
||||
version = "0.27.1";
|
||||
version = "0.29.2";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lancedb";
|
||||
tag = "python-v${finalAttrs.version}";
|
||||
hash = "sha256-pWrwv3VtfkfOKnkiiu26yRDrDrsNxb+0r/kcNHwzmhU=";
|
||||
hash = "sha256-sOgRGn0romt5xJ70c+GSqNoRAp0D9F9hEq6bm7JRK/Y=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "python";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoVendor {
|
||||
inherit (finalAttrs) pname version src;
|
||||
hash = "sha256-U1Od4lhaaGdYF3TISfRWY7sRmyyniZqLofBCnYAo1ew=";
|
||||
hash = "sha256-GQA5RuxpYmrNqNrpW4GLZlXrphflErmR5PeeVcs6ZJQ=";
|
||||
};
|
||||
|
||||
build-system = [ rustPlatform.maturinBuildHook ];
|
||||
@@ -110,6 +110,17 @@ buildPythonPackage (finalAttrs: {
|
||||
# Requires internet access
|
||||
# RuntimeError: lance error: LanceError(IO): Generic S3 error
|
||||
"test_bucket_without_dots_passes"
|
||||
|
||||
# lance_namespace.errors.UnsupportedOperationError: Not supported: create_empty_table
|
||||
"TestAsyncNamespaceConnection"
|
||||
"TestNamespaceConnection"
|
||||
|
||||
# Failed: DID NOT RAISE <class 'Exception'>
|
||||
"test_merge_insert"
|
||||
|
||||
# TypeError: FFILanceTableProvider.__datafusion_table_provider__() missing 1 required positional
|
||||
# argument: 'session'
|
||||
"test_sql_query"
|
||||
]
|
||||
++ lib.optionals (pythonAtLeast "3.14") [
|
||||
# TypeError: Converting Pydantic type to Arrow Type: unsupported type
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-json";
|
||||
version = "0.4.2";
|
||||
version = "0.5.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_index_readers_json";
|
||||
inherit version;
|
||||
hash = "sha256-ggwpTUnfP1aZhAyZ1wTsoNpW52dt0y5/59JT6RSUMNQ=";
|
||||
hash = "sha256-315Uzbm3CuRJQpAwnrLxQ6zr0e1pCmM3JKMV6KhrEs8=";
|
||||
};
|
||||
|
||||
build-system = [ hatchling ];
|
||||
|
||||
@@ -75,8 +75,8 @@ in
|
||||
"sha256-Q8nkt2PJnip62r2lbCZcB9qGE6sSg28ZAycLI8gIQ7s=";
|
||||
|
||||
mypy-boto3-apigateway =
|
||||
buildMypyBoto3Package "apigateway" "1.42.3"
|
||||
"sha256-JVGKx+VCoE4EvUrxsmFsdXwu6gaprva+q1xrsSl5EDA=";
|
||||
buildMypyBoto3Package "apigateway" "1.42.68"
|
||||
"sha256-cjHTz3Q9T7NBcr/p00heOzlBVlnVMfzWylivg37dtWk=";
|
||||
|
||||
mypy-boto3-apigatewaymanagementapi =
|
||||
buildMypyBoto3Package "apigatewaymanagementapi" "1.42.3"
|
||||
@@ -331,12 +331,12 @@ in
|
||||
"sha256-M8vUOtM7Q5gnwi9ZPGu6n+I4Twl02Su4eRGqq2+Ow1o=";
|
||||
|
||||
mypy-boto3-config =
|
||||
buildMypyBoto3Package "config" "1.42.32"
|
||||
"sha256-HQUL0R1NWP6DXQ26iS9k6lIAVdwK899fwLGH4/Z4U8Q=";
|
||||
buildMypyBoto3Package "config" "1.42.68"
|
||||
"sha256-UNxmIK9UD6AVmT4nyQzunNAKjp2YmV1wQ5oloHOwcXw=";
|
||||
|
||||
mypy-boto3-connect =
|
||||
buildMypyBoto3Package "connect" "1.42.63"
|
||||
"sha256-dZUnInRs0ndWy4jNbZLmUUswZZPC4GwUeBlTqm6JxJI=";
|
||||
buildMypyBoto3Package "connect" "1.42.68"
|
||||
"sha256-jppL6jpw0/Wb+cOW3GQ62h65l+/ZX8c6OFvyJfzVLtA=";
|
||||
|
||||
mypy-boto3-connect-contact-lens =
|
||||
buildMypyBoto3Package "connect-contact-lens" "1.42.3"
|
||||
@@ -571,8 +571,8 @@ in
|
||||
"sha256-N0kQ7Fc44SFKXhl4V+oAclPNlWhluOs53NDokiXcSNM=";
|
||||
|
||||
mypy-boto3-glue =
|
||||
buildMypyBoto3Package "glue" "1.42.43"
|
||||
"sha256-PBFrSU7QbOuaU5kWjYe6eA8k9BHdAZUuD3jMYLlFwF0=";
|
||||
buildMypyBoto3Package "glue" "1.42.68"
|
||||
"sha256-HvL13TFg9jP3iSqyxDdsOaBv7shpkMqIQURe9e+ACVA=";
|
||||
mypy-boto3-grafana =
|
||||
buildMypyBoto3Package "grafana" "1.42.51"
|
||||
"sha256-QHAuRJrioMD7ASgV1Wobm81Gb+Z87c78yBs9X1+Kz+E=";
|
||||
@@ -698,8 +698,8 @@ in
|
||||
"sha256-TzudGWLWWzTRWZb3585Tkar1iXmt5TtFNox+DJzvhS4=";
|
||||
|
||||
mypy-boto3-ivs-realtime =
|
||||
buildMypyBoto3Package "ivs-realtime" "1.42.6"
|
||||
"sha256-MjfhT4KcLIDO4iQVo7eyq2K4lqM4anHaDJosPqZdaGw=";
|
||||
buildMypyBoto3Package "ivs-realtime" "1.42.68"
|
||||
"sha256-Q+++H+qR9OKMnbyZVL06+uDV9KuPuEabZDVXcrkAozM=";
|
||||
|
||||
mypy-boto3-ivschat =
|
||||
buildMypyBoto3Package "ivschat" "1.42.3"
|
||||
@@ -858,12 +858,12 @@ in
|
||||
"sha256-NYn/N65sVAUxA4kTCi/IJNP/QQeutFjH8S7N2AeK3g8=";
|
||||
|
||||
mypy-boto3-mediaconvert =
|
||||
buildMypyBoto3Package "mediaconvert" "1.42.37"
|
||||
"sha256-Z+TiVg/mjr0vTU+awHlS7GCynOeSl+IPl0n9GaLTsYE=";
|
||||
buildMypyBoto3Package "mediaconvert" "1.42.68"
|
||||
"sha256-aRJIk0hzRVvbGQHbXxCoLl/6xReo2f4CZHdRo2YN364=";
|
||||
|
||||
mypy-boto3-medialive =
|
||||
buildMypyBoto3Package "medialive" "1.42.56"
|
||||
"sha256-MshslPZEBNOuIPrs0w2No6g8UzXNouSdRgM7WAkXlbc=";
|
||||
buildMypyBoto3Package "medialive" "1.42.68"
|
||||
"sha256-J9NnMG0prpzU+1dNQcH396UcZ0tCoNCbRXqVI42Qfz0=";
|
||||
|
||||
mypy-boto3-mediapackage =
|
||||
buildMypyBoto3Package "mediapackage" "1.42.3"
|
||||
@@ -906,8 +906,8 @@ in
|
||||
"sha256-kFHGogiCfbftZr67o8zT7eb8na74J4AGneac03q+Pvc=";
|
||||
|
||||
mypy-boto3-mgn =
|
||||
buildMypyBoto3Package "mgn" "1.42.64"
|
||||
"sha256-F12y2J72+c2VRP9sMdXVjeXZ7vlZqkEFpwm/dNWhkbU=";
|
||||
buildMypyBoto3Package "mgn" "1.42.68"
|
||||
"sha256-zrUwEeofbz+Tj7GgHzOzodYzsnPKqAISOuRGG6B7rpY=";
|
||||
|
||||
mypy-boto3-migration-hub-refactor-spaces =
|
||||
buildMypyBoto3Package "migration-hub-refactor-spaces" "1.42.3"
|
||||
@@ -1070,8 +1070,8 @@ in
|
||||
"sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";
|
||||
|
||||
mypy-boto3-quicksight =
|
||||
buildMypyBoto3Package "quicksight" "1.42.61"
|
||||
"sha256-3ZA5BRq6lgqNM8tt02E7fXSrwf0gfF4JE6lfaw6cYWo=";
|
||||
buildMypyBoto3Package "quicksight" "1.42.68"
|
||||
"sha256-TrlvFHHGdfpGIk7MV17EAeaJD+Sf0Tfys/J0o1THx/Y=";
|
||||
|
||||
mypy-boto3-ram =
|
||||
buildMypyBoto3Package "ram" "1.42.59"
|
||||
|
||||
@@ -34,14 +34,14 @@
|
||||
|
||||
buildPythonPackage (finalAttrs: {
|
||||
pname = "pylance";
|
||||
version = "2.0.1";
|
||||
version = "3.0.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "lancedb";
|
||||
repo = "lance";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-KuUXo7GyC78U5RG6orW0X7a/B/0e9TbLpbTc7KXpxF8=";
|
||||
hash = "sha256-71PogI877/dLwwlvMBraaC0vQWKtAHI/bmGEIBZVui4=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/python";
|
||||
@@ -53,7 +53,7 @@ buildPythonPackage (finalAttrs: {
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-dq5HK0yS/nnI7cqpsS51KnQus8KJ2mHsxmlgi8601gk=";
|
||||
hash = "sha256-scQDRyX3hweYZep+LVAsiVqOvDTEw/ss0/4M3R4ewDU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
aiohttp,
|
||||
awsiotsdk,
|
||||
buildPythonPackage,
|
||||
fetchFromGitHub,
|
||||
@@ -7,18 +8,19 @@
|
||||
paho-mqtt,
|
||||
requests,
|
||||
urllib3,
|
||||
tzdata,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyworxcloud";
|
||||
version = "5.0.0";
|
||||
version = "6.0.5";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MTrab";
|
||||
repo = "pyworxcloud";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-eyMMtLgJuBIuPCyenYrHaRQIrb2tzPaIzM2UCAPPqDg=";
|
||||
hash = "sha256-BqRdR202mF+aosAf1GRu8xcMSTkUrgxRVSgHyCg4wjA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "awsiotsdk" ];
|
||||
@@ -26,10 +28,12 @@ buildPythonPackage rec {
|
||||
build-system = [ poetry-core ];
|
||||
|
||||
dependencies = [
|
||||
aiohttp
|
||||
awsiotsdk
|
||||
paho-mqtt
|
||||
requests
|
||||
urllib3
|
||||
tzdata
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "pyworxcloud" ];
|
||||
|
||||
@@ -3,9 +3,9 @@ index f5dbe8600f..9e1e5e0704 100644
|
||||
--- a/electron/patches/config.json
|
||||
+++ b/electron/patches/config.json
|
||||
@@ -14,5 +14,5 @@
|
||||
{ "patch_dir": "src/electron/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
|
||||
{ "patch_dir": "src/electron/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
|
||||
{ "patch_dir": "src/electron/electron/patches/skia", "repo": "src/third_party/skia" },
|
||||
- { "patch_dir": "src/electron/electron/patches/angle", "repo": "src/third_party/angle/src" }
|
||||
+ { "patch_dir": "src/electron/electron/patches/angle", "repo": "src/third_party/angle" }
|
||||
{ "patch_dir": "src/electron/patches/reclient-configs", "repo": "src/third_party/engflow-reclient-configs" },
|
||||
{ "patch_dir": "src/electron/patches/sqlite", "repo": "src/third_party/sqlite/src" },
|
||||
{ "patch_dir": "src/electron/patches/skia", "repo": "src/third_party/skia" },
|
||||
- { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle/src" }
|
||||
+ { "patch_dir": "src/electron/patches/angle", "repo": "src/third_party/angle" }
|
||||
]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import ./generic.nix {
|
||||
kafkaVersion = "3.9.1";
|
||||
kafkaVersion = "3.9.2";
|
||||
scalaVersion = "2.13";
|
||||
hash = "sha256-3UOZgW5niUbKt2470WhhA1VeabyPKrhobNpxqhW8MaM=";
|
||||
hash = "sha256-1dlRwiSE+aCQiwVWO8gKBC3pd53x4GqJ930nzrX2gyM=";
|
||||
}
|
||||
|
||||
@@ -7617,8 +7617,6 @@ with pkgs;
|
||||
|
||||
vtkWithQt6 = vtk.override { withQt6 = true; };
|
||||
|
||||
vulkan-caps-viewer = libsForQt5.callPackage ../tools/graphics/vulkan-caps-viewer { };
|
||||
|
||||
wayland = callPackage ../development/libraries/wayland { };
|
||||
wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user