diff --git a/.envrc b/.envrc index 3550a30f2d..5def8fd66a 100644 --- a/.envrc +++ b/.envrc @@ -1 +1,4 @@ +if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=" +fi use flake diff --git a/flake.lock b/flake.lock index 12bc679600..42b72caa2b 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1683293859, - "narHash": "sha256-4BTV7T76XwAfnHJ0z6hR0tk2LFxoXf40JfKzmMb2xfY=", + "lastModified": 1686226347, + "narHash": "sha256-XSe3DXyslXbEMkkPEAZRqNuab5dZbFndpt30BFk5/Hw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef47d4daa93372ae33c0b249d392e90408e06b96", + "rev": "5c4b536bc7e94fec9ea542ffde996646a77f33e5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 2f0e7b9901..4617b65743 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { + description = "Development environment for Space Station 14"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-22.11"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.05"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, nixpkgs, flake-utils, ... }: - flake-utils.lib.simpleFlake { - inherit self nixpkgs; - name = "space-station-14-devshell"; - shell = ./shell.nix; - }; - + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + devShells.default = import ./shell.nix { inherit pkgs; }; + }); } diff --git a/shell.nix b/shell.nix index 752b6fcadb..44cce93923 100644 --- a/shell.nix +++ b/shell.nix @@ -7,6 +7,7 @@ let SDL2 libGL openal + glibc freetype fluidsynth soundfont-fluid