jiebi/CodeConvo huggingface dataset:
<del> { stdenv, lib, fetchFromGitHub, autoreconfHook }: </del> <ins> { stdenv, lib, fetchurl, fetchzip, autoreconfHook, writeScript, fetchpatch , modelUrl ? "", modelHash ? "" # Allow overriding the model URL and hash }: </ins> <del> stdenv.mkDerivation (rec { </del> <ins> let modelVersionJSON = lib.importJSON ./model-version.json; # Copy from https://gitlab.xiph.org/xiph/rnnoise/-/raw/v${version}/model_version default_model_version = modelVersionJSON.version; # Either use the default model or the one provided by package override model_url = if (modelUrl == "") then "https://media.xiph.org/rnnoise/models/rnnoise_data-${default_model_version}.tar.gz" else modelUrl; model_hash = if (modelHash == "") then modelVersionJSON.hash else modelHash; in stdenv.mkDerivation (finalAttrs: { </ins> pname = "rnnoise"; <del> version = "2021-01-22"; </del> <ins> version = "0.2"; src = fetchzip { urls = [ "https://gitlab.xiph.org/xiph/rnnoise/-/archive/v${finalAttrs.version}/rnnoise-v${finalAttrs.version}.tar.gz" "https://github.com/xiph/rnnoise/archive/v${finalAttrs.version}.tar.gz" ]; hash = "sha256-Qaf+0iOprq7ILRWNRkBjsniByctRa/lFVqiU5ZInF/Q="; }; patches = [ # remove when updating (fetchpatch { url = "https://github.com/xiph/rnnoise/commit/372f7b4b76cde4ca1ec4605353dd17898a99de38.patch"; hash = "sha256-Dzikb59hjVxd1XIEj/Je4evxtGORkaNcqE+zxOJMSvs="; }) ]; </ins> <del> src = fetchFromGitHub { owner = "xiph"; repo = "rnnoise"; rev = "1cbdbcf1283499bbb2230a6b0f126eb9b236defd"; sha256 = "1y0rzgmvy8bf9a431garpm2w177s6ajgf79y5ymw4yb0pik57rwb"; </del> <ins> model = fetchurl { url = model_url; hash = model_hash; </ins> }; <ins> postPatch = '' tar xvomf ${finalAttrs.model} ''; </ins> nativeBuildInputs = [ autoreconfHook ]; postInstall = '' install -Dt $out/bin examples/.libs/rnnoise_demo ''; <del> meta = with lib; { </del> <ins> passthru.updateScript = writeScript "update-rnnoise.sh" '' #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl jq common-updater-scripts nix nix-prefetch findutils moreutils prefetch-sri() { nix-prefetch-url "$1" | xargs nix hash to-sri --type sha256 } res="$(curl ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"}  -sL "https://api.github.com/repos/xiph/rnnoise/tags?per_page=1")" version="$(echo $res | jq '.[0].name | split("v") | .[1]' --raw-output)" update-source-version ${finalAttrs.pname} "$version" --ignore-same-hash model_version=$(curl -sL "https://raw.githubusercontent.com/xiph/rnnoise/v$version/model_version") model_url="https://media.xiph.org/rnnoise/models/rnnoise_data-$model_version.tar.gz" model_hash="$(prefetch-sri $model_url)" modelJson=pkgs/development/libraries/rnnoise/model-version.json jq --arg version "$model_version"  --arg hash "$model_hash"  '.version = $version | .hash = $hash'  "$modelJson" | sponge "$modelJson" ''; meta = { </ins> description = "Recurrent neural network for audio noise reduction"; homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; <del> license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; </del> <ins> license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nh2 ]; </ins> mainProgram = "rnnoise_demo"; <del> platforms = platforms.all; </del> <ins> platforms = lib.platforms.all; </ins> }; })
<del> { lib , stdenv , fetchFromGitHub , cmake , libqalculate , muparser , libarchive , python3Packages , qtbase , qtscxml , qtsvg , qtdeclarative , qtwayland , qt5compat , qttools , wrapQtAppsHook , nix-update-script , pkg-config </del> <ins> { lib, stdenv, fetchFromGitHub, cmake, libqalculate, muparser, libarchive, python3Packages, qtbase, qtscxml, qtsvg, qtdeclarative, qtwayland, qt5compat, qttools, wrapQtAppsHook, nix-update-script, pkg-config, </ins> }: stdenv.mkDerivation (finalAttrs: { pname = "albert"; <del> version = "0.23.0"; </del> <ins> version = "0.24.1"; </ins> src = fetchFromGitHub { owner = "albertlauncher"; repo = "albert"; rev = "v${finalAttrs.version}"; <del> sha256 = "sha256-L6qHaksArgwySk6J7N5zamUDWh5qa6zTtPFdpxU2NTM="; </del> <ins> sha256 = "sha256-vlap8gTZYoQS70Co99bZ16Fv9eq1N3rH7skjwrLDWiM="; </ins> fetchSubmodules = true; };
wrapQtAppsHook ]; <del> buildInputs = [ libqalculate libarchive muparser qtbase qtscxml qtsvg qtdeclarative qtwayland qt5compat qttools ] ++ (with python3Packages; [ python pybind11 ]); </del> <ins> buildInputs = [ libqalculate libarchive muparser qtbase qtscxml qtsvg qtdeclarative qtwayland qt5compat qttools ] ++ (with python3Packages; [ python pybind11 ]); </ins> postPatch = '' find -type f -name CMakeLists.txt -exec sed -i {} -e '/INSTALL_RPATH/d' ; <del> sed -i src/qtpluginprovider.cpp  -e "/QStringList dirs = {/a    QFileInfo("$out/lib").canonicalFilePath()," </del> <ins> # WARN: This is necessary for albert to detect the package libraries. # Please check if the file below has changed upstream before updating. sed -i src/app/qtpluginprovider.cpp  -e "/QStringList install_paths;/a    install_paths << QFileInfo("$out/lib").canonicalFilePath();" </ins> ''; postFixup = ''
changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; # See: https://github.com/NixOS/nixpkgs/issues/279226 license = licenses.unfree; <del> maintainers = with maintainers; [ ericsagnes synthetica ]; </del> <ins> maintainers = with maintainers; [ ericsagnes synthetica eljamm ]; </ins> mainProgram = "albert"; platforms = platforms.linux; };
<del> diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh --- rsync-3.2.7/configure.sh	2022-10-20 17:57:22 +++ rsync-3.2.7-fixed/configure.sh	2024-01-01 19:51:58 @@ -7706,7 +7706,7 @@ else $as_nop #include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> -main() +int main() { if (socket(AF_INET6, SOCK_STREAM, 0) < 0) exit(1); </del>
stdenv.mkDerivation rec { pname = "rsync"; <del> version = "3.2.7"; </del> <ins> version = "3.3.0"; </ins> src = fetchurl { # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5 url = "mirror://samba/rsync/src/rsync-${version}.tar.gz"; <del> sha256 = "sha256-Tn2dP27RCHjFjF+3JKZ9rPS2qsc0CxPkiPstxBNG8rs="; </del> <ins> hash = "sha256-c5nppnCMMtZ4pypjIZ6W8jvgviM25Q/RNISY0HBB35A="; </ins> }; nativeBuildInputs = [ perl ]; <del> patches = [ # https://github.com/WayneD/rsync/issues/511#issuecomment-1774612577 # original source: https://build.opensuse.org/package/view_file/network/rsync/rsync-fortified-strlcpy-fix.patch?expand=1&rev=3f8dd2f4a404c96c0f69176e60893714 ./rsync-fortified-strlcpy-fix.patch # https://github.com/WayneD/rsync/pull/558 ./configure.ac-fix-failing-IPv6-check.patch ]; </del> buildInputs = [ libiconv zlib popt ] ++ lib.optional enableACLs acl ++ lib.optional enableZstd zstd
<del> From 1f83963f59960150e8c46112daa8411324c1f209 Mon Sep 17 00:00:00 2001 From: Jiri Slaby <jslaby@suse.cz> Date: Fri, 18 Aug 2023 08:26:20 +0200 Subject: [PATCH] exclude: fix crashes with fortified strlcpy() Fortified (-D_FORTIFY_SOURCE=2 for gcc) builds make strlcpy() crash when its third parameter (size) is larger than the buffer: $ rsync -FFXHav '--filter=merge global-rsync-filter' Align-37-43/ xxx sending incremental file list *** buffer overflow detected ***: terminated It's in the exclude code in setup_merge_file(): strlcpy(y, save, MAXPATHLEN); Note the 'y' pointer was incremented, so it no longer points to memory with MAXPATHLEN "owned" bytes. Fix it by remembering the number of copied bytes into the 'save' buffer and use that instead of MAXPATHLEN which is clearly incorrect. Fixes #511. --- exclude.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/exclude.c b/exclude.c index ffe55b167..1a5de3b9e 100644 --- a/exclude.c +++ b/exclude.c @@ -720,7 +720,8 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, parent_dirscan = True; while (*y) { char save[MAXPATHLEN]; -		strlcpy(save, y, MAXPATHLEN); +		/* copylen is strlen(y) which is < MAXPATHLEN. +1 for 0 */ +		size_t copylen = strlcpy(save, y, MAXPATHLEN) + 1; *y = '0'; dirbuf_len = y - dirbuf; strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); @@ -734,7 +735,7 @@ static BOOL setup_merge_file(int mergelist_num, filter_rule *ex, lp->head = NULL; } lp->tail = NULL; -		strlcpy(y, save, MAXPATHLEN); +		strlcpy(y, save, copylen); while ((*x++ = *y++) != '/') {} } parent_dirscan = False; </del>
stdenv.mkDerivation (finalAttrs: { pname = "calibre"; <del> version = "7.8.0"; </del> <ins> version = "7.9.0"; </ins> src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; <del> hash = "sha256-FxYuQzzuaWZihSsmeJc6ssG3VBr2YNEi3TkXyyymLUQ="; </del> <ins> hash = "sha256-Ilzv4HXW6ZmEVNUWQm04cHZ71FEgjfWVX9IvrfYCHIk="; </ins> }; patches = [
(fetchpatch { name = "0001-only-plugin-update.patch"; url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch"; <del> hash = "sha256-uL1mSjgCl5ZRLbSuKxJM6XTfvVwog70F7vgKtQzQNEQ="; </del> <ins> hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8="; </ins> }) (fetchpatch { name = "0007-Hardening-Qt-code.patch";
# THIS IS A GENERATED FILE.  DO NOT EDIT! xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, testers }: stdenv.mkDerivation (finalAttrs: { pname = "xorg-server"; <del> version = "21.1.12"; </del> <ins> version = "21.1.13"; </ins> builder = ./builder.sh; src = fetchurl { <del> url = "mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz"; sha256 = "03x954bygi6sdynk5yy3yvsfhg6i9gjhisn3x9jxvk5mw4mnw08y"; </del> <ins> url = "mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz"; sha256 = "033lvjihidc68v08izrr63va8jhkfmzcjg0d6rm26wizjkah4nml"; </ins> }; hardeningDisable = [ "bindnow" "relro" ]; strictDeps = true;
mirror://xorg/individual/util/makedepend-1.0.9.tar.xz mirror://xorg/individual/util/util-macros-1.20.0.tar.xz mirror://xorg/individual/util/xorg-cf-files-1.0.8.tar.xz <del> mirror://xorg/individual/xserver/xorg-server-21.1.12.tar.xz </del> <ins> mirror://xorg/individual/xserver/xorg-server-21.1.13.tar.xz </ins>
stdenv.mkDerivation rec { pname = "binaryen"; <del> version = "117"; </del> <ins> version = "118"; </ins> src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; <del> hash = "sha256-QYJkrvwcUWbFV5oQdP11JuVmfOTYaFWGQGksboQ1d58="; </del> <ins> hash = "sha256-akMW3S2/qUyLK8F77EtnaXPDXvIMpkGfNB2jOD6hQho="; </ins> }; nativeBuildInputs = [ cmake python3 ];
name = "emscripten-node-modules-${version}"; inherit pname version src; <del> npmDepsHash = "sha256-7tZEZ7NN1jJBHa9G5sRz/ZpWJvgnTJj4i5EvQMsGQH4="; </del> <ins> npmDepsHash = "sha256-2dsIuB6P+Z3wflIsn6QaZvjHeHHGzsFAI3GcP3SfiP4="; </ins> dontBuild = true;
src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; <del> hash = "sha256-3SqbkXI8xn4Zj3bDLCegxslYH5m/PkF6n/pPfm5z5VA="; </del> <ins> hash = "sha256-AbO1b4pxZ7I6n1dRzxhLC7DnXIUnaCK9SbLy96Qxqr0="; </ins> rev = version; };
patchShebangs . <del> # emscripten 3.1.55 requires LLVM tip-of-tree instead of LLVM 18 sed -i -e "s/EXPECTED_LLVM_VERSION = 19/EXPECTED_LLVM_VERSION = 18/g" tools/shared.py </del> # fixes cmake support sed -i -e "s/print ('emcc (Emscript.*)/sys.stderr.write(1); sys.stderr.flush()/g" emcc.py
easeprobe = callPackage ../tools/misc/easeprobe { }; emscripten = callPackage ../development/compilers/emscripten { <del> llvmPackages = llvmPackages_18; </del> <ins> llvmPackages = llvmPackages_git; </ins> }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
githubId = 887072; name = "Alexander Lebedev"; }; <ins> lebensterben = { name = "Lucius Hu"; github = "lebensterben"; githubId = 1222865; keys = [{ fingerprint = "80C6 77F2 ED0B E732 3835 A8D3 7E47 4E82 E29B 5A7A"; }]; }; </ins> lecoqjacob = { name = "Jacob LeCoq"; email = "lecoqjacob@gmail.com";
<ins> { stdenvNoCC , fetchurl , lib }: stdenvNoCC.mkDerivation rec { pname = "lxgw-wenkai-tc"; version = "1.330"; src = fetchurl { url = "https://github.com/lxgw/LxgwWenKaiTC/releases/download/v${version}/${pname}-v${version}.tar.gz"; hash = "sha256-qpX5shH1HbGMa287u/R1rMFgQeAUC0wwKFVD+QSTyho="; }; installPhase = '' runHook preInstall mkdir -p $out/share/fonts/truetype mv *.ttf $out/share/fonts/truetype runHook postInstall ''; meta = with lib; { homepage = "https://github.com/lxgw/LxgwWenKaiTC"; description = "The Traditional Chinese Edition of LXGW WenKai."; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ lebensterben ]; }; } </ins>
lib.checkListOfEnum "${pname}: size variants" [ "standard" "compact" ] sizeVariants lib.checkListOfEnum "${pname}: tweaks" [ "solid" "float" "round" "blur" "noborder" "square" ] tweaks <del> stdenvNoCC.mkDerivation rec { </del> <ins> stdenvNoCC.mkDerivation (finalAttrs: { </ins> inherit pname; <del> version = "2023-06-20"; </del> <ins> version = "2024-04-28"; </ins> src = fetchFromGitHub { owner = "vinceliuice"; <del> repo = pname; rev = version; hash = "sha256-hUXlzLdcWeOHEJx3+vCMpxvJst6Rr8ISvlzlsUgCrhg="; </del> <ins> repo = "fluent-gtk-theme"; rev = finalAttrs.version; hash = "sha256-0zf3fHtWcrbT26jgwgsPEDDhBWErOkgXyvGwSWV8rGs="; </ins> }; nativeBuildInputs = [
passthru.updateScript = gitUpdater { }; <del> meta = with lib; { </del> <ins> meta = { </ins> description = "Fluent design gtk theme"; homepage = "https://github.com/vinceliuice/Fluent-gtk-theme"; <del> license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; </del> <ins> license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ romildo ]; </ins> }; <del> } </del> <ins> }) </ins>
in stdenv'.mkDerivation (finalAttrs: { pname = "fastfetch"; <del> version = "2.11.0"; </del> <ins> version = "2.11.3"; </ins> src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; <del> hash = "sha256-/j0dRnApP5PQV4qVkqM6WlFdSZHlBTheaoWXSd2YP5k="; </del> <ins> hash = "sha256-kKtJvGnPncosmwjfTKa14G5jQiSkzkURBATvBmavdys="; </ins> }; outputs = [ "out" "man" ];
(lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) (lib.cmakeBool "ENABLE_XFCONF" (x11Support && (!stdenv.isDarwin))) (lib.cmakeBool "ENABLE_XRANDR" x11Support) <ins> ] ++ lib.optionals stdenv.isLinux [ (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") </ins> ]; postInstall = ''
}; vendorHash = "sha256-pYeHqYd2cCOVQlD1r2lh//KC+732H0lj1fPDBr+W8qA="; <del> patches = [ # Reverts "cmd/tailscaled/tailscaled.service: revert recent hardening" (fetchpatch { url = "https://github.com/tailscale/tailscale/commit/2889fabaefc50040507ead652d6d2b212f476c2b.patch"; hash = "sha256-DPBrv7kjSVXhmptUGGzOkaP4iXi/Bym3lvqy4otL9HE="; revert = true; }) ]; </del> nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; CGO_ENABLED = 0;
<del> { lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops, vault }: </del> <ins> { lib, stdenv, fetchFromGitHub, makeWrapper, coreutils, findutils, getopt, gnugrep, gnused, sops }: </ins> stdenv.mkDerivation rec { pname = "helm-secrets";
install -m644 -Dt $out/${pname} plugin.yaml cp -r scripts/* $out/${pname}/scripts wrapProgram $out/${pname}/scripts/run.sh  <del> --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops vault ]} </del> <ins> --prefix PATH : ${lib.makeBinPath [ coreutils findutils getopt gnugrep gnused sops ]} </ins> runHook postInstall '';
"-X github.com/notaryproject/notation/internal/version.BuildMetadata=" ]; <ins> postInstall = '' installShellCompletion --cmd notation  --bash <($out/bin/notation completion bash)  --fish <($out/bin/notation completion fish)  --zsh <($out/bin/notation completion zsh) ''; </ins> passthru.tests.version = testers.testVersion { package = notation; command = "notation version";
<del> { lib , buildGoModule , fetchFromGitHub }: buildGoModule rec { pname = "kcl-cli"; version = "0.8.9"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; hash = "sha256-slU3n7YCV5VfvXArzlcITb9epdu/gyXlAWq9KLjGdJA="; }; vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; ldflags = [ "-X=kcl-lang.io/cli/pkg/version.version=${version}" ]; subPackages = [ "cmd/kcl" ]; meta = with lib; { description = "Command line interface for KCL programming language"; homepage = "https://github.com/kcl-lang/cli"; license = licenses.asl20; maintainers = with maintainers; [ peefy ]; mainProgram = "kcl"; }; } </del>
<ins> { lib , buildGoModule , fetchFromGitHub , kclvm_cli , kclvm , makeWrapper , installShellFiles , }: buildGoModule rec { pname = "kcl"; version = "0.8.9"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${version}"; hash = "sha256-slU3n7YCV5VfvXArzlcITb9epdu/gyXlAWq9KLjGdJA="; }; vendorHash = "sha256-Xv8Tfq9Kb1xGFCWZQwBFDX9xZW9j99td/DUb7jBtkpE="; ldflags = [ "-w -s" "-X=kcl-lang.io/cli/pkg/version.version=v${version}" ]; nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = [ kclvm kclvm_cli ]; subPackages = [ "cmd/kcl" ]; # env vars https://github.com/kcl-lang/kcl-go/blob/main/pkg/env/env.go#L29 postFixup = '' wrapProgram $out/bin/kcl  --set PATH ${lib.makeBinPath [kclvm_cli]}  --set KCL_LIB_HOME ${lib.makeLibraryPath [kclvm]}  --set KCL_GO_DISABLE_INSTALL_ARTIFACT false  ''; postInstall = '' installShellCompletion --cmd kcl  --bash <($out/bin/kcl completion bash)  --fish <($out/bin/kcl completion fish)  --zsh <($out/bin/kcl completion zsh) ''; meta = with lib; { description = "A command line interface for KCL programming language"; homepage = "https://github.com/kcl-lang/cli"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ selfuryon peefy ]; mainProgram = "kcl"; }; } </ins>
<ins> diff --git a/api/build.rs b/api/build.rs index 617c1b9a..20d728e3 100644 --- a/api/build.rs +++ b/api/build.rs @@ -5,10 +5,10 @@ use prost_wkt_build::{FileDescriptorSet, Message}; /// According to the file kclvm/spec/gpyrpc/gpyrpc.proto, automatically generate /// the corresponding rust source file to the directory src/model fn main() { -    std::env::set_var( -        "PROTOC", -        protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), -    ); +    // std::env::set_var( +    //     "PROTOC", +    //     protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +    // ); let out = PathBuf::from(env::var("OUT_DIR").unwrap()); let descriptor_file = out.join("kclvm_service_descriptor.bin"); diff --git b/third-party/prost-wkt/wkt-types/build.rs a/third-party/prost-wkt/wkt-types/build.rs index e49222d5..a933ddf4 100644 --- a/third-party/prost-wkt/wkt-types/build.rs +++ b/third-party/prost-wkt/wkt-types/build.rs @@ -13,10 +13,10 @@ use regex::Regex; fn main() { //hack: set protoc_bin_vendored::protoc_bin_path() to PROTOC -    std::env::set_var( -        "PROTOC", -        protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), -    ); +    // std::env::set_var( +    //     "PROTOC", +    //     protoc_bin_vendored::protoc_bin_path().unwrap().as_os_str(), +    // ); let dir = PathBuf::from(env::var("OUT_DIR").unwrap()); process_prost_pbtime(&dir); </ins>
<ins> { lib , rustPlatform , fetchFromGitHub , protobuf , pkg-config , }: rustPlatform.buildRustPackage rec { pname = "kclvm"; version = "0.8.7"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; }; sourceRoot = "source/kclvm"; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "inkwell-0.2.0" = "sha256-JxSlhShb3JPhsXK8nGFi2uGPp8XqZUSiqniLBrhr+sM="; }; }; nativeBuildInputs = [ pkg-config protobuf ]; patches = [ ./enable_protoc_env.patch ]; PROTOC = "${protobuf}/bin/protoc"; PROTOC_INCLUDE = "${protobuf}/include"; meta = with lib; { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ selfuryon peefy ]; }; } </ins>
<ins> --- /dev/null	2024-03-29 17:01:59.989114590 +0100 +++ cli/Cargo.lock	2024-04-17 13:27:32.243365234 +0200 @@ -0,0 +1,7 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "kclvm_cli" +version = "0.8.7" </ins>
<ins> { lib , rustPlatform , fetchFromGitHub , kclvm }: rustPlatform.buildRustPackage rec { pname = "kclvm_cli"; version = "0.8.7"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "kcl"; rev = "v${version}"; hash = "sha256-ieGpuNkzT6AODZYUcEanb7Jpb+PXclnQ9KkdmlehK0o="; }; sourceRoot = "source/cli"; cargoLock.lockFile = ./Cargo.lock; cargoPatches = [ ./cargo_lock.patch ]; buildInputs = [ kclvm ]; meta = with lib; { description = "A high-performance implementation of KCL written in Rust that uses LLVM as the compiler backend"; homepage = "https://github.com/kcl-lang/kcl"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ selfuryon peefy ]; mainProgram = "kclvm_cli"; }; } </ins>
srcs = { emoji-sequences = fetchData { suffix = "sequences"; <del> hash = "sha256-XCIi2KQy2JagMaaML1SwT79HsPzi5phT8euKPpRetW0="; </del> <ins> hash = "sha256-63LJEV41BPu+HIYhthn4eUcaRszFbi9EVBe3wcrQUNE="; </ins> }; emoji-test = fetchData { suffix = "test"; <del> hash = "sha256-hEXyOsg4jglr4Z0CYuFPzv+Fb/Ugk/I1bciUhfGoU9s="; </del> <ins> hash = "sha256-2HbuJJqijqp2z6bfqnAoR6jROwYqpIjUZdA5XugTftk="; </ins> }; emoji-zwj-sequences = fetchData { suffix = "zwj-sequences"; <del> hash = "sha256-/jV/kRe3dGZ2Bjdl1YcTft+bJZA6eSvVSTW/CFZ5EYI="; </del> <ins> hash = "sha256-mnagPcrPzY+b/gjEnI2QtVGCuXfLzIemlOioGT77Dlc="; </ins> }; }; in
}: let pname = "feishin"; <del> version = "0.6.1"; </del> <ins> version = "0.7.1"; </ins> src = fetchFromGitHub { owner = "jeffvli"; repo = pname; rev = "v${version}"; <del> hash = "sha256-Nj8GwrH49ph14xvJldj5GQR4mlt9unCPEcgLrsH/sx8="; </del> <ins> hash = "sha256-eNGHrSF/MgRHh0CVc0l8denZIbAnPXwFCZJZcvF+Xtc="; </ins> }; electron = electron_27;
inherit pname version; inherit src; <del> npmDepsHash = "sha256-+pr9fWg/9kxkYMmthtqhjgF6MOomSQxVCO5V8tHHRdE="; </del> <ins> npmDepsHash = "sha256-7oh5bl5APAvzb/TxHMUP/saRWLwuP9xqGvn7/RDhFk8="; </ins> npmFlags = [ "--legacy-peer-deps" ]; makeCacheWritable = true;
inherit version; src = "${src}/release/app"; <del> npmDepsHash = "sha256-MRwKxe1hoFs5bPXT6K/UspSDs9XBdcRJGvxGlTKExp4="; </del> <ins> npmDepsHash = "sha256-NgWPr3mctn7f6X2JFsbdNNHkN84RRlLAywqfbyahCQw="; </ins> npmFlags = [ "--ignore-scripts" ]; dontNpmBuild = true;