mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-11-18 02:05:51 +03:00
Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
81a57dc133
@ -119,10 +119,10 @@ in {
|
||||
extraPackages = mkOption {
|
||||
type = with types; listOf package;
|
||||
default = with pkgs; [
|
||||
swaylock swayidle foot dmenu
|
||||
swaylock swayidle foot dmenu wmenu
|
||||
];
|
||||
defaultText = literalExpression ''
|
||||
with pkgs; [ swaylock swayidle foot dmenu ];
|
||||
with pkgs; [ swaylock swayidle foot dmenu wmenu ];
|
||||
'';
|
||||
example = literalExpression ''
|
||||
with pkgs; [
|
||||
|
||||
@ -307,6 +307,9 @@ in
|
||||
Restart = "on-failure";
|
||||
};
|
||||
environment = env;
|
||||
# Allow the consumer to access the private /tmp directory of the server.
|
||||
# This is required to support consuming files via a local folder.
|
||||
unitConfig.JoinsNamespaceOf = "paperless-task-queue.service";
|
||||
};
|
||||
|
||||
systemd.services.paperless-web = {
|
||||
|
||||
@ -5,6 +5,8 @@ let
|
||||
inherit (self) callPackage;
|
||||
in
|
||||
{
|
||||
inherit (pkgs) emacspeak;
|
||||
|
||||
acm = callPackage ./manual-packages/acm { };
|
||||
|
||||
acm-terminal = callPackage ./manual-packages/acm-terminal { };
|
||||
@ -31,8 +33,6 @@ in
|
||||
|
||||
elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
|
||||
|
||||
emacspeak = callPackage ./manual-packages/emacspeak { };
|
||||
|
||||
ess-R-object-popup = callPackage ./manual-packages/ess-R-object-popup { };
|
||||
|
||||
evil-markdown = callPackage ./manual-packages/evil-markdown { };
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -33,11 +33,11 @@
|
||||
|
||||
firefox-beta = buildMozillaMach rec {
|
||||
pname = "firefox-beta";
|
||||
version = "124.0b2";
|
||||
version = "124.0b5";
|
||||
applicationName = "Mozilla Firefox Beta";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "a98bedcf2bb6e58a20b4ab49d53db0899ed7c6589b20266522521c3db5c583807be1d536a580a1b42dd5783c0d81d95c4f42be6a157fb08a588447ca4fa21dde";
|
||||
sha512 = "a232d5f8d3118ef37166ef8706ab17d4cceaf67f0b12da4780c52253eec297c79e95ab42fe15165fdda62cda045ac923a53550c3525e9fd94ea3dca586510637";
|
||||
};
|
||||
|
||||
meta = {
|
||||
@ -62,13 +62,13 @@
|
||||
|
||||
firefox-devedition = buildMozillaMach rec {
|
||||
pname = "firefox-devedition";
|
||||
version = "124.0b2";
|
||||
version = "124.0b5";
|
||||
applicationName = "Mozilla Firefox Developer Edition";
|
||||
requireSigning = false;
|
||||
branding = "browser/branding/aurora";
|
||||
src = fetchurl {
|
||||
url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
|
||||
sha512 = "a65a522130d95ef5ffd4ee351c79a64517abdd60a80a74e66b147f6b179613240ab2abd6eb9cd939dfe31dd5b971773e882eb234a358e9546ab0272d8ed94145";
|
||||
sha512 = "bea92dcf8703dab99cc8248a0d205b8613f74efa81cbe789aa3ef863093fa78ac4e362956dfd57186954389cd87cd97bc0b077d3f80bfe5b7dd3b6435874fa98";
|
||||
};
|
||||
|
||||
meta = {
|
||||
|
||||
@ -1,34 +1,37 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, emacs
|
||||
, espeak-ng
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, emacs
|
||||
, stdenv
|
||||
, tcl
|
||||
, tclx
|
||||
, espeak-ng
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "emacspeak";
|
||||
version = "58.0";
|
||||
version = "59.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tvraman";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash= "sha256-5pWC17nvy3ZuG0bR//LqDVpKsH5hFSFf63Q33a1BfBk=";
|
||||
repo = "emacspeak";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-npS/wlqI7nBde/2S/rzp79jdfYXIIhgsVs5VizxEDAQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
emacs
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
espeak-ng
|
||||
tcl
|
||||
tclx
|
||||
];
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
preConfigure = ''
|
||||
make config
|
||||
'';
|
||||
@ -44,17 +47,21 @@ stdenv.mkDerivation rec {
|
||||
cp -a . "$d"
|
||||
find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} +
|
||||
find "$d" -type f -not -executable -execdir chmod 644 {} +
|
||||
makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \
|
||||
makeWrapper ${lib.getExe emacs} $out/bin/emacspeak \
|
||||
--set DTK_PROGRAM "${placeholder "out"}/share/emacs/site-lisp/emacspeak/servers/espeak" \
|
||||
--set TCLLIBPATH "${tclx}/lib" \
|
||||
--add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"'
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
homepage = "https://github.com/tvraman/emacspeak/";
|
||||
description = "Emacs extension that provides spoken output";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = [ maintainers.AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
changelog = "https://github.com/tvraman/emacspeak/blob/${finalAttrs.src.rev}/etc/NEWS";
|
||||
license = with lib.licenses; [ gpl2Plus ];
|
||||
mainProgram = "emacspeak";
|
||||
maintainers = with lib.maintainers; [ AndersonTorres ];
|
||||
platforms = lib.platforms.linux;
|
||||
# Emacspeak requires a minimal Emacs version; let's use the broken flag
|
||||
broken = lib.versionOlder (lib.getVersion emacs) "29.1";
|
||||
};
|
||||
}
|
||||
})
|
||||
@ -17,16 +17,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "eza";
|
||||
version = "0.18.4";
|
||||
version = "0.18.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eza-community";
|
||||
repo = "eza";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-G8Ow38vNSMMYINYhGp33rls5AV4EFZDEJhkNn5H64LA=";
|
||||
hash = "sha256-L0FF9pN4WGCFpg2MPAvrKC/DwyWK6BWGxwYEpQBl9Rw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-A/EIkWSdMqSdrnjMTfIdg0scSBK/xsI5PPsOn+cRogA=";
|
||||
cargoHash = "sha256-bZ2NzFpB9vpT0mB2LsETdmtzYAwNrpzBRoqmm4+13+0=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
|
||||
buildInputs = [ zlib ]
|
||||
|
||||
@ -15,12 +15,16 @@
|
||||
, openclSupport ? false
|
||||
, clblast
|
||||
|
||||
, blasSupport ? !rocmSupport && !cudaSupport
|
||||
, openblas
|
||||
, blasSupport ? builtins.all (x: !x) [ cudaSupport metalSupport openclSupport rocmSupport vulkanSupport ]
|
||||
, pkg-config
|
||||
, metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport
|
||||
, patchelf
|
||||
, static ? true # if false will build the shared objects as well
|
||||
, vulkanSupport ? false
|
||||
, mpiSupport ? false # Increases the runtime closure by ~700M
|
||||
, vulkan-headers
|
||||
, vulkan-loader
|
||||
, ninja
|
||||
, git
|
||||
, mpi
|
||||
}:
|
||||
|
||||
let
|
||||
@ -28,42 +32,18 @@ let
|
||||
# otherwise we get libstdc++ errors downstream.
|
||||
# cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11
|
||||
effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv;
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "2249";
|
||||
inherit (lib) cmakeBool cmakeFeature optionals;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-ikJUToUbA60u/8azR6dPmPyodq/nQe5L2aotlYBclaE=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./ggml-metal.m \
|
||||
--replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ] ++ lib.optionals blasSupport [ pkg-config ] ++ lib.optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
|
||||
# TODO: Replace with autoAddDriverRunpath
|
||||
# once https://github.com/NixOS/nixpkgs/pull/275241 has been merged
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
];
|
||||
|
||||
buildInputs = lib.optionals effectiveStdenv.isDarwin
|
||||
(with darwin.apple_sdk.frameworks; [
|
||||
darwinBuildInputs =
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
Accelerate
|
||||
CoreGraphics
|
||||
CoreVideo
|
||||
Foundation
|
||||
])
|
||||
++ lib.optionals metalSupport (with darwin.apple_sdk.frameworks; [
|
||||
MetalKit
|
||||
])
|
||||
++ lib.optionals cudaSupport (with cudaPackages; [
|
||||
CoreGraphics
|
||||
]
|
||||
++ optionals metalSupport [ MetalKit ];
|
||||
|
||||
cudaBuildInputs = with cudaPackages; [
|
||||
cuda_cccl.dev # <nv/target>
|
||||
|
||||
# A temporary hack for reducing the closure size, remove once cudaPackages
|
||||
@ -74,65 +54,93 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
libcublas.dev
|
||||
libcublas.lib
|
||||
libcublas.static
|
||||
]) ++ lib.optionals rocmSupport [
|
||||
rocmPackages.clr
|
||||
rocmPackages.hipblas
|
||||
rocmPackages.rocblas
|
||||
] ++ lib.optionals openclSupport [
|
||||
clblast
|
||||
] ++ lib.optionals blasSupport [
|
||||
openblas
|
||||
];
|
||||
|
||||
rocmBuildInputs = with rocmPackages; [
|
||||
clr
|
||||
hipblas
|
||||
rocblas
|
||||
];
|
||||
|
||||
vulkanBuildInputs = [
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
];
|
||||
in
|
||||
effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
pname = "llama-cpp";
|
||||
version = "2294";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ggerganov";
|
||||
repo = "llama.cpp";
|
||||
rev = "refs/tags/b${finalAttrs.version}";
|
||||
hash = "sha256-uZi4Bj03PgfFV+jS5M+A1sMCWC/GMY5IyyrlR1b4Sh4=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace ./ggml-metal.m \
|
||||
--replace '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake ninja pkg-config git ]
|
||||
++ optionals cudaSupport [
|
||||
cudaPackages.cuda_nvcc
|
||||
|
||||
# TODO: Replace with autoAddDriverRunpath
|
||||
# once https://github.com/NixOS/nixpkgs/pull/275241 has been merged
|
||||
cudaPackages.autoAddOpenGLRunpathHook
|
||||
];
|
||||
|
||||
buildInputs = optionals effectiveStdenv.isDarwin darwinBuildInputs
|
||||
++ optionals cudaSupport cudaBuildInputs
|
||||
++ optionals mpiSupport mpi
|
||||
++ optionals openclSupport [ clblast ]
|
||||
++ optionals rocmSupport rocmBuildInputs
|
||||
++ optionals vulkanSupport vulkanBuildInputs;
|
||||
|
||||
cmakeFlags = [
|
||||
"-DLLAMA_NATIVE=OFF"
|
||||
"-DLLAMA_BUILD_SERVER=ON"
|
||||
# -march=native is non-deterministic; override with platform-specific flags if needed
|
||||
(cmakeBool "LLAMA_NATIVE" false)
|
||||
(cmakeBool "BUILD_SHARED_SERVER" true)
|
||||
(cmakeBool "BUILD_SHARED_LIBS" true)
|
||||
(cmakeBool "BUILD_SHARED_LIBS" true)
|
||||
(cmakeBool "LLAMA_BLAS" blasSupport)
|
||||
(cmakeBool "LLAMA_CLBLAST" openclSupport)
|
||||
(cmakeBool "LLAMA_CUBLAS" cudaSupport)
|
||||
(cmakeBool "LLAMA_HIPBLAS" rocmSupport)
|
||||
(cmakeBool "LLAMA_METAL" metalSupport)
|
||||
(cmakeBool "LLAMA_MPI" mpiSupport)
|
||||
(cmakeBool "LLAMA_VULKAN" vulkanSupport)
|
||||
]
|
||||
++ lib.optionals metalSupport [
|
||||
"-DCMAKE_C_FLAGS=-D__ARM_FEATURE_DOTPROD=1"
|
||||
"-DLLAMA_METAL=ON"
|
||||
++ optionals cudaSupport [
|
||||
(
|
||||
with cudaPackages.flags;
|
||||
cmakeFeature "CMAKE_CUDA_ARCHITECTURES" (
|
||||
builtins.concatStringsSep ";" (map dropDot cudaCapabilities)
|
||||
)
|
||||
)
|
||||
]
|
||||
++ lib.optionals cudaSupport [
|
||||
"-DLLAMA_CUBLAS=ON"
|
||||
]
|
||||
++ lib.optionals rocmSupport [
|
||||
"-DLLAMA_HIPBLAS=1"
|
||||
"-DCMAKE_C_COMPILER=hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=hipcc"
|
||||
"-DCMAKE_POSITION_INDEPENDENT_CODE=ON"
|
||||
]
|
||||
++ lib.optionals openclSupport [
|
||||
"-DLLAMA_CLBLAST=ON"
|
||||
]
|
||||
++ lib.optionals blasSupport [
|
||||
"-DLLAMA_BLAS=ON"
|
||||
"-DLLAMA_BLAS_VENDOR=OpenBLAS"
|
||||
]
|
||||
++ lib.optionals (!static) [
|
||||
(lib.cmakeBool "BUILD_SHARED_LIBS" true)
|
||||
];
|
||||
++ optionals rocmSupport [
|
||||
(cmakeFeature "CMAKE_C_COMPILER" "hipcc")
|
||||
(cmakeFeature "CMAKE_CXX_COMPILER" "hipcc")
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
# Build all targets supported by rocBLAS. When updating search for TARGET_LIST_ROCM
|
||||
# in https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/CMakeLists.txt
|
||||
# and select the line that matches the current nixpkgs version of rocBLAS.
|
||||
# Should likely use `rocmPackages.clr.gpuTargets`.
|
||||
"-DAMDGPU_TARGETS=gfx803;gfx900;gfx906:xnack-;gfx908:xnack-;gfx90a:xnack+;gfx90a:xnack-;gfx940;gfx941;gfx942;gfx1010;gfx1012;gfx1030;gfx1100;gfx1101;gfx1102"
|
||||
]
|
||||
++ optionals metalSupport [ (cmakeFeature "CMAKE_C_FLAGS" "-D__ARM_FEATURE_DOTPROD=1") ]
|
||||
++ optionals blasSupport [ (cmakeFeature "LLAMA_BLAS_VENDOR" "OpenBLAS") ];
|
||||
|
||||
mkdir -p $out/bin
|
||||
${lib.optionalString (!static) ''
|
||||
mkdir $out/lib
|
||||
cp libggml_shared.so $out/lib
|
||||
cp libllama.so $out/lib
|
||||
''}
|
||||
|
||||
for f in bin/*; do
|
||||
test -x "$f" || continue
|
||||
${lib.optionalString (!static) ''
|
||||
${patchelf}/bin/patchelf "$f" --set-rpath "$out/lib"
|
||||
''}
|
||||
cp "$f" $out/bin/llama-cpp-"$(basename "$f")"
|
||||
done
|
||||
|
||||
${lib.optionalString metalSupport "cp ./bin/ggml-metal.metal $out/bin/ggml-metal.metal"}
|
||||
|
||||
runHook postInstall
|
||||
# upstream plans on adding targets at the cmakelevel, remove those
|
||||
# additional steps after that
|
||||
postInstall = ''
|
||||
mv $out/bin/main $out/bin/llama
|
||||
mv $out/bin/server $out/bin/llama-server
|
||||
mkdir -p $out/include
|
||||
cp $src/llama.h $out/include/
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script {
|
||||
@ -144,9 +152,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
|
||||
description = "Port of Facebook's LLaMA model in C/C++";
|
||||
homepage = "https://github.com/ggerganov/llama.cpp/";
|
||||
license = licenses.mit;
|
||||
mainProgram = "llama-cpp-main";
|
||||
maintainers = with maintainers; [ dit7ya elohmeier ];
|
||||
broken = (effectiveStdenv.isDarwin && effectiveStdenv.isx86_64) || lib.count lib.id [openclSupport blasSupport rocmSupport cudaSupport] == 0;
|
||||
mainProgram = "llama";
|
||||
maintainers = with maintainers; [ dit7ya elohmeier philiptaron ];
|
||||
platforms = platforms.unix;
|
||||
badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin;
|
||||
broken = (metalSupport && !effectiveStdenv.isDarwin);
|
||||
};
|
||||
})
|
||||
|
||||
590
pkgs/by-name/ni/niri/Cargo.lock
generated
590
pkgs/by-name/ni/niri/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -20,19 +20,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "niri";
|
||||
version = "0.1.1";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YaLTeR";
|
||||
repo = "niri";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-+Y7dnq8gwVxefwvRnamqGneCTI4uUXgAo0SEffIvNB0=";
|
||||
hash = "sha256-vO6ak5rT6ntBC20vYC36zcEcHv7Cki9y8A+c7ThfsUg=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"smithay-0.3.0" = "sha256-TWq4L7Pe4/s0+hGjvTixoOFQ3P6tJXzV4/VgKcJ0tWU=";
|
||||
"smithay-0.3.0" = "sha256-ZEWamojE5ZRlhPVv/DK2Mj+QIz7zudw9+AxFD7Onr9Q=";
|
||||
};
|
||||
};
|
||||
|
||||
@ -64,6 +64,22 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
LIBCLANG_PATH = "${libclang.lib}/lib";
|
||||
|
||||
passthru.providedSessions = ["niri"];
|
||||
|
||||
postInstall = ''
|
||||
mkdir -p $out/share/{systemd/user,wayland-sessions,xdg-desktop-portal}
|
||||
|
||||
cp ./resources/niri-session $out/bin/niri-session
|
||||
cp ./resources/niri.service $out/share/systemd/user/niri.service
|
||||
cp ./resources/niri-shutdown.target $out/share/systemd/user/niri-shutdown.target
|
||||
cp ./resources/niri.desktop $out/share/wayland-sessions/niri.desktop
|
||||
cp ./resources/niri-portals.conf $out/share/xdg-desktop-portal/niri-portals.conf
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
sed -i "s#/usr#$out#" $out/share/systemd/user/niri.service
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A scrollable-tiling Wayland compositor";
|
||||
homepage = "https://github.com/YaLTeR/niri";
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
, meson, ninja, pkg-config, wayland-scanner, scdoc
|
||||
, libGL, wayland, libxkbcommon, pcre2, json_c, libevdev
|
||||
, pango, cairo, libinput, gdk-pixbuf, librsvg
|
||||
, wlroots_0_16, wayland-protocols, libdrm
|
||||
, wlroots, wayland-protocols, libdrm
|
||||
, nixosTests
|
||||
# Used by the NixOS module:
|
||||
, isNixOS ? false
|
||||
@ -11,19 +11,16 @@
|
||||
, trayEnabled ? systemdSupport
|
||||
}:
|
||||
|
||||
let
|
||||
wlroots = wlroots_0_16;
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "sway-unwrapped";
|
||||
version = "1.8.1";
|
||||
version = "1.9";
|
||||
|
||||
inherit enableXWayland isNixOS systemdSupport trayEnabled;
|
||||
src = fetchFromGitHub {
|
||||
owner = "swaywm";
|
||||
repo = "sway";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-WxnT+le9vneQLFPz2KoBduOI+zfZPhn1fKlaqbPL6/g=";
|
||||
hash = "sha256-/6+iDkQfdLcL/pTJaqNc6QdP4SRVOYLjfOItEu/bZtg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -34,11 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
inherit swaybg;
|
||||
})
|
||||
|
||||
(fetchpatch {
|
||||
name = "LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch";
|
||||
url = "https://github.com/swaywm/sway/commit/dee032d0a0ecd958c902b88302dc59703d703c7f.diff";
|
||||
hash = "sha256-dx+7MpEiAkxTBnJcsT3/1BO8rYRfNLecXmpAvhqGMD0=";
|
||||
})
|
||||
] ++ lib.optionals (!finalAttrs.isNixOS) [
|
||||
# References to /nix/store/... will get GC'ed which causes problems when
|
||||
# copying the default configuration:
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
sway-unwrapped,
|
||||
stdenv,
|
||||
systemd,
|
||||
wlroots_0_16,
|
||||
# Used by the NixOS module:
|
||||
isNixOS ? false,
|
||||
enableXWayland ? true,
|
||||
@ -18,6 +19,8 @@
|
||||
systemdSupport
|
||||
trayEnabled
|
||||
;
|
||||
|
||||
wlroots = wlroots_0_16;
|
||||
}).overrideAttrs (oldAttrs: rec {
|
||||
pname = "swayfx-unwrapped";
|
||||
version = "0.3.2";
|
||||
@ -29,18 +32,6 @@
|
||||
sha256 = "sha256-Gwewb0yDVhEBrefSSGDf1hLtpWcntzifPCPJQhqLqI0=";
|
||||
};
|
||||
|
||||
# This patch was backported into SwayFX
|
||||
# remove when next release is rebased on Sway 1.9
|
||||
patches =
|
||||
let
|
||||
removePatches = [
|
||||
"LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM.patch"
|
||||
];
|
||||
in
|
||||
builtins.filter
|
||||
(patch: !builtins.elem (patch.name or null) removePatches)
|
||||
(oldAttrs.patches or [ ]);
|
||||
|
||||
meta = with lib; {
|
||||
description = "Sway, but with eye candy!";
|
||||
homepage = "https://github.com/WillPower3309/swayfx";
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "adafruit-platformdetect";
|
||||
version = "3.60.0";
|
||||
version = "3.61.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "Adafruit-PlatformDetect";
|
||||
inherit version;
|
||||
hash = "sha256-ZE3rETwAuhv7pHA/zYDKtStWONShFG8tWDeN9K8JdG8=";
|
||||
hash = "sha256-hA10t/ZtMH2MjyHJJdJeOZLOF5NNTCOgGqxU6CCkZlQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -18,7 +18,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioboto3";
|
||||
version = "12.1.0";
|
||||
version = "12.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -27,7 +27,7 @@ buildPythonPackage rec {
|
||||
owner = "terrycain";
|
||||
repo = "aioboto3";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-CVRDQhymQRi5dyVBLJYTnF3RI4jPBB966dVMT4lOd8g=";
|
||||
hash = "sha256-GDuxy/V+j0LRJ2lbcRHMEAga+pdCbYIWhEt3ItrHMB4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -37,8 +37,7 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiobotocore
|
||||
boto3
|
||||
];
|
||||
] ++ aiobotocore.optional-dependencies.boto3;
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
chalice = [
|
||||
|
||||
@ -7,7 +7,10 @@
|
||||
, fetchFromGitHub
|
||||
, flask
|
||||
, flask-cors
|
||||
, awscli
|
||||
, moto
|
||||
, boto3
|
||||
, setuptools
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
@ -16,16 +19,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiobotocore";
|
||||
version = "2.9.1";
|
||||
format = "setuptools";
|
||||
version = "2.11.2";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aio-libs";
|
||||
repo = pname;
|
||||
repo = "aiobotocore";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-cODdmP/O24fNIugzl4AYdf3g4Gzwx3JseYKbZKgEPbc=";
|
||||
hash = "sha256-H9nsLPxjv3H5y6+5piBt6Pb+Wks4vwOitM+WQtyViPs=";
|
||||
};
|
||||
|
||||
# Relax version constraints: aiobotocore works with newer botocore versions
|
||||
@ -34,6 +37,10 @@ buildPythonPackage rec {
|
||||
sed -i "s/'botocore>=.*'/'botocore'/" setup.py
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
aioitertools
|
||||
@ -41,6 +48,15 @@ buildPythonPackage rec {
|
||||
wrapt
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
awscli = [
|
||||
awscli
|
||||
];
|
||||
boto3 = [
|
||||
boto3
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
dill
|
||||
flask
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiocsv";
|
||||
version = "1.3.0";
|
||||
version = "1.3.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "MKuranowski";
|
||||
repo = "aiocsv";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5jMmT7XY+1VNbDNciZS6B/oQJFj4XmGvhDITKWHCuOQ=";
|
||||
hash = "sha256-zHU9NfxiRUOAk0kwsKmvxd01UtNXZTnb700Wlm9DUz4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aioshelly";
|
||||
version = "8.0.2";
|
||||
version = "8.1.1";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
@ -21,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "home-assistant-libs";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-wDEHHc+TFlrp2X2/03NNxZut1bn1Sn7y4Sk5nGYBvEs=";
|
||||
hash = "sha256-i2dlcparDQlwM7Wk/HwlBz0mmI38ZRwxVM6jLY0rI+0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aiounifi";
|
||||
version = "71";
|
||||
version = "72";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.11";
|
||||
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
||||
owner = "Kane610";
|
||||
repo = "aiounifi";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-KmxwCjmvDByCtsSQ+fQtdLS4ZDxtUaqc5zoOF9dsSq8=";
|
||||
hash = "sha256-PrFI5ncHW4r2Re1BIqRZlz8ns6d5p6y6PASCleSmyNc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,54 +1,62 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, attrs
|
||||
, boto3
|
||||
, buildPythonPackage
|
||||
, cryptography
|
||||
, setuptools
|
||||
, wrapt
|
||||
, fetchPypi
|
||||
, mock
|
||||
, pytest
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, wrapt
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws-encryption-sdk";
|
||||
version = "3.1.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-jV+/AY/GjWscrL5N0Df9gFKWx3Nqn+RX62hNBT9/lWM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
attrs
|
||||
boto3
|
||||
cryptography
|
||||
setuptools
|
||||
wrapt
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
pytest
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# requires networking
|
||||
# Tests require networking
|
||||
"examples"
|
||||
"test/integration"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.12") [
|
||||
# AssertionError: Regex pattern did not match, https://github.com/aws/aws-encryption-sdk-python/issues/644
|
||||
"test_abstracts"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python implementation of the AWS Encryption SDK";
|
||||
homepage = "https://aws-encryption-sdk-python.readthedocs.io/";
|
||||
changelog = "https://github.com/aws/aws-encryption-sdk-python/blob/v${version}/CHANGELOG.rst";
|
||||
description = "Fully compliant, native Python implementation of the AWS Encryption SDK.";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
};
|
||||
|
||||
@ -1,25 +1,37 @@
|
||||
{ lib
|
||||
, botocore
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, botocore
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "aws_secretsmanager_caching";
|
||||
pname = "aws-secretsmanager-caching";
|
||||
version = "1.1.1.5";
|
||||
format = "setuptools";
|
||||
pyprject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5cee2762bb89b72f3e5123feee8e45fbe44ffe163bfca08b28f27b2e2b7772e1";
|
||||
pname = "aws_secretsmanager_caching";
|
||||
inherit version;
|
||||
hash = "sha256-XO4nYruJty8+USP+7o5F++RP/hY7/KCLKPJ7Lit3cuE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Remove coverage tests from the pytest invocation in setup.cfg.
|
||||
./remove-coverage-tests.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace-fail "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools-scm
|
||||
];
|
||||
@ -29,16 +41,6 @@ buildPythonPackage rec {
|
||||
setuptools # Needs pkg_resources at runtime.
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Remove coverage tests from the pytest invocation in setup.cfg.
|
||||
./remove-coverage-tests.patch
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "'pytest-runner'," ""
|
||||
'';
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
@ -48,6 +50,21 @@ buildPythonPackage rec {
|
||||
"test/integ"
|
||||
];
|
||||
|
||||
disabledTests = lib.optionals (pythonAtLeast "3.12") [
|
||||
# TypeError: 'float' object cannot be interpreted as an integer
|
||||
"test_calls_hook_binary"
|
||||
"test_calls_hook_string"
|
||||
"test_get_secret_binary"
|
||||
"test_get_secret_string"
|
||||
"test_invalid_json"
|
||||
"test_missing_key"
|
||||
"test_string_with_additional_kwargs"
|
||||
"test_string"
|
||||
"test_valid_json_with_mixed_args"
|
||||
"test_valid_json_with_no_secret_kwarg"
|
||||
"test_valid_json"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"aws_secretsmanager_caching"
|
||||
];
|
||||
|
||||
@ -12,15 +12,16 @@
|
||||
, pytest-trio
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
, setuptools
|
||||
, six
|
||||
, trio
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.28.0";
|
||||
version = "1.30.0";
|
||||
pname = "azure-core";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -28,10 +29,13 @@ buildPythonPackage rec {
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-6e78Zvwf3lbatvBNTl0SxgdU1an6Sb3P2FNPyW7ZNr0=";
|
||||
hash = "sha256-bzp4g+8YRyL2vZlyYu3a+Az+fls+DKqvjbFpVpWJPTU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
six
|
||||
@ -99,8 +103,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Core Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/main/sdk/core/azure-core/CHANGELOG.md";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-core_${version}/sdk/core/azure-core/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
|
||||
@ -1,34 +1,36 @@
|
||||
{ lib
|
||||
, azure-core
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isodate
|
||||
, pythonOlder
|
||||
, azure-common
|
||||
, azure-core
|
||||
, msrest
|
||||
, six
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-administration";
|
||||
version = "4.3.0";
|
||||
format = "setuptools";
|
||||
version = "4.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-PuKjui0OP0ODNErjbjJ90hOgee97JDrVT2sh+MufxWY=";
|
||||
hash = "sha256-ems2y59UTzV1D/L6lMg7l7PvIMH+G0JOpoAY7ucD8d8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-core
|
||||
msrest
|
||||
six
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# no tests in pypi tarball
|
||||
propagatedBuildInputs = [
|
||||
azure-core
|
||||
typing-extensions
|
||||
isodate
|
||||
];
|
||||
|
||||
# Tests require checkout from mono-repo
|
||||
doCheck = false;
|
||||
|
||||
pythonNamespaces = [
|
||||
@ -42,6 +44,7 @@ buildPythonPackage rec {
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Key Vault Administration Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/master/sdk/keyvault/azure-keyvault-administration";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-administration_${version}/sdk/keyvault/azure-keyvault-administration/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
|
||||
@ -3,36 +3,40 @@
|
||||
, fetchPypi
|
||||
, azure-common
|
||||
, azure-core
|
||||
, msrest
|
||||
, msrestazure
|
||||
, isodate
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-certificates";
|
||||
version = "4.7.0";
|
||||
format = "setuptools";
|
||||
version = "4.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-nkfZp0gl5QKxPVSByZwYIEDE9Ucj9DNx4AhZQ23888o=";
|
||||
hash = "sha256-xWEnPkQCwlEUhzSGyYv6GyxHiGIp1BAOh9rxAO4Edyg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-core
|
||||
msrest
|
||||
msrestazure
|
||||
isodate
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonNamespaces = [
|
||||
"azure.keyvault"
|
||||
];
|
||||
|
||||
# has no tests
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
@ -41,7 +45,8 @@ buildPythonPackage rec {
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Key Vault Certificates Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-certificates";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-keyvault-certificates_${version}/sdk/keyvault/azure-keyvault-certificates/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
|
||||
@ -1,41 +1,46 @@
|
||||
{ lib
|
||||
, azure-core
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, isodate
|
||||
, pythonOlder
|
||||
, azure-common
|
||||
, azure-core
|
||||
, msrest
|
||||
, setuptools
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-keyvault-secrets";
|
||||
version = "4.7.0";
|
||||
format = "setuptools";
|
||||
version = "4.8.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
hash = "sha256-d+4lNLplGh8wbIXXtQW8PM7o/qd0UOuvr8Jq7BblRF0=";
|
||||
hash = "sha256-VjbAodiiDjxXmcs8z/1Ovz8NGst8rpUmhhgzr4sP6BQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-common
|
||||
azure-core
|
||||
msrest
|
||||
isodate
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
pythonNamespaces = [
|
||||
"azure.keyvault"
|
||||
];
|
||||
|
||||
# requires checkout from mono-repo
|
||||
# Tests require checkout from mono-repo
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Microsoft Azure Key Vault Secrets Client Library for Python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python";
|
||||
homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/keyvault/azure-keyvault-secrets";
|
||||
changelog = "https://github.com/Azure/azure-sdk-for-python/tree/azure-keyvault-secrets_${version}/sdk/keyvault/azure-keyvault-secrets";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ jonringer ];
|
||||
};
|
||||
|
||||
@ -365,14 +365,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3-stubs";
|
||||
version = "1.34.50";
|
||||
version = "1.34.52";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-7WKO7Bq5oyTBN60pJAi474gvFyShWk6ESqfusljIyzM=";
|
||||
hash = "sha256-gjxBBZ+DbWh32qocvSD4E8jxp4uf3ykLwLhTEn4Se6M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,27 +1,27 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, botocore
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, jmespath
|
||||
, s3transfer
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, s3transfer
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "boto3";
|
||||
version = "1.34.21"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
format = "pyproject";
|
||||
version = "1.34.49"; # N.B: if you change this, change botocore and awscli to a matching version
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boto";
|
||||
repo = pname;
|
||||
repo = "boto3";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-oOrUVBh1sbaOibU8A+bGZ4z7IEiE4gjHwZ+8889Hv60=";
|
||||
hash = "sha256-/pgbLSL5RJ5RrKUAfQ1QNJykBdICrpqnuziHOVHt1JI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -54,14 +54,16 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
crt = [ botocore.optional-dependencies.crt ];
|
||||
crt = [
|
||||
botocore.optional-dependencies.crt
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "AWS SDK for Python";
|
||||
homepage = "https://github.com/boto/boto3";
|
||||
changelog = "https://github.com/boto/boto3/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.asl20;
|
||||
description = "AWS SDK for Python";
|
||||
longDescription = ''
|
||||
Boto3 is the Amazon Web Services (AWS) Software Development Kit (SDK) for
|
||||
Python, which allows Python developers to write software that makes use of
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore-stubs";
|
||||
version = "1.34.50";
|
||||
version = "1.34.52";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "botocore_stubs";
|
||||
inherit version;
|
||||
hash = "sha256-jWzjI/M4gnTLbYyBCyvEe/GJHioZlVdv/YKzrf+L5NU=";
|
||||
hash = "sha256-pRtsofyprNqp6AQS83FTaQ//rX7SJ3Q8xTCAmSDSoAk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,36 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchPypi
|
||||
, python-dateutil
|
||||
, jmespath
|
||||
, urllib3
|
||||
, pytestCheckHook
|
||||
, jsonschema
|
||||
, awscrt
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, jmespath
|
||||
, jsonschema
|
||||
, pytestCheckHook
|
||||
, python-dateutil
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools
|
||||
, urllib3
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "botocore";
|
||||
version = "1.34.21"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
format = "setuptools";
|
||||
version = "1.34.49"; # N.B: if you change this, change boto3 and awscli to a matching version
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-IZg7sEc6GRMBksUOxpdNVfDEqkinCUvPQPeILItpuPE=";
|
||||
hash = "sha256-2JQQvGBnPq/xaZ8/H9yw46Xh96agSMDYjDzlw1SUM+w=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"urllib3"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
python-dateutil
|
||||
jmespath
|
||||
python-dateutil
|
||||
urllib3
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
jsonschema
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
@ -46,14 +57,16 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
crt = [ awscrt ];
|
||||
crt = [
|
||||
awscrt
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A low-level interface to a growing number of Amazon Web Services";
|
||||
homepage = "https://github.com/boto/botocore";
|
||||
changelog = "https://github.com/boto/botocore/blob/${version}/CHANGELOG.rst";
|
||||
license = licenses.asl20;
|
||||
description = "A low-level interface to a growing number of Amazon Web Services";
|
||||
maintainers = with maintainers; [ anthonyroussel ];
|
||||
};
|
||||
}
|
||||
|
||||
47
pkgs/development/python-modules/chroma-hnswlib/default.nix
Normal file
47
pkgs/development/python-modules/chroma-hnswlib/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, numpy
|
||||
, pybind11
|
||||
, setuptools
|
||||
, wheel
|
||||
, pythonOlder
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chroma-hnswlib";
|
||||
version = "0.7.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chroma-core";
|
||||
repo = "hnswlib";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-c4FvymqZy8AZKbh6Y8xZRjKAqYcUyZABRGc1u7vwlsk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
numpy
|
||||
pybind11
|
||||
setuptools
|
||||
wheel
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"hnswlib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Header-only C++/python library for fast approximate nearest neighbors";
|
||||
homepage = "https://github.com/chroma-core/hnswlib";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
160
pkgs/development/python-modules/chromadb/default.nix
Normal file
160
pkgs/development/python-modules/chromadb/default.nix
Normal file
@ -0,0 +1,160 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, bcrypt
|
||||
, build
|
||||
, buildPythonPackage
|
||||
, cargo
|
||||
, chroma-hnswlib
|
||||
, darwin
|
||||
, fastapi
|
||||
, fetchFromGitHub
|
||||
, grpcio
|
||||
, hypothesis
|
||||
, importlib-resources
|
||||
, kubernetes
|
||||
, mmh3
|
||||
, numpy
|
||||
, onnxruntime
|
||||
, openssl
|
||||
, opentelemetry-api
|
||||
, opentelemetry-exporter-otlp-proto-grpc
|
||||
, opentelemetry-instrumentation-fastapi
|
||||
, opentelemetry-sdk
|
||||
, orjson
|
||||
, overrides
|
||||
, pkg-config
|
||||
, posthog
|
||||
, protobuf
|
||||
, pulsar-client
|
||||
, pydantic
|
||||
, pypika
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pyyaml
|
||||
, requests
|
||||
, rustc
|
||||
, rustPlatform
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, tenacity
|
||||
, tokenizers
|
||||
, tqdm
|
||||
, typer
|
||||
, typing-extensions
|
||||
, uvicorn
|
||||
, zstd
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "chromadb";
|
||||
version = "0.4.23";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "chroma-core";
|
||||
repo = "chroma";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-5gI+FE2jx4G/qahATLcYsONfPZZkk1RFFYK5nrpE0Ug=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit src;
|
||||
name = "${pname}-${version}";
|
||||
hash = "sha256-glItbT8gg5SAySnfx3A9TaPyFmd1R46JpAB1JnjBE5M=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"orjson"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
pkg-config
|
||||
protobuf
|
||||
pythonRelaxDepsHook
|
||||
rustc
|
||||
rustPlatform.cargoSetupHook
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
bcrypt
|
||||
build
|
||||
chroma-hnswlib
|
||||
fastapi
|
||||
grpcio
|
||||
importlib-resources
|
||||
kubernetes
|
||||
mmh3
|
||||
numpy
|
||||
onnxruntime
|
||||
opentelemetry-api
|
||||
opentelemetry-exporter-otlp-proto-grpc
|
||||
opentelemetry-instrumentation-fastapi
|
||||
opentelemetry-sdk
|
||||
orjson
|
||||
overrides
|
||||
posthog
|
||||
pulsar-client
|
||||
pydantic
|
||||
pypika
|
||||
pyyaml
|
||||
requests
|
||||
tenacity
|
||||
tokenizers
|
||||
tqdm
|
||||
typer
|
||||
typing-extensions
|
||||
uvicorn
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
hypothesis
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"chromadb"
|
||||
];
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
};
|
||||
|
||||
pytestFlagsArray = [ "-x" ];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"chromadb/test/property/test_cross_version_persist.py"
|
||||
"chromadb/test/auth/test_simple_rbac_authz.py"
|
||||
"chromadb/test/ef/test_default_ef.py"
|
||||
"chromadb/test/test_api.py"
|
||||
"chromadb/test/property/"
|
||||
"chromadb/test/stress/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The AI-native open-source embedding database";
|
||||
homepage = "https://github.com/chroma-core/chroma";
|
||||
changelog = "https://github.com/chroma-core/chroma/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -1,23 +1,29 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, clarifai-grpc
|
||||
, fetchFromGitHub
|
||||
, inquirerpy
|
||||
, llama-index-core
|
||||
, numpy
|
||||
, opencv4
|
||||
, pandas
|
||||
, pillow
|
||||
, pycocotools
|
||||
, pypdf
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, pyyaml
|
||||
, rich
|
||||
, schema
|
||||
, setuptools
|
||||
, tqdm
|
||||
, tritonclient
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "clarifai";
|
||||
version = "9.11.1";
|
||||
version = "10.1.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -26,36 +32,59 @@ buildPythonPackage rec {
|
||||
owner = "Clarifai";
|
||||
repo = "clarifai-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fVari/SnrUnEbrYefV9j2yA/EMJoGiLOV7q/DrS0AQ8=";
|
||||
hash = "sha256-/2PIsSsYr/R7DuTX/ndBAOX7C3IaFqPw16ZAX8E1Vk8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"clarifai-grpc"
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"opencv-python"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
clarifai-grpc
|
||||
inquirerpy
|
||||
llama-index-core
|
||||
numpy
|
||||
tqdm
|
||||
opencv4
|
||||
tritonclient
|
||||
pandas
|
||||
pillow
|
||||
pypdf
|
||||
pyyaml
|
||||
rich
|
||||
schema
|
||||
pillow
|
||||
pyyaml
|
||||
tqdm
|
||||
tritonclient
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
all = [
|
||||
pycocotools
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
'';
|
||||
|
||||
disabledTests = [
|
||||
# require network access and API key
|
||||
# Test requires network access and API key
|
||||
"test_export_workflow_general"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# require network access and API key
|
||||
# Tests require network access and API key
|
||||
"tests/test_app.py"
|
||||
"tests/test_data_upload.py"
|
||||
"tests/test_model_predict.py"
|
||||
@ -63,14 +92,18 @@ buildPythonPackage rec {
|
||||
"tests/test_search.py"
|
||||
"tests/workflow/test_create_delete.py"
|
||||
"tests/workflow/test_predict.py"
|
||||
"tests/test_rag.py"
|
||||
"clarifai/models/model_serving/repo_build/static_files/base_test.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "clarifai" ];
|
||||
pythonImportsCheck = [
|
||||
"clarifai"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Clarifai Python Utilities";
|
||||
homepage = "https://github.com/Clarifai/clarifai-python";
|
||||
changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${src.rev}";
|
||||
changelog = "https://github.com/Clarifai/clarifai-python/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ natsukium ];
|
||||
};
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dbt-core";
|
||||
version = "1.7.8";
|
||||
version = "1.7.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
owner = "dbt-labs";
|
||||
repo = "dbt-core";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-EpKZiSDU5fivG3TIarirPgxRGQ3Sf1hwNvCKdQx25c0=";
|
||||
hash = "sha256-ff+cdY6xy14w30BDn1ct/2Q+4j8cQupJrJHb4vO58J0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/core";
|
||||
|
||||
39
pkgs/development/python-modules/dirtyjson/default.nix
Normal file
39
pkgs/development/python-modules/dirtyjson/default.nix
Normal file
@ -0,0 +1,39 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "dirtyjson";
|
||||
version = "1.0.8";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-kMpKGPP/MM6EnRANz0oAOVPHnTojSO8Fbx2cIiMaJf0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"dirtyjson"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "JSON decoder for Python that can extract data from the muck";
|
||||
homepage = "https://github.com/codecobblers/dirtyjson";
|
||||
license = with licenses; [ afl21 /* and */ mit];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -33,7 +33,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "litellm";
|
||||
version = "1.27.4";
|
||||
version = "1.28.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -42,7 +42,7 @@ buildPythonPackage rec {
|
||||
owner = "BerriAI";
|
||||
repo = "litellm";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mgBbU5vbSKjJysPQHu2FH7VzB7aCW4XJThNkpMnu1+c=";
|
||||
hash = "sha256-rmgKitWY2YFa+L9vpjXCsx5rCS2UrrobyKoleP5taG0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, llama-index-llms-openai
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-agent-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/agent/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.agent.openai"
|
||||
];
|
||||
}
|
||||
34
pkgs/development/python-modules/llama-index-cli/default.nix
Normal file
34
pkgs/development/python-modules/llama-index-cli/default.nix
Normal file
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, llama-index-embeddings-openai
|
||||
, llama-index-llms-openai
|
||||
, llama-index-vector-stores-chroma
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-cli";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
llama-index-embeddings-openai
|
||||
llama-index-llms-openai
|
||||
llama-index-vector-stores-chroma
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.cli"
|
||||
];
|
||||
}
|
||||
115
pkgs/development/python-modules/llama-index-core/default.nix
Normal file
115
pkgs/development/python-modules/llama-index-core/default.nix
Normal file
@ -0,0 +1,115 @@
|
||||
{ lib
|
||||
, aiohttp
|
||||
, buildPythonPackage
|
||||
, dataclasses-json
|
||||
, deprecated
|
||||
, dirtyjson
|
||||
, fetchFromGitHub
|
||||
, fsspec
|
||||
, llamaindex-py-client
|
||||
, nest-asyncio
|
||||
, networkx
|
||||
, nltk
|
||||
, numpy
|
||||
, openai
|
||||
, pandas
|
||||
, pillow
|
||||
, poetry-core
|
||||
, pytest-asyncio
|
||||
, pytest-mock
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, pyyaml
|
||||
, requests
|
||||
, tree-sitter
|
||||
, sqlalchemy
|
||||
, tenacity
|
||||
, tiktoken
|
||||
, typing-inspect
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-core";
|
||||
version = "0.10.12";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "run-llama";
|
||||
repo = "llama_index";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-Xn4Gqr5zjZGAEHg5duqkS9GLWWlC83puDHNktNYzvDw=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
aiohttp
|
||||
dataclasses-json
|
||||
deprecated
|
||||
dirtyjson
|
||||
fsspec
|
||||
llamaindex-py-client
|
||||
nest-asyncio
|
||||
networkx
|
||||
nltk
|
||||
numpy
|
||||
openai
|
||||
pandas
|
||||
pillow
|
||||
pyyaml
|
||||
requests
|
||||
sqlalchemy
|
||||
tenacity
|
||||
tiktoken
|
||||
typing-inspect
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
tree-sitter
|
||||
pytest-asyncio
|
||||
pytest-mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index"
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Tests require network access
|
||||
"tests/agent/"
|
||||
"tests/callbacks/"
|
||||
"tests/chat_engine/"
|
||||
"tests/evaluation/"
|
||||
"tests/indices/"
|
||||
"tests/ingestion/"
|
||||
"tests/memory/"
|
||||
"tests/node_parser/"
|
||||
"tests/objects/"
|
||||
"tests/playground/"
|
||||
"tests/postprocessor/"
|
||||
"tests/query_engine/"
|
||||
"tests/question_gen/"
|
||||
"tests/response_synthesizers/"
|
||||
"tests/retrievers/"
|
||||
"tests/selectors/"
|
||||
"tests/test_utils.py"
|
||||
"tests/text_splitter/"
|
||||
"tests/token_predictor/"
|
||||
"tests/tools/"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Data framework for your LLM applications";
|
||||
homepage = "https://github.com/run-llama/llama_index/";
|
||||
changelog = "https://github.com/run-llama/llama_index/blob/${version}/CHANGELOG.md";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, google-generativeai
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-gemini";
|
||||
version = "0.1.3";
|
||||
|
||||
inherit (llama-index-core) src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-generativeai
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.embeddings.gemini"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, google-generativeai
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-google";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
google-generativeai
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.embeddings.google"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-embeddings-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/embeddings/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.embeddings.openai"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, llama-index-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-indices-managed-llama-cloud";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/indices/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.indices.managed.llama_cloud"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, llama-index-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-legacy";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, poetry-core
|
||||
, llama-index-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-llms-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/llms/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.llms.openai"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, llama-index-llms-openai
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-multi-modal-llms-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/multi_modal_llms/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.multi_modal_llms.openai"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-agent-openai
|
||||
, llama-index-core
|
||||
, llama-index-llms-openai
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-program-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/program/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-agent-openai
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.program.openai"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, llama-index-llms-openai
|
||||
, llama-index-program-openai
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-question-gen-openai";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/question_gen/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
llama-index-llms-openai
|
||||
llama-index-program-openai
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.question_gen.openai"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,46 @@
|
||||
{ lib
|
||||
, beautifulsoup4
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pymupdf
|
||||
, pypdf
|
||||
, pythonRelaxDepsHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-file";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}";
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"beautifulsoup4"
|
||||
"pymupdf"
|
||||
"pypdf"
|
||||
];
|
||||
|
||||
pythonRemoveDeps = [
|
||||
"bs4"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
beautifulsoup4
|
||||
llama-index-core
|
||||
pymupdf
|
||||
pypdf
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.file"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-json";
|
||||
version = "0.1.2";
|
||||
|
||||
inherit (llama-index-core) src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.json"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, llama-parse
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-llama-parse";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-parse
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.llama_parse"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pyowm
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-readers-weather";
|
||||
version = "0.1.4";
|
||||
|
||||
inherit (llama-index-core) src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/readers/${pname}";
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
pyowm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.readers.weather"
|
||||
];
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, chromadb
|
||||
, fetchFromGitHub
|
||||
, llama-index-core
|
||||
, onnxruntime
|
||||
, poetry-core
|
||||
, pythonRelaxDepsHook
|
||||
, tokenizers
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index-vector-stores-chroma";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
sourceRoot = "${src.name}/llama-index-integrations/vector_stores/${pname}";
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"onnxruntime"
|
||||
"tokenizers"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
pythonRelaxDepsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
chromadb
|
||||
llama-index-core
|
||||
onnxruntime
|
||||
tokenizers
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index.vector_stores.chroma"
|
||||
];
|
||||
}
|
||||
47
pkgs/development/python-modules/llama-index/default.nix
Normal file
47
pkgs/development/python-modules/llama-index/default.nix
Normal file
@ -0,0 +1,47 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, llama-index-agent-openai
|
||||
, llama-index-cli
|
||||
, llama-index-core
|
||||
, llama-index-embeddings-openai
|
||||
, llama-index-indices-managed-llama-cloud
|
||||
, llama-index-legacy
|
||||
, llama-index-llms-openai
|
||||
, llama-index-multi-modal-llms-openai
|
||||
, llama-index-program-openai
|
||||
, llama-index-question-gen-openai
|
||||
, llama-index-readers-file
|
||||
, llama-index-readers-llama-parse
|
||||
, poetry-core
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-index";
|
||||
|
||||
inherit (llama-index-core) version src meta;
|
||||
|
||||
pyproject = true;
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-agent-openai
|
||||
llama-index-cli
|
||||
llama-index-core
|
||||
llama-index-embeddings-openai
|
||||
llama-index-indices-managed-llama-cloud
|
||||
llama-index-legacy
|
||||
llama-index-llms-openai
|
||||
llama-index-multi-modal-llms-openai
|
||||
llama-index-program-openai
|
||||
llama-index-question-gen-openai
|
||||
llama-index-readers-file
|
||||
llama-index-readers-llama-parse
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index"
|
||||
];
|
||||
}
|
||||
40
pkgs/development/python-modules/llama-parse/default.nix
Normal file
40
pkgs/development/python-modules/llama-parse/default.nix
Normal file
@ -0,0 +1,40 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, llama-index-core
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llama-parse";
|
||||
version = "0.3.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llama_parse";
|
||||
inherit version;
|
||||
hash = "sha256-WjBWnDkKuQidrWbPKoyWf4wh13ZB3uwKkiZy304Wz6M=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
llama-index-core
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_parse"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Parse files into RAG-Optimized formats";
|
||||
homepage = "https://pypi.org/project/llama-parse/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, httpx
|
||||
, poetry-core
|
||||
, pydantic
|
||||
, pythonOlder
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "llamaindex-py-client";
|
||||
version = "0.1.13";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "llamaindex_py_client";
|
||||
inherit version;
|
||||
hash = "sha256-O9m0Ne4KeBceukEt6lZ02BPrW/NuV308fH6Q7cVJANk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
httpx
|
||||
pydantic
|
||||
];
|
||||
|
||||
# Module has no tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"llama_index_client"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for LlamaIndex";
|
||||
homepage = "https://pypi.org/project/llamaindex-py-client/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mscerts";
|
||||
version = "2023.11.29";
|
||||
version = "2024.2.28";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -15,7 +15,7 @@ buildPythonPackage rec {
|
||||
owner = "ralphje";
|
||||
repo = "mscerts";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-TNwpWxknCUcvXFy3UInrEx4iFZi/hLS7exvJBv3DlWo=";
|
||||
hash = "sha256-ReUDpax4tvw4ZCH8zOipelIPtHi7BdgLHI/r3FNpo1c=";
|
||||
};
|
||||
|
||||
# extras_require contains signify -> circular dependency
|
||||
|
||||
@ -9,16 +9,18 @@
|
||||
, isodate
|
||||
, pytest-aiohttp
|
||||
, pytestCheckHook
|
||||
, pythonAtLeast
|
||||
, pythonOlder
|
||||
, requests
|
||||
, requests-oauthlib
|
||||
, setuptools
|
||||
, trio
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "msrest";
|
||||
version = "0.7.1";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
@ -30,6 +32,10 @@ buildPythonPackage rec {
|
||||
hash = "sha256-1EXXXflhDeU+erdI+NsWxSX76ooDTl3+MyQwRzm2xV0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
azure-core
|
||||
aiodns
|
||||
@ -56,6 +62,12 @@ buildPythonPackage rec {
|
||||
"test_conf_async_requests"
|
||||
"test_conf_async_requests"
|
||||
"test_conf_async_trio_requests"
|
||||
] ++ lib.optionals (pythonAtLeast "3.12") [
|
||||
# AttributeError: 'TestAuthentication' object has no attribute...
|
||||
"test_apikey_auth"
|
||||
"test_cs_auth"
|
||||
"test_eventgrid_auth"
|
||||
"test_eventgrid_domain_auth"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
|
||||
@ -1,41 +1,52 @@
|
||||
{ pkgs
|
||||
, lib
|
||||
{ lib
|
||||
, adal
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, isPy3k
|
||||
, adal
|
||||
, msrest
|
||||
, mock
|
||||
, httpretty
|
||||
, pytest
|
||||
, mock
|
||||
, msrest
|
||||
, pytest-asyncio
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.6.4";
|
||||
format = "setuptools";
|
||||
pname = "msrestazure";
|
||||
version = "0.6.4";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
# Pypi tarball doesnt include tests
|
||||
# see https://github.com/Azure/msrestazure-for-python/pull/133
|
||||
src = fetchFromGitHub {
|
||||
owner = "Azure";
|
||||
repo = "msrestazure-for-python";
|
||||
rev = "v${version}";
|
||||
sha256 = "0ik81f0n6r27f02gblgm0vl5zl3wc6ijsscihgvc1fgm9f5mk5b5";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-ZZVZi0v1ucD2g5FpLaNhfNBf6Ab10fUEcEdkY4ELaEY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ adal msrest ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ httpretty mock pytest ]
|
||||
++ lib.optionals isPy3k [ pytest-asyncio ];
|
||||
propagatedBuildInputs = [
|
||||
adal
|
||||
msrest
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
pytest tests/
|
||||
'';
|
||||
nativeCheckInputs = [
|
||||
httpretty
|
||||
mock
|
||||
pytest-asyncio
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
meta = with pkgs.lib; {
|
||||
description = "The runtime library 'msrestazure' for AutoRest generated Python clients.";
|
||||
pythonImportsCheck = [
|
||||
"msrest"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "The runtime library 'msrestazure' for AutoRest generated Python clients";
|
||||
homepage = "https://azure.microsoft.com/en-us/develop/python/";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ bendlas jonringer ];
|
||||
|
||||
@ -1,27 +1,43 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonAtLeast
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "1.5.6";
|
||||
pname = "nest_asyncio";
|
||||
disabled = !(pythonAtLeast "3.5");
|
||||
pname = "nest-asyncio";
|
||||
version = "1.6.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-0mfMH/eUQD999pKWTR0qP6lBj/6io/aFmkOf9IL+8pA=";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "erdewit";
|
||||
repo = "nest_asyncio";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-5I5WItOl1QpyI4OXZgZf8GiQ7Jlo+SJbDicIbernaU4=";
|
||||
};
|
||||
|
||||
# tests not packaged with source dist as of 1.3.2/1.3.2, and
|
||||
# can't check tests out of GitHub easily without specific commit IDs (no tagged releases)
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "nest_asyncio" ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nest_asyncio"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Patch asyncio to allow nested event loops";
|
||||
homepage = "https://github.com/erdewit/nest_asyncio";
|
||||
changelog = "https://github.com/erdewit/nest_asyncio/releases/tag/v${version}";
|
||||
license = licenses.bsdOriginal;
|
||||
maintainers = with maintainers; [ ];
|
||||
};
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fastapi
|
||||
, hatchling
|
||||
, httpx
|
||||
, opentelemetry-api
|
||||
, opentelemetry-instrumentation
|
||||
, opentelemetry-instrumentation-asgi
|
||||
, opentelemetry-semantic-conventions
|
||||
, opentelemetry-test-utils
|
||||
, opentelemetry-util-http
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, requests
|
||||
}:
|
||||
|
||||
buildPythonPackage {
|
||||
inherit (opentelemetry-instrumentation) version src;
|
||||
pname = "opentelemetry-instrumentation-fastapi";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-fastapi";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hatchling
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
fastapi
|
||||
opentelemetry-api
|
||||
opentelemetry-instrumentation
|
||||
opentelemetry-instrumentation-asgi
|
||||
opentelemetry-semantic-conventions
|
||||
opentelemetry-util-http
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
httpx
|
||||
opentelemetry-test-utils
|
||||
pytestCheckHook
|
||||
requests
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"opentelemetry.instrumentation.fastapi"
|
||||
];
|
||||
|
||||
meta = opentelemetry-instrumentation.meta // {
|
||||
description = "OpenTelemetry Instrumentation for fastapi";
|
||||
homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/blob/main/instrumentation/opentelemetry-instrumentation-fastapi";
|
||||
};
|
||||
}
|
||||
@ -5,13 +5,14 @@
|
||||
, fetchFromGitHub
|
||||
, pyotp
|
||||
, pytestCheckHook
|
||||
, python-dotenv
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "opower";
|
||||
version = "0.3.1";
|
||||
version = "0.4.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -20,7 +21,7 @@ buildPythonPackage rec {
|
||||
owner = "tronikos";
|
||||
repo = "opower";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-aSzy1QLNGfEqHE2IQDdh9YfK+pC6j8X+5KviasSvYI8=";
|
||||
hash = "sha256-O+yIxEFqD6hel1H9aUnSz/wJoEhVrg6DDZptNcJVkSw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@ -31,6 +32,7 @@ buildPythonPackage rec {
|
||||
aiohttp
|
||||
arrow
|
||||
pyotp
|
||||
python-dotenv
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -18,13 +18,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oslo-concurrency";
|
||||
version = "5.3.0";
|
||||
version = "6.0.0";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "oslo.concurrency";
|
||||
inherit version;
|
||||
hash = "sha256-yqaSBw0hVZ73H/WQeAb3USoXgsRby1ChlP4+DNeNfe0=";
|
||||
hash = "sha256-tS8CtORvXydLkfuOG/xcv5pBjfzUqDvggDRUlePSboo=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
119
pkgs/development/python-modules/pulsar-client/default.nix
Normal file
119
pkgs/development/python-modules/pulsar-client/default.nix
Normal file
@ -0,0 +1,119 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, python
|
||||
}:
|
||||
let
|
||||
version = "3.4.0";
|
||||
|
||||
inherit (python) pythonVersion;
|
||||
|
||||
Srcs =
|
||||
let
|
||||
getSrcFromPypi = { platform, dist, hash }: fetchPypi {
|
||||
inherit version platform dist hash;
|
||||
pname = "pulsar_client";
|
||||
format = "wheel";
|
||||
python = dist;
|
||||
abi = dist;
|
||||
};
|
||||
in
|
||||
{
|
||||
"3.9-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux_2_17_x86_64.manylinux2014_x86_64";
|
||||
dist = "cp39";
|
||||
hash = "sha256-1P5ArMoLZiUkHUoQ/mJccbNj5/7el/op+Qo6cGQ33xE=";
|
||||
};
|
||||
"3.9-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux_2_17_aarch64.manylinux2014_aarch64";
|
||||
dist = "cp39";
|
||||
hash = "sha256-11JQZRwMLtt7sK/JlCBqqRyfTVIAVJFN2sL+nAkQgvU=";
|
||||
};
|
||||
"3.9-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp39";
|
||||
hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8=";
|
||||
};
|
||||
"3.9-x86_64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp39";
|
||||
hash = "sha256-dwTGZKosgBr0wtOljp2P+u7xLOig9xcS6Rh/mpbahW8=";
|
||||
};
|
||||
"3.10-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux_2_17_x86_64.manylinux2014_x86_64";
|
||||
dist = "cp310";
|
||||
hash = "sha256-swp1kuQsdgNOmo1k1C3VurNhQl+GneVi6cytaY4ZzYg=";
|
||||
};
|
||||
"3.10-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "musllinux_1_1_aarch64";
|
||||
dist = "cp310";
|
||||
hash = "sha256-1ZYwkKeKVkS6JfQdo6bUnqPwDJcrCVuv82WRbcJGQmo=";
|
||||
};
|
||||
"3.10-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp310";
|
||||
hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo=";
|
||||
};
|
||||
"3.10-x86_64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp310";
|
||||
hash = "sha256-6/mdtSRP9pR5KDslYhsHBJKsxLtkPRYthrkDh8tv2yo=";
|
||||
};
|
||||
"3.11-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux_2_17_x86_64.manylinux2014_x86_64";
|
||||
dist = "cp311";
|
||||
hash = "sha256-M1cd6ZzYmDSfF5eLpi4rg56gJ1+3Bn8xv19uv+rgmH0=";
|
||||
};
|
||||
"3.11-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux_2_17_aarch64.manylinux2014_aarch64";
|
||||
dist = "cp311";
|
||||
hash = "sha256-+HQ8MgqpZ5jSDK+pjql6aMQpX8SHLCOs1eAS/TbLBro=";
|
||||
};
|
||||
"3.11-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp311";
|
||||
hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M=";
|
||||
};
|
||||
"3.11-x86_64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp311";
|
||||
hash = "sha256-EZUvsCLuct6/U7Fp9EgvncXIkL4BSa6Yd5hks6IfG9M=";
|
||||
};
|
||||
"3.12-x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux_2_17_x86_64.manylinux2014_x86_64";
|
||||
dist = "cp312";
|
||||
hash = "sha256-xgbATzVzQQQvpsdUd959IgT3rlCqKcL3SyTlTIX0f5Y=";
|
||||
};
|
||||
"3.12-aarch64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux_2_17_aarch64.manylinux2014_aarch64";
|
||||
dist = "cp312";
|
||||
hash = "sha256-8gK4Th9oPWRnLdGXERRgCuLlw3NVhyhv+b+0MThfCOg=";
|
||||
};
|
||||
"3.12-aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp312";
|
||||
hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE=";
|
||||
};
|
||||
"3.12-x86_64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_15_universal2";
|
||||
dist = "cp312";
|
||||
hash = "sha256-9/jw/wr1oUD9pOadVAaMRL081iVMUXwVgnUMcG1UNvE=";
|
||||
};
|
||||
};
|
||||
|
||||
in buildPythonPackage {
|
||||
pname = "pulsar-client";
|
||||
inherit version;
|
||||
|
||||
format = "wheel";
|
||||
|
||||
src = Srcs."${pythonVersion}-${stdenv.hostPlatform.system}";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Client for pulsar";
|
||||
homepage = "https://pypi.org/project/pulsar-client/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pymicrobot";
|
||||
version = "0.0.18";
|
||||
version = "0.0.22";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "PyMicroBot";
|
||||
inherit version;
|
||||
hash = "sha256-+CF1m/Z5txSOQSUp4TOCTS0fRNcL/zuWCpbox8yIOIk=";
|
||||
hash = "sha256-8Nkkgznt4JzImJSAbdaX6znhvmgqwOIBjAXVhaMorLk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "reptor";
|
||||
version = "0.9";
|
||||
version = "0.11";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@ -41,7 +41,7 @@ buildPythonPackage rec {
|
||||
owner = "Syslifters";
|
||||
repo = "reptor";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-CjTedIl7ZkSFfKKhHmCadTd7zdz3gP7Q4uCscv5An38=";
|
||||
hash = "sha256-OJcg/e+ZC5Hf4dkP1dhsR9A+5lWvuFeuNLXyW8Hw6ko=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -1,29 +1,38 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, botocore
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, stdenv
|
||||
, setuptools
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "s3transfer";
|
||||
version = "0.10.0";
|
||||
format = "setuptools";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "boto";
|
||||
repo = pname;
|
||||
repo = "s3transfer";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-21xycx1+84uY4gFr7N+ra98dpsEwxy9zeSl4QA66nUc=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ botocore ];
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
propagatedBuildInputs = [
|
||||
botocore
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
disabledTestPaths = [
|
||||
# Requires network access
|
||||
@ -32,12 +41,18 @@ buildPythonPackage rec {
|
||||
# There was a change in python 3.8 that defaults multiprocessing to spawn instead of fork on macOS
|
||||
# See https://bugs.python.org/issue33725 and https://github.com/python/cpython/pull/13603.
|
||||
# I suspect the underlying issue here is that upstream tests aren't compatible with spawn multiprocessing, and pass on linux where the default is still fork
|
||||
lib.optionals stdenv.isDarwin [ "tests/unit/test_compat.py" ];
|
||||
lib.optionals stdenv.isDarwin [
|
||||
"tests/unit/test_compat.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "s3transfer" ];
|
||||
pythonImportsCheck = [
|
||||
"s3transfer"
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
crt = [ botocore.optional-dependencies.crt ];
|
||||
crt = [
|
||||
botocore.optional-dependencies.crt
|
||||
];
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "thriftpy2";
|
||||
version = "0.4.16";
|
||||
version = "0.4.19";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
||||
owner = "Thriftpy";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-o+h38NREnh14M23gyF2X2UdW7/spmHFo0rqvkKnmSRQ=";
|
||||
hash = "sha256-u5k9dP6llfTjM745fRHvKC2vM7jd9D8lvPUsDcYx0EI=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "twilio";
|
||||
version = "8.13.0";
|
||||
version = "9.0.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -28,7 +28,7 @@ buildPythonPackage rec {
|
||||
owner = "twilio";
|
||||
repo = "twilio-python";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-HlHT7fJbDz8+7pTWHortK2xKDzoIQElJPbUTxmIdGCs=";
|
||||
hash = "sha256-5PhINmG1y+oAEpfxaB8ZFHfWlo0jRZnUKO5oUPcnFuM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-beautifulsoup4";
|
||||
version = "4.12.0.20240106";
|
||||
version = "4.12.0.20240229";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-mNYomFtxsUC9O8IqjLCrYDwvLQjyDTeSWWXrSiFzm+g=";
|
||||
hash = "sha256-435M+hGwOwF3VzLlbSwBDLJO4Qd4Yne65rwPo+MFtoY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-html5lib";
|
||||
version = "1.1.11.20240222";
|
||||
version = "1.1.11.20240228";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-2VF+xrovofYxE+KTClm2ByKpdsyYO5TX/XcvFIZeEVI=";
|
||||
hash = "sha256-InNrcpnmBexLpTnUhpHpBf0MYcPqYQrMWZIiMtyEzt4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
69
pkgs/development/python-modules/types-lxml/default.nix
Normal file
69
pkgs/development/python-modules/types-lxml/default.nix
Normal file
@ -0,0 +1,69 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, lxml
|
||||
, pyright
|
||||
, pytestCheckHook
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, typeguard
|
||||
, types-beautifulsoup4
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "types-lxml";
|
||||
version = "2024.02.09";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "abelcheung";
|
||||
repo = "types-lxml";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-vmRbzfwlGGxd64KX8j4B3O9c7kg7hXSsCEYq3WAFdmk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
types-beautifulsoup4
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
lxml
|
||||
pyright
|
||||
pytestCheckHook
|
||||
typeguard
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"lxml-stubs"
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
# AttributeError: 'bytes' object has no attribute 'find_class'
|
||||
# https://github.com/abelcheung/types-lxml/issues/34
|
||||
"test_bad_methodfunc"
|
||||
"test_find_class"
|
||||
"test_find_rel_links"
|
||||
"test_iterlinks"
|
||||
"test_make_links_absolute"
|
||||
"test_resolve_base_href"
|
||||
"test_rewrite_links"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Complete lxml external type annotation";
|
||||
homepage = "https://github.com/abelcheung/types-lxml";
|
||||
changelog = "https://github.com/abelcheung/types-lxml/releases/tag/${version}";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
@ -11,16 +11,16 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "yolink-api";
|
||||
version = "0.3.8";
|
||||
format = "pyproject";
|
||||
version = "0.3.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "YoSmart-Inc";
|
||||
repo = pname;
|
||||
repo = "yolink-api";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-QkN6gF2Gq/gWkQxm8ahXBEsG/ClydHaaKnT3t+r5sNo=";
|
||||
hash = "sha256-RXO++8Dh0hLkjXev/WDhPixLHKXlqRabbrPW6Hs/xoM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "checkov";
|
||||
version = "3.2.8";
|
||||
version = "3.2.24";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bridgecrewio";
|
||||
repo = "checkov";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Hd1YOzIH6v8N/oP2cJRUv6OkgOv9aSe7nkvzpsCN3rc=";
|
||||
hash = "sha256-1v6Mft+FVEGXNQDiulpOvRy3KAD1JPkstjrURlL5r4o=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -20,6 +20,8 @@ python3.pkgs.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
pythonRelaxDeps = [
|
||||
"boto3"
|
||||
"botocore"
|
||||
"bc-detect-secrets"
|
||||
"bc-python-hcl2"
|
||||
"dpath"
|
||||
|
||||
@ -108,6 +108,9 @@ in
|
||||
homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}";
|
||||
license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname});
|
||||
maintainers = lib.teams.qt-kde.members;
|
||||
# Platforms are currently limited to what upstream tests in CI, but can be extended if
|
||||
# there's interest.
|
||||
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
|
||||
}
|
||||
// meta;
|
||||
};
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "check_ssl_cert";
|
||||
version = "2.79.0";
|
||||
version = "2.80.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "matteocorti";
|
||||
repo = "check_ssl_cert";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2NraUEUGyvmEdWCQdzZ5kf+sx/CnSZ54N3zRcCSYhBA=";
|
||||
hash = "sha256-1KYolUA5AZ9fQLfNb4UE1WlMTj6GiAnNszPTLlERBvc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -6,16 +6,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "exportarr";
|
||||
version = "1.6.1";
|
||||
version = "1.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "onedr0p";
|
||||
repo = "exportarr";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-i5ia9GX/0wvLnIwSxZ50y3fTFHwkUzj00+NoEceXp84=";
|
||||
hash = "sha256-Eacu8NeAAQqztzVpBhW1UeKQU+FBEJcx5+mcaByQid8=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-2gzHX7XHzgvZXWm7mfakxnsRfpEysQwnZ0mJocLyyoA=";
|
||||
vendorHash = "sha256-lizPm/3hxKt7ZxKkhbwsj1nL8bWmE90QqRGxTqMSMAw=";
|
||||
|
||||
subPackages = [ "cmd/exportarr" ];
|
||||
|
||||
|
||||
@ -1,19 +1,24 @@
|
||||
diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh
|
||||
index 601c1c3f..fcb7305d 100755
|
||||
index 32cb1530..375baa41 100755
|
||||
--- a/data/dconf/make-dconf-override-db.sh
|
||||
+++ b/data/dconf/make-dconf-override-db.sh
|
||||
@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
|
||||
@@ -12,15 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache"
|
||||
export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas"
|
||||
mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR
|
||||
|
||||
-eval `dbus-launch --sh-syntax`
|
||||
-
|
||||
-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR
|
||||
-trap cleanup EXIT
|
||||
-
|
||||
-cleanup() {
|
||||
- test $? -eq 0 && exit
|
||||
- rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID
|
||||
-}
|
||||
-
|
||||
# in case that schema is not installed on the system
|
||||
glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD"
|
||||
|
||||
@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then
|
||||
@@ -57,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then
|
||||
umount $TMPDIR/cache/gvfs
|
||||
fi
|
||||
rm -rf $TMPDIR
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib, stdenv
|
||||
{ lib
|
||||
, stdenv
|
||||
, substituteAll
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, gettext
|
||||
, makeWrapper
|
||||
@ -17,6 +17,7 @@
|
||||
, gtk3
|
||||
, gtk4
|
||||
, gtk-doc
|
||||
, libdbusmenu-gtk3
|
||||
, runCommand
|
||||
, isocodes
|
||||
, cldr-annotations
|
||||
@ -26,7 +27,7 @@
|
||||
, json-glib
|
||||
, libnotify ? null
|
||||
, enableUI ? true
|
||||
, withWayland ? false
|
||||
, withWayland ? true
|
||||
, libxkbcommon
|
||||
, wayland
|
||||
, buildPackages
|
||||
@ -46,7 +47,8 @@ let
|
||||
};
|
||||
# make-dconf-override-db.sh needs to execute dbus-launch in the sandbox,
|
||||
# it will fail to read /etc/dbus-1/session.conf unless we add this flag
|
||||
dbus-launch = runCommand "sandbox-dbus-launch" {
|
||||
dbus-launch = runCommand "sandbox-dbus-launch"
|
||||
{
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \
|
||||
@ -56,13 +58,13 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ibus";
|
||||
version = "1.5.28";
|
||||
version = "1.5.29";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ibus";
|
||||
repo = "ibus";
|
||||
rev = version;
|
||||
sha256 = "sha256-zjV+QkhVkrHFs9Vt1FpbvmS4nRHxwKaKU3mQkSgyLaQ=";
|
||||
sha256 = "sha256-d4EUIg0v8rfHdvzG5USc6GLY6QHtQpIJp1PrPaaBxxE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
@ -72,27 +74,17 @@ stdenv.mkDerivation rec {
|
||||
pythonSitePackages = python3.sitePackages;
|
||||
})
|
||||
./build-without-dbus-launch.patch
|
||||
# unicode and emoji input are broken before 1.5.29
|
||||
# https://github.com/NixOS/nixpkgs/issues/226526
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ibus/ibus/commit/7c8abbe89403c2fcb08e3fda42049a97187e53ab.patch";
|
||||
hash = "sha256-59HzAdLq8ahrF7K+tFGLjTodwIiTkJGEkFe8quqIkhU=";
|
||||
})
|
||||
# fix SIGABRT in X11 https://github.com/ibus/ibus/issues/2484
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ibus/ibus/commit/8f706d160631f1ffdbfa16543a38b9d5f91c16ad.patch";
|
||||
hash = "sha256-YzS9TmUWW0OmheDeCeU00kFK2U2QEmKYMSRJAbu14ec=";
|
||||
})
|
||||
# fix missing key releases in Wine https://github.com/ibus/ibus/issues/2480
|
||||
(fetchpatch {
|
||||
url = "https://github.com/ibus/ibus/commit/497f0c74230a65309e22ce5569060ce48310406b.patch";
|
||||
hash = "sha256-PAZcUxmzjChs1/K8hXgOcytyS4LYoNL1dtU6X5Tx8ic=";
|
||||
})
|
||||
];
|
||||
|
||||
outputs = [ "out" "dev" "installedTests" ];
|
||||
|
||||
postPatch = ''
|
||||
# Maintainer does not want to create separate tarballs for final release candidate and release versions,
|
||||
# so we need to set `ibus_released` to `1` in `configure.ac`. Otherwise, anyone running `ibus version` gets
|
||||
# a version with an inaccurate `-rcX` suffix.
|
||||
# https://github.com/ibus/ibus/issues/2584
|
||||
substituteInPlace configure.ac --replace "m4_define([ibus_released], [0])" "m4_define([ibus_released], [1])"
|
||||
|
||||
patchShebangs --build data/dconf/make-dconf-override-db.sh
|
||||
cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make .
|
||||
substituteInPlace bus/services/org.freedesktop.IBus.session.GNOME.service.in --replace "ExecStart=sh" "ExecStart=${runtimeShell}"
|
||||
@ -102,6 +94,11 @@ stdenv.mkDerivation rec {
|
||||
preAutoreconf = "touch ChangeLog";
|
||||
|
||||
configureFlags = [
|
||||
# The `AX_PROG_{CC,CXX}_FOR_BUILD` autoconf macros can pick up unwrapped GCC binaries,
|
||||
# so we set `{CC,CXX}_FOR_BUILD` to override that behavior.
|
||||
# https://github.com/NixOS/nixpkgs/issues/21751
|
||||
"CC_FOR_BUILD=${stdenv.cc}/bin/cc"
|
||||
"CXX_FOR_BUILD=${stdenv.cc}/bin/c++"
|
||||
"--disable-memconf"
|
||||
(lib.enableFeature (dconf != null) "dconf")
|
||||
(lib.enableFeature (libnotify != null) "libnotify")
|
||||
@ -115,12 +112,6 @@ stdenv.mkDerivation rec {
|
||||
"--with-ucd-dir=${unicode-character-database}/share/unicode"
|
||||
];
|
||||
|
||||
# missing make dependency
|
||||
# https://github.com/NixOS/nixpkgs/pull/218120#issuecomment-1514027173
|
||||
preBuild = ''
|
||||
make -C src ibusenumtypes.h
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"test_execsdir=${placeholder "installedTests"}/libexec/installed-tests/ibus"
|
||||
"test_sourcesdir=${placeholder "installedTests"}/share/installed-tests/ibus"
|
||||
@ -154,6 +145,7 @@ stdenv.mkDerivation rec {
|
||||
isocodes
|
||||
json-glib
|
||||
libnotify
|
||||
libdbusmenu-gtk3
|
||||
] ++ lib.optionals withWayland [
|
||||
libxkbcommon
|
||||
wayland
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "ggshield";
|
||||
version = "1.24.0";
|
||||
version = "1.25.0";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GitGuardian";
|
||||
repo = "ggshield";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-N0yokLsp6jRELIPu8w6gvD7V97xiKJl+kLQQB9h2mMY=";
|
||||
hash = "sha256-D6+0ZYuOiCy5LonP1Ob7PlWmBXvLwU3PODOT6F+70HY=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "trufflehog";
|
||||
version = "3.68.2";
|
||||
version = "3.68.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "trufflesecurity";
|
||||
repo = "trufflehog";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-6gQoyVlLE+cXYwh8lTkL2giDhd3ETgETjT3XuEOwOU8=";
|
||||
hash = "sha256-gX0NEXRFN9UFqtdKf/2MuqtFYfWQs0H0Foq+IPiMprU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-D58WqqDwQo7fRubkGNRhD6g9ooKS9peb2qJJDRXgLtk=";
|
||||
vendorHash = "sha256-2QHIdVi0hDWxACbzIp+OYSxCC/ZyM3CdhP0abVansBI=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -4777,6 +4777,10 @@ with pkgs;
|
||||
|
||||
slurp = callPackage ../tools/wayland/slurp { };
|
||||
|
||||
sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
|
||||
wlroots = wlroots_0_17;
|
||||
};
|
||||
|
||||
swaykbdd = callPackage ../tools/wayland/swaykbdd { };
|
||||
|
||||
swayr = callPackage ../tools/wayland/swayr { };
|
||||
|
||||
@ -2061,6 +2061,10 @@ self: super: with self; {
|
||||
|
||||
chispa = callPackage ../development/python-modules/chispa { };
|
||||
|
||||
chroma-hnswlib = callPackage ../development/python-modules/chroma-hnswlib { };
|
||||
|
||||
chromadb = callPackage ../development/python-modules/chromadb { };
|
||||
|
||||
chromaprint = callPackage ../development/python-modules/chromaprint { };
|
||||
|
||||
ci-info = callPackage ../development/python-modules/ci-info { };
|
||||
@ -2922,6 +2926,8 @@ self: super: with self; {
|
||||
|
||||
dirty-equals = callPackage ../development/python-modules/dirty-equals { };
|
||||
|
||||
dirtyjson = callPackage ../development/python-modules/dirtyjson { };
|
||||
|
||||
discid = callPackage ../development/python-modules/discid { };
|
||||
|
||||
discogs-client = callPackage ../development/python-modules/discogs-client { };
|
||||
@ -6670,6 +6676,46 @@ self: super: with self; {
|
||||
|
||||
lizard = callPackage ../development/python-modules/lizard { };
|
||||
|
||||
llama-index = callPackage ../development/python-modules/llama-index { };
|
||||
|
||||
llama-index-agent-openai = callPackage ../development/python-modules/llama-index-agent-openai { };
|
||||
|
||||
llama-index-cli = callPackage ../development/python-modules/llama-index-cli { };
|
||||
|
||||
llama-index-core = callPackage ../development/python-modules/llama-index-core { };
|
||||
|
||||
llama-index-embeddings-gemini = callPackage ../development/python-modules/llama-index-embeddings-gemini { };
|
||||
|
||||
llama-index-embeddings-google = callPackage ../development/python-modules/llama-index-embeddings-google { };
|
||||
|
||||
llama-index-embeddings-openai = callPackage ../development/python-modules/llama-index-embeddings-openai { };
|
||||
|
||||
llama-index-indices-managed-llama-cloud = callPackage ../development/python-modules/llama-index-indices-managed-llama-cloud { };
|
||||
|
||||
llama-index-legacy = callPackage ../development/python-modules/llama-index-legacy { };
|
||||
|
||||
llama-index-llms-openai = callPackage ../development/python-modules/llama-index-llms-openai { };
|
||||
|
||||
llama-index-multi-modal-llms-openai = callPackage ../development/python-modules/llama-index-multi-modal-llms-openai { };
|
||||
|
||||
llama-index-program-openai = callPackage ../development/python-modules/llama-index-program-openai { };
|
||||
|
||||
llama-index-question-gen-openai = callPackage ../development/python-modules/llama-index-question-gen-openai { };
|
||||
|
||||
llama-index-readers-file = callPackage ../development/python-modules/llama-index-readers-file { };
|
||||
|
||||
llama-index-readers-json = callPackage ../development/python-modules/llama-index-readers-json { };
|
||||
|
||||
llama-index-readers-llama-parse = callPackage ../development/python-modules/llama-index-readers-llama-parse { };
|
||||
|
||||
llama-index-readers-weather = callPackage ../development/python-modules/llama-index-readers-weather { };
|
||||
|
||||
llama-index-vector-stores-chroma = callPackage ../development/python-modules/llama-index-vector-stores-chroma { };
|
||||
|
||||
llama-parse = callPackage ../development/python-modules/llama-parse { };
|
||||
|
||||
llamaindex-py-client = callPackage ../development/python-modules/llamaindex-py-client { };
|
||||
|
||||
llfuse = callPackage ../development/python-modules/llfuse {
|
||||
inherit (pkgs) fuse;
|
||||
};
|
||||
@ -8887,6 +8933,8 @@ self: super: with self; {
|
||||
|
||||
opentelemetry-instrumentation-django = callPackage ../development/python-modules/opentelemetry-instrumentation-django { };
|
||||
|
||||
opentelemetry-instrumentation-fastapi = callPackage ../development/python-modules/opentelemetry-instrumentation-fastapi { };
|
||||
|
||||
opentelemetry-instrumentation-flask = callPackage ../development/python-modules/opentelemetry-instrumentation-flask { };
|
||||
|
||||
opentelemetry-instrumentation-grpc = callPackage ../development/python-modules/opentelemetry-instrumentation-grpc { };
|
||||
@ -10091,6 +10139,8 @@ self: super: with self; {
|
||||
|
||||
pulp = callPackage ../development/python-modules/pulp { };
|
||||
|
||||
pulsar-client = callPackage ../development/python-modules/pulsar-client { };
|
||||
|
||||
pulsectl-asyncio = callPackage ../development/python-modules/pulsectl-asyncio { };
|
||||
|
||||
pulsectl = callPackage ../development/python-modules/pulsectl { };
|
||||
@ -15750,6 +15800,8 @@ self: super: with self; {
|
||||
|
||||
types-ipaddress = callPackage ../development/python-modules/types-ipaddress { };
|
||||
|
||||
types-lxml = callPackage ../development/python-modules/types-lxml { };
|
||||
|
||||
types-markdown = callPackage ../development/python-modules/types-markdown { };
|
||||
|
||||
types-mock = callPackage ../development/python-modules/types-mock { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user