From 16811f8690a8f54dd43f1afe12569f7a4790d0b4 Mon Sep 17 00:00:00 2001 From: jacobi petrucciani <8117202+jpetrucciani@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:20:59 -0400 Subject: [PATCH] automatic update (#1660) * automatic update * remove tenere * update vercel-log-drain deps * remove parseable * more tweaks --- flake.lock | 54 +++++++++++----------- mods/hax.nix | 4 -- pkgs/ai/README.md | 4 -- pkgs/ai/tenere.nix | 52 --------------------- pkgs/server/README.md | 4 -- pkgs/server/parseable.nix | 77 -------------------------------- pkgs/server/vercel-log-drain.nix | 6 +-- 7 files changed, 30 insertions(+), 171 deletions(-) delete mode 100644 pkgs/ai/tenere.nix delete mode 100644 pkgs/server/parseable.nix diff --git a/flake.lock b/flake.lock index 305d996ea..bd00eef51 100644 --- a/flake.lock +++ b/flake.lock @@ -387,11 +387,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -414,11 +414,11 @@ ] }, "locked": { - "lastModified": 1723619988, - "narHash": "sha256-P0BnlOSK76Tny+bPcxnU4Q7uH+BZeWmD62PvpyO5Am4=", + "lastModified": 1724092518, + "narHash": "sha256-QLmW6l6TrT5JDJ5vRHe5W9Cxvv68QAPiVf0a1iKqR2w=", "owner": "kwbauson", "repo": "cfg", - "rev": "92dcf068577f64cafe44960060088e03cb1b61f8", + "rev": "e299d660ab93f6f58e65ec37efb6eca90c8b2f78", "type": "github" }, "original": { @@ -478,11 +478,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixlib": { "locked": { - "lastModified": 1722732880, - "narHash": "sha256-do2Mfm3T6SR7a5A804RhjQ+JTsF5hk4JTPGjCTRM/m8=", + "lastModified": 1723942470, + "narHash": "sha256-QdSArN0xKESEOTcv+3kE6yu4B4WX9lupZ4+Htx3RXGg=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "8bebd4c74f368aacb047f0141db09ec6b339733c", + "rev": "531a2e8416a6d8200a53eddfbdb8f2c8dc4a1251", "type": "github" }, "original": { @@ -619,11 +619,11 @@ ] }, "locked": { - "lastModified": 1723444610, - "narHash": "sha256-WzhuUR2ZwafNzBh0VAbk3+320xd2sNWdZdjZa0S9ydY=", + "lastModified": 1724028932, + "narHash": "sha256-U11ZiQPrpIBdv7oS23bNdX9GCxe/hPf/ARr64P2Wj1Y=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "a220fc3a6e144f12f0c3dc3e4d01d44c2e6b0b85", + "rev": "5fd22603892e4ec5ac6085058ed658243143aacd", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1723310128, - "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", + "lastModified": 1724067415, + "narHash": "sha256-WJBAEFXAtA41RMpK8mvw0cQ62CJkNMBtzcEeNIJV7b0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", + "rev": "b09c46430ffcf18d575acf5c339b38ac4e1db5d2", "type": "github" }, "original": { @@ -655,11 +655,11 @@ ] }, "locked": { - "lastModified": 1723124175, - "narHash": "sha256-w+rlZdbj4kn70uPJl4WrPDFoGEy0A9oJqw684nvZ9dY=", + "lastModified": 1724065442, + "narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "be1a6b2e4ddc34b9b6a297e7df2f2a2ecee24690", + "rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2", "type": "github" }, "original": { @@ -763,11 +763,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1723362943, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -847,11 +847,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723512448, - "narHash": "sha256-VSTtxGKre1p6zd6ACuBmfDcR+BT9+ml8Y3KrSbfGFYU=", + "lastModified": 1724134185, + "narHash": "sha256-nDqpGjz7cq3ThdC98BPe1ANCNlsJds/LLZ3/MdIXjA0=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "ed52f844c4dd04dde45550c3189529854384124e", + "rev": "5ee730a8752264e463c0eaf06cc060fd07f6dae9", "type": "github" }, "original": { diff --git a/mods/hax.nix b/mods/hax.nix index 376aed493..493d6cd0c 100644 --- a/mods/hax.nix +++ b/mods/hax.nix @@ -207,10 +207,6 @@ final: prev: tabulate beautifulsoup4 - # api - fastapi - uvicorn - # data numpy pandas diff --git a/pkgs/ai/README.md b/pkgs/ai/README.md index 4f3f4e7b5..70ead0c36 100644 --- a/pkgs/ai/README.md +++ b/pkgs/ai/README.md @@ -30,10 +30,6 @@ This directory contains packages that are related to the new wave of AI/LLM popu [`stable-diffusion.cpp`](https://github.com/leejet/stable-diffusion.cpp) is a port of stable-diffusion model inference in C/C+ -### [tenere.nix](./tenere.nix) - -[tenere](https://github.com/pythops/tenere) is a TUI interface for LLMs - ### [whisper-cpp.nix](./whisper-cpp.nix) [`whisper.cpp`](https://github.com/ggerganov/whisper.cpp) is a port of [OpenAI's Whisper](https://openai.com/research/whisperg) model in C/C++ diff --git a/pkgs/ai/tenere.nix b/pkgs/ai/tenere.nix deleted file mode 100644 index 2bc44753d..000000000 --- a/pkgs/ai/tenere.nix +++ /dev/null @@ -1,52 +0,0 @@ -# [tenere](https://github.com/pythops/tenere) is a TUI interface for LLMs -{ lib -, rustPlatform -, fetchFromGitHub -, pkg-config -, libgit2 -, oniguruma -, zlib -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "tenere"; - version = "0.11.1"; - - src = fetchFromGitHub { - owner = "pythops"; - repo = "tenere"; - rev = "v${version}"; - hash = "sha256-uvv7URcdpKBUc04LsEigjt7iQhiEgiglBP5iwH6bQRI="; - }; - - cargoHash = "sha256-mz/lRh5+GWQrU7w2P4J3KV9Fz8rvc14JswPKO5UxrIs="; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - libgit2 - oniguruma - zlib - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.AppKit - darwin.apple_sdk.frameworks.CoreGraphics - darwin.apple_sdk.frameworks.Security - ]; - - env = { - RUSTONIG_SYSTEM_LIBONIG = true; - }; - - meta = with lib; { - description = "TUI interface for LLMs written in Rust"; - homepage = "https://github.com/pythops/tenere"; - changelog = "https://github.com/pythops/tenere/blob/${src.rev}/CHANGELOG.md"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ jpetrucciani ]; - mainProgram = "tenere"; - }; -} diff --git a/pkgs/server/README.md b/pkgs/server/README.md index aa9d77a5e..e69aaf20f 100644 --- a/pkgs/server/README.md +++ b/pkgs/server/README.md @@ -22,10 +22,6 @@ This directory contains specific servers [obligator](https://github.com/anderspitman/obligator) is an OIDC server designed for self-hosters -### [parseable.nix](./parseable.nix) - -[parseable](https://github.com/parseablehq/parseable) is a log analytics system written in Rust - ### [poglets.nix](./poglets.nix) [poglets](https://github.com/jpetrucciani/poglets) is a TCP tunneling system diff --git a/pkgs/server/parseable.nix b/pkgs/server/parseable.nix deleted file mode 100644 index 90b3b6fcd..000000000 --- a/pkgs/server/parseable.nix +++ /dev/null @@ -1,77 +0,0 @@ -# [parseable](https://github.com/parseablehq/parseable) is a log analytics system written in Rust -{ lib -, rustPlatform -, stdenvNoCC -, fetchFromGitHub -, pkg-config -, bzip2 -, openssl -, xz -, zstd -, stdenv -, unzip -, darwin -}: -let - frontend = - let - pname = "parseable-frontend"; - version = "0.2.4"; - in - stdenvNoCC.mkDerivation rec { - inherit pname version; - src = builtins.fetchurl { - url = "https://github.com/parseablehq/console/releases/download/v${version}/build.zip"; - sha256 = "1i4nhz2knzm0x1crmixpcigs2gzcc48x3b1zzssmsqn7lab9vjcq"; - }; - dontConfigure = true; - dontBuild = true; - unpackPhase = '' - ${unzip}/bin/unzip ${src} - ''; - installPhase = '' - mkdir -p $out - cp -r . $out - ''; - }; -in -rustPlatform.buildRustPackage rec { - pname = "parseable"; - version = "0.6.2"; - - src = fetchFromGitHub { - owner = "parseablehq"; - repo = "parseable"; - rev = "v${version}"; - hash = "sha256-Gjx/2LNoeTcLNf0kXmEdQ6O8WB53jic8KhV72h9Fd6A="; - }; - - cargoHash = "sha256-86j2LzRnmY6KRsfnF4trZoSmnibwbGxFA9U2b++mml4="; - - LOCAL_ASSETS_PATH = "${frontend}/dist"; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - bzip2 - openssl - xz - zstd - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - darwin.apple_sdk.frameworks.Security - ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - meta = with lib; { - description = "Log analytics system written in Rust. It is built for high throughput log ingestion cases"; - homepage = "https://github.com/parseablehq/parseable"; - license = licenses.agpl3Only; - maintainers = with maintainers; [ jpetrucciani ]; - }; -} diff --git a/pkgs/server/vercel-log-drain.nix b/pkgs/server/vercel-log-drain.nix index d37b35891..5b12d0079 100644 --- a/pkgs/server/vercel-log-drain.nix +++ b/pkgs/server/vercel-log-drain.nix @@ -22,11 +22,11 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "dacbd"; repo = "vercel-log-drain"; - rev = "df4ddace599e9a8c2ac57c27cbb9e39e0c7c52ee"; - hash = "sha256-AmKYPmJ5GCbLu+LB3uObagHjIg2ahsg6kmBWLVF3ACw="; + rev = "04d002ce54dba769316f649185468de4cf1f7d81"; + hash = "sha256-NkSU8tCuHdS6UXyeSuYjLMDLC7aARon+bfERWdkQz9I="; }; - cargoHash = "sha256-v/GxeBmR6qhUna3PjZhi9wAEwdmC1t7m6ysfNJ/pfyU="; + cargoHash = "sha256-ACwAfTZVyl28N14sJuxSRoKj7LvEtKf/i81kEVCMfyc="; nativeBuildInputs = [ pkg-config