From ee9745fef3ee0cff60e0a4a3bc0a7355202503da Mon Sep 17 00:00:00 2001 From: "Wyatt J. Miller" Date: Fri, 12 Jun 2026 00:46:53 -0400 Subject: [PATCH] mod: update to nixpkgs 26.05, update vintage story to 1.22.3 --- flake.lock | 8 ++++---- flake.nix | 2 +- pkgs/linux/vintage-story.nix | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 7ba959d..13ca140 100644 --- a/flake.lock +++ b/flake.lock @@ -74,16 +74,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1779467186, - "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", + "lastModified": 1780902259, + "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", + "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 36f43a5..6192da9 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Miller Nix User Repository"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; flake-utils.url = "github:numtide/flake-utils"; home-manager.url = "github:nix-community/home-manager"; darwin.url = "github:LnL7/nix-darwin"; diff --git a/pkgs/linux/vintage-story.nix b/pkgs/linux/vintage-story.nix index 3119a9c..ed06c01 100644 --- a/pkgs/linux/vintage-story.nix +++ b/pkgs/linux/vintage-story.nix @@ -7,7 +7,7 @@ in pkgs.stdenv.mkDerivation (finalAttrs: inherit (pkgs) lib; in { pname = "vintagestory"; - version = "1.21.6"; + version = "1.22.3"; src = pkgs.fetchurl { url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${finalAttrs.version}.tar.gz"; @@ -78,7 +78,7 @@ in pkgs.stdenv.mkDerivation (finalAttrs: runtimeLibs' = lib.strings.makeLibraryPath finalAttrs.runtimeLibs; in '' - makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_8} $out/bin/vintagestory \ + makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_10} $out/bin/vintagestory \ --prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \ --set-default mesa_glthread true \ ${lib.strings.optionalString waylandSupport '' @@ -86,7 +86,7 @@ in pkgs.stdenv.mkDerivation (finalAttrs: ''} \ --add-flags $out/share/vintagestory/Vintagestory.dll - makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_8} $out/bin/vintagestory-server \ + makeWrapper ${lib.meta.getExe pkgs.dotnet-runtime_10} $out/bin/vintagestory-server \ --prefix LD_LIBRARY_PATH : "${runtimeLibs'}" \ --set-default mesa_glthread true \ --add-flags $out/share/vintagestory/VintagestoryServer.dll