Compare commits

..

No commits in common. "19e86c615c8f252bd1f47007673707c3ef56a517" and "ae928f753bcde9ac848895924c23fc0d1413daf6" have entirely different histories.

2 changed files with 10 additions and 11 deletions

View File

@ -8,7 +8,6 @@
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,7 +280,9 @@ 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
@ -329,19 +331,17 @@ 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