From e3b4402b0b1eeb07e1c7c781ba84f5b94ebeb656 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Tue, 5 Mar 2024 12:36:45 -0500 Subject: [PATCH] fix: don't install dotnet from nix for now. --- nix/base-system/.zshrc | 3 +++ nix/base-system/flake.lock | 6 +++--- nix/base-system/flake.nix | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nix/base-system/.zshrc b/nix/base-system/.zshrc index 4f1d15b..5f427da 100644 --- a/nix/base-system/.zshrc +++ b/nix/base-system/.zshrc @@ -7,3 +7,6 @@ bindkey '^R' history-incremental-search-backward # Opam configurattion [[ ! -r ~/.opam/opam-init/init.zsh ]] || source ~/.opam/opam-init/init.zsh > /dev/null 2> /dev/null + +# dotnet stuff +[[ ! -d /usr/local/share/dotnet ]] || DOTNET_ROOT=/usr/local/share/dotnet PATH=$PATH:/usr/local/share/dotnet diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock index e07cfc7..8653155 100644 --- a/nix/base-system/flake.lock +++ b/nix/base-system/flake.lock @@ -329,11 +329,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1708869798, - "narHash": "sha256-ptDmgUUJBZ5SYkRNqmcfrSqIcsARsBO4CrOxKlFVmZY=", + "lastModified": 1709072133, + "narHash": "sha256-RdDYNockp2wH22DdJlQ/h8IJnB9n9U3XLIAI4dqMQME=", "owner": "zaphar", "repo": "Heracles", - "rev": "ac52aea6c84870afb6104d0184b4371ba689db89", + "rev": "782cca41a0b44ea8ac68c696f73d5491197a933b", "type": "github" }, "original": { diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix index e3fd667..5cb41a4 100644 --- a/nix/base-system/flake.nix +++ b/nix/base-system/flake.nix @@ -190,7 +190,7 @@ EOF"; nil-pkg lua-language-server rust-analyzer - omnisharp-roslyn + #omnisharp-roslyn ]); }; }; @@ -294,8 +294,8 @@ EOF"; nomad mkcert kubo - dotnet-sdk_7 - netcoredbg + #dotnet-sdk_7 + #netcoredbg powershell unstablePkgs.ocaml unstablePkgs.opam