jiebi/CodeConvo huggingface dataset:
<ins> { lib , python3 , python311 , fetchFromGitHub }: let python = if (builtins.tryEval python3.pkgs.nose.outPath).success then python3 else python311; in python.pkgs.buildPythonApplication rec { pname = "flexget"; version = "3.11.41"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; hash = "sha256-ZSqkD53fdDnKulVPgM9NWXVFXDR0sZ94mRyV1iKS87o="; }; postPatch = '' # remove dependency constraints but keep environment constraints sed 's/[~<>=][^;]*//' -i requirements.txt ''; build-system = with python.pkgs; [ setuptools wheel ]; dependencies = with python.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml apscheduler beautifulsoup4 colorama feedparser guessit html5lib jinja2 jsonschema loguru psutil pynzb pyrss2gen python-dateutil pyyaml rebulk requests rich rpyc sqlalchemy # WebUI requirements cherrypy flask-compress flask-cors flask-login flask-restx flask packaging pyparsing werkzeug zxcvbn pendulum # Plugins requirements transmission-rpc qbittorrent-api deluge-client cloudscraper python-telegram-bot ]; pythonImportsCheck = [ "flexget" "flexget.api.core.authentication" "flexget.api.core.database" "flexget.api.core.plugins" "flexget.api.core.schema" "flexget.api.core.server" "flexget.api.core.tasks" "flexget.api.core.user" "flexget.components.thetvdb.api" "flexget.components.tmdb.api" "flexget.components.trakt.api" "flexget.components.tvmaze.api" "flexget.plugins.clients.aria2" "flexget.plugins.clients.deluge" "flexget.plugins.clients.nzbget" "flexget.plugins.clients.pyload" "flexget.plugins.clients.qbittorrent" "flexget.plugins.clients.rtorrent" "flexget.plugins.clients.transmission" "flexget.plugins.services.kodi_library" "flexget.plugins.services.myepisodes" "flexget.plugins.services.pogcal_acquired" ]; # ~400 failures doCheck = false; meta = with lib; { homepage = "https://flexget.com/"; changelog = "https://github.com/Flexget/Flexget/releases/tag/v${version}"; description = "Multipurpose automation tool for all of your media"; license = licenses.mit; maintainers = with maintainers; [ pbsds ]; }; } </ins>
<del> { lib, stdenv, fetchFromGitHub, makeWrapper , SDL2, gzip, libvorbis, libmad, vulkan-headers, vulkan-loader, moltenvk </del> <ins> { lib, stdenv, fetchFromGitHub, meson, ninja, glslang, pkg-config, flac, libopus, opusfile, makeWrapper, SDL2, gzip, libvorbis, libmad, vulkan-loader, moltenvk, </ins> }: stdenv.mkDerivation rec { pname = "vkquake"; <del> version = "1.22.3"; </del> <ins> version = "1.31.0"; </ins> src = fetchFromGitHub { owner = "Novum"; repo = "vkQuake"; rev = version; <del> sha256 = "sha256-+8DU1QT3Lgqf1AIReVnXQ2Lq6R6eBb8VjdkJfAn/Rtc="; </del> <ins> sha256 = "sha256-3xWwqN0EcwDMEhVxfLa0bMMClM+zELEFWzO/EJvPNs0="; </ins> }; <del> sourceRoot = "${src.name}/Quake"; </del> nativeBuildInputs = [ makeWrapper <del> vulkan-headers </del> <ins> glslang meson ninja pkg-config </ins> ]; buildInputs = [ <del> gzip </del> SDL2 <del> libvorbis </del> <ins> flac gzip </ins> libmad <ins> libopus libvorbis opusfile </ins> vulkan-loader ] ++ lib.optional stdenv.isDarwin moltenvk; buildFlags = [ "DO_USERDIRS=1" ]; <del> preInstall = '' mkdir -p "$out/bin" ''; makeFlags = [ "prefix=$(out) bindir=$(out)/bin" ]; </del> env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; }; <del> postFixup = '' wrapProgram $out/bin/vkquake  --prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib </del> <ins> installPhase = '' mkdir -p "$out/bin" cp vkquake "$out/bin" </ins> ''; <del> enableParallelBuilding = true; </del> <ins> postFixup = '' patchelf $out/bin/vkquake  --add-rpath ${lib.makeLibraryPath [ vulkan-loader ]} ''; </ins> meta = with lib; { description = "Vulkan Quake port based on QuakeSpasm"; <del> mainProgram = "vkquake"; </del> homepage = src.meta.homepage; longDescription = '' vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering.
owner = "pysal"; repo = "momepy"; rev = "v${version}"; <del> hash = "sha256-HVp2a0z+5fbfkNSxnTfZPCgG2SJMlKX/zso14M18mCk="; </del> <ins> hash = "sha256-r2iGzk54MsrkYB3Sp9/B1QGKnvqPGUj3MQhk6yqIoXE="; </ins> }; build-system = [ setuptools-scm ];
haveLibcxx = stdenv.cc.libcxx != null; isDarwinStatic = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isStatic && lib.versionAtLeast release_version "16"; inherit (stdenv.hostPlatform) isMusl isAarch64; <ins> noSanitizers = !haveLibc || bareMetal || isMusl || isDarwinStatic; </ins> baseName = "compiler-rt"; pname = baseName + lib.optionalString (haveLibc) "-libc";
"-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" ] ++ lib.optionals (useLLVM && haveLibc) [ "-DCOMPILER_RT_BUILD_SANITIZERS=ON" <del> ] ++ lib.optionals (!haveLibc || bareMetal || isMusl || isDarwinStatic) [ </del> <ins> ] ++ lib.optionals (noSanitizers) [ </ins> "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" ] ++ lib.optionals ((useLLVM && !haveLibcxx) || !haveLibc || bareMetal || isMusl || isDarwinStatic) [ "-DCOMPILER_RT_BUILD_XRAY=OFF"
"-DCOMPILER_RT_ENABLE_IOS=OFF" ]) ++ lib.optionals (lib.versionAtLeast version "19" && stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ "-DSANITIZER_MIN_OSX_VERSION=10.10" <ins> ]  ++ lib.optionals (noSanitizers && lib.versionAtLeast release_version "19") [ "-DCOMPILER_RT_BUILD_CTX_PROFILE=OFF" </ins> ]; outputs = [ "out" "dev" ];
push @kernelModules, "kvm-intel" if hasCPUFeature "vmx"; push @kernelModules, "kvm-amd" if hasCPUFeature "svm"; <ins> push @attrs, "hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "AuthenticAMD"; push @attrs, "hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;" if cpuManufacturer "GenuineIntel"; </ins> # Look at the PCI devices and add necessary modules.  Note that most # modules are auto-detected so we don't need to list them here.
}) # Fix detection of NEON (and armv6 build) : ./fix-neon-detection.patch <del> ]; </del> <ins> ] # CMake files require a bit of patching to support CMAKE_ASM_COMPILER. # Made by @RossComputerGuy for x265 v3.5. # https://mailman.videolan.org/pipermail/x265-devel/2024-July/013734.html ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-clang-asm.patch; </ins> postPatch = '' substituteInPlace cmake/Version.cmake
(mkFlag ppaSupport "ENABLE_PPA") (mkFlag vtuneSupport "ENABLE_VTUNE") (mkFlag werrorSupport "WARNINGS_AS_ERRORS") <del> ]; </del> <ins> ] # Clang does not support the endfunc directive so use GCC. ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) "-DCMAKE_ASM_COMPILER=${gccStdenv.cc}/bin/${gccStdenv.cc.targetPrefix}gcc"; </ins> cmakeStaticLibFlags = [ "-DHIGH_BIT_DEPTH=ON"
<ins> diff --git a/CMakeLists.txt b/CMakeLists.txt index a407271b4..593628e0f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -310,7 +310,7 @@ if(GCC) endif() check_cxx_compiler_flag(-mstackrealign CC_HAS_STACK_REALIGN) if (CC_HAS_STACK_REALIGN) -        add_definitions(-mstackrealign) +        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-mstackrealign>) endif() # Disable exceptions. Reduce executable size, increase compability. check_cxx_compiler_flag(-fno-exceptions CC_HAS_FNO_EXCEPTIONS_FLAG) @@ -545,7 +545,7 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY) list(APPEND ASM_OBJS ${ASM}.${SUFFIX}) add_custom_command( OUTPUT ${ASM}.${SUFFIX} -                COMMAND ${CMAKE_CXX_COMPILER} +                COMMAND ${CMAKE_ASM_COMPILER} ARGS ${ARM_ARGS} -c ${ASM_SRC} -o ${ASM}.${SUFFIX} DEPENDS ${ASM_SRC}) endforeach() diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 12b643ad5..876f3543d 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -16,6 +16,7 @@ endif(EXTRA_LIB) if(ENABLE_ASSEMBLY) set_source_files_properties(threading.cpp primitives.cpp pixel.cpp PROPERTIES COMPILE_FLAGS -DENABLE_ASSEMBLY=1) list(APPEND VFLAGS "-DENABLE_ASSEMBLY=1") +    enable_language(ASM) endif(ENABLE_ASSEMBLY) if(ENABLE_ASSEMBLY AND X86) </ins>
<del> { appimageTools , lib , fetchurl }: let pname = "nuclear"; version = "0.6.30"; src = fetchurl { url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}.AppImage"; hash = "sha256-he1uGC1M/nFcKpMM9JKY4oeexJcnzV0ZRxhTjtJz6xw="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop  --replace 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = with lib; { description = "Streaming music player that finds free music for you"; homepage = "https://nuclear.js.org/"; license = licenses.agpl3Plus; maintainers = [ maintainers.NotAShelf ]; platforms = [ "x86_64-linux" ]; mainProgram = "nuclear"; }; } </del>
<ins> { appimageTools, lib, fetchurl, }: let pname = "nuclear"; version = "0.6.31"; src = fetchurl { # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in # the package name. We also hardcode the host arch in the release name, but should upstream # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose # source URL accordingly. url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage"; hash = "sha256-ezho69fDP4OiLpC8KNKc8OIZ++TX4GUinFB6o8MLx3I="; }; appimageContents = appimageTools.extract { inherit pname version src; }; in appimageTools.wrapType2 { inherit pname version src; extraInstallCommands = '' install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications substituteInPlace $out/share/applications/${pname}.desktop  --replace-fail 'Exec=AppRun' 'Exec=${pname}' cp -r ${appimageContents}/usr/share/icons $out/share ''; meta = { description = "Streaming music player that finds free music for you"; homepage = "https://nuclear.js.org/"; license = lib.licenses.agpl3Plus; maintainers = [ lib.maintainers.NotAShelf ]; platforms = [ "x86_64-linux" ]; mainProgram = "nuclear"; }; } </ins>
<ins> { lib, rustPlatform, fetchFromGitHub, pkg-config, dbus, ffmpeg, oniguruma, openssl, sqlite, stdenv, darwin, alsa-lib, xorg, }: rustPlatform.buildRustPackage rec { pname = "screen-pipe"; version = "0.1.48"; src = fetchFromGitHub { owner = "louis030195"; repo = "screen-pipe"; rev = "v${version}"; hash = "sha256-rWKRCqWFuPO84C52mMrrS4euD6XdJU8kqZsAz28+vWE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "cpal-0.15.3" = "sha256-eKn3tS5QuqbMTwnRAEybvbPZOiKiid7ghGztAmrs9fw="; "rusty-tesseract-1.1.10" = "sha256-XT74zGn+DetEBUujHm4Soe2iorQcIoUeZbscTv+64hw="; }; }; postPatch = '' ln -s ${./Cargo.lock} Cargo.lock ''; nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ]; buildInputs = [ dbus ffmpeg oniguruma openssl sqlite ] ++ lib.optionals stdenv.isDarwin ( with darwin.apple_sdk_12_3.frameworks; [ CoreAudio AudioUnit CoreFoundation CoreGraphics CoreMedia IOKit Metal MetalPerformanceShaders Security ScreenCaptureKit SystemConfiguration ] ) ++ lib.optionals stdenv.isLinux [ alsa-lib xorg.libxcb ]; buildFeatures = lib.optional stdenv.isDarwin "metal"; env = { RUSTONIG_SYSTEM_LIBONIG = true; }; doCheck = false; # Tests fail to build meta = with lib; { description = "Personalized AI powered by what you've seen, said, or heard"; homepage = "https://github.com/louis030195/screen-pipe"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; mainProgram = "screen-pipe"; }; } </ins>
stdenv.mkDerivation rec { pname = "redux"; <del> version = "1.3.2"; </del> <ins> version = "1.3.5"; </ins> src = if releasePath != null then releasePath else fetchurl { <del> url = "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz"; sha256 = "sha256-wafOeNvVIHc8pOHoNQcCwV8+OwnuevJo1EcRQKRX4YA="; </del> <ins> urls = [ "https://files.renoise.com/demo/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz" "https://files.renoise.com/demo/archive/Renoise_Redux_${lib.replaceStrings ["."] ["_"] version}_Demo_Linux_x86_64.tar.gz" ]; sha256 = "sha256-eznsdLzgdJ7MyWe5WAEg1MHId5VlfyanoZ6+I9nI/0I="; </ins> }; nativeBuildInputs = [
runHook postInstall ''; <ins> passthru.updateScript = writeScript "update-redux" '' #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts set -euo pipefail new_version="$( curl 'https://files.renoise.com/demo/'  | htmlq a --text  | grep -E '^Renoise_Redux_([0-9]+_?)+_Demo_Linux_x86_64.tar.gz$'  | grep -Eo '[0-9]+(_[0-9]+)*'  | head -n1  | tr _ . )" update-source-version redux "$new_version" --system="x86_64-linux" ''; </ins> meta = with lib; { description = "Sample-based instrument, with a powerful phrase sequencer"; homepage = "https://www.renoise.com/products/redux";
platforms = { x86_64-linux = { archSuffix = "x86_64"; <del> hash = "sha256-Etz6NaeLMysSkcQGC3g+IqUy9QrONCrbkyej63uLflo="; </del> <ins> hash = "sha256-b+YXBVnxu54HfC/tWapcs/ZYzwBOJswYbEbEU3SVNss="; </ins> }; aarch64-linux = { archSuffix = "arm64"; <del> hash = "sha256-PVpgxhJU8RY6QepydqImQnisWBjbrsuW4j49Xot3C6Y="; </del> <ins> hash = "sha256-l54FAtT+Rj4Mv3GuOF0/9WuKdJowgbZDZYo7VCh6Flg="; </ins> }; }; in stdenv.mkDerivation rec { pname = "renoise"; <del> version = "3.4.3"; </del> <ins> version = "3.4.4"; </ins> src = if releasePath != null then releasePath
platform = platforms.${stdenv.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); urlVersion = lib.replaceStrings [ "." ] [ "_" ] version; in fetchurl { <del> url = "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz"; </del> <ins> urls = [ "https://files.renoise.com/demo/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz" "https://files.renoise.com/demo/archive/Renoise_${urlVersion}_Demo_Linux_${platform.archSuffix}.tar.gz" ]; </ins> hash = platform.hash; };
--replace Exec=renoise Exec=$out/bin/renoise ''; <ins> passthru.updateScript = writeScript "update-renoise" '' #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=./. -i bash -p curl htmlq common-updater-scripts set -euo pipefail new_version="$( curl 'https://files.renoise.com/demo/'  | htmlq a --text  | grep -E '^Renoise_([0-9]+_?)+_Demo_Linux_x86_64.tar.gz$'  | grep -Eo '[0-9]+(_[0-9]+)*'  | head -n1  | tr _ . )" hash_x86_64="$(nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_x86_64.tar.gz")" hash_arm64="$( nix-prefetch-url "https://files.renoise.com/demo/Renoise_$(echo "$new_version" | tr . _)_Demo_Linux_arm64.tar.gz")" sri_x86_64="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_x86_64")" sri_arm64="$( nix --extra-experimental-features nix-command hash to-sri --type sha256 "$hash_arm64")" update-source-version renoise "$new_version" "$sri_x86_64" --system="x86_64-linux"  --ignore-same-version update-source-version renoise "$new_version" "$sri_arm64"  --system="aarch64-linux" --ignore-same-version ''; </ins> meta = { description = "Modern tracker-based DAW"; homepage = "https://www.renoise.com/";
<del> { lib, buildPackages, stdenvNoCC, autoreconfHook, fetchurl, fetchpatch }: stdenvNoCC.mkDerivation rec { </del> <ins> { lib, stdenv, buildPackages, autoreconfHook, fetchurl, fetchpatch, }: stdenv.mkDerivation rec { </ins> pname = "alsa-firmware"; version = "1.2.4";
}) ]; <del> depsBuildBuild = [ buildPackages.stdenv.cc ]; </del> nativeBuildInputs = [ autoreconfHook ]; <del> configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ]; </del> <ins> configureFlags = [ "--with-hotplug-dir=$(out)/lib/firmware" ]; depsBuildBuild = lib.optional ( stdenv.buildPlatform != stdenv.hostPlatform || stdenv.hostPlatform.isAarch64 ) buildPackages.stdenv.cc; </ins> dontStrip = true;
<ins> { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, git }: buildGoPackage rec { name = "fac-${version}"; version = "1.0.1"; goPackagePath = "github.com/mkchoi212/fac"; src = fetchFromGitHub { owner = "mkchoi212"; repo = "fac"; rev = "v${version}"; sha256 = "1j5kip3l3p9qlly03pih905sdz3ncvpj7135jpnfhckbk1s5x9dc"; }; nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $bin/bin/fac  --prefix PATH : ${git}/bin ''; meta = with stdenv.lib; { description = "CUI for fixing git conflicts"; inherit (src.meta) homepage; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; } </ins>
pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; <del> buildTools = drv.buildTools or [] ++ [haskellPackages.file-embed]; </del> <ins> buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; </ins> }); pamtester = callPackage ../tools/security/pamtester { };
outputs = [ "out" "lib" "dev" "bin" ]; <ins> # Cherry-pick of # https://github.com/open-eid/libdigidocpp/commit/2b5db855ba3ceb9bae1f11589ea1aea22bb7595a # Fixes https://github.com/NixOS/nixpkgs/issues/334397 postPatch = '' substituteInPlace CMakeLists.txt  --replace-fail 'TSA_URL "http://dd-at.ria.ee/tsa"' 'TSA_URL "https://eid-dd.ria.ee/ts"' ''; </ins> # libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so" # itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it. # https://github.com/open-eid/cmake/pull/35 might be an alternative.
<ins> { lib, buildGoModule, fetchFromGitHub, }: let pname = "poptop"; version = "0.1.8"; in buildGoModule { inherit pname version; src = fetchFromGitHub { owner = "bakks"; repo = "poptop"; rev = "v${version}"; hash = "sha256-CwJpkGNTDmtXfJx6GGz2XRU0fMeKl7I3fXm4BJ9MAQ4="; }; vendorHash = "sha256-Ccvr+J+GDKnhlrlv0/kTaQYD986As7yb/h6Vyiuqjoc="; meta = { description = "Modern top command that charts system metrics like CPU load, network IO, etc in the terminal"; changelog = "https://github.com/bakks/poptop/releases/tag/v${version}"; homepage = "https://github.com/bakks/poptop"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "poptop"; }; } </ins>
owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; <del> hash = "sha256-rB/zaJavA3OH1HK7Rfpta/QmQzi0xsEYTvW5JzzTAlI="; </del> <ins> hash = "sha256-PFXXd5ToBbvuGl+u4nEAHy1F696lxHD3PrPJ3Tpb+eg="; </ins> }; patches = [
}) ]; <del> vendorHash = "sha256-NtNjH2Vo1Leh98VIOkpyALErhC+6H5BE/uaPkwlejoo="; </del> <ins> vendorHash = "sha256-M5e5dE1gGW3ly94r3SxCsBmVwbBmhVtaVDW691vxG/8="; </ins> nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ] ++ [ installShellFiles ];
github = "tirimia"; githubId = 11174371; }; <ins> titaniumtown = { email = "titaniumtown@proton.me"; name = "Simon Gardling"; github = "titaniumtown"; githubId = 11786225; matrix = "@titaniumtown:envs.net"; keys = [ { fingerprint = "D15E 4754 FE1A EDA1 5A6D  4702 9AB2 8AC1 0ECE 533D"; } ]; }; </ins> tjni = { email = "43ngvg@masqt.com"; matrix = "@tni:matrix.org";
<ins> commit 1e8fdf3f90fd142c5ddd63e44ca1e5c172dbfb7f Author: Simon Gardling <titaniumtown@proton.me> Date:   Tue Aug 27 12:45:14 2024 -0400 use locally downloaded embeddings index 27f3f5d9..9e25528a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,7 @@ elseif (APPLE) endif() # Embedding model +#[[ set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf") set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547") set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}") @@ -104,6 +105,7 @@ if (APPLE) list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}") endif() +]] qt_add_executable(chat main.cpp @@ -383,11 +385,13 @@ endif() endif() +#[[ if (NOT APPLE) install(FILES "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}" DESTINATION resources COMPONENT ${COMPONENT_NAME_MAIN}) endif() +]] set(CPACK_GENERATOR "IFW") set(CPACK_VERBATIM_VARIABLES YES) --- a/embllm.cpp +++ b/embllm.cpp @@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel() QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL); if (!QFileInfo::exists(filePath)) { -        qWarning() << "embllm WARNING: Local embedding model not found"; +        qWarning() << "embllm WARNING: Local embedding model not found: " << filePath; return false; } </ins>
stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; <del> version = "2.8.0"; </del> <ins> version = "3.2.1"; </ins> src = fetchFromGitHub { fetchSubmodules = true; <del> hash = "sha256-aSz37+1K26Xizf4cpV45a2DnSsl959VQok/ppFRk/hs="; </del> <ins> hash = "sha256-h6hcqafTjQsqVlpnqVeohh38A67VSGrW3WrCErjaKIQ="; </ins> owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; }; <ins> embed_model = fetchurl { url = "https://gpt4all.io/models/gguf/nomic-embed-text-v1.5.f16.gguf"; sha256 = "f7af6f66802f4df86eda10fe9bbcfc75c39562bed48ef6ace719a251cf1c2fdb"; }; patches = [ ./embedding-local.patch ]; </ins> sourceRoot = "${finalAttrs.src.name}/gpt4all-chat"; nativeBuildInputs = [
rm -rf $out/include rm -rf $out/lib/*.a mv $out/bin/chat $out/bin/${finalAttrs.meta.mainProgram} <ins> install -D ${finalAttrs.embed_model} $out/resources/nomic-embed-text-v1.5.f16.gguf </ins> install -m 444 -D $src/gpt4all-chat/flatpak-manifest/io.gpt4all.gpt4all.desktop $out/share/applications/io.gpt4all.gpt4all.desktop <del> install -m 444 -D $src/gpt4all-chat/icons/logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg </del> <ins> install -m 444 -D $src/gpt4all-chat/icons/nomic_logo.svg $out/share/icons/hicolor/scalable/apps/io.gpt4all.gpt4all.svg </ins> substituteInPlace $out/share/applications/io.gpt4all.gpt4all.desktop  --replace-fail 'Exec=chat' 'Exec=${finalAttrs.meta.mainProgram}' '';
[[package]] name = "time" <del> version = "0.3.34" </del> <ins> version = "0.3.36" </ins> source = "registry+https://github.com/rust-lang/crates.io-index" <del> checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" </del> <ins> checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" </ins> dependencies = [ "deranged", "itoa",
[[package]] name = "time-macros" <del> version = "0.2.17" </del> <ins> version = "0.2.18" </ins> source = "registry+https://github.com/rust-lang/crates.io-index" <del> checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" </del> <ins> checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" </ins> dependencies = [ "num-conv", "time-core",
hash = "sha256-fPXhayS8OKiiiDvVvBry3njZ74/W6oVL0p85Z5qf3KA=="; }; <ins> cargoPatches = [ # fix build with Rust 1.80 ./time-crate.patch ]; </ins> cargoBuildFlags = [ "--package=meilisearch" ]; cargoLock = {
<ins> diff --git a/Cargo.lock b/Cargo.lock index 3c728f348..51df0ea7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5098,9 +5098,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -5121,9 +5121,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", </ins>
<del> { stdenv, buildPythonPackage, fetchPypi, lib , six, protobuf, enum34, futures, isPy27, isPy34 }: </del> <ins> { stdenv, buildPythonPackage, fetchPypi, lib, darwin , six, protobuf, enum34, futures, isPy27, isPy34, pkgconfig }: with stdenv.lib; </ins> buildPythonPackage rec { pname = "grpcio"; version = "1.13.0";