tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update nixpkgs to 23.05, improve direnv integration and flake devShell (#17217)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2023-06-08 21:25:04 +02:00
committed by GitHub
parent d79c0f0a6c
commit f24c5331bc
4 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.envrc
View File

@@ -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 use flake

14
flake.lock generated
View File

@@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1681202837, "lastModified": 1685518550,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -20,16 +20,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1683293859, "lastModified": 1686226347,
"narHash": "sha256-4BTV7T76XwAfnHJ0z6hR0tk2LFxoXf40JfKzmMb2xfY=", "narHash": "sha256-XSe3DXyslXbEMkkPEAZRqNuab5dZbFndpt30BFk5/Hw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ef47d4daa93372ae33c0b249d392e90408e06b96", "rev": "5c4b536bc7e94fec9ea542ffde996646a77f33e5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-22.11", "ref": "release-23.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

16
flake.nix
View File

@@ -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"; inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils, ... }: outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.simpleFlake { flake-utils.lib.eachDefaultSystem (system: let
inherit self nixpkgs; pkgs = nixpkgs.legacyPackages.${system};
name = "space-station-14-devshell"; in {
shell = ./shell.nix; devShells.default = import ./shell.nix { inherit pkgs; };
}; });
} }

1
shell.nix
View File

@@ -7,6 +7,7 @@ let
SDL2 SDL2
libGL libGL
openal openal
glibc
freetype freetype
fluidsynth fluidsynth
soundfont-fluid soundfont-fluid