From 493301a2e44074398112fe5c3028521af77da486 Mon Sep 17 00:00:00 2001 From: Smaug123 <3138005+Smaug123@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:56:43 +0100 Subject: [PATCH] Bump nixpkgs --- flake.lock | 6 +++--- flake.nix | 6 +++--- nix/deps.nix | 56 ++++++++++++++++++++++++++-------------------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index ae909e0..c5209b8 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720775258, - "narHash": "sha256-VibdQUwacz7OFCPLqAwDZcNn6GogppwpZmAwaLcpQsk=", + "lastModified": 1721841206, + "narHash": "sha256-0Q3zNYro6m8v9r2yB35y+AlGmrxmiLBcFhR5Hqto/6c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0f1ab31eb26dcdde3c149af557e0a4a46744bdde", + "rev": "a1159ff6c68901142ae41788387bc4c841f190b2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 912f255..4b02ce2 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,7 @@ dotnet-sdk = pkgs.dotnet-sdk_8; dotnet-runtime = pkgs.dotnetCorePackages.runtime_8_0; version = "0.1"; - dotnetTool = toolName: toolVersion: hash: + dotnetTool = toolName: toolVersion: sha256: pkgs.stdenvNoCC.mkDerivation rec { name = toolName; version = toolVersion; @@ -28,7 +28,7 @@ src = pkgs.fetchNuGet { pname = name; version = version; - hash = hash; + sha256 = sha256; installPhase = ''mkdir -p $out/bin && cp -r tools/net6.0/any/* $out/bin''; }; installPhase = '' @@ -39,7 +39,7 @@ runHook postInstall ''; }; - fantomas = dotnetTool "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).hash; + fantomas = dotnetTool "fantomas" (builtins.fromJSON (builtins.readFile ./.config/dotnet-tools.json)).tools.fantomas.version (builtins.head (builtins.filter (elem: elem.pname == "fantomas") ((import ./nix/deps.nix) {fetchNuGet = x: x;}))).sha256; in { packages = { fantomas = fantomas; diff --git a/nix/deps.nix b/nix/deps.nix index 61b2265..fd941b5 100644 --- a/nix/deps.nix +++ b/nix/deps.nix @@ -38,28 +38,28 @@ }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; - version = "6.0.31"; - hash = "sha256-rVxnpwa8B1weEzkJIxm+todHXrSdIT3KY38D09MncUI="; + version = "6.0.32"; + hash = "sha256-1mQTxwruzhm20YdlZefrYuy7xrBs17pH4Vo0K3Tl7Fc="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; - version = "6.0.31"; - hash = "sha256-z6HNgiyLyXN5+QlktIZmOQh9D4KRHWd6yonmKChEji4="; + version = "6.0.32"; + hash = "sha256-cIe0F+7rgwYSmh0VuFuQsUI9iEW5hn2KCD2H8Cs/k2g="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; - version = "6.0.31"; - hash = "sha256-Rq97wUeAD2bZhe0XRLB9Ffq1MBU/u4Yq45KwRLz7DRQ="; + version = "6.0.32"; + hash = "sha256-TkYv7h9NBr3I+FIaXeLU4MawJtgT2RWhs35ewGRDKx8="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; - version = "6.0.31"; - hash = "sha256-QlAteE0egI+YzouNm4d8+yXRs9E0jfBTVl7KbMxSmnA="; + version = "6.0.32"; + hash = "sha256-RaC37ZQcJn7ykXJrtV7ibxh0GcalRyPKncxlqOLou+I="; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; - version = "6.0.31"; - hash = "sha256-c1hTOPeoH7STKevPryBv4+IL/7YMfTFm5EakMvrhfI4="; + version = "6.0.32"; + hash = "sha256-vh/e46xM/HbhbBvL5eP5/DCHwCP2Bg7WoMS28nBXWV0="; }) (fetchNuGet { pname = "Microsoft.CodeCoverage"; @@ -73,48 +73,48 @@ }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; - version = "6.0.31"; - hash = "sha256-mjS1IKBwxDFT2UmcyC5ZMIQ3mWSADw887CIV0pZhQRc="; + version = "6.0.32"; + hash = "sha256-yDOkSHEGuGG6u+rB5u+IC3rc2tQwvbjdqmgHcl7Gkn4="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; - version = "6.0.31"; - hash = "sha256-VifKEirDStL5vpjnEe0hGsODssK20XBX/Mm6j8G4QIM="; + version = "6.0.32"; + hash = "sha256-2aDGkn0QqXXHUUSAwtQQbjKl5I6S0fcQWPciqPnOiM4="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; - version = "6.0.31"; - hash = "sha256-unElfKN3Ro852wsIzgTIXJJPoYpvVjrsSIwxKtwLUGk="; + version = "6.0.32"; + hash = "sha256-n6hks4j88TRelq1O6SCeUH5GmxoSm5BWXGwnpnYJibI="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; - version = "6.0.31"; - hash = "sha256-JiIXW9FPqjEb5cZHZ0otmmbY4gpgRdTZCxxuy12AJkw="; + version = "6.0.32"; + hash = "sha256-nBBq4RYAgimBYOn/bN6JTFvJFYaqYXMHae2pmCzRaS8="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; - version = "6.0.31"; - hash = "sha256-p/KpNGwJfvoWNRn057o4t8u8La2LvsmOjF0i2W1URKU="; + version = "6.0.32"; + hash = "sha256-Fm3RUZNcro434rIu3c7unGviGeGBjXj2dGnr2mmrM2g="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; - version = "6.0.31"; - hash = "sha256-N3xRbF5nQo9Okixqg1mN86L7VB72bpDR0C6wlfzntPI="; + version = "6.0.32"; + hash = "sha256-kdj8ia/2du2oKGg4MJdO2XytpT3gQ9UOiHVCyfiX2V8="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; - version = "6.0.31"; - hash = "sha256-TE1DmzoBKO9qKoATBWZPRKXBRoRzs6AafKuubeSwgl8="; + version = "6.0.32"; + hash = "sha256-/Hti30Ba12NDJQcG8pFTg6REVUDIrxZ/hRtEZNDlgxE="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; - version = "6.0.31"; - hash = "sha256-Gh+/HbETPJ2LNX9vRo+e8CmbL3YacBUXGHNVcIEQrIQ="; + version = "6.0.32"; + hash = "sha256-A8MFGOMXFROH1QGUE7xzq5b5EskDyIQCQt7SLfGdSbU="; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; - version = "6.0.31"; - hash = "sha256-ZZYzARixjQ42taRJLiTq0ykG1Hm8F/4RkZXM9lowhbI="; + version = "6.0.32"; + hash = "sha256-y5YB62WlMrK10bR/+nNpI8luVRlD9W9ZG3GsX7AXzUM="; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms";