Merge master into staging-next

This commit is contained in:
github-actions[bot]
2024-12-17 12:06:09 +00:00
committed by GitHub
52 changed files with 632 additions and 2808 deletions
-1
View File
@@ -12,7 +12,6 @@ queue_rules:
- check-success=Outpaths (x86_64-linux)
- check-success=Process
- check-success=Request
- check-success=Tag
- check-success=editorconfig-check
- check-success=label-pr
- check-success=nix-files-parseable-check
@@ -57,6 +57,8 @@
- [mqtt-exporter](https://github.com/kpetremann/mqtt-exporter/), a Prometheus exporter for exposing messages from MQTT. Available as [services.prometheus.exporters.mqtt](#opt-services.prometheus.exporters.mqtt.enable).
- [nvidia-gpu](https://github.com/utkuozdemir/nvidia_gpu_exporter), a Prometheus exporter that scrapes `nvidia-smi` for GPU metrics. Available as [services.prometheus.exporters.nvidia-gpu](#opt-services.prometheus.exporters.nvidia-gpu.enable).
- [Buffyboard](https://gitlab.postmarketos.org/postmarketOS/buffybox/-/tree/master/buffyboard), a framebuffer on-screen keyboard. Available as [services.buffyboard](option.html#opt-services.buffyboard).
- [KanBoard](https://github.com/kanboard/kanboard), a project management tool that focuses on the Kanban methodology. Available as [services.kanboard](#opt-services.kanboard.enable).
@@ -66,6 +66,7 @@ let
"nginxlog"
"node"
"nut"
"nvidia-gpu"
"pgbouncer"
"php-fpm"
"pihole"
@@ -0,0 +1,29 @@
{
config,
lib,
pkgs,
...
}:
let
cfg = config.services.prometheus.exporters.nvidia-gpu;
inherit (lib)
types
concatStringsSep
;
in
{
port = 9835;
serviceOpts = {
serviceConfig = {
ExecStart = ''
${pkgs.prometheus-nvidia-gpu-exporter}/bin/nvidia_gpu_exporter \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--nvidia-smi-command ${config.hardware.nvidia.package.bin}/bin/nvidia-smi \
${concatStringsSep " " cfg.extraFlags}
'';
PrivateDevices = false;
};
wantedBy = [ "multi-user.target" ];
};
}
@@ -1242,6 +1242,30 @@ final: prev:
meta.homepage = "https://github.com/APZelos/blamer.nvim/";
};
blink-cmp-copilot = buildVimPlugin {
pname = "blink-cmp-copilot";
version = "2024-12-16";
src = fetchFromGitHub {
owner = "giuxtaposition";
repo = "blink-cmp-copilot";
rev = "f8e12f3ec152ca7dfbdbd6f50797aac0171a46a9";
sha256 = "1rpdzacp1m6k3ng38hb1vwnb931k5kncc10761x5ycn4qk88icq9";
};
meta.homepage = "https://github.com/giuxtaposition/blink-cmp-copilot/";
};
blink-compat = buildVimPlugin {
pname = "blink.compat";
version = "2024-12-03";
src = fetchFromGitHub {
owner = "Saghen";
repo = "blink.compat";
rev = "73249d35c8737b614bed64c2f33277387035f8ec";
sha256 = "151lqk78g3zwbwr7d0yvlxc3zbwyh9776nl779r7fx7ap4dm0vj1";
};
meta.homepage = "https://github.com/Saghen/blink.compat/";
};
block-nvim = buildVimPlugin {
pname = "block.nvim";
version = "2023-10-10";
@@ -101,6 +101,8 @@ https://github.com/rbgrouleff/bclose.vim/,,
https://github.com/max397574/better-escape.nvim/,,
https://github.com/LunarVim/bigfile.nvim/,,
https://github.com/APZelos/blamer.nvim/,HEAD,
https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD,
https://github.com/Saghen/blink.compat/,HEAD,
https://github.com/HampusHauffman/block.nvim/,HEAD,
https://github.com/blueballs-theme/blueballs-neovim/,,
https://github.com/uloco/bluloco.nvim/,,
+2 -2
View File
@@ -17,14 +17,14 @@
python3Packages.buildPythonApplication rec {
pname = "binary";
version = "5.1";
version = "5.2";
pyproject = false;
src = fetchFromGitHub {
owner = "fizzyizzy05";
repo = "binary";
rev = "refs/tags/${version}";
hash = "sha256-HBmWaT0cjYz3UAO1r5chFW7KARpL1EnY8wEeR9etPE0=";
hash = "sha256-0pVQMPwy/XXJl2fHQ/gIi+e/cJY87CA9G+GPkdYFQBc=";
};
strictDeps = true;
+3 -3
View File
@@ -23,19 +23,19 @@
stdenv.mkDerivation (finalAttrs: {
pname = "citations";
version = "0.6.2";
version = "0.7.0";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "citations";
rev = finalAttrs.version;
hash = "sha256-RV9oQcXzRsNcvZc/8Xt7qZ/88DvHofC2Av0ftxzeF6Q=";
hash = "sha256-WYy6cyPmyWL/11yHf+dRbcZGBfvVfELeTwKvpJMu5ns=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
src = finalAttrs.src;
hash = "sha256-XlqwgXuwxR6oEz0+hYAp/3b+XxH+Vd/DGr5j+iKhUjQ=";
hash = "sha256-SmKt3oPzeJRAFjgZvJubNCTsjhqCrGZfE1LfDQ8AxZA=";
};
nativeBuildInputs = [
+2 -2
View File
@@ -21,7 +21,7 @@
python3Packages.buildPythonApplication rec {
pname = "eartag";
version = "0.6.1";
version = "0.6.3";
format = "other";
src = fetchFromGitLab {
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec {
owner = "World";
repo = pname;
rev = version;
hash = "sha256-CAJz9p1PJxq3VDxzZEHD860xINCQF722bPaf7psNztY=";
hash = "sha256-eo6Vboo2Kn39M0r1OeqRFG3ug6frxzMKler5qT9KysY=";
};
postPatch = ''
+2 -2
View File
@@ -17,14 +17,14 @@
stdenv.mkDerivation rec {
pname = "elastic";
version = "0.1.5";
version = "0.1.6";
src = fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "World";
repo = "elastic";
rev = version;
hash = "sha256-y/XBXN5RIqnFmxnmkThBGW0B5owgy/1Q/6jmkBCi+rk=";
hash = "sha256-D7DqSBP0E0CzjTROh97JXhB8N8q0I2pDo4HbAK8vQ/Y=";
};
nativeBuildInputs = [
+15 -11
View File
@@ -32,14 +32,15 @@
libdecor,
lcms,
lib,
luajit,
makeBinaryWrapper,
nix-update-script,
enableExecutable ? true,
enableWsi ? true,
}:
let
joshShaders = fetchFromGitHub {
owner = "Joshua-Ashton";
frogShaders = fetchFromGitHub {
owner = "misyltoad";
repo = "GamescopeShaders";
rev = "v0.1";
hash = "sha256-gR1AeAHV/Kn4ntiEDUSPxASLMFusV6hgSGrTbMCBUZA=";
@@ -47,14 +48,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "gamescope";
version = "3.15.15";
version = "3.16.1";
src = fetchFromGitHub {
owner = "ValveSoftware";
repo = "gamescope";
rev = "refs/tags/${finalAttrs.version}";
tag = finalAttrs.version;
fetchSubmodules = true;
hash = "sha256-FiPSGzfA3YH9TED8E5hpfpd+IQGthvwsxAFXZuqVZ4Q=";
hash = "sha256-+0QGt4UADJmZok2LzvL+GBad0t4vVL4HXq27399zH3Y=";
};
patches = [
@@ -67,11 +68,12 @@ stdenv.mkDerivation (finalAttrs: {
# We can't substitute the patch itself because substituteAll is itself a derivation,
# so `placeholder "out"` ends up pointing to the wrong place
postPatch = ''
substituteInPlace src/reshade_effect_manager.cpp --replace "@out@" "$out"
substituteInPlace src/reshade_effect_manager.cpp --replace-fail "@out@" "$out"
# Patching shebangs in the main `libdisplay-info` build
patchShebangs subprojects/libdisplay-info/tool/gen-search-table.py
# Replace gamescopereeaper with absolute path
substituteInPlace src/Utils/Process.cpp --subst-var-by "gamescopereaper" "$out/bin/gamescopereaper"
patchShebangs default_scripts_install.sh
'';
mesonFlags = [
@@ -118,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
wayland-protocols
vulkan-loader
glm
luajit
]
++ lib.optionals enableWsi [
vulkan-headers
@@ -168,23 +171,24 @@ stdenv.mkDerivation (finalAttrs: {
# Install ReShade shaders
mkdir -p $out/share/gamescope/reshade
cp -r ${joshShaders}/* $out/share/gamescope/reshade/
cp -r ${frogShaders}/* $out/share/gamescope/reshade/
'';
passthru.updateScript = nix-update-script { };
meta = with lib; {
meta = {
description = "SteamOS session compositing window manager";
homepage = "https://github.com/ValveSoftware/gamescope";
license = licenses.bsd2;
maintainers = with maintainers; [
license = lib.licenses.bsd2;
maintainers = with lib.maintainers; [
nrdxp
pedrohlc
Scrumplex
zhaofengli
k900
Gliczy
];
platforms = platforms.linux;
platforms = lib.platforms.linux;
mainProgram = "gamescope";
};
})
@@ -18,13 +18,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "lua-language-server";
version = "3.13.3";
version = "3.13.4";
src = fetchFromGitHub {
owner = "luals";
repo = "lua-language-server";
rev = "refs/tags/${finalAttrs.version}";
hash = "sha256-pAmNzc9GlkUB3FxYXiBqbS9Ym2wg3lBLbBKio6WezyQ=";
tag = finalAttrs.version;
hash = "sha256-keyJ1Vtt+QjBAgGSIx6WEWAowFKgBpCfZMgemt6Qh9M=";
fetchSubmodules = true;
};
+15 -58
View File
@@ -1,69 +1,26 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchYarnDeps
, makeWrapper
, nodejs
, fixup-yarn-lock
, yarn
{
lib,
buildNpmPackage,
fetchFromGitHub,
nodejs,
}:
stdenv.mkDerivation (finalAttrs: {
buildNpmPackage rec {
pname = "marp-cli";
version = "3.4.0";
version = "4.0.3";
src = fetchFromGitHub {
owner = "marp-team";
repo = "marp-cli";
rev = "v${finalAttrs.version}";
hash = "sha256-azscuPkQ9/xcQtBg+5pJigXSQQVtBGvbd7ZwiLwU7Qo=";
repo = pname;
rev = "v${version}";
hash = "sha256-HiLhFRQBCrDqMDX04gI7KolphA1ogTxdj1ehpL1D9e4=";
};
offlineCache = fetchYarnDeps {
yarnLock = "${finalAttrs.src}/yarn.lock";
hash = "sha256-b/JyhsfXEbmM6+ajrjL65WhX9u9MEH+m1NHE6cTyf2g=";
};
npmDepsHash = "sha256-8IN3MJBtq3Nu4T/WMcvg9QnckyigYhItBoGoSYOImTY=";
npmPackFlags = [ "--ignore-scripts" ];
makeCacheWritable = true;
nativeBuildInputs = [
makeWrapper
nodejs
fixup-yarn-lock
yarn
];
configurePhase = ''
runHook preConfigure
export HOME=$(mktemp -d)
yarn config --offline set yarn-offline-mirror $offlineCache
fixup-yarn-lock yarn.lock
yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install
patchShebangs node_modules
runHook postConfigure
'';
buildPhase = ''
runHook preBuild
yarn --offline build
runHook postBuild
'';
installPhase = ''
runHook preInstall
yarn --offline --production install
mkdir -p $out/lib/node_modules/@marp-team/marp-cli
cp -r lib node_modules marp-cli.js $out/lib/node_modules/@marp-team/marp-cli/
makeWrapper "${nodejs}/bin/node" "$out/bin/marp" \
--add-flags "$out/lib/node_modules/@marp-team/marp-cli/marp-cli.js"
runHook postInstall
'';
doCheck = false;
meta = with lib; {
description = "About A CLI interface for Marp and Marpit based converters";
@@ -73,4 +30,4 @@ stdenv.mkDerivation (finalAttrs: {
platforms = nodejs.meta.platforms;
mainProgram = "marp";
};
})
}
+2 -2
View File
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "mpris-timer";
version = "1.5";
version = "1.6.2";
src = fetchFromGitHub {
owner = "efogdev";
repo = "mpris-timer";
rev = "refs/tags/${version}";
hash = "sha256-drp/JB7C1MMEOWbZUmrFtaEDRpgf90MSR6dFqdagCpI=";
hash = "sha256-QOnyu2FphqQW6aFa3rdJwLvQw+DXTS2JSzixshixLEg=";
};
vendorHash = "sha256-APcQgNEn7ULIjBk7f4q6MMSX9k58+F7vzgUDiIZ3Jxc=";
+2 -2
View File
@@ -6,12 +6,12 @@
python3Packages.buildPythonPackage rec {
pname = "overturemaps";
version = "0.10.0";
version = "0.11.0";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-SDfz2qsS0cn8xbgAin9MTKJRyTOtkA6ut4wCCsO8Chg=";
hash = "sha256-voLt1wsWYlbC9vrepFgdHaP3yThvhr8ZwEkffTdJeVU=";
};
build-system = with python3Packages; [ poetry-core ];
+3 -3
View File
@@ -7,18 +7,18 @@
buildGoModule rec {
pname = "parca-agent";
version = "0.35.0";
version = "0.35.1";
src = fetchFromGitHub {
owner = "parca-dev";
repo = "parca-agent";
rev = "refs/tags/v${version}";
hash = "sha256-5MoHX47uUtQgszNuu9ImLJPYnaN2NKZKOPa60PMHDL0=";
hash = "sha256-Sc2mqfOKXjiGtUVvo/pIRvSgDPaFeiK7UoWHhTtucFQ=";
fetchSubmodules = true;
};
proxyVendor = true;
vendorHash = "sha256-v2OnCuOI9inZ4WiU/3PbBwK6ZcvZX21MNsLhRWZ6sGY=";
vendorHash = "sha256-KKvOs2Pa0MFWKX8gsoYsfdn9R9OFPKvl24E1dTtjAPo=";
buildInputs = [
stdenv.cc.libc.static
+2 -19
View File
@@ -2,7 +2,6 @@
, stdenv
, callPackage
, fetchFromGitHub
, fetchpatch
, fetchurl
, testers
@@ -30,23 +29,15 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pdal";
version = "2.8.1";
version = "2.8.2";
src = fetchFromGitHub {
owner = "PDAL";
repo = "PDAL";
rev = finalAttrs.version;
hash = "sha256-aRWVBCMGr/FX3g8tF7PP3sarN2DHx7AG3vvGAkQTuAM=";
hash = "sha256-zHy/fZ6vlgbBvYZ1olmkO4qsqW5Y2UU5fT1XQPvNmas=";
};
patches = [
(fetchpatch {
name = "pdal-tests-gdal-3.10-compatibility.patch";
url = "https://github.com/PDAL/PDAL/commit/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f.patch";
hash = "sha256-8AeWcMeZXth6y+Ox1rhK7cEySql//Jig46rHw7PyJh4=";
})
];
nativeBuildInputs = [
cmake
pkg-config
@@ -119,14 +110,6 @@ stdenv.mkDerivation (finalAttrs: {
"pdal_app_plugin_test"
];
# Add binary test file that we cant apply from the patch.
postPatch = ''
ln -s ${fetchurl {
url = "https://github.com/PDAL/PDAL/raw/e6df3aa21f84ea49c79c338b87fe2e2797f4e44f/test/data/gdal/1234_red_0_green_0_blue.tif";
hash = "sha256-x/jHMhZTKmQxlTkswDGszhBIfP/qgY0zJ8QIz+wR5S4=";
}} test/data/gdal/1234_red_0_green_0_blue.tif
'';
checkPhase = ''
runHook preCheck
# tests are flaky and they seem to fail less often when they don't run in
+2 -2
View File
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "prowler";
version = "5.0.0";
version = "5.0.1";
pyproject = true;
src = fetchFromGitHub {
owner = "prowler-cloud";
repo = "prowler";
rev = "refs/tags/${version}";
hash = "sha256-RrVmM9j+eApmTT3ufatpQ1CeQT7bart/ESs75THU574=";
hash = "sha256-yT6hyOmKkndJvtbxGQdzmW/miC8kz1yIo3DxvMPJ30Y=";
};
pythonRelaxDeps = true;
+15 -10
View File
@@ -4,32 +4,37 @@
fetchFromGitHub,
cmake,
openssl,
popt,
xmlto,
testers,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "rabbitmq-c";
version = "0.15.0";
outputs = [
"out"
"dev"
];
src = fetchFromGitHub {
owner = "alanxz";
repo = "rabbitmq-c";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-uOI+YV9aV/LGlSxr75sSii5jQ005smCVe14QAGNpKY8=";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
openssl
popt
xmlto
];
buildInputs = [ openssl ];
meta = with lib; {
description = "RabbitMQ C AMQP client library";
homepage = "https://github.com/alanxz/rabbitmq-c";
license = licenses.mit;
platforms = platforms.unix;
pkgConfigModules = [ "librabbitmq" ];
};
}
passthru = {
tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
};
})
+2 -2
View File
@@ -33,13 +33,13 @@ assert withHyperscan -> stdenv.hostPlatform.isx86_64;
stdenv.mkDerivation rec {
pname = "rspamd";
version = "3.10.2";
version = "3.11.0";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
hash = "sha256-x0Mw2ug5H6BZI6LKOjFufYzGVxZIkgxXHeIX7Emsj8A=";
hash = "sha256-id5nmxdqx+0m0JCCvwaEuUAQkMLTlWadfieJ0wO/wJI=";
};
hardeningEnable = [ "pie" ];
+2 -2
View File
@@ -8,11 +8,11 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "stats";
version = "2.11.19";
version = "2.11.21";
src = fetchurl {
url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
hash = "sha256-aJ9b8/mWZmYPbS9Er6sMoMAIS7G0AoPT/7gnEx7SsGw=";
hash = "sha256-EqgWHxiSpMpzxQkogfMX8wTlzIhlfcUIlTARlihjwgw=";
};
sourceRoot = ".";
@@ -0,0 +1,11 @@
--- a/v2/pkg/runner/options.go
+++ b/v2/pkg/runner/options.go
@@ -107,7 +107,7 @@ func ParseOptions() *Options {
flagSet.CreateGroup("update", "Update",
flagSet.CallbackVarP(GetUpdateCallback(), "update", "up", "update subfinder to latest version"),
- flagSet.BoolVarP(&options.DisableUpdateCheck, "disable-update-check", "duc", false, "disable automatic subfinder update check"),
+ flagSet.BoolVarP(&options.DisableUpdateCheck, "disable-update-check", "duc", true, "disable automatic subfinder update check"),
)
flagSet.CreateGroup("output", "Output",
+5
View File
@@ -19,6 +19,11 @@ buildGoModule rec {
modRoot = "./v2";
patches = [
# Disable automatic version check
./disable-update-check.patch
];
subPackages = [
"cmd/subfinder/"
];
File diff suppressed because it is too large Load Diff
+5 -7
View File
@@ -19,20 +19,18 @@
stdenv.mkDerivation (finalAttrs: {
pname = "textpieces";
version = "4.1.0";
version = "4.1.1-1";
src = fetchFromGitLab {
owner = "liferooter";
repo = "textpieces";
rev = "v${finalAttrs.version}";
hash = "sha256-0bc2Q3k08ZItRH7teQCv7uQyj4Rig6LtZmO5Vu48vxo=";
hash = "sha256-+CmlJrND61w1qXSUgIsacBoJcmmf9eLI2GSvDJbXv44=";
};
cargoDeps = rustPlatform.importCargoLock {
lockFile = ./Cargo.lock;
outputHashes = {
"textpieces-core-1.1.2" = "sha256-fAATzugZ4kpUqHx8H4yuNH9Weeubkp8eAHAe94rMBmA=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) src;
hash = "sha256-fpnXMzQFne/TnRgjWy47nVlcwXFZJG4S+VD+D6bz5iQ=";
};
nativeBuildInputs = [
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "uplosi";
version = "0.3.1";
version = "0.4.0";
src = fetchFromGitHub {
owner = "edgelesssys";
repo = pname;
rev = "v${version}";
hash = "sha256-MsZ4Bl8sW1dZUB9cYPsaLtc8P8RRx4hafSbNB4vXqi4=";
hash = "sha256-5I916T70sH4UAq5EGRjR7lnRBbPqMJIxaXwUCJQ4DcM=";
};
vendorHash = "sha256-o7PPgW3JL47G6Na5n9h3RasRMfU25FD1U/wCMaydRmc=";
vendorHash = "sha256-2lJmPNLpI1ksFb0EtcjPjyTy7eX1DKeX0F80k9FtGno=";
CGO_ENABLED = "0";
ldflags = [
+16 -6
View File
@@ -85,8 +85,8 @@
})
(fetchNuGet {
pname = "CliWrap";
version = "3.6.7";
hash = "sha256-9j3GILP25inLJoQe0E8sF8egVt8ISqEQBGdIShev4Mk=";
version = "3.7.0";
hash = "sha256-hXClLGuhscCrcBaymrp57Prh4m8Qe0vdE4S2ErIM13w=";
})
(fetchNuGet {
pname = "DialogHost.Avalonia";
@@ -180,13 +180,13 @@
})
(fetchNuGet {
pname = "Semi.Avalonia";
version = "11.2.1.1";
hash = "sha256-SG3MQHk1J/ktdRn1GXF3AOXvhgl3S6hcIwhmFU4sWU4=";
version = "11.2.1.2";
hash = "sha256-64eayKF+P3qrUZIOOVliqnZ8zK7ZCCxFz1RkD5kJSxM=";
})
(fetchNuGet {
pname = "Semi.Avalonia.DataGrid";
version = "11.2.1.1";
hash = "sha256-LH1Yjg9JkFdH8VEYXXBaKi9jvjCAXYoJkTWCJEoIMHM=";
version = "11.2.1.2";
hash = "sha256-zEEmBjgksVgv9qwnKAFfDhDkrHphKe1/836Ax1gyazc=";
})
(fetchNuGet {
pname = "SkiaSharp";
@@ -288,6 +288,11 @@
version = "2.1.2";
hash = "sha256-e56+FgxEHqV3SGQx0ZAqzlscPxNUPXJ8Ls9rtqET1S4=";
})
(fetchNuGet {
pname = "System.CodeDom";
version = "9.0.0";
hash = "sha256-578lcBgswW0eM16r0EnJzfGodPx86RxxFoZHc2PSzsw=";
})
(fetchNuGet {
pname = "System.Collections.Immutable";
version = "8.0.0";
@@ -308,6 +313,11 @@
version = "8.0.0";
hash = "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=";
})
(fetchNuGet {
pname = "System.Management";
version = "9.0.0";
hash = "sha256-UyLO5dgNVC7rBT1S6o/Ix6EQGlVTSWUQtVC+/cyTkfQ=";
})
(fetchNuGet {
pname = "System.Memory";
version = "4.5.3";
+24 -25
View File
@@ -11,31 +11,20 @@
openssl,
lttng-ust_2_12,
krb5,
wrapGAppsHook4,
imagemagick,
makeDesktopItem,
copyDesktopItems,
bash,
}:
let
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system}
or (throw "v2rayn: ${stdenv.hostPlatform.system} is not supported");
arch = selectSystem {
x86_64-linux = "linux-x64";
aarch64-linux = "linux-arm64";
};
in
buildDotnetModule rec {
pname = "v2rayn";
version = "7.3.1";
version = "7.3.2";
src = fetchFromGitHub {
owner = "2dust";
repo = "v2rayN";
tag = version;
hash = "sha256-K5u8+zaXcDn4aytsgYFhhzG3xzLgoks5dnWuVk/6cS4=";
hash = "sha256-mWfWpleUVbq6Z31oh6QoG0j9eT3d7yF6z7e4lRe6+cM=";
};
projectFile = "v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj";
@@ -49,12 +38,12 @@ buildDotnetModule rec {
--replace-fail "return AppDomain.CurrentDomain.BaseDirectory;" 'return Path.Combine(Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"), "v2rayn");'
substituteInPlace v2rayN/ServiceLib/Common/Utils.cs \
--replace-fail "/bin/bash" "${bash}/bin/bash"
substituteInPlace v2rayN/ServiceLib/ServiceLib.csproj \
--replace-fail "0.16.20" "0.16.14"
'';
dotnetInstallFlags = [ "-p:PublishReadyToRun=false" ];
selfContainedBuild = true;
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
@@ -62,10 +51,9 @@ buildDotnetModule rec {
executables = [ "v2rayN" ];
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook4
copyDesktopItems
imagemagick
copyDesktopItems
autoPatchelfHook
];
buildInputs = [
@@ -73,17 +61,28 @@ buildDotnetModule rec {
fontconfig
icu
openssl
lttng-ust_2_12
krb5
lttng-ust_2_12
(lib.getLib stdenv.cc.cc)
];
postBuild = ''
mv ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/${arch} ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn
rm -r ./v2rayN/v2rayN.Desktop/bin/Release/net8.0
mv ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn ./v2rayN/v2rayN.Desktop/bin/Release/net8.0
ln -s . ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/${arch}
'';
postBuild =
let
selectSystem =
attrs:
attrs.${stdenv.hostPlatform.system}
or (throw "v2rayn: ${stdenv.hostPlatform.system} is not supported");
arch = selectSystem {
x86_64-linux = "x64";
aarch64-linux = "arm64";
};
in
''
mv ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/linux-${arch} ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn
rm -r ./v2rayN/v2rayN.Desktop/bin/Release/net8.0
mv ./v2rayN/v2rayN.Desktop/bin/Release/v2rayn ./v2rayN/v2rayN.Desktop/bin/Release/net8.0
ln -s . ./v2rayN/v2rayN.Desktop/bin/Release/net8.0/linux-${arch}
'';
desktopItems = [
(makeDesktopItem {
+40
View File
@@ -0,0 +1,40 @@
{
lib,
buildNpmPackage,
fetchFromGitHub,
nix-update-script,
}:
buildNpmPackage rec {
pname = "vuetorrent";
version = "2.18.0";
src = fetchFromGitHub {
owner = "VueTorrent";
repo = "VueTorrent";
tag = "v${version}";
hash = "sha256-n5CtVNowGUsIHdxpnXmtXLpjwRfIoRoOr7Gh7PUE0ck=";
};
npmDepsHash = "sha256-PfnZ61m8VulRm18R3aqnIPrCXAy0DOOCUPIgr2eFrbk=";
installPhase = ''
runHook preInstall
mkdir -p $out/share
cp -r vuetorrent $out/share/vuetorrent
runHook postInstall
'';
passthru.updateScript = nix-update-script { };
meta = {
description = "Full-featured BitTorrent client written in Vue";
homepage = "https://github.com/VueTorrent/VueTorrent";
changelog = "https://github.com/VueTorrent/VueTorrent/releases/tag/${src.tag}";
license = lib.licenses.gpl3Only;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ redxtech ];
};
}
+6 -4
View File
@@ -2,7 +2,7 @@
lib,
stdenv,
callPackage,
fetchurl,
fetchFromGitHub,
testers,
cmake,
@@ -12,9 +12,11 @@ stdenv.mkDerivation (finalAttrs: {
pname = "geos";
version = "3.13.0";
src = fetchurl {
url = "https://download.osgeo.org/geos/geos-${finalAttrs.version}.tar.bz2";
hash = "sha256-R+yD/zNNZyueRCZpXxXabmNoJEIUlx+r84b/jvbfOeQ=";
src = fetchFromGitHub {
owner = "libgeos";
repo = "geos";
tag = finalAttrs.version;
hash = "sha256-WcE5dbfbeq9uCRgfVgiA3MTOisRpilXxjquEM5aKTCc=";
};
nativeBuildInputs = [ cmake ];
@@ -14,22 +14,22 @@
buildPythonPackage rec {
pname = "axis";
version = "63";
version = "64";
pyproject = true;
disabled = pythonOlder "3.11";
disabled = pythonOlder "3.12";
src = fetchFromGitHub {
owner = "Kane610";
repo = "axis";
rev = "refs/tags/v${version}";
hash = "sha256-XqNzYd7WgSDho3jyCHF1lDZWWpBEZFqGFmVOAUlm50o=";
hash = "sha256-6g4Dqk+oGlEcqlNuMiwep+NCVFmwRZjKgEZC1OzmKw0=";
};
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "setuptools==68.0.0" "setuptools" \
--replace-fail "wheel==0.40.0" "wheel"
--replace-fail "setuptools==75.6.0" "setuptools" \
--replace-fail "wheel==0.45.1" "wheel"
'';
build-system = [ setuptools ];
@@ -50,10 +50,10 @@ buildPythonPackage rec {
meta = with lib; {
description = "Python library for communicating with devices from Axis Communications";
mainProgram = "axis";
homepage = "https://github.com/Kane610/axis";
changelog = "https://github.com/Kane610/axis/releases/tag/v${version}";
license = with licenses; [ mit ];
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "axis";
};
}
@@ -29,7 +29,7 @@
buildPythonPackage rec {
pname = "deepdiff";
version = "8.0.1";
version = "8.1.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -37,8 +37,8 @@ buildPythonPackage rec {
src = fetchFromGitHub {
owner = "seperman";
repo = "deepdiff";
rev = "refs/tags/${version}";
hash = "sha256-e6eTPSGoJ8r/4vGi/iGVFW/BruBADtVMtnO001Qs0IQ=";
tag = version;
hash = "sha256-b1L+8xOqxY2nI8UxZHxs3x28mVAzaRuPjYlPSqSapwk=";
};
build-system = [
@@ -8,23 +8,24 @@
buildPythonPackage rec {
pname = "django-types";
version = "0.19.1";
version = "0.20.0";
pyproject = true;
src = fetchPypi {
pname = "django_types";
inherit version;
hash = "sha256-WueYhhLPb7w1ewGLvDs6h4tl4EJ1zEbg011mpwja/xI=";
hash = "sha256-TlXSxWFV49addd756x2VqJEwPyrBn8z2/oBW2kKT+uc=";
};
nativeBuildInputs = [ poetry-core ];
build-system = [ poetry-core ];
propagatedBuildInputs = [ types-psycopg2 ];
dependencies = [ types-psycopg2 ];
meta = with lib; {
meta = {
description = "Type stubs for Django";
homepage = "https://github.com/sbdchd/django-types";
license = licenses.mit;
maintainers = [ ];
changelog = "https://github.com/sbdchd/django-types/blob/main/CHANGELOG.md";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ nickcao ];
};
}
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "fastcore";
version = "1.7.26";
version = "1.7.27";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "ha-mqtt-discoverable";
version = "0.16.0";
version = "0.16.2";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "unixorn";
repo = "ha-mqtt-discoverable";
rev = "refs/tags/v${version}";
hash = "sha256-IdyrcqRX5YXS6tx5qP7vOnAJpvy5sOsCwFpWMdyYaeI=";
hash = "sha256-2Ti03c9eyiBBJy5vTUMQddL2SE3Vyjc7gt/0LkgMkbE=";
};
pythonRelaxDeps = [ "pyaml" ];
@@ -23,7 +23,7 @@
buildPythonPackage rec {
pname = "jsonargparse";
version = "4.34.1";
version = "4.35.0";
pyproject = true;
disabled = pythonOlder "3.11";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
owner = "omni-us";
repo = "jsonargparse";
rev = "refs/tags/v${version}";
hash = "sha256-clqQGb9IC1PeySvssbo5fF+MU9W/oDnwiDsPeV5InNA=";
hash = "sha256-+gxwajChbdcsIa8Jp0iva3ik5vZeMRa38KuoQwIGNoU=";
};
build-system = [ setuptools ];
@@ -36,7 +36,7 @@
buildPythonPackage rec {
pname = "llama-index-core";
version = "0.12.2";
version = "0.12.5";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
owner = "run-llama";
repo = "llama_index";
rev = "refs/tags/v${version}";
hash = "sha256-Zt97JZHp0MsHFtdrx6Xjqhz/jREWwevGSz8u9l5t8oI=";
hash = "sha256-Z4WmjIuu42XAo+Lb7ylNQfXrS9VQM+0BkeufqwFtT9I=";
};
sourceRoot = "${src.name}/${pname}";
@@ -133,6 +133,7 @@ buildPythonPackage rec {
"test_from_persist_dir"
# asyncio.exceptions.InvalidStateError: invalid state
"test_workflow_context_to_dict_mid_run"
"test_SimpleDirectoryReader"
];
meta = with lib; {
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "llama-index-embeddings-openai";
version = "0.3.0";
version = "0.3.1";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_embeddings_openai";
inherit version;
hash = "sha256-o31bpcyUejajzqpB38ZdcmqHP/s6J7e0lZKE9blE9hc=";
hash = "sha256-E2iq084ky67SPVrSUTQ87x63tKBtZWPWYG1ZyzR/7yA=";
};
build-system = [ poetry-core ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-graph-stores-neo4j";
version = "0.4.0";
version = "0.4.2";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_graph_stores_neo4j";
inherit version;
hash = "sha256-XJQJaUCAvIAmLnyFuo81upmm9iMOD08iHm0/HZMHR1M=";
hash = "sha256-+mh1iIE5BFBs4kREG7SjstOMWmWAc1JSUMkHbg89ues=";
};
build-system = [ poetry-core ];
@@ -11,7 +11,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-openai-like";
version = "0.3.0";
version = "0.3.3";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_openai_like";
inherit version;
hash = "sha256-Ah6D1kJAtGWH8i5XxgxTHe004Y12nIebTupIHIjJez0=";
hash = "sha256-vqBCAXKR2TOsk6DEh8jarSWnDm9r8qVEAVD2wYskbfY=";
};
build-system = [ poetry-core ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-llms-openai";
version = "0.3.2";
version = "0.3.10";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_llms_openai";
inherit version;
hash = "sha256-ikQ6Vk59EneanwMMuC/jJDgD4hfXJBB2SsEW3UNVT+U=";
hash = "sha256-/aM0WqS6QbJdkoF+6KVpmTHnnHyHkkPxctbg5svFxbM=";
};
pythonRemoveDeps = [
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "llama-index-multi-modal-llms-openai";
version = "0.3.0";
version = "0.4.0";
pyproject = true;
disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "llama_index_multi_modal_llms_openai";
inherit version;
hash = "sha256-cemDx3ccOQiOQFjNeAKSGTFaD7YxueErkD5TJDuaP9Y=";
hash = "sha256-EcOsfi16zp283ZpmLye8pf786YxWgquv+33QHVl3Zlg=";
};
build-system = [ poetry-core ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "pyexploitdb";
version = "0.2.58";
version = "0.2.59";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "pyExploitDb";
inherit version;
hash = "sha256-NYiNcOcdKN89C/AK/Lgj2PquHeGXDaZdax6Zpz/xrEM=";
hash = "sha256-E6XMXgHB3q03ZeCjxctKvSndfgfdXhTns7csqQju2BM=";
};
build-system = [ setuptools ];
@@ -10,7 +10,7 @@
buildPythonPackage rec {
pname = "tencentcloud-sdk-python";
version = "3.0.1280";
version = "3.0.1282";
pyproject = true;
disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "TencentCloud";
repo = "tencentcloud-sdk-python";
rev = "refs/tags/${version}";
hash = "sha256-9hSGe7E0jp6JN3Oi1zkxI2tU+ZAJm9BFdx43Dce+S+I=";
hash = "sha256-d9zi0pnpZwC1uTWT+223U+KUvlvztdKh09J5Y1vgryc=";
};
build-system = [ setuptools ];
@@ -13,7 +13,7 @@
buildPythonPackage rec {
pname = "tesla-fleet-api";
version = "0.8.5";
version = "0.9.0";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
owner = "Teslemetry";
repo = "python-tesla-fleet-api";
rev = "refs/tags/v${version}";
hash = "sha256-vsgWdAvNl1lZgVK7SU6oF93gfEQ1hsAuFMSIpmKNWAg=";
hash = "sha256-+P3LwO7F9o5h0L7/7GK0ic6p86ay3kWt6F9Pks2rWRY=";
};
build-system = [ setuptools ];
@@ -21,7 +21,7 @@
buildPythonPackage rec {
pname = "twilio";
version = "9.3.8";
version = "9.4.1";
pyproject = true;
disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
owner = "twilio";
repo = "twilio-python";
rev = "refs/tags/${version}";
hash = "sha256-r4uhtvvsbiwcTdiT8HQtKL2587cowwGLaL2FowOEXiw=";
hash = "sha256-sZhKFnCmARocnOqM1NE6eGU/6UtfJSQTK+bv5HHHU1U=";
};
build-system = [ setuptools ];
@@ -41,8 +41,8 @@ buildPythonPackage rec {
opencv-python
onnxruntime
transformers
detectron2
paddleocr
# detectron2 # fails to build
# paddleocr # 3.12 not yet supported
# yolox
]
++ layoutparser.optional-dependencies.layoutmodels
@@ -59,6 +59,9 @@ buildPythonPackage rec {
huggingface-hub
];
# This dependency needs to be updated properly
doCheck = false;
preCheck = ''
export HOME=$(mktemp -d)
'';
@@ -75,7 +78,6 @@ buildPythonPackage rec {
# network access
"test_unstructured_inference/inference/test_layout.py"
"test_unstructured_inference/models/test_chippermodel.py"
"test_unstructured_inference/models/test_detectron2.py"
"test_unstructured_inference/models/test_detectron2onnx.py"
# unclear failure
"test_unstructured_inference/models/test_donut.py"
@@ -2,47 +2,103 @@
lib,
buildPythonPackage,
fetchFromGitHub,
# propagated build inputs
# core networking and async dependencies
anyio,
backoff,
certifi,
httpcore,
httpx,
h11,
nest-asyncio,
requests,
requests-toolbelt,
sniffio,
urllib3,
# core parsing and processing
beautifulsoup4,
chardet,
charset-normalizer,
emoji,
filetype,
lxml,
msg-parser,
html5lib,
idna,
joblib,
# jsonpath-python,
nltk,
olefile,
orderly-set,
python-dateutil,
# python-iso639,
python-magic,
# python-oxmsg,
rapidfuzz,
regex,
soupsieve,
webencodings,
# core data handling
dataclasses-json,
deepdiff,
marshmallow,
mypy-extensions,
packaging,
typing-extensions,
typing-inspect,
# core system utilities
cffi,
cryptography,
psutil,
pycparser,
six,
tqdm,
wrapt,
# document format support
markdown,
pdfminer-six,
pdfplumber,
# pi-heif,
pikepdf,
pypandoc,
pypdf,
python-docx,
# unstructured-client,
# unstructured-pytesseract,
# optional dependencies
# csv
pytz,
tzdata,
# markdown
importlib-metadata,
zipp,
# pdf
opencv-python,
paddlepaddle,
pdf2image,
# unstructured-paddleocr,
# pptx
lxml,
pillow,
python-pptx,
xlsxwriter,
# xslx
et-xmlfile,
networkx,
numpy,
openpyxl,
pandas,
pdf2image,
pdfminer-six,
pillow,
pypandoc,
python-docx,
python-pptx,
python-magic,
markdown,
requests,
tabulate,
xlrd,
# optional-dependencies
# huggingface
langdetect,
sacremoses,
sentencepiece,
torch,
transformers,
# local-inference
unstructured-inference,
s3fs,
fsspec,
adlfs,
# , discord-py
pygithub,
python-gitlab,
praw,
slack-sdk,
wikipedia,
google-api-python-client,
# , gcsfs
elasticsearch8,
jq,
# , dropboxdrivefs
atlassian-python-api,
# test dependencies
pytestCheckHook,
black,
@@ -58,38 +114,6 @@
}:
let
version = "0.16.11";
optional-dependencies = {
huggingflace = [
langdetect
sacremoses
sentencepiece
torch
transformers
];
local-inference = [ unstructured-inference ];
s3 = [
s3fs
fsspec
];
azure = [
adlfs
fsspec
];
discord = [ ]; # discord-py
github = [ pygithub ];
gitlab = [ python-gitlab ];
reddit = [ praw ];
slack = [ slack-sdk ];
wikipedia = [ wikipedia ];
google-drive = [ google-api-python-client ];
gcs = [ ]; # gcsfs fsspec
elasticsearch = [
elasticsearch8
jq
];
dropbox = [ ]; # dropboxdrivefs fsspec
confluence = [ atlassian-python-api ];
};
in
buildPythonPackage {
pname = "unstructured";
@@ -99,31 +123,133 @@ buildPythonPackage {
src = fetchFromGitHub {
owner = "Unstructured-IO";
repo = "unstructured";
tag = version;
rev = "refs/tags/${version}";
hash = "sha256-+I5eXG/ICmYPDTavDnyLlopIvoABjdDwOyfotrNs6qs=";
};
propagatedBuildInputs = [
# Base dependencies
anyio
backoff
beautifulsoup4
certifi
cffi
chardet
charset-normalizer
click
cryptography
dataclasses-json
deepdiff
emoji
filetype
h11
html5lib
httpcore
httpx
idna
joblib
# jsonpath-python
langdetect
lxml
msg-parser
marshmallow
mypy-extensions
nest-asyncio
nltk
openpyxl
pandas
pdf2image
pdfminer-six
pillow
pypandoc
python-docx
python-pptx
numpy
olefile
orderly-set
packaging
psutil
pycparser
pypdf
python-dateutil
# python-iso639
python-magic
markdown
# python-oxmsg
rapidfuzz
regex
requests
tabulate
xlrd
requests-toolbelt
six
sniffio
soupsieve
tqdm
typing-extensions
typing-inspect
# unstructured-client
urllib3
webencodings
wrapt
];
optional-dependencies = rec {
all-docs = csv ++ docx ++ epub ++ pdf ++ req-markdown ++ odt ++ org ++ pptx ++ xlsx;
csv = [
numpy
pandas
python-dateutil
pytz
tzdata
];
docx = [
lxml
python-docx
typing-extensions
];
epub = [ pypandoc ];
req-markdown = [
importlib-metadata
markdown
zipp
];
odt = [
lxml
pypandoc
python-docx
typing-extensions
];
org = [
pypandoc
];
paddleocr = [
opencv-python
# paddlepaddle # 3.12 not supported for now
pdf2image
# unstructured-paddleocr
];
pdf = [
pdf2image
pdfminer-six
pdfplumber
# pi-heif
pikepdf
pypdf
unstructured-inference
# unstructured-pytesseract
];
pptx = [
lxml
pillow
python-pptx
xlsxwriter
];
xlsx = [
et-xmlfile
networkx
numpy
openpyxl
pandas
xlrd
];
huggingface = [
langdetect
sacremoses
sentencepiece
torch
transformers
];
};
pythonImportsCheck = [ "unstructured" ];
# test try to download punkt from nltk
@@ -143,8 +269,6 @@ buildPythonPackage {
grpcio
];
optional-dependencies = optional-dependencies;
meta = with lib; {
description = "Open source libraries and APIs to build custom preprocessing pipelines for labeling, training, or production machine learning pipelines";
mainProgram = "unstructured-ingest";
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "checkov";
version = "3.2.334";
version = "3.2.336";
pyproject = true;
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = "checkov";
rev = "refs/tags/${version}";
hash = "sha256-UY3EXGOo9xXU/Iqzwk2+pcbtMYQwuEU9G3uETWL3o2o=";
hash = "sha256-T++J0kRFXV5v7+CCSy5ho5340kYF7mp9Cru8StXx+UQ=";
};
patches = [ ./flake8-compat-5.x.patch ];
+9 -11
View File
@@ -26,18 +26,16 @@ in
if lib.versionAtLeast ocaml.version "4.02" then
buildDunePackage rec {
inherit pname;
version = "1.6.9";
buildDunePackage rec {
inherit pname;
version = "1.8.0";
duneVersion = "3";
src = fetchFromGitHub {
owner = "ocaml-community";
repo = pname;
rev = "v${version}";
sha256 = "sha256-NdN2QnVRfRq9hEcSAnO2Wha7icDlf2Zg4JQqoEWmErE=";
};
src = fetchFromGitHub {
owner = "ocaml-community";
repo = pname;
rev = "v${version}";
hash = "sha256-+HnAGM+GddYJK0RCvKrs+baZS+1o8Yq+/cVa3U3nFWg=";
};
doCheck = true;
+129 -9
View File
@@ -13,20 +13,140 @@ let
packages:
with packages;
[
unstructured-api-tools
unstructured
pydantic
aiofiles
annotated-types
antlr4-python3-runtime
anyio
backoff
beautifulsoup4
cachetools
certifi
cffi
chardet
charset-normalizer
click
ratelimit
requests
pypdf
coloredlogs
contourpy
cryptography
cycler
dataclasses-json
deprecated
effdet
emoji
et-xmlfile
eval-type-backport
fastapi
filelock
filetype
flatbuffers
fonttools
fsspec
google-api-core
google-auth
google-cloud-vision
googleapis-common-protos
grpcio
grpcio-status
h11
html5lib
httpcore
httpx
huggingface-hub
humanfriendly
idna
iopath
jinja2
joblib
jsonpath
kiwisolver
langdetect
layoutparser
lxml
markdown
markupsafe
marshmallow
matplotlib
mpmath
mypy-extensions
nest-asyncio
networkx
nltk
numpy
olefile
omegaconf
onnx
onnxruntime
opencv-python
openpyxl
packaging
pandas
pdf2image
pdfminer-six
pdfplumber
# pi-heif
pikepdf
pillow
portalocker
proto-plus
protobuf
psutil
pyasn1
pyasn1-modules
pycocotools
pycparser
pycryptodome
pydantic
pydantic-core
pypandoc
pyparsing
pypdf
# pypdfium2
python-dateutil
python-docx
# python-iso639
python-magic
python-multipart
# python-oxmsg
python-pptx
pytz
pyyaml
rapidfuzz
ratelimit
regex
requests
requests-toolbelt
rsa
safetensors
scipy
six
sniffio
soupsieve
starlette
sympy
timm
tokenizers
torch
torchvision
tqdm
transformers
typing-extensions
typing-inspect
tzdata
unstructured
# unstructured-client
unstructured-inference
# unstructured-pytesseract
urllib3
uvicorn
webencodings
wrapt
xlrd
xlsxwriter
]
++ packages.unstructured.optional-dependencies.local-inference
++ google-api-core.optional-dependencies.grpc
++ unstructured.optional-dependencies.all-docs
);
version = "0.0.61";
version = "0.0.82";
unstructured_api_nltk_data = symlinkJoin {
name = "unstructured_api_nltk_data";
@@ -44,7 +164,7 @@ stdenvNoCC.mkDerivation {
owner = "Unstructured-IO";
repo = "unstructured-api";
rev = version;
hash = "sha256-Ucd+SKIES9E5WgKJjg8Vihjc1hMrJ9e956Sb7QlQea8=";
hash = "sha256-mvcARpewqC25x3ZdpM8QB7SjbqGoBL/rtxi90KdKdO8=";
};
nativeBuildInputs = [ makeWrapper ];
+3 -3
View File
@@ -20,13 +20,13 @@
assert blas.implementation == "openblas" && lapack.implementation == "openblas";
stdenv.mkDerivation (finalAttrs: {
pname = "kaldi";
version = "0-unstable-2024-10-04";
version = "0-unstable-2024-11-29";
src = fetchFromGitHub {
owner = "kaldi-asr";
repo = "kaldi";
rev = "4a8b7f673275597fef8a15b160124bd0985b59bd";
sha256 = "sha256-CY40zkVP0ZTjOBjnmVyFdqaHdAxuGGH82GzudoA5MyM=";
rev = "701f13107fda71195ab76a7f9f51ed45ce4ec728";
sha256 = "sha256-Uusj5nkLyOiPI0mAdlykBDNEzHWE+tU/kUhVYzwjhOY=";
};
cmakeFlags = [