Compare commits

...

3 Commits

2 changed files with 11 additions and 10 deletions

View File

@ -8,6 +8,7 @@
extraOptions = '' extraOptions = ''
experimental-features = nix-command flakes repl-flake experimental-features = nix-command flakes repl-flake
extra-platforms = x86_64-darwin aarch64-darwin x86_64-linux extra-platforms = x86_64-darwin aarch64-darwin x86_64-linux
trusted-users = root zaphar
''; '';
}; };

View File

@ -280,9 +280,7 @@ EOF";
environment.systemPackages = (with pkgs; [ environment.systemPackages = (with pkgs; [
# TODO(jwall): This appears to be broken due to: https://github.com/NixOS/nixpkgs/issues/166205 # TODO(jwall): This appears to be broken due to: https://github.com/NixOS/nixpkgs/issues/166205
# Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624 # Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624
#isabelle isabelle
# Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624
#(lean4.override { stdenv = stdenv.override { allowedRequisites = null; cc = llvmPackages_11.clang; }; })
lean4 lean4
terraform # TODO(jeremy): Replace with opentofu when that is an option. terraform # TODO(jeremy): Replace with opentofu when that is an option.
nomad nomad
@ -331,17 +329,19 @@ EOF";
# NOTE(jwall): I include these initially for nvim telescope # NOTE(jwall): I include these initially for nvim telescope
ripgrep ripgrep
fd fd
#ocaml
#opam
vector vector
victoriametrics victoriametrics
# TODO add sonic-pi here if it supports the arch # TODO add sonic-pi here if it supports the arch
]) ])
++ (with pkgs.ocamlPackages; [ #++ (with pkgs.ocamlPackages; [
dune_3 # dune_3
odoc # odoc
ocaml-lsp # ocaml-lsp
merlin # merlin
utop # utop
]) #])
++ [ ++ [
sile sile
runwhen runwhen