Update nix dev env (#41886)

Update flake

diff --git a/flake.lock b/flake.lock
index 1bed402bb0fcc4524d29c6b98ee65aed763f9d26..565bff53e8a873c7441a1cf171e786cedf6812b5 100644 (file)
--- a/flake.lock
+++ b/flake.lock
@@ -20,16 +20,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1737097711,
-        "narHash": "sha256-Zql7TDxEMAOASLSu0wBlfM5SIY+4Pz2R/k17O/asCYc=",
+        "lastModified": 1765890948,
+        "narHash": "sha256-Xe6fZzDS8uy9f17Pv6NEeBS9R6MFyuepbQUy6Xq/wH0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3cbc78cfa611511c04f47c4932509f9dbdf4381a",
+        "rev": "f92e917d0cefd3eca9d56ae25d689da841a989fd",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-24.11",
+        "ref": "release-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }

diff --git a/flake.nix b/flake.nix
index 4ab9ab5a3add1978d89f45fd1ad1aa2a71ec0327..532b73d519d948786db92d6fda1da3d68a4ac34e 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -1,13 +1,22 @@
 {
   description = "Development environment for Space Station 14";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-25.11";
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system: let
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      devShells.default = import ./shell.nix { inherit pkgs; };
-    });
+  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 5d1bcb024dab38c5cefe496fb6e9523e5a02f7d5..43f7349f1e00bd034ef93201f5126611b9fb90c9 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -1,16 +1,20 @@
-{ pkgs ? (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-in import (builtins.fetchTarball {
-  url =
-    "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
-  sha256 = lock.nodes.nixpkgs.locked.narHash;
-}) { }) }:
+{
+  pkgs ? (
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+    import (builtins.fetchTarball {
+      url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
+      sha256 = lock.nodes.nixpkgs.locked.narHash;
+    }) { }
+  ),
+}:
 
 let
   dependencies = with pkgs; [
     dotnetCorePackages.sdk_9_0
     icu
     glfw
-    SDL2
     libGL
     openal
     freetype
@@ -43,8 +47,11 @@ let
     at-spi2-core
     cups
     python3
+    wayland
+    nixfmt
   ];
-in pkgs.mkShell {
+in
+pkgs.mkShell {
   name = "space-station-14-devshell";
   buildInputs = [ pkgs.gtk3 ];
   packages = dependencies;