From e1e89e2b72b9348eadd0e708f08da1415b582bd7 Mon Sep 17 00:00:00 2001 From: Tobias Berger Date: Fri, 17 Jan 2025 13:13:56 +0100 Subject: [PATCH] Update nix flake for .NET 9 --- .envrc | 5 +++-- flake.lock | 14 +++++++------- flake.nix | 2 +- shell.nix | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.envrc b/.envrc index 7fd05db3e5ee..b1ad7237edf5 100644 --- a/.envrc +++ b/.envrc @@ -1,4 +1,5 @@ -if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then - source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4=" +set -e +if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then + source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM=" fi use flake diff --git a/flake.lock b/flake.lock index 7baaa468ea56..1bed402bb0fc 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717352157, - "narHash": "sha256-hbBzucWOhwxt3QzeAyUojtD6/aHH81JssDfhFfmqOy0=", + "lastModified": 1737097711, + "narHash": "sha256-Zql7TDxEMAOASLSu0wBlfM5SIY+4Pz2R/k17O/asCYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44f538ab12e2726af450877a5529f4fd88ddb0fb", + "rev": "3cbc78cfa611511c04f47c4932509f9dbdf4381a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 095e6b017c7a..4ab9ab5a3add 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Development environment for Space Station 14"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils }: diff --git a/shell.nix b/shell.nix index 9a1b0ca4290d..ffd7f8685eff 100644 --- a/shell.nix +++ b/shell.nix @@ -7,7 +7,7 @@ in import (builtins.fetchTarball { let dependencies = with pkgs; [ - dotnetCorePackages.sdk_8_0 + dotnetCorePackages.sdk_9_0 glfw SDL2 libGL