diff options
Diffstat (limited to 'Omni/Bild.nix')
| -rw-r--r-- | Omni/Bild.nix | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/Omni/Bild.nix b/Omni/Bild.nix index c6c0fe7..b7e0801 100644 --- a/Omni/Bild.nix +++ b/Omni/Bild.nix @@ -13,7 +13,6 @@ ccacheStdenv haskell sbcl - python312 nixos mkShell dockerTools @@ -22,7 +21,7 @@ stdenv = stable.ccacheStdenv; }; - unstable = nixpkgs.nixos-unstable-small; + unstable = nixpkgs.nixos-unstable; # get the .src attributes of all drvs in each pkgset in the `sources` list, # and concat them with `:` into a Unix-style search path. @@ -69,6 +68,7 @@ ghcPackageSetBild = ghcWith (hpkgs: with hpkgs; [ aeson + ansi-terminal async base bytestring @@ -78,6 +78,7 @@ directory docopt filepath + hostname process protolude rainbow @@ -87,7 +88,6 @@ tasty-hunit tasty-quickcheck text - hostname wai # can remove when removed from Omni.Log ]); }; @@ -97,9 +97,9 @@ python = { packages = self.lib.attrsets.getAttrs (import ./Bild/Deps/Python.nix) - stable.python312.pkgs; - pythonWith = stable.python312.withPackages; - buildPythonApplication = stable.python312.pkgs.buildPythonApplication; + unstable.python312.pkgs; + pythonWith = unstable.python312.withPackages; + buildPythonApplication = unstable.python312.pkgs.buildPythonApplication; }; # c packages are just stable, filtered to just the list of deps i want @@ -113,16 +113,20 @@ bat bc cmark + coreutils universal-ctags - #datasette + datasette deadnix fd figlet + findutils + ffmpeg fzf git git-branchless gitlint gitstats + gnutar groff guile hlint @@ -134,17 +138,13 @@ pkg-config ripgrep rustc + sqlite + stripe-cli tree wemux ; - #aider-chat = unstable.aider-chat; llama-cpp = unstable.llama-cpp; - # can't put this in the dev namespace because it pulls in openai with - # python311, which conflicts with any other usage of openai with - # python312. so i need to make a target that exposese/wraps llm like i did - # with llamacpp - #llm = python311.withPackages - # (p: [ p.llm p.llm-ollama p.llm-sentence-transformers ]); + llm = unstable.python312.withPackages (p: [p.llm]); ollama = unstable.ollama; ruff = unstable.ruff; shellcheck = unstable.shellcheck; @@ -162,6 +162,8 @@ ../Omni/Bild/Meta.hs ../Omni/Cli.hs ../Omni/Log.hs + ../Omni/Log/Concurrent.hs + ../Omni/Log/Terminal.hs ../Omni/Namespace.hs ../Omni/Test.hs ]; @@ -224,6 +226,7 @@ + self.lib.strings.removePrefix (toString src) (toString target); buildPhase = '' export CODEROOT=$(pwd) + export NO_COLOR=1 mkdir $out ${self.bild}/bin/bild --plan "$TARGET" 1> $out/analysis.json \ 2> >(tee -a $out/stderr >&2) @@ -249,11 +252,10 @@ name = "omnidev"; # this should just be dev tools buildInputs = with self.pkgs; [ - #aider-chat bat bc self.bild - #datasette + datasette universal-ctags fd figlet @@ -262,9 +264,13 @@ git-branchless gitlint jq + llm lolcat ormolu ripgrep + ruff + sqlite + stripe-cli tree wemux ]; |