diff --git a/.envrc b/.envrc index 82b2b9e..0629dd4 100644 --- a/.envrc +++ b/.envrc @@ -1,9 +1,3 @@ #!/usr/bin/env bash # the shebang is ignored, but nice for editors - -if type -P lorri &>/dev/null; then - eval "$(lorri direnv)" -else - echo 'while direnv evaluated .envrc, could not find the command "lorri" [https://github.com/nix-community/lorri]' - use nix -fi +use nix diff --git a/README.md b/README.md index 9e7c2f3..8ed4017 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ result/bin/claude-vm -p "fix the tests" or ```bash -nix run git+https://git.oceanbox.io/oceanbox/claude-vm#claude-vm --impure +nix run git+ssh://git@git.obx/oceanbox/claude-vm ``` All arguments are forwarded to claude-code inside the VM. diff --git a/flake.nix b/flake.nix index c94031c..4520ad0 100644 --- a/flake.nix +++ b/flake.nix @@ -24,10 +24,13 @@ packages = forAllSystems ( system: let - pkgs = import sources.nixpkgs { inherit system; }; + pkgs = import sources.nixpkgs { + inherit system; + config.allowUnfree = true; + }; in { - default = (import ./default.nix { inherit system; }).claude-vm; + default = (import ./default.nix { inherit pkgs system; }).claude-vm; } ); }; diff --git a/npins/sources.json b/npins/sources.json index f0e1b6a..638179c 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -9,9 +9,9 @@ }, "branch": "main", "submodules": false, - "revision": "214fdf6592f40a8bb472e80283c029d01fb6653d", - "url": "https://github.com/sadjow/claude-code-nix/archive/214fdf6592f40a8bb472e80283c029d01fb6653d.tar.gz", - "hash": "sha256-0ru4G0uQeokPTlJGuRHf3ApBZMeuIRdUyp0SYi//RWM=" + "revision": "9150fa95a83d2a30b5f3a45d4562c0250da0ce11", + "url": "https://github.com/sadjow/claude-code-nix/archive/9150fa95a83d2a30b5f3a45d4562c0250da0ce11.tar.gz", + "hash": "sha256-9ftpmZu/sTuaV6rJoYakj7rxoGRjcsug1c4G+723u20=" }, "nixpkgs": { "type": "Git", @@ -22,9 +22,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", - "url": "https://github.com/NixOS/nixpkgs/archive/68d8aa3d661f0e6bd5862291b5bb263b2a6595c9.tar.gz", - "hash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=" + "revision": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "url": "https://github.com/NixOS/nixpkgs/archive/4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9.tar.gz", + "hash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=" } }, "version": 7 diff --git a/pkgs/serena/package.nix b/pkgs/serena/package.nix index dbbcf31..7804a5f 100644 --- a/pkgs/serena/package.nix +++ b/pkgs/serena/package.nix @@ -9,7 +9,7 @@ # TODO: We can just get this from nixpkgs when merged: https://github.com/NixOS/nixpkgs/pull/506300 python3Packages.buildPythonApplication (finalAttrs: { pname = "serena"; - version = "1.1.1"; + version = "1.1.2"; pyproject = true; disabled = python3Packages.pythonOlder "3.11"; @@ -41,12 +41,18 @@ python3Packages.buildPythonApplication (finalAttrs: { pythonRelaxDeps = true; makeWrapperArgs = [ - "--prefix PATH : ${lib.makeBinPath [ pyright fortls ]}" + "--prefix PATH : ${ + lib.makeBinPath [ + pyright + fortls + ] + }" ]; dependencies = [ oraios-pywebview - ] ++ (with python3Packages; [ + ] + ++ (with python3Packages; [ anthropic docstring-parser beautifulsoup4