diff options
author | Ben Sima <ben@bsima.me> | 2024-11-15 14:55:37 -0500 |
---|---|---|
committer | Ben Sima <ben@bsima.me> | 2024-12-21 10:06:49 -0500 |
commit | 6513755670892983db88a6633b8c1ea6019c03d1 (patch) | |
tree | 44e9eccdb7a3a74ab7e96a8fee7572dd6a78dc73 /Biz/Bild/Deps | |
parent | ae7b7e0186b5f2e0dcd4d5fac0a71fa264caedc2 (diff) |
Re-namespace some stuff to Omni
I was getting confused about what is a product and what is internal
infrastructure; I think it is good to keep those things separate. So I moved a
bunch of stuff to an Omni namespace, actually most stuff went there. Only things
that are explicitly external products are still in the Biz namespace.
Diffstat (limited to 'Biz/Bild/Deps')
-rw-r--r-- | Biz/Bild/Deps/C.nix | 1 | ||||
-rw-r--r-- | Biz/Bild/Deps/Haskell.nix | 72 | ||||
-rw-r--r-- | Biz/Bild/Deps/Python.nix | 1 | ||||
-rw-r--r-- | Biz/Bild/Deps/accelerate.nix | 16 | ||||
-rw-r--r-- | Biz/Bild/Deps/bitsandbytes.nix | 86 | ||||
-rw-r--r-- | Biz/Bild/Deps/guile-opengl.nix | 32 | ||||
-rw-r--r-- | Biz/Bild/Deps/inspekt3d.nix | 30 | ||||
-rw-r--r-- | Biz/Bild/Deps/interegular.nix | 21 | ||||
-rw-r--r-- | Biz/Bild/Deps/lion-pytorch.nix | 27 | ||||
-rw-r--r-- | Biz/Bild/Deps/llm-ollama.nix | 40 | ||||
-rw-r--r-- | Biz/Bild/Deps/llm-sentence-transformers.nix | 42 | ||||
-rw-r--r-- | Biz/Bild/Deps/nostr-rs-relay.nix | 19 | ||||
-rw-r--r-- | Biz/Bild/Deps/outlines.nix | 34 | ||||
-rw-r--r-- | Biz/Bild/Deps/perscache.nix | 25 |
14 files changed, 0 insertions, 446 deletions
diff --git a/Biz/Bild/Deps/C.nix b/Biz/Bild/Deps/C.nix deleted file mode 100644 index 3f670cd..0000000 --- a/Biz/Bild/Deps/C.nix +++ /dev/null @@ -1 +0,0 @@ -[ "libsodium" ] diff --git a/Biz/Bild/Deps/Haskell.nix b/Biz/Bild/Deps/Haskell.nix deleted file mode 100644 index 04f3a74..0000000 --- a/Biz/Bild/Deps/Haskell.nix +++ /dev/null @@ -1,72 +0,0 @@ -# This is the global set of Haskell packages which gets deployed to Hoogle, and -# is available for selecting. - -[ - "MonadRandom" - "QuickCheck" - "SafeSemaphore" - "acid-state" - "aeson" - "async" - "base" - "bytestring" - "clay" - "cmark" - "cmark-lucid" - "conduit" - "conduit-extra" - "config-ini" - "containers" - "directory" - "docopt" - "envy" - "fast-logger" - "filepath" - "github" - "haskeline" - "hostname" - "http-types" - "ixset" - "katip" - "lucid" - "monad-logger" - "mtl" - "neat-interpolation" - "network-uri" - "niv" - "optparse-simple" - "parsec" - "process" - "protolude" - "quickcheck-instances" - "rainbow" - "random" - "regex-applicative" - "req" - "safecopy" - "saltine" - "servant" - "servant-auth" - "servant-auth-server" - "servant-lucid" - "servant-server" - "split" - "stm" - "tasty" - "tasty-hunit" - "tasty-quickcheck" - "text" - "time" - "transformers" - "unagi-chan" - "unix" - "unordered-containers" - "uuid" - "vector" - "wai" - "wai-app-static" - "wai-extra" - "wai-middleware-metrics" - "warp" - "x509" -] diff --git a/Biz/Bild/Deps/Python.nix b/Biz/Bild/Deps/Python.nix deleted file mode 100644 index b0b2465..0000000 --- a/Biz/Bild/Deps/Python.nix +++ /dev/null @@ -1 +0,0 @@ -[ "cryptography" "llm" "mypy" "nltk" "slixmpp" ] diff --git a/Biz/Bild/Deps/accelerate.nix b/Biz/Bild/Deps/accelerate.nix deleted file mode 100644 index be1d2fd..0000000 --- a/Biz/Bild/Deps/accelerate.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ fetchFromGitHub, buildPythonPackage, numpy, packaging, psutil, pyyaml, torch -}: - -buildPythonPackage rec { - name = "accelerate"; - version = "0.15.0"; - propagatedBuildInputs = [ numpy packaging psutil pyyaml torch ]; - doCheck = false; - src = fetchFromGitHub { - owner = "huggingface"; - repo = "accelerate"; - rev = "v${version}"; - sha256 = "sha256-agfbOaa+Nm10HZkd2Y7zR3R37n+vLNsxCyxZax6O3Lo="; - }; -} - diff --git a/Biz/Bild/Deps/bitsandbytes.nix b/Biz/Bild/Deps/bitsandbytes.nix deleted file mode 100644 index eb32aac..0000000 --- a/Biz/Bild/Deps/bitsandbytes.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, pythonOlder, pytestCheckHook -, setuptools, torch, einops, lion-pytorch, scipy, symlinkJoin }: - -let - pname = "bitsandbytes"; - version = "0.38.0"; - - inherit (torch) cudaPackages cudaSupport; - inherit (cudaPackages) cudaVersion; - - # NOTE: torchvision doesn't use cudnn; torch does! - # For this reason it is not included. - cuda-common-redist = with cudaPackages; [ - cuda_cccl # <thrust/*> - libcublas # cublas_v2.h - libcurand - libcusolver # cusolverDn.h - libcusparse # cusparse.h - ]; - - cuda-native-redist = symlinkJoin { - name = "cuda-native-redist-${cudaVersion}"; - paths = with cudaPackages; - [ - cuda_cudart # cuda_runtime.h cuda_runtime_api.h - cuda_nvcc - ] ++ cuda-common-redist; - }; - - cuda-redist = symlinkJoin { - name = "cuda-redist-${cudaVersion}"; - paths = cuda-common-redist; - }; - -in buildPythonPackage { - inherit pname version; - format = "pyproject"; - - disabled = pythonOlder "3.7"; - - src = fetchFromGitHub { - owner = "TimDettmers"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-gGlbzTDvZNo4MhcYzLvWuB2ec7q+Qt5/LtTbJ0Rc+Kk="; - }; - - postPatch = '' - substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib" - substituteInPlace bitsandbytes/cuda_setup/main.py \ - --replace "binary_path = package_dir / binary_name" \ - "binary_path = Path('$out/${python.sitePackages}/${pname}')/binary_name" - '' + lib.optionalString torch.cudaSupport '' - substituteInPlace bitsandbytes/cuda_setup/main.py \ - --replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib" - ''; - - CUDA_HOME = "${cuda-native-redist}"; - - preBuild = if torch.cudaSupport then - with torch.cudaPackages; - let - cudaVersion = lib.concatStrings - (lib.splitVersion torch.cudaPackages.cudaMajorMinorVersion); - in "make CUDA_VERSION=${cudaVersion} cuda${cudaMajorVersion}x" - else - "make CUDA_VERSION=CPU cpuonly"; - - nativeBuildInputs = [ setuptools ] - ++ lib.optionals torch.cudaSupport [ cuda-native-redist ]; - buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ]; - - propagatedBuildInputs = [ torch ]; - - doCheck = false; # tests require CUDA and also GPU access - nativeCheckInputs = [ pytestCheckHook einops lion-pytorch scipy ]; - - pythonImportsCheck = [ "bitsandbytes" ]; - - meta = with lib; { - homepage = "https://github.com/TimDettmers/bitsandbytes"; - description = "8-bit CUDA functions for PyTorch"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; - }; -} diff --git a/Biz/Bild/Deps/guile-opengl.nix b/Biz/Bild/Deps/guile-opengl.nix deleted file mode 100644 index af01082..0000000 --- a/Biz/Bild/Deps/guile-opengl.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchurl, pkg-config, guile, libGL, libGLU, freeglut }: - -let - name = "guile-opengl-${version}"; - version = "0.1.0"; -in stdenv.mkDerivation { - inherit name; - - src = fetchurl { - url = "mirror://gnu/guile-opengl/${name}.tar.gz"; - sha256 = "13qfx4xh8baryxqrv986l848ygd0piqwm6s2s90pxk9c0m9vklim"; - }; - - patchPhase = '' - substituteInPlace glx/runtime.scm \ - --replace '(dynamic-link "libGL")' '(dynamic-link "${libGL}/lib/libGL.so")' - substituteInPlace glu/runtime.scm \ - --replace '(dynamic-link "libGLU")' '(dynamic-link "${libGLU}/lib/libGLU.so")' - substituteInPlace glut/runtime.scm \ - --replace '(dynamic-link "libglut")' '(dynamic-link "${freeglut}/lib/libglut.so")' - ''; - - nativeBuildInputs = [ pkg-config guile libGL libGLU freeglut ]; - - meta = with lib; { - description = "Guile bindings for the OpenGL graphics API"; - homepage = "https://www.gnu.org/software/guile-opengl/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ vyp ]; - platforms = platforms.all; - }; -} diff --git a/Biz/Bild/Deps/inspekt3d.nix b/Biz/Bild/Deps/inspekt3d.nix deleted file mode 100644 index 3146350..0000000 --- a/Biz/Bild/Deps/inspekt3d.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, lib, autoreconfHook, pkg-config, guile, guile-opengl, mesa -, glibcLocales, libfive, sources }: - -stdenv.mkDerivation { - name = "inspekt3d-unstable"; - - src = sources.inspekt3d; - version = "unstable-2018-10-17"; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - buildInputs = [ guile glibcLocales mesa ]; - propagatedBuildInputs = [ guile-opengl libfive ]; - - preBuild = '' - substituteInPlace inspekt3d/library.scm \ - --replace '"libfive-guile"' '"${libfive}/lib/libfive-guile.so"' \ - --replace '"libfive"' '"${libfive}/lib/libfive.so"' - ''; - - GUILE_AUTO_COMPILE = 0; - preConfigure = "./bootstrap"; - - meta = with lib; { - description = "Lightweight 3D viewer for Libfive written in Guile Scheme"; - homepage = "https://sr.ht/~morgansmith/inspekt3d"; - license = licenses.gpl3; - maintainers = with maintainers; [ bsima ]; - platforms = platforms.all; - }; -} diff --git a/Biz/Bild/Deps/interegular.nix b/Biz/Bild/Deps/interegular.nix deleted file mode 100644 index 24065d8..0000000 --- a/Biz/Bild/Deps/interegular.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ lib, sources, buildPythonPackage }: - -buildPythonPackage rec { - pname = "interegular"; - version = sources.interegular.rev; - format = "setuptools"; - - src = sources.interegular; - - propagatedBuildInputs = [ ]; - - doCheck = false; # no tests currently - pythonImportsCheck = [ "interegular" ]; - - meta = with lib; { - description = "Allows to check regexes for overlaps."; - homepage = "https://github.com/MegaIng/interegular"; - license = licenses.mit; - maintainers = with maintainers; [ bsima ]; - }; -} diff --git a/Biz/Bild/Deps/lion-pytorch.nix b/Biz/Bild/Deps/lion-pytorch.nix deleted file mode 100644 index 7b06e78..0000000 --- a/Biz/Bild/Deps/lion-pytorch.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib, buildPythonPackage, pythonOlder, fetchFromGitHub, torch }: - -buildPythonPackage rec { - pname = "lion-pytorch"; - version = "0.1.2"; - format = "setuptools"; - disabled = pythonOlder "3.6"; - - src = fetchFromGitHub { - owner = "lucidrains"; - repo = "lion-pytorch"; - rev = "refs/tags/${version}"; - hash = "sha256-9hdpRJvCpv3PeC7f0IXpHt6i+e6LiT0QUl5jeDGelQE="; - }; - - propagatedBuildInputs = [ torch ]; - - pythonImportsCheck = [ "lion_pytorch" ]; - doCheck = false; # no tests currently - - meta = with lib; { - description = "Optimizer tuned by Google Brain using genetic algorithms"; - homepage = "https://github.com/lucidrains/lion-pytorch"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; - }; -} diff --git a/Biz/Bild/Deps/llm-ollama.nix b/Biz/Bild/Deps/llm-ollama.nix deleted file mode 100644 index e2b6a66..0000000 --- a/Biz/Bild/Deps/llm-ollama.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ buildPythonPackage, fetchFromGitHub, lib, llm, ollama, pytestCheckHook -, setuptools, pythonOlder, }: -buildPythonPackage rec { - pname = "llm-ollama"; - version = "0.3.0"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "taketwo"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-Ar0Ux8BNGY0i764CEk7+48J6jnndlRIIMPZ9tFpXiy4="; - }; - - nativeBuildInputs = [ setuptools ]; - - buildInputs = [ llm ollama ]; - - propagatedBuildInputs = [ ollama ]; - - disabledTests = [ - # wants to mkdir in the /homeless-shelter - "test_registered_models" - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "llm_ollama" ]; - - meta = with lib; { - homepage = "https://github.com/taketwo/llm-ollama"; - description = - "LLM plugin providing access to local Ollama models usting HTTP API"; - changelog = "https://github.com/taketwo/llm-ollama/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bsima ]; - }; -} diff --git a/Biz/Bild/Deps/llm-sentence-transformers.nix b/Biz/Bild/Deps/llm-sentence-transformers.nix deleted file mode 100644 index 4d63c83..0000000 --- a/Biz/Bild/Deps/llm-sentence-transformers.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ buildPythonPackage, fetchFromGitHub, lib, llm, sentence-transformers -, pytestCheckHook, setuptools, pythonOlder, }: -buildPythonPackage rec { - pname = "llm-sentence-transformers"; - version = "0.2"; - pyproject = true; - - disabled = pythonOlder "3.8"; - - src = fetchFromGitHub { - owner = "simonw"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-1NlKPWekdVLrNkIMWXLCRWn54RlAEuEDWMCDnQHNkBc="; - }; - - nativeBuildInputs = [ setuptools ]; - - buildInputs = [ llm sentence-transformers ]; - - propagatedBuildInputs = [ sentence-transformers ]; - - # fails because of some pydantic warnings - doCheck = false; - disabledTests = [ - # wants to mkdir in the /homeless-shelter - "test_sentence_transformers" - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - pythonImportsCheck = [ "llm_sentence_transformers" ]; - - meta = with lib; { - homepage = "https://github.com/taketwo/llm-sentence-transformers"; - description = "LLM plugin for embeddings using sentence-transformers"; - changelog = - "https://github.com/taketwo/llm-sentence-transformers/releases/tag/${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ bsima ]; - }; -} diff --git a/Biz/Bild/Deps/nostr-rs-relay.nix b/Biz/Bild/Deps/nostr-rs-relay.nix deleted file mode 100644 index 0eef13f..0000000 --- a/Biz/Bild/Deps/nostr-rs-relay.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ fetchFromSourcehut, rustPlatform, pkg-config, openssl }: - -rustPlatform.buildRustPackage rec { - pname = "nostr-rs-relay"; - version = "0.7.15"; - - src = fetchFromSourcehut { - owner = "~gheartsfield"; - repo = pname; - rev = version; - sha256 = "sha256-aa1uFJcpQPMVzIWpkQ2MW6LIzTnhXNQc220scbzwJ5k="; - }; - - cargoSha256 = "sha256-3593pjc4A4NsEnE/ZYsR1vSMCvw2ZJue4EIY6cFa2WA="; - - nativeBuildInputs = [ pkg-config openssl.dev ]; - - buildInputs = [ openssl.dev ]; -} diff --git a/Biz/Bild/Deps/outlines.nix b/Biz/Bild/Deps/outlines.nix deleted file mode 100644 index 29ef41b..0000000 --- a/Biz/Bild/Deps/outlines.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib, sources, buildPythonPackage, interegular, jinja2, lark, numpy, perscache -, pillow, pydantic, regex, scipy, tenacity, torch }: - -buildPythonPackage rec { - pname = "outlines"; - version = sources.outlines.rev; - format = "pyproject"; - - src = sources.outlines; - - propagatedBuildInputs = [ - interegular - jinja2 - lark - numpy - perscache - pillow - pydantic - regex - scipy - tenacity - torch - ]; - - doCheck = false; # no tests currently - pythonImportsCheck = [ "outlines" ]; - - meta = with lib; { - description = "Probabilistic Generative Model Programming"; - homepage = "https://github.com/normal-computing/outlines"; - license = licenses.asl20; - maintainers = with maintainers; [ bsima ]; - }; -} diff --git a/Biz/Bild/Deps/perscache.nix b/Biz/Bild/Deps/perscache.nix deleted file mode 100644 index 508a261..0000000 --- a/Biz/Bild/Deps/perscache.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, sources, buildPythonPackage, beartype, cloudpickle, icontract, pbr }: - -buildPythonPackage rec { - pname = "perscache"; - version = sources.perscache.rev; - - src = sources.perscache; - - propagatedBuildInputs = [ beartype cloudpickle icontract pbr ]; - PBR_VERSION = version; - - doCheck = false; # no tests currently - pythonImportsCheck = [ "perscache" ]; - - meta = with lib; { - description = '' - An easy to use decorator for persistent memoization: like - `functools.lrucache`, but results can be saved in any format to any - storage. - ''; - homepage = "https://github.com/leshchenko1979/perscache"; - license = licenses.mit; - maintainers = with maintainers; [ bsima ]; - }; -} |