Compare commits

..

12 Commits

5 changed files with 10 additions and 18 deletions

View File

@ -2,7 +2,7 @@
"terminal.integrated.profiles.linux": { "terminal.integrated.profiles.linux": {
"nix develop": { "nix develop": {
"path": "nix", "path": "nix",
"args": ["develop", "--impure"] "args": ["develop"]
} }
}, },
"terminal.integrated.profiles.windows": { "terminal.integrated.profiles.windows": {

View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>

View File

@ -17,18 +17,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1717179513, "lastModified": 1667292599,
"narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "rev": "ef2f213d9659a274985778bff4ca322f3ef3ac68",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "24.05", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"root": { "root": {

View File

@ -1,7 +1,6 @@
{ {
description = "5D Diplomacy With Multiversal Time Travel"; description = "5D Diplomacy With Multiversal Time Travel";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/24.05";
inputs.flake-utils.url = "github:numtide/flake-utils"; inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils }: outputs = { self, nixpkgs, flake-utils }:
@ -10,16 +9,11 @@
in rec { in rec {
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
shellHook = '' shellHook = ''
PS1='\[\e[0;94m\]\u@\H\[\e[0;93m\] 5dplomacy \[\e[0;92m\]$(git rev-parse --short HEAD)\[\e[0m\]\n\W$ '
alias repl="dotnet run --project MultiversalDiplomacy repl" alias repl="dotnet run --project MultiversalDiplomacy repl"
''; '';
DOTNET_CLI_TELEMETRY_OPTOUT = 1; DOTNET_CLI_TELEMETRY_OPTOUT = 1;
NIX_LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]; packages = [ pkgs.dotnet-sdk pkgs.dotnetPackages.NUnit3 ];
NIX_LD = builtins.readFile "${pkgs.stdenv.cc}/nix-support/dynamic-linker";
packages = [
pkgs.bashInteractive
pkgs.dotnet-sdk_8
pkgs.dotnetPackages.NUnit3
];
}; };
} }
); );