Merge master into staging-next

doc/build-helpers/images/dockertools.section.md

@@ -145,14 +145,14 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
 
 `diskSize` (Number; _optional_)
 
-: Controls the disk size (in megabytes) of the VM used to run the script specified in `runAsRoot`.
+: Controls the disk size in MiB (1024x1024 bytes) of the VM used to run the script specified in `runAsRoot`.
   This attribute is ignored if `runAsRoot` is `null`.
 
   _Default value:_ 1024.
 
 `buildVMMemorySize` (Number; _optional_)
 
-: Controls the amount of memory (in megabytes) provisioned for the VM used to run the script specified in `runAsRoot`.
+: Controls the amount of memory in MiB (1024x1024 bytes) provisioned for the VM used to run the script specified in `runAsRoot`.
   This attribute is ignored if `runAsRoot` is `null`.
 
   _Default value:_ 512.

doc/build-helpers/images/makediskimage.section.md

@@ -108,6 +108,6 @@ make-disk-image {
   diskSize = "auto";
   additionalSpace = "0M"; # Defaults to 512M.
   copyChannel = false;
-  memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M.
+  memSize = 2048; # Qemu VM memory size in MiB (1024*1024 bytes). Defaults to 1024M.
 }
 ```

doc/build-helpers/special/vm-tools.section.md

@@ -23,7 +23,7 @@ If the build fails and Nix is run with the `-K/--keep-failed` option, a script `
 ### Attributes {#vm-tools-runInLinuxVM-attributes}
 
 * `preVM` (optional). Shell command to be evaluated *before* the VM is started (i.e., on the host).
-* `memSize` (optional, default `512`). The memory size of the VM in MiB.
+* `memSize` (optional, default `512`). The memory size of the VM in MiB (1024×1024 bytes).
 * `diskImage` (optional). A file system image to be attached to `/dev/sda`.
   Note that currently we expect the image to contain a filesystem, not a full disk image with a partition table etc.
 

nixos/doc/manual/development/writing-nixos-tests.section.md

@@ -92,7 +92,7 @@ There are a few special NixOS options for test VMs:
 
 `virtualisation.memorySize`
 
-:   The memory of the VM in megabytes.
+:   The memory of the VM in MiB (1024×1024 bytes).
 
 `virtualisation.vlans`
 

nixos/lib/make-disk-image.nix

@@ -104,7 +104,7 @@
   # The NixOS configuration to be installed onto the disk image.
   config,
 
-  # The size of the disk, in megabytes.
+  # The size of the disk, in MiB (1024*1024 bytes).
   # if "auto" size is calculated based on the contents copied to it and
   #   additionalSpace is taken into account.
   diskSize ? "auto",
@@ -160,7 +160,7 @@
   # Shell code executed after the VM has finished.
   postVM ? "",
 
-  # Guest memory size
+  # Guest memory size in MiB (1024*1024 bytes)
   memSize ? 1024,
 
   # Copy the contents of the Nix store to the root of the image and

nixos/lib/make-multi-disk-zfs-image.nix

@@ -30,10 +30,10 @@
   # The NixOS configuration to be installed onto the disk image.
   config,
 
-  # size of the FAT boot disk, in megabytes.
+  # size of the FAT boot disk in MiB (1024*1024 bytes)
   bootSize ? 1024,
 
-  # The size of the root disk, in megabytes.
+  # The size of the root disk in MiB (1024*1024 bytes)
   rootSize ? 2048,
 
   # The name of the ZFS pool
@@ -74,7 +74,7 @@
   # Shell code executed after the VM has finished.
   postVM ? "",
 
-  # Guest memory size
+  # Guest memory size in MiB (1024*1024 bytes)
   memSize ? 1024,
 
   name ? "nixos-disk-image",

nixos/lib/make-single-disk-zfs-image.nix

@@ -19,13 +19,13 @@
   # The NixOS configuration to be installed onto the disk image.
   config,
 
-  # size of the FAT partition, in megabytes.
+  # size of the FAT partition, in MiB (1024x1024 bytes).
-  bootSize ? 1024
+  bootSize ? 1024,
 
-  , # memory allocated for virtualized build instance
+  # memory allocated for virtualized build instance, in MiB (1024x1024 bytes).
   memSize ? 1024,
 
-  # The size of the root partition, in megabytes.
+  # The size of the root partition, in MiB (1024x1024 bytes).
   rootSize ? 2048,
 
   # The name of the ZFS pool

nixos/modules/config/swap.nix

@@ -121,7 +121,7 @@ let
           description = ''
             If this option is set, ‘device’ is interpreted as the
             path of a swapfile that will be created automatically
-            with the indicated size (in megabytes).
+            with the indicated size in MiB (1024×1024 bytes).
           '';
         };
 

nixos/modules/installer/sd-card/sd-image.nix

@@ -80,8 +80,7 @@ in
       type = types.int;
       default = 8;
       description = ''
-        Gap in front of the /boot/firmware partition, in mebibytes (1024×1024
+        Gap in front of the /boot/firmware partition, in MiB (1024×1024 bytes).
-        bytes).
         Can be increased to make more space for boards requiring to dd u-boot
         SPL before actual partitions.
 

nixos/modules/profiles/nix-builder-vm.nix

@@ -48,13 +48,13 @@ in
       default = 20 * 1024;
       type = types.int;
       example = 30720;
-      description = "The maximum disk space allocated to the runner in MB";
+      description = "The maximum disk space allocated to the runner in MiB (1024×1024 bytes).";
     };
     memorySize = mkOption {
       default = 3 * 1024;
       type = types.int;
       example = 8192;
-      description = "The runner's memory in MB";
+      description = "The runner's memory in MiB (1024×1024 bytes).";
     };
     min-free = mkOption {
       default = 1024 * 1024 * 1024;

nixos/modules/programs/wayland/uwsm.nix

@@ -16,7 +16,7 @@ let
         [Desktop Entry]
         Name=${opts.prettyName} (UWSM)
         Comment=${opts.comment}
-        Exec=${lib.getExe cfg.package} start -S -F ${opts.binPath}
+        Exec=${lib.getExe cfg.package} start -F ${opts.binPath}
         Type=Application
       '';
       destination = "/share/wayland-sessions/${opts.name}-uwsm.desktop";

nixos/modules/services/databases/memcached.nix

@@ -44,7 +44,7 @@ in
       maxMemory = lib.mkOption {
         type = lib.types.ints.unsigned;
         default = 64;
-        description = "The maximum amount of memory to use for storage, in megabytes.";
+        description = "The maximum amount of memory to use for storage, in MiB (1024×1024 bytes).";
       };
 
       maxConnections = lib.mkOption {

nixos/modules/virtualisation/disk-size-option.nix

@@ -18,7 +18,7 @@ in
       default = if config.virtualisation.diskSizeAutoSupported then "auto" else 1024;
       defaultText = lib.literalExpression "if virtualisation.diskSizeAutoSupported then \"auto\" else 1024";
       description = ''
-        The disk size in megabytes of the virtual machine.
+        The disk size in MiB (1024×1024 bytes) of the virtual machine.
       '';
     };
   };

nixos/modules/virtualisation/proxmox-image.nix

@@ -71,7 +71,7 @@ with lib;
         type = types.ints.positive;
         default = 1024;
         description = ''
-          Guest memory in MB
+          Guest memory in MiB (1024×1024 bytes)
         '';
       };
       bios = mkOption {

nixos/modules/virtualisation/qemu-vm.nix

@@ -405,7 +405,7 @@ in
       type = types.ints.positive;
       default = 1024;
       description = ''
-        The memory size in megabytes of the virtual machine.
+        The memory size of the virtual machine in MiB (1024×1024 bytes).
       '';
     };
 
@@ -480,7 +480,7 @@ in
       default = [ ];
       description = ''
         Additional disk images to provide to the VM. The value is
-        a list of size in megabytes of each disk. These disks are
+        a list of size in MiB (1024×1024 bytes) of each disk. These disks are
         writeable by the VM.
       '';
     };
@@ -1129,7 +1129,7 @@ in
         {
           assertion = pkgs.stdenv.hostPlatform.is32bit -> cfg.memorySize < 2047;
           message = ''
-            virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047MB RAM on 32bit max.
+            virtualisation.memorySize is above 2047, but qemu is only able to allocate 2047 MiB RAM on 32bit max.
           '';
         }
         {

nixos/modules/virtualisation/waagent.nix

@@ -174,7 +174,7 @@ let
           type = types.int;
           default = 0;
           description = ''
-            Specifies the size of the swap file in megabytes.
+            Specifies the size of the swap file in MiB (1024×1024 bytes).
 
             This configuration has no effect if resource disk is managed by cloud-init.
           '';

pkgs/applications/editors/android-studio/default.nix

@@ -16,8 +16,8 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2025.1.1.13"; # "Android Studio Narwhal | 2025.1.1"
+    version = "2025.1.1.14"; # "Android Studio Narwhal | 2025.1.1 Patch 1"
-    sha256Hash = "sha256-MEUqYZd/Ny2spzFqbZ40j2H4Tg6pHQGWqkpRrVtbwO8=";
+    sha256Hash = "sha256-rTZOvLl1Lqc0zXNiTmVoMnLEAwWOEDW5MJg8ysiiyBo=";
   };
   betaVersion = {
     version = "2025.1.1.12"; # "Android Studio Narwhal | 2025.1.1 RC 2"

pkgs/applications/emulators/libretro/cores/bsnes.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bsnes";
-  version = "0-unstable-2025-06-27";
+  version = "0-unstable-2025-07-11";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bsnes-libretro";
-    rev = "d9697514a1901b7fcace0a77a7deccc693db38fb";
+    rev = "df64459ea3a6c3e6e112f81c56d1426074a78d2f";
-    hash = "sha256-PS0Wc9ckVDuXS8bEimlzwXkiz5klAGJrApL04VdDW0A=";
+    hash = "sha256-eW9283UcE1wpP/dh/FYZ/oJwVgAefubnfcvQLTABB0k=";
   };
 
   makefile = "Makefile";

pkgs/applications/emulators/libretro/cores/play.nix

@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-06-18";
+  version = "0-unstable-2025-07-01";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "ea544501ba7d06f53188939254f671055ceaeaba";
+    rev = "5fa3b71304aec0d2a70569bd38c87433f719e6ce";
-    hash = "sha256-fGMFtjvqKCy7jd59Ky2pcLR5PANq1v9GT5tVB2iPXhk=";
+    hash = "sha256-t61xAqghmOmZJzAxU2Ez1ALQ8jjuHZKwmrNoRA9L+4k=";
     fetchSubmodules = true;
   };
 

pkgs/applications/video/kodi/addons/screensaver-asteroids/default.nix

@@ -10,13 +10,13 @@
 buildKodiBinaryAddon rec {
   pname = "screensaver-asteroids";
   namespace = "screensaver.asteroids";
-  version = "22.0.2";
+  version = "21.0.2";
 
   src = fetchFromGitHub {
     owner = "xbmc";
     repo = namespace;
     rev = "${version}-${rel}";
-    hash = "sha256-Ri9dgdhJbHybdUkZeRE7X7SQMaV2JZCm7znAyDEa470=";
+    hash = "sha256-cepo7amJn6y1J9hVSt35VgOz/ixT7l/UfjtmHOajBrw=";
   };
 
   extraNativeBuildInputs = [ pkg-config ];

pkgs/applications/video/obs-studio/plugins/distroav/default.nix

@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "distroav";
-  version = "6.0.0";
+  version = "6.1.1";
 
   nativeBuildInputs = [
     cmake
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     owner = "DistroAV";
     repo = "DistroAV";
     tag = version;
-    hash = "sha256-pr/5XCLo5fzergIQrYFC9o9K+KuP4leDk5/oRe5ct9Q=";
+    hash = "sha256-nbXh6bjpiKbvuntZSnuTWWpmhfAcep7Krjjq8FvbENk=";
   };
 
   # Modify plugin-main.cpp file to fix ndi libs path

pkgs/applications/video/obs-studio/plugins/distroav/hardcode-ndi-path.patch

@@ -1,8 +1,8 @@
 diff --git a/src/plugin-main.cpp b/src/plugin-main.cpp
-index 0d94add..617af73 100644
+index 43f0e28..5e393c6 100644
 --- a/src/plugin-main.cpp
 +++ b/src/plugin-main.cpp
-@@ -369,14 +369,7 @@ const NDIlib_v5 *load_ndilib() 
+@@ -412,14 +412,7 @@ const NDIlib_v5 *load_ndilib()
  	if (!temp_path.isEmpty()) {
  		locations << temp_path;
  	}
@@ -15,4 +15,6 @@ index 0d94add..617af73 100644
 -	locations << "/usr/local/lib";
 -#endif
 +	locations << "@NDI@/lib";
-	auto lib_path = QString();
+ 	auto lib_path = QString();
+ #if defined(Q_OS_LINUX)
+ 	// Linux

pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig

@@ -1,5 +0,0 @@
-[*]
-end_of_line = unset
-indent_style = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset

pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wrapper", "Wrapper\Wrapper.csproj", "{D01B3597-E85E-42F4-940A-EF5AE712942F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.ActiveCfg = Debug|x86
-		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Debug|x86.Build.0 = Debug|x86
-		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.ActiveCfg = Release|x86
-		{D01B3597-E85E-42F4-940A-EF5AE712942F}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Properties/AssemblyInfo.cs

@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Wrapper")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Philips Healthcare")]
-[assembly: AssemblyProduct("Wrapper")]
-[assembly: AssemblyCopyright("Copyright © Philips Healthcare 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("2045ce22-78c7-4cd6-ad0a-9367f8a49738")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.cs.in

@@ -1,66 +0,0 @@
-using System;
-using System.Reflection;
-using System.IO;
-
-namespace @NAMESPACE@Wrapper
-{
-    class @MAINCLASSNAME@Wrapper
-    {
-        private String[] AssemblySearchPaths = { @ASSEMBLYSEARCHPATH@ };
-
-        private String ExePath = @"@EXEPATH@";
-
-        private String MainClassName = "@NAMESPACE@.@MAINCLASSNAME@";
-
-        private Assembly exeAssembly;
-
-        public @MAINCLASSNAME@Wrapper(string[] args)
-        {
-            // Attach the resolve event handler to the AppDomain so that missing library assemblies will be searched
-            AppDomain currentDomain = AppDomain.CurrentDomain;
-            currentDomain.AssemblyResolve += new ResolveEventHandler(MyResolveEventHandler);
-
-            // Dynamically load the executable assembly
-            exeAssembly = Assembly.LoadFrom(ExePath);
-
-            // Lookup the main class
-            Type mainClass = exeAssembly.GetType(MainClassName);
-
-            // Lookup the main method
-            MethodInfo mainMethod = mainClass.GetMethod("Main");
-
-            // Invoke the main method
-            mainMethod.Invoke(this, new Object[] {args});
-        }
-
-        static void Main(string[] args)
-        {
-            new @MAINCLASSNAME@Wrapper(args);
-        }
-
-        private Assembly MyResolveEventHandler(object sender, ResolveEventArgs args)
-        {
-            // This handler is called only when the common language runtime tries to bind to the assembly and fails.
-
-            Assembly MyAssembly;
-            String assemblyPath = "";
-            String requestedAssemblyName = args.Name.Substring(0, args.Name.IndexOf(","));
-
-            // Search for the right path of the library assembly
-            foreach (String currentAssemblyPath in AssemblySearchPaths)
-            {
-                assemblyPath = currentAssemblyPath + "/" + requestedAssemblyName + ".dll";
-
-                if (File.Exists(assemblyPath))
-                    break;
-            }
-
-            // Load the assembly from the specified path. 					
-            MyAssembly = Assembly.LoadFrom(assemblyPath);
-
-            // Return the loaded assembly.
-            return MyAssembly;
-        }
-
-    }
-}

pkgs/build-support/dotnet/dotnetenv/Wrapper/Wrapper/Wrapper.csproj.in

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D01B3597-E85E-42F4-940A-EF5AE712942F}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>@ROOTNAMESPACE@</RootNamespace>
-    <AssemblyName>@ASSEMBLYNAME@</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Wrapper.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

pkgs/build-support/dotnet/dotnetenv/build-solution.nix

@@ -1,87 +0,0 @@
-{
-  lib,
-  stdenv,
-  dotnetfx,
-}:
-{
-  name,
-  src,
-  baseDir ? ".",
-  slnFile,
-  targets ? "ReBuild",
-  verbosity ? "detailed",
-  options ? "/p:Configuration=Debug;Platform=Win32",
-  assemblyInputs ? [ ],
-  preBuild ? "",
-  modifyPublicMain ? false,
-  mainClassFile ? null,
-}:
-
-assert modifyPublicMain -> mainClassFile != null;
-
-stdenv.mkDerivation {
-  inherit name src;
-
-  buildInputs = [ dotnetfx ];
-
-  preConfigure = ''
-    cd ${baseDir}
-  '';
-
-  preBuild = ''
-    ${lib.optionalString modifyPublicMain ''
-      sed -i -e "s|static void Main|public static void Main|" ${mainClassFile}
-    ''}
-    ${preBuild}
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    addDeps() {
-      if [ -f $1/nix-support/dotnet-assemblies ]; then
-        for i in $(cat $1/nix-support/dotnet-assemblies); do
-          windowsPath=$(cygpath --windows $i)
-          assemblySearchPaths="$assemblySearchPaths;$windowsPath"
-
-          addDeps $i
-        done
-      fi
-    }
-
-    for i in ${toString assemblyInputs}; do
-      windowsPath=$(cygpath --windows $i)
-      echo "Using assembly path: $windowsPath"
-
-      if [ "$assemblySearchPaths" = "" ]; then
-        assemblySearchPaths="$windowsPath"
-      else
-        assemblySearchPaths="$assemblySearchPaths;$windowsPath"
-      fi
-
-      addDeps $i
-    done
-
-    echo "Assembly search paths are: $assemblySearchPaths"
-
-    if [ "$assemblySearchPaths" != "" ]; then
-      echo "Using assembly search paths args: $assemblySearchPathsArg"
-      export AssemblySearchPaths=$assemblySearchPaths
-    fi
-
-    mkdir -p $out
-    MSBuild.exe ${toString slnFile} /nologo /t:${targets} /p:IntermediateOutputPath=$(cygpath --windows $out)\\ /p:OutputPath=$(cygpath --windows $out)\\ /verbosity:${verbosity} ${options}
-
-    # Because .NET assemblies store strings as UTF-16 internally, we cannot detect
-    # hashes. Therefore a text files containing the proper paths is created
-    # We can also use this file the propagate transitive dependencies.
-
-    mkdir -p $out/nix-support
-
-    for i in ${toString assemblyInputs}; do
-      echo $i >> $out/nix-support/dotnet-assemblies
-    done
-
-    runHook postInstall
-  '';
-}

pkgs/build-support/dotnet/dotnetenv/default.nix

@@ -1,26 +0,0 @@
-{
-  lib,
-  stdenv,
-  dotnetfx,
-}:
-
-let
-  dotnetenv = {
-    buildSolution = import ./build-solution.nix {
-      inherit lib stdenv;
-      dotnetfx = dotnetfx.pkg;
-    };
-
-    buildWrapper = import ./wrapper.nix {
-      inherit dotnetenv;
-    };
-
-    inherit (dotnetfx)
-      assembly20Path
-      wcfPath
-      referenceAssembly30Path
-      referenceAssembly35Path
-      ;
-  };
-in
-dotnetenv

pkgs/build-support/dotnet/dotnetenv/wrapper.nix

@@ -1,68 +0,0 @@
-{ dotnetenv }:
-
-{
-  name,
-  src,
-  baseDir ? ".",
-  slnFile,
-  targets ? "ReBuild",
-  verbosity ? "detailed",
-  options ? "/p:Configuration=Debug;Platform=Win32",
-  assemblyInputs ? [ ],
-  preBuild ? "",
-  namespace,
-  mainClassName,
-  mainClassFile,
-  modifyPublicMain ? true,
-}:
-
-let
-  application = dotnetenv.buildSolution {
-    inherit
-      name
-      src
-      baseDir
-      slnFile
-      targets
-      verbosity
-      ;
-    inherit options assemblyInputs preBuild;
-    inherit modifyPublicMain mainClassFile;
-  };
-in
-dotnetenv.buildSolution {
-  name = "${name}-wrapper";
-  src = ./Wrapper;
-  slnFile = "Wrapper.sln";
-  assemblyInputs = [ application ];
-  preBuild = ''
-    addRuntimeDeps() {
-      if [ -f $1/nix-support/dotnet-assemblies ]; then
-        for i in $(cat $1/nix-support/dotnet-assemblies); do
-          windowsPath=$(cygpath --windows $i | sed 's|\\|\\\\|g')
-          assemblySearchArray="$assemblySearchArray @\"$windowsPath\""
-
-          addRuntimeDeps $i
-        done
-      fi
-    }
-
-    export exePath=$(cygpath --windows $(find ${application} -name \*.exe) | sed 's|\\|\\\\|g')
-
-    # Generate assemblySearchPaths string array contents
-    for path in ${toString assemblyInputs}; do
-      assemblySearchArray="$assemblySearchArray @\"$(cygpath --windows $path | sed 's|\\|\\\\|g')\", "
-      addRuntimeDeps $path
-    done
-
-    sed -e "s|@ROOTNAMESPACE@|${namespace}Wrapper|" \
-        -e "s|@ASSEMBLYNAME@|${namespace}|" \
-        Wrapper/Wrapper.csproj.in > Wrapper/Wrapper.csproj
-
-    sed -e "s|@NAMESPACE@|${namespace}|g" \
-        -e "s|@MAINCLASSNAME@|${mainClassName}|g" \
-        -e "s|@EXEPATH@|$exePath|g" \
-        -e "s|@ASSEMBLYSEARCHPATH@|$assemblySearchArray|" \
-        Wrapper/Wrapper.cs.in > Wrapper/Wrapper.cs
-  '';
-}

pkgs/build-support/vm/default.nix

@@ -317,7 +317,7 @@ rec {
   # A bash script fragment that produces a disk image at `destination`.
   createEmptyImage =
     {
-      # Disk image size in MiB
+      # Disk image size in MiB (1024*1024 bytes)
       size,
       # Name that will be written to ${destination}/nix-support/full-name
       fullName,
@@ -358,11 +358,11 @@ rec {
     will build the derivation `patchelf' inside a VM.  The attribute
     `preVM' can optionally contain a shell command to be evaluated
     *before* the VM is started (i.e., on the host).  The attribute
-    `memSize' specifies the memory size of the VM in megabytes,
+    `memSize' specifies the memory size of the VM in MiB (1024*1024
-    defaulting to 512.  The attribute `diskImage' can optionally
+    bytes), defaulting to 512.  The attribute `diskImage' can
-    specify a file system image to be attached to /dev/sda.  (Note
+    optionally specify a file system image to be attached to /dev/sda.
-    that currently we expect the image to contain a filesystem, not a
+    (Note that currently we expect the image to contain a filesystem,
-    full disk image with a partition table etc.)
+    not a full disk image with a partition table etc.)
 
     If the build fails and Nix is run with the `-K' option, a script
     `run-vm' will be left behind in the temporary build directory
@@ -1230,7 +1230,7 @@ rec {
     `extraPackages' specifies the names of additional packages from
     the distribution that should be included in the image; `packages'
     allows the entire set of packages to be overridden; and `size'
-    sets the size of the disk in megabytes.  E.g.,
+    sets the size of the disk in MiB (1024*1024 bytes).  E.g.,
     `diskImageFuns.ubuntu1004x86_64 { extraPackages = ["firefox"];
     size = 8192; }' builds an 8 GiB image containing Firefox in
     addition to the default packages.

pkgs/by-name/_1/_1password-gui/linux.nix

@@ -111,13 +111,13 @@ stdenv.mkDerivation {
       # Desktop file
       install -Dt $out/share/applications resources/${pname}.desktop
       substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'
+        --replace-fail 'Exec=/opt/1Password/${pname}' 'Exec=${pname}'
 
     ''
     + (lib.optionalString (polkitPolicyOwners != [ ]) ''
       # Polkit file
         mkdir -p $out/share/polkit-1/actions
-        substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace "\''${POLICY_OWNERS}" "${policyOwners}"
+        substitute com.1password.1Password.policy.tpl $out/share/polkit-1/actions/com.1password.1Password.policy --replace-fail "\''${POLICY_OWNERS}" "${policyOwners}"
     '')
     + ''
 

pkgs/by-name/al/albert/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "0.28.2";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FYl/S7+KoQ3kgUQX0hiv8B+AbTbyfmo1GX130G09bZ8=";
+    hash = "sha256-lkicEaQLHloa10A7rySDX7UpOFsDzOSL1xepL5bymd0=";
     fetchSubmodules = true;
   };
 

pkgs/by-name/av/avalonia/deps.json

@@ -902,8 +902,8 @@
   },
   {
     "pname": "Microsoft.WindowsDesktop.App.Ref",
-    "version": "8.0.17",
+    "version": "8.0.18",
-    "hash": "sha256-/qXchS21sqnrLcJ9BmJJTQuhFhAQMsnGowGbnTGhXZk="
+    "hash": "sha256-cuCPcAp4jRFR44Z7Ib9oFxzKTKEVD9zKchNlA6Z2OfA="
   },
   {
     "pname": "Mono.Cecil",

pkgs/by-name/co/coder/package.nix

@@ -15,21 +15,21 @@ let
 
   channels = {
     stable = {
-      version = "2.22.1";
+      version = "2.23.2";
       hash = {
-        x86_64-linux = "sha256-Jr0vv0ib8FPm4QiClXyJ8eWyF+0bdcn1BHmOb5BeGKo=";
+        x86_64-linux = "sha256-nFb4G4PQdrxwXHpialI0g3CszOdNt8xnSEZCAsFADAo=";
-        x86_64-darwin = "sha256-rniO5/53B47Q5lOtP3nAImQNdiaHeUNb5D1aBlVoEz0=";
+        x86_64-darwin = "sha256-XHivHFYxTmjR+vkkR4632ZjKqKVVb6MwSSPy0rzuLLo=";
-        aarch64-linux = "sha256-9X5Wriyavcplf0ep7y1wvgnC9mg+3gKnzShyjC3yhp0=";
+        aarch64-linux = "sha256-DNuEeiTkGlDyOrFMuApSASs51bRYleoPQN9eMyY7c78=";
-        aarch64-darwin = "sha256-y/3cA5ImlXEIBh1z0ADsCtvK2E7X6URPC1miWZpeIMY=";
+        aarch64-darwin = "sha256-A1sF3RFAQrkPU8GMOXmpzzY3CXjKwOeA6f/dZtuetZc=";
       };
     };
     mainline = {
-      version = "2.23.0";
+      version = "2.24.1";
       hash = {
-        x86_64-linux = "sha256-/0Zy0cHocahRrLRi/+LK296gP5dZENguciX+h9ByKME=";
+        x86_64-linux = "sha256-gqQlyA1LtWYpeBHupbFTFLD0KmF1P61JgrokCtqTDiI=";
-        x86_64-darwin = "sha256-AIC5AB0rae5CSDVeJa2urrxh+4eBUTX8fhOSYc4fX58=";
+        x86_64-darwin = "sha256-iiCMCs7Det/ebTRo69FDqUW76cHnzgtl0gxRfAYMnho=";
-        aarch64-linux = "sha256-vUfFEpMGeXdE/h9if/8PuL2t2kWJAQd8Bg6/m3N+JD0=";
+        aarch64-linux = "sha256-Qxc+GQ2xmKkgJkoMi4gtauTen1wvU5UD/faY13xnuHI=";
-        aarch64-darwin = "sha256-aGio0fhvycape2vPYrAhniirdSbjSzbZtfFIdhl1gNk=";
+        aarch64-darwin = "sha256-0wRRpLhqosd4n0JhFe4/4/odUTMGwf74bYFBJ6rlTw4=";
       };
     };
   };

pkgs/by-name/fo/forgejo/lts.nix

@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "11.0.2";
+  version = "11.0.3";
-  hash = "sha256-myg6BGoCJaX7YbQAFSRwX0KtX/TFLKJOUuirqtQcN8Q=";
+  hash = "sha256-tHanxcxpxVYKd28onKJnuB/Qtee2gop3yKjXJ+i9X4o=";
   npmDepsHash = "sha256-wsjosyZ5J5mU7ixbWjXnbqkvgnOE0dGz81vVqaI61go=";
   vendorHash = "sha256-5eaPdvU2NbCgbL+rcCqzphTESLHGbGZ3MgtXknCjrSc=";
   lts = true;

pkgs/by-name/in/intel-gpu-tools/package.nix

@@ -43,14 +43,14 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gpu-tools";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "drm";
     repo = "igt-gpu-tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-568sgmP7HhrNv3nwhuokiPk/2qQtzPOC9aCsScKCI8A=";
+    hash = "sha256-O//tL7AuYmrpTlZ61YzpSKOxbtM6u6zlcANzXWTTbhw=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ku/kubectl-view-secret/package.nix

@@ -20,12 +20,12 @@ buildGoModule rec {
   subPackages = [ "./cmd/" ];
 
   postInstall = ''
-    mv $out/bin/cmd $out/bin/kubectl-view-secret
+    mv $out/bin/cmd $out/bin/kubectl-view_secret
   '';
 
   meta = {
     description = "Kubernetes CLI plugin to decode Kubernetes secrets";
-    mainProgram = "kubectl-view-secret";
+    mainProgram = "kubectl-view_secret";
     homepage = "https://github.com/elsesiy/kubectl-view-secret";
     changelog = "https://github.com/elsesiy/kubectl-view-secret/releases/tag/v${version}";
     license = lib.licenses.mit;

pkgs/by-name/mo/mobroute/package.nix

@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "mobroute";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromSourcehut {
     owner = "~mil";
     repo = "mobroute";
     rev = "v${version}";
-    hash = "sha256-eMLn9Px6jO88CQWpwFF7JK1UPHoEbhDXoU2G1aYe2dw=";
+    hash = "sha256-qQmOvo8fVZfAE0XzX1YPhfzXrBXEWwRkNNnhLQFd4ec=";
   };
-  vendorHash = "sha256-fMIa9HCfK6YDb0V0RhzomwuSqPhlwLBHJRjQV96cY8g=";
+  vendorHash = "sha256-HcHPQq9KmqSB5RdmZDFR6BXsVoJ4XfBMClS8hR8weCU=";
 
   buildInputs = [ sqlite ];
   tags = [

pkgs/by-name/mo/moonlight/package.nix

@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.21";
+  version = "1.3.22";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E8iHTYK9iUtIjYgBNj54Xeulj9WaxSGDbzOLLFhCSqA=";
+    hash = "sha256-mn6f4ci5C2jkyxgmBHQ4dI9V0/20DlyS6EbQz4w7znc=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     buildInputs = [ nodejs_22 ];
 
-    hash = "sha256-FOhaBm0mc7rHBGzenqRWsxGwktXTq25n/6yz7IURYXY=";
+    hash = "sha256-vrSfrAnLc30kba+8VOPawdp8KaQVUhsD6mUq+YdAJTY=";
   };
 
   env = {

pkgs/by-name/nd/ndi-6/version.json

@@ -1 +1 @@
-{"hash": "sha256-6iqjexwILth2muLpXWQjDVTvOuMq4jM8KBYnpPmViU8=", "version": "6.1.1"}
+{"hash": "sha256-10pxvHLYbQ1p3NKSTC1I3YAFkPbYSCenXTEWukqy5TY=", "version": "6.2.0"}

pkgs/by-name/ne/networkminer/deps.json

@@ -1,17 +1,12 @@
 [
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies",
-    "version": "1.0.2",
+    "version": "1.0.3",
-    "sha256": "0i42rn8xmvhn08799manpym06kpw89qy9080myyy2ngy565pqh0a"
+    "hash": "sha256-FBoJP5DHZF0QHM0xLm9yd4HJZVQOuSpSKA+VQRpphEE="
   },
   {
-    "pname": "Microsoft.NETFramework.ReferenceAssemblies.net461",
+    "pname": "Microsoft.NETFramework.ReferenceAssemblies.net48",
-    "version": "1.0.2",
+    "version": "1.0.3",
-    "sha256": "0js3dp26nszx82q0phv7hmsm5z23dva7javbmk6a91lbkm07y8p2"
+    "hash": "sha256-in40hTjn65E1FpaRFon0nj1PY/i6tRdDK74Vm4sRBKI="
-  },
-  {
-    "pname": "Microsoft.NETFramework.ReferenceAssemblies.net472",
-    "version": "1.0.2",
-    "sha256": "1dny43jksy6dm9zrkdm8j80gb25w6wdvjlxnphj7ngf0fbg3dd2c"
   }
 ]

pkgs/by-name/ne/networkminer/package.nix

@@ -1,39 +1,37 @@
 {
   lib,
   buildDotnetModule,
-  fetchurl,
+  fetchzip,
-  unzip,
   dos2unix,
   msbuild,
+  gtk2,
   mono,
   dotnetCorePackages,
 }:
+
 buildDotnetModule rec {
   pname = "networkminer";
-  version = "2.8";
+  version = "3.0";
 
-  src = fetchurl {
+  src =
-    # Upstream does not provide versioned releases, a mirror has been uploaded
+    let
-    # to archive.org
+      version' = lib.replaceString "." "-" version;
-    url = "https://archive.org/download/networkminer-${
+    in
-      lib.replaceStrings [ "." ] [ "-" ] version
+    fetchzip {
-    }/NetworkMiner_${lib.replaceStrings [ "." ] [ "-" ] version}_source.zip";
+      # Upstream does not provide versioned releases, a mirror has been uploaded
-    sha256 = "1n2312acq5rq0jizlcfk0crslx3wgcsd836p47nk3pnapzw0cqvv";
+      # to archive.org
-  };
+      # Non-versioned download link can be found on https://www.netresec.com/?page=NetworkMinerSourceCode
+      url = "https://archive.org/download/network-miner-${version'}-source/NetworkMiner_${version'}_source.zip";
+      hash = "sha256-BdjSsFSpt3U7IUurY1dmprzq8wNdPNZyXGKeIGETr7Q=";
+    };
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0-bin;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
 
   nativeBuildInputs = [
-    unzip
     dos2unix
     msbuild
   ];
 
-  patches = [
-    # Store application data in XDG_DATA_DIRS instead of trying to write to nix store
-    ./xdg-dirs.patch
-  ];
-
   postPatch = ''
     # Not all files have UTF-8 BOM applied consistently
     find . -type f -exec dos2unix -m {} \+
@@ -58,25 +56,29 @@ buildDotnetModule rec {
 
     mkdir -p $out/bin $out/share
     cp -r NetworkMiner/bin/Release $out/share/NetworkMiner
-    makeWrapper ${mono}/bin/mono $out/bin/NetworkMiner \
+    makeWrapper ${lib.getExe mono} $out/bin/NetworkMiner \
       --add-flags "$out/share/NetworkMiner/NetworkMiner.exe" \
-      --add-flags "--noupdatecheck"
+      --add-flags "--noupdatecheck" \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          gtk2
+        ]
+      }
 
     install -D NetworkMiner/NetworkMiner.desktop $out/share/applications/NetworkMiner.desktop
     substituteInPlace $out/share/applications/NetworkMiner.desktop \
-      --replace "Exec=mono NetworkMiner.exe %f" "Exec=NetworkMiner" \
+      --replace-fail "Icon=./Images/NetworkMiner_logo_313x313.png" "Icon=NetworkMiner"
-      --replace "Icon=./networkminericon-96x96.png" "Icon=NetworkMiner"
     install -D NetworkMiner/networkminericon-96x96.png $out/share/pixmaps/NetworkMiner.png
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open Source Network Forensic Analysis Tool (NFAT)";
     homepage = "https://www.netresec.com/?page=NetworkMiner";
-    license = licenses.gpl2Only;
+    license = lib.licenses.gpl2Only;
-    maintainers = with maintainers; [ emilytrau ];
+    maintainers = with lib.maintainers; [ emilytrau ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "NetworkMiner";
   };
 }

pkgs/by-name/ne/networkminer/xdg-dirs.patch

@@ -1,174 +0,0 @@
-diff --git a/NetworkMiner/NetworkMinerForm.cs b/NetworkMiner/NetworkMinerForm.cs
-index 06c808b..6495b73 100644
---- a/NetworkMiner/NetworkMinerForm.cs
-+++ b/NetworkMiner/NetworkMinerForm.cs
-@@ -1,4 +1,4 @@
--//  Copyright: Erik Hjelmvik, NETRESEC
-+//  Copyright: Erik Hjelmvik, NETRESEC
- //
- //  NetworkMiner is free software; you can redistribute it and/or modify it
- //  under the terms of the GNU General Public License
-@@ -419,7 +419,7 @@ namespace NetworkMiner {
-             }
-             try {
-                 //require FileIOPermission to be PermissionState.Unrestricted
--                string path = System.IO.Path.GetDirectoryName(System.Windows.Forms.Application.ExecutablePath) + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY;
-+                string path = System.IO.Path.GetDirectoryName(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome()) + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY;
-                 System.Security.Permissions.FileIOPermission fileIOPerm = new System.Security.Permissions.FileIOPermission(System.Security.Permissions.FileIOPermissionAccess.AllAccess, path);
-                 fileIOPerm.Demand();
-             }
-@@ -1023,13 +1023,13 @@ namespace NetworkMiner {
-         public void CreateNewPacketHandlerWrapper(System.IO.DirectoryInfo outputDirectory) {
-             //make sure that folders exists
-             try {
--                System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(outputDirectory.FullName + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY);
-+                System.IO.DirectoryInfo di = new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY);
-                 if (!di.Exists)
-                     di.Create();
--                di = new System.IO.DirectoryInfo(outputDirectory.FullName + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar + "cache");
-+                di = new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar + "cache");
-                 if (!di.Exists)
-                     di.Create();
--                di = new System.IO.DirectoryInfo(outputDirectory.FullName + System.IO.Path.DirectorySeparatorChar + "Captures");
-+                di = new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures");
-                 if (!di.Exists)
-                     di.Create();
-             }
-@@ -1962,7 +1962,7 @@ namespace NetworkMiner {
-             string filename = Tools.GenerateCaptureFileName(DateTime.Now);
-             //string filename="NM_"+DateTime.Now.ToString("s", System.Globalization.DateTimeFormatInfo.InvariantInfo).Replace(':','-')+".pcap";
- 
--            string fileFullPath = this.OutputDirectory.FullName + "Captures" + System.IO.Path.DirectorySeparatorChar + filename;
-+            string fileFullPath = SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename;
-             //string fileFullPath = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(System.Windows.Forms.Application.ExecutablePath)) + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename;
- 
-             //make sure to get the right datalink type
-@@ -2534,7 +2534,7 @@ namespace NetworkMiner {
- 
-             if (removeCapturedFiles) {
-                 PacketParser.FileTransfer.FileStreamAssemblerList.RemoveTempFiles();
--                string capturesDirectory = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(System.Windows.Forms.Application.ExecutablePath)) + System.IO.Path.DirectorySeparatorChar + "Captures";
-+                string capturesDirectory = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome())) + System.IO.Path.DirectorySeparatorChar + "Captures";
-                 if (System.IO.Directory.Exists(capturesDirectory)) {
-                     foreach (string pcapFile in System.IO.Directory.GetFiles(capturesDirectory))
-                         try {
-@@ -2545,7 +2545,7 @@ namespace NetworkMiner {
-                             //this.ShowAnomaly("Error deleting file \"" + pcapFile + "\"", DateTime.Now);
-                         }
-                 }
--                capturesDirectory = this.packetHandlerWrapper.PacketHandler.OutputDirectory + "Captures";
-+                capturesDirectory = SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures";
-                 if (System.IO.Directory.Exists(capturesDirectory)) {
-                     foreach (string pcapFile in System.IO.Directory.GetFiles(capturesDirectory))
-                         try {
-@@ -2635,7 +2635,7 @@ namespace NetworkMiner {
-                     try {
-                         PacketParser.Utils.ByteConverter.ToByteArrayFromHexString(keyword);//to force valid hex
-                         this.keywordListBox.Items.Add(keyword);
--                        //Lägg till keywordet till PacketHandler.PacketHandler!!!
-+                        //L�gg till keywordet till PacketHandler.PacketHandler!!!
-                     }
-                     catch (Exception ex) {
-                         errorMessage = ex.Message;
-@@ -2720,7 +2720,7 @@ namespace NetworkMiner {
- #endregion
- 
-         private void hostSortOrderComboBox_SelectedIndexChanged(object sender, EventArgs e) {
--            //HÄR SKA detailsHeader LIGGA Enabled MASSA OLIKA SORTERINGSORDNINGAR:
-+            //H�R SKA detailsHeader LIGGA Enabled MASSA OLIKA SORTERINGSORDNINGAR:
-             //IP, HOTSNAME, SENT PACKETS, RECEIVED PACKETS, MAC ADDRESS
-             this.RebuildHostsTree(sender, e);
-         }
-@@ -2754,7 +2754,7 @@ namespace NetworkMiner {
-             foreach (string p in paths) {
-                 if (!p.Contains(PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY))
-                     return false;
--                if (!this.IsSubDirectoryOf(new System.IO.DirectoryInfo(p), new System.IO.DirectoryInfo(this.packetHandlerWrapper.PacketHandler.OutputDirectory + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY)))
-+                if (!this.IsSubDirectoryOf(new System.IO.DirectoryInfo(p), new System.IO.DirectoryInfo(SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY)))
-                     return false;
-             }
-             return true;
-@@ -3976,7 +3976,7 @@ finally {
-         }
- 
-         private void closeToolStripMenuItem_Click(object sender, EventArgs e) {
--            DialogResult yesOrNo = MessageBox.Show("Would you like to delete all extracted files from:" + Environment.NewLine + this.OutputDirectory.FullName + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar, "Delete extracted files?", MessageBoxButtons.YesNo);
-+            DialogResult yesOrNo = MessageBox.Show("Would you like to delete all extracted files from:" + Environment.NewLine + SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar, "Delete extracted files?", MessageBoxButtons.YesNo);
-             this.ResetCapturedData(false, yesOrNo == DialogResult.Yes, true);
-         }
- 
-diff --git a/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs b/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs
-index 9bae5f0..72586d4 100644
---- a/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs
-+++ b/NetworkMiner/PcapOverIP/ReceivePcapOverTcpForm.cs
-@@ -162,7 +162,7 @@ namespace NetworkMiner.PcapOverIP {
-             DateTime lastFrameTimestamp = DateTime.MinValue;
- 
-             string filename = Tools.GenerateCaptureFileName(DateTime.Now);
--            string fileFullPath = this.packetHandler.OutputDirectory + "Captures" + System.IO.Path.DirectorySeparatorChar + filename;
-+            string fileFullPath = SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename;
-             //string fileFullPath = System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(System.Windows.Forms.Application.ExecutablePath)) + System.IO.Path.DirectorySeparatorChar + "Captures" + System.IO.Path.DirectorySeparatorChar + filename;
- 
-             PcapFileWriter pcapFileWriter = new PcapFileWriter(fileFullPath, this.pcapStreamReader.FileDataLinkType[0]);
-diff --git a/PacketParser/FileTransfer/FileStreamAssemblerList.cs b/PacketParser/FileTransfer/FileStreamAssemblerList.cs
-index 4a6a4dd..129d48b 100644
---- a/PacketParser/FileTransfer/FileStreamAssemblerList.cs
-+++ b/PacketParser/FileTransfer/FileStreamAssemblerList.cs
-@@ -191,7 +191,7 @@ namespace PacketParser.FileTransfer {
-             if (removeExtractedFilesFromDisk) {
-                 //remove all files
-                 foreach (string subDirectory in System.IO.Directory.GetDirectories(this.FileOutputDirectory)) {
--                    if (subDirectory == this.FileOutputDirectory + System.IO.Path.DirectorySeparatorChar + "cache") {
-+                    if (subDirectory == SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + "cache") {
-                         foreach (string cacheFile in System.IO.Directory.GetFiles(subDirectory))
-                             try {
-                                 System.IO.File.Delete(cacheFile);
-diff --git a/PacketParser/PacketHandler.cs b/PacketParser/PacketHandler.cs
-index a600200..cb78071 100644
---- a/PacketParser/PacketHandler.cs
-+++ b/PacketParser/PacketHandler.cs
-@@ -1,4 +1,4 @@
--//  Copyright: Erik Hjelmvik, NETRESEC
-+//  Copyright: Erik Hjelmvik, NETRESEC
- //
- //  NetworkMiner is free software; you can redistribute it and/or modify it
- //  under the terms of the GNU General Public License
-@@ -228,7 +228,7 @@ namespace PacketParser {
-             //this.networkTcpSessionDictionary=new Dictionary<int, NetworkTcpSession>();
-             this.networkTcpSessionList=new PopularityList<int, NetworkTcpSession>(200);
-             this.networkTcpSessionList.PopularityLost+=new PopularityList<int, NetworkTcpSession>.PopularityLostEventHandler(networkTcpSessionList_PopularityLost);
--            this.FileStreamAssemblerList = new FileTransfer.FileStreamAssemblerList(this, 100, this.OutputDirectory + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar);
-+            this.FileStreamAssemblerList = new FileTransfer.FileStreamAssemblerList(this, 100, SharedUtils.XdgDirectories.GetOrCreateXdgDataHome() + System.IO.Path.DirectorySeparatorChar + PacketParser.FileTransfer.FileStreamAssembler.ASSMEBLED_FILES_DIRECTORY + System.IO.Path.DirectorySeparatorChar);
-             this.FileStreamAssemblerList.PopularityLost += this.FileStreamAssemblerList_PopularityLost;
-             this.ReconstructedFileList=new List<FileTransfer.ReconstructedFile>();
-             this.credentialList=new SortedList<string, NetworkCredential>();
-@@ -874,7 +874,7 @@ namespace PacketParser {
- 
-                     //check the frame content for keywords
-                     foreach (byte[] keyword in this.keywordList) {
--                        //jAG SLUTADE HÄR. FUNKAR EJ VID RELOAD
-+                        //jAG SLUTADE H�R. FUNKAR EJ VID RELOAD
-                         int keyIndex = receivedFrame.IndexOf(keyword);
-                         if (keyIndex >= 0) {
-                             if (networkPacket != null)
-diff --git a/SharedUtils/XdgDirectories.cs b/SharedUtils/XdgDirectories.cs
-new file mode 100644
-index 0000000..80c09e3
---- /dev/null
-+++ b/SharedUtils/XdgDirectories.cs
-@@ -0,0 +1,15 @@
-+using System;
-+using System.IO;
-+
-+namespace SharedUtils {
-+    public class XdgDirectories {
-+        public static string GetOrCreateXdgDataHome() {
-+            string home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
-+            string data = Environment.GetEnvironmentVariable("XDG_DATA_HOME") ?? home + System.IO.Path.DirectorySeparatorChar + ".local" + System.IO.Path.DirectorySeparatorChar + "share";
-+            string dir = data + System.IO.Path.DirectorySeparatorChar + "NetworkMiner";
-+            // Directory.CreateDirectory(dir);
-+            return dir;
-+        }
-+
-+    }
-+}

pkgs/by-name/op/openlinkhub/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "openlinkhub";
-  version = "0.5.9";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "jurkovic-nikola";
     repo = "OpenLinkHub";
     tag = version;
-    hash = "sha256-vfu2hs4IHTU6VnhBELL0MaulmUVayyBBOYUsi2JPh78=";
+    hash = "sha256-pCMdljBgqxfI9mVperzjAiuq5UUsqmmR+xvuywudv9o=";
   };
 
   proxyVendor = true;

pkgs/by-name/ru/ruffle/package.nix

@@ -21,17 +21,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0-nightly-2025-06-30";
+  version = "0-nightly-2025-07-10";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0-" finalAttrs.version;
-    hash = "sha256-D2IkIypkJMa4ndZnmIkSJwCKl5k3ZIa+99uMz/zEysQ=";
+    hash = "sha256-uN+UqoTSj98ARkwgQT+npY75HDQBDyBO82USXKaq9bI=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-RboGtauRMuui8vewxF5mTiRF3/STxxG/ZG5Z9J/GtSI=";
+  cargoHash = "sha256-2/Fbd6O233/464UXvK5HOk30Z8xbqeURjZNFWITVsW4=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =

pkgs/by-name/si/simpleDBus/package.nix

@@ -10,13 +10,13 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "simpleDBus";
 
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "OpenBluetoothToolbox";
     repo = "SimpleBLE";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Qi78o3WJ28Gp1OsCyFHhd/7F4/jWLzGjPRwT5qSqqtM=";
+    hash = "sha256-eEbptFy5tlIHuBu+HbPxsgdb9CVNXq8r2KKP0E8SIuE=";
   };
 
   outputs = [

pkgs/by-name/so/sope/package.nix

@@ -14,13 +14,13 @@
 
 clangStdenv.mkDerivation rec {
   pname = "sope";
-  version = "5.12.1";
+  version = "5.12.2";
 
   src = fetchFromGitHub {
     owner = "Alinto";
     repo = "sope";
     rev = "SOPE-${version}";
-    hash = "sha256-a7uOFiPnZ++ACV1Ggwh+YtP+NQYS4datQdlPtG+qlg0=";
+    hash = "sha256-GeJ1o8Juw7jm3/pkfuMqVpfMxKewU6hQmBoPmb0HgTc=";
   };
 
   buildInputs =

pkgs/by-name/st/stackit-cli/package.nix

@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.35.0";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-cNfdjVhm9oh/ZOXPNqnLaEG4aKbwl8uh1XgpTMYk5Nw=";
+    hash = "sha256-l8r4/6ihuZSRg5yjjGxyiA8OTHH+RM0yEgonaZUPGjM=";
   };
 
-  vendorHash = "sha256-oK/k0ar8D+V922alVWmhK4MFd8iXgmEkIc16m37Jsl8=";
+  vendorHash = "sha256-Uq1sRG8XcRsi4MQQcjdFCWF3hTpSzqUUkPfeiHVbd8I=";
 
   subPackages = [ "." ];
 

pkgs/by-name/st/streamlink/package.nix

@@ -4,6 +4,9 @@
   fetchPypi,
   replaceVars,
   ffmpeg,
+  extras ? [
+    "decompress"
+  ],
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -39,19 +42,26 @@ python3Packages.buildPythonApplication rec {
     "test_no_cache"
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs =
-    certifi
+    with python3Packages;
-    isodate
+    [
-    lxml
+      certifi
-    pycountry
+      isodate
-    pycryptodome
+      lxml
-    pysocks
+      pycountry
-    requests
+      pycryptodome
-    trio
+      pysocks
-    trio-websocket
+      requests
-    urllib3
+      trio
-    websocket-client
+      trio-websocket
-  ];
+      urllib3
+      websocket-client
+    ]
+    ++ lib.attrVals extras optional-dependencies;
+
+  optional-dependencies = with python3Packages; {
+    decompress = urllib3.optional-dependencies.brotli ++ urllib3.optional-dependencies.zstd;
+  };
 
   meta = {
     changelog = "https://streamlink.github.io/changelog.html";

pkgs/by-name/te/texstudio/package.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "texstudio";
-  version = "4.8.7";
+  version = "4.8.8";
 
   src = fetchFromGitHub {
     owner = "texstudio-org";
     repo = "texstudio";
     rev = finalAttrs.version;
-    hash = "sha256-/0f8SIzF5OnVYfxS6Cb7VbN+IMc4VzCxfA7p93iQJ/w=";
+    hash = "sha256-e3kQnWjOe5dkFslDZ+pUgsMB0twDZEcQXYUaPtd+jHA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ts/tscli/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "tscli";
-  version = "0.0.9";
+  version = "0.0.12";
 
   src = fetchFromGitHub {
     owner = "jaxxstorm";
     repo = "tscli";
     tag = "v${version}";
-    hash = "sha256-GJkFiofMO9dMFDqISzp/ewH5hxpp04o/dXJ/XNUZk74=";
+    hash = "sha256-+1meGROQvprReWSJMKutFcTjhw0YcIekDHml/A+RbN4=";
   };
 
-  vendorHash = "sha256-a/1I1enzmtVY/js7w/cCLTts8lGmMKMiCowH0Hr+xdM=";
+  vendorHash = "sha256-FmJoKADhcHk5mWjcXxXb7VszZhFfGWmBKUGxUjvA64U=";
 
   nativeBuildInputs = [ installShellFiles ];
 

pkgs/by-name/ya/yandex-cloud/sources.json

@@ -1,25 +1,25 @@
 {
-  "version": "0.152.0",
+  "version": "0.153.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.152.0/darwin/arm64/yc",
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/darwin/arm64/yc",
-      "hash": "sha256-DGQGckyCdG5Rj9dPacyml4rHWsZ+x9v2LcBtuCRoadQ="
+      "hash": "sha256-UKivp0FiR1cNTQ8VPYnvQ9dRVVjoUKgwCLl7+WEncxQ="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.152.0/linux/arm64/yc",
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/linux/arm64/yc",
-      "hash": "sha256-99ioFWZNj9V3R+KalfngrrtqcrvihBOFzZ1w14UW9XA="
+      "hash": "sha256-DGmhc6jRu9K4PIdrHN75VcqqfTsoii/hw7+lelFSeP8="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.152.0/linux/386/yc",
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/linux/386/yc",
-      "hash": "sha256-2bMVdGz7kHccYXqutGxtLidpjLMxdzLNogp326du6TI="
+      "hash": "sha256-O5CUX4r699adT3gq3bcjRvW+F1nUFddt6iSp+WloYVs="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.152.0/darwin/amd64/yc",
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/darwin/amd64/yc",
-      "hash": "sha256-hzYzAOGBEk2vi+dg38nP/A0V3BicjZay4Q5Qy/vZ9G0="
+      "hash": "sha256-lPnRt8/8hZEwWeXbOGVfLgSfEAj7vEAHn86M6Z/DT3w="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.152.0/linux/amd64/yc",
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.153.0/linux/amd64/yc",
-      "hash": "sha256-qnHDkqrCPphGiEnqz3iw+N4QoFi2xDjJSQDqHgoXZ+U="
+      "hash": "sha256-JfJ0QcKQviz7wBz21pIGJ/hxGixV5qkDObwT5WBzaZ0="
     }
   }
 }

pkgs/by-name/ya/yandex-music/package.nix

@@ -29,13 +29,13 @@ assert lib.assertMsg (trayStyle >= 1 && trayStyle <= 3) "Tray style must be with
 assert lib.assertMsg (vibeAnimationMaxFps >= 0) "Vibe animation max FPS must be greater then 0";
 stdenvNoCC.mkDerivation rec {
   pname = "yandex-music";
-  version = "5.56.0";
+  version = "5.57.0";
 
   src = fetchFromGitHub {
     owner = "cucumber-sp";
     repo = "yandex-music-linux";
     rev = "v${version}";
-    hash = "sha256-H2sqHkNQUzNm2C1+u89TOdQTM+I4ht8oC+3ONU5YfXU=";
+    hash = "sha256-WvbT/ipVF1oQul76G+92iR1hdOxBUp4BpT4ekQrMtMY=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/ya/yandex-music/ym_info.json

@@ -1,6 +1,6 @@
 {
-  "version": "5.56.0",
+  "version": "5.57.0",
-  "exe_name": "Yandex_Music_x64_5.56.0.exe",
+  "exe_name": "Yandex_Music_x64_5.57.0.exe",
-  "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.56.0.exe",
+  "exe_link": "https://music-desktop-application.s3.yandex.net/stable/Yandex_Music_x64_5.57.0.exe",
-  "exe_hash": "sha256-Z3hmCKOMNIYtPJIhcw5692+c6ZTO2eRO/ZrCQnSM00M="
+  "exe_hash": "sha256-FIr77eH0ksKSLDJBbyTSd/Qkwd1UFc/VFJ3GEnbOD90="
 }

pkgs/development/compilers/dotnet/8/deps.json

@@ -19,50 +19,50 @@
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "485cc4c76fb1751f10f96f1a3a31c6e3b34f9ccf21aff007f6e299783770e279",
+    "sha256": "e177fd7f5ac5d0338b39b1221761a3948a430a9e3fdee53edffd0176435136ce",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "a41d1f12683d1e78cdbcfbae3da897be8e67f1c36cebc9aff7fdcab73e06ccc0",
+    "sha256": "05f3649e566a64715fcbc54904b050aaff8c3b4fd951679603af2dd1f2684542",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   },
   {
-    "hash": "sha256-yLIojj1GuucdeVGBCMWpSyNSYz9UB7Kgf3Z0tBn1Hcs=",
+    "hash": "sha256-otVdsOqE7P6o1rWd1vda3Qvy6IdPLHaYx9C2Od9GkPs=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.linux-x64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.linux-x64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   },
   {
-    "hash": "sha256-eiZ2r4bU86pJP9uhwZrXzYG2aNVCk5Ih/CYV64oX0B0=",
+    "hash": "sha256-MW+OmpBFpT67jnTfPuFMZKv8b0+jqXKn9UR+a6LI6FY=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.linux-x64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.linux-x64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "c82200bcd92ca0de2d0c079b96c0e3dbac3e17688a5857cc91ebd6a19adffd58",
+    "sha256": "b4ebae53b0ba10d1ebd101a3c74cca4e101f3f22edd6ace039d16c1a3b8516ee",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "b9f2e63ac07740e093829220996e16d40e325cb2f09d03b7dbdb9cc754408904",
+    "sha256": "589ca009f3dbe27d7d96e64fab6b2f5fc6c04c2ce84454a65333f52d84efe117",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "6410989c97ea00d97b6d6c494ee9e057db4f2d9d0838c6c2fc8c287b40285d41",
+    "sha256": "e093837ba7ef8e1d4f3a15e6079911850c72e51f5cfc0641cedb13a4eff846d2",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.16-servicing.25215.6/runtime.osx-x64.microsoft.netcore.ilasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.17-servicing.25266.2/runtime.osx-x64.microsoft.netcore.ilasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "b8d2b7f24768d3ac2655e30f77aac4ffc696ad8ef419203f253f569d253f24ca",
+    "sha256": "322f70cf8d23ca01636a02539a2b03d29230352786b09301d0fd6e4e0c5aae3c",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.16-servicing.25215.6/runtime.osx-x64.microsoft.netcore.ildasm.8.0.16-servicing.25215.6.nupkg",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.17-servicing.25266.2/runtime.osx-x64.microsoft.netcore.ildasm.8.0.17-servicing.25266.2.nupkg",
-    "version": "8.0.16-servicing.25215.6"
+    "version": "8.0.17-servicing.25266.2"
   }
 ]

pkgs/development/compilers/dotnet/8/release-info.json

@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-F9gpgqdOLyVa1tFxtysxdHEJVwTCe+WNuVoMtn0jfBI=",
+  "tarballHash": "sha256-RVXgFRVTdQ3jhPI1AGoikK56b7ZNQj3GB0Cm+7ynf9M=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.116-servicing.25219.1.centos.9-x64.tar.gz",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.117-servicing.25269.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-vX8Tri52OaW0OwXV2DgdiwVgj7LCDZVqSm/pxsjN5dc="
+  "artifactsHash": "sha256-aTIMtLGeRxTdY8laeBqmV9HEgbwcCObYV1S3tHt+hS8="
 }

pkgs/development/compilers/dotnet/8/release.json

@@ -1,10 +1,10 @@
 {
-  "release": "8.0.17",
+  "release": "8.0.18",
   "channel": "8.0",
-  "tag": "v8.0.17",
+  "tag": "v8.0.18",
-  "sdkVersion": "8.0.117",
+  "sdkVersion": "8.0.118",
-  "runtimeVersion": "8.0.17",
+  "runtimeVersion": "8.0.18",
-  "aspNetCoreVersion": "8.0.17",
+  "aspNetCoreVersion": "8.0.18",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "30c331373e55effdf3c799bdec8751e6ee5367f6"
+  "sourceVersion": "f4d2dc9c002dee003c875b89729d1ce958c24a9e"
 }

pkgs/development/compilers/dotnet/9/release-info.json

@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-jyXUjn7AqUswtwLBkO54YJo0hSDuvvMsHmv6GW8p15Q=",
+  "tarballHash": "sha256-9oGCuV+kQe+2Oypxyj+YSYtmTo2BlkaQzk7E+FWYGkQ=",
   "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.106-servicing.25230.1.centos.9-x64.tar.gz",
   "artifactsHash": "sha256-z45Rk63ad5VL5pslOUktewJQOHYLQlOgz/ZiT9v/UNo="
 }

pkgs/development/compilers/dotnet/9/release.json

@@ -1,10 +1,10 @@
 {
-  "release": "9.0.6",
+  "release": "9.0.7",
   "channel": "9.0",
-  "tag": "v9.0.6",
+  "tag": "v9.0.7",
-  "sdkVersion": "9.0.107",
+  "sdkVersion": "9.0.108",
-  "runtimeVersion": "9.0.6",
+  "runtimeVersion": "9.0.7",
-  "aspNetCoreVersion": "9.0.6",
+  "aspNetCoreVersion": "9.0.7",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "3b2a975be6836979a19db7625a972b46a36efaeb"
+  "sourceVersion": "2d8506e0fc69ec3d8e92eb3090e18fdb5f8636f5"
 }

pkgs/development/compilers/dotnet/default.nix

@@ -171,10 +171,9 @@ pkgs
   # https://github.com/dotnet/source-build/issues/3667
   sdk_8_0_3xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_3xx-bin;
   sdk_8_0_4xx = combineSdk sdk_8_0_1xx pkgs.sdk_8_0_4xx-bin;
-  sdk_9_0_2xx = combineSdk sdk_9_0_1xx pkgs.sdk_9_0_2xx-bin;
   sdk_9_0_3xx = combineSdk sdk_9_0_1xx pkgs.sdk_9_0_3xx-bin;
   sdk_8_0 = sdk_8_0_4xx;
-  sdk_9_0 = sdk_9_0_2xx;
+  sdk_9_0 = sdk_9_0_3xx;
   sdk_10_0 = sdk_10_0_1xx;
   sdk_8_0-source = sdk_8_0_1xx;
   sdk_9_0-source = sdk_9_0_1xx;

pkgs/development/compilers/dotnet/versions/9.0.nix

@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.6";
+      version = "9.0.7";
-      hash = "sha512-4cbMRgJ07eJMBUi8v3Ps9L+ntztvA9VcCiMvGSIZc7Tj4QZG6yW9PEVrks/X8AfjA1Rj1l8OTJaHykv6oRLZSw==";
+      hash = "sha512-id6IbzqA6pn5TIbYABSCXpPeNwxUGZuMHbMnjeMs+GQIMFFf2Yr5BUy2kigmXoBtgx8RYHDT3PzOrRvcfX908A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.6";
+      version = "9.0.7";
-      hash = "sha512-23ET/Y/1NCDNZWVnfMRXwoadsuz+pZrtZG2q1Woj/iZCkvei7zDgUP3OY5HVyHNRyT7y9TH1GA3smeEGRzxVzg==";
+      hash = "sha512-TeNH3NfbaRL2t1vTSwK1nR41if3XBsvxIXl5XDeVBKp9uJ++D9S98KkNEAUAJLyV+6AZGgcDPlDSG5KjiZZ4vg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.6";
+      version = "9.0.7";
-      hash = "sha512-EgMOEOOHwep0HuDkKqmUHPU5LyytjYNhKEck/jrk1jEuVOMM85gJ51A6V/D8HbpLMwZu6Xf3mun+X8FTQ8rBQg==";
+      hash = "sha512-spN1zg0NHM482nnpPzXZYJKgxT+A44KLSswXbsTf+bDWdoZpMeBcODz3pNAz2Fg5PIcpR6amQgTy/G0JHoDqrw==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.6";
+      version = "9.0.7";
-      hash = "sha512-perSjdz+eXfLbiEiuKTpuwyDK6cY/Bb06nXrC5yyzyRSpOXCSTYReckhj905HsLcGhh/fI/f001oZeKkRapjNQ==";
+      hash = "sha512-SiLChOzRKjrQHquCUytslPdSTgzUV8VHIvT7bertBM7BaidvQDfkl+0O7zrdxEUeN8ppHAsV1ZP+l5tPZiHv8w==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.6";
+      version = "9.0.7";
-      hash = "sha512-Syea/ZRRC5TEoOHYOjTrPY5MutLowj/wNyVmfc+vpsjPKZ3aUONP8QtajyFGV2MiaRe3n0v9zICCahscDd0C7A==";
+      hash = "sha512-Y1X3qXOXHD22H1IAFk8BRFehz48zEkiZr/xdQ0eop3xVFvkiSitzVGhGTsE5cA3JG1/5lItxqJLozjnf1RsNVw==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-jZGye2/1bZCKp2pstHa7Ao9WTJvn0nkjW71T9GX1LXlAptkf36QFJhC/3Dty+XqJpsuxRsxU9A6Cjib0g3tCGQ==";
+        hash = "sha512-0hSN5Dz16LRR+ddZh7NjEqOEYsj1Ba07/Ouo9HbUrT6/PJ1XtsK1tdpwoJJgrpKrw+n6JyqpaMKpS4f9oNYNhA==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-Nk3g8RsNxtG8hC5L4BT+VBuqNKo6RnCirF/9d1RjhhwpleMH9uQsvkyKhVm1wNodFORzQdAP+uUgdiKZ6eu/+w==";
+        hash = "sha512-wuO6tQcWJj1GKWXpPhoFvobx99K0xy0C1Z8ZACvHhRuWoN1CKfPzC5vU2w/9zCCbLR9iDWYrcC0VdrduMJ+BOQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-p2V2hOy/yqf3sCeoxi09m6WoZ/1B7iSM0NXXgcYqoE1G2bhv2FhAv2z2eg6Ynh0GYU07RfQHLwrxC2+qjg5xTQ==";
+        hash = "sha512-MSJVLRiLk+L3NjJBx5sn8tZVEGCppOapb6Zie8nebplwo1ifRtcIf6BDRVSv8V9wBh3uI38jJOQwhcqLUY2ehw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-6A2zGQSBQp0K/Anld6WIXIeCEA0KwCgROQLwi81+NUz0MySjOVo06OgxG+svJeH0gGX4O4g4aP0G0mu5I/9sTw==";
+        hash = "sha512-aW8mtPF46qa4i+GrHv8OUiPam/x4xYGOUKt/pUPIFz9j9SMrKXgw0mHK/H+j2qHknN4Ozy6OtcTUxpIdxkmw6g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-Ueh2AoWYf1xIq1GlKxGiWPdRWNTky6id6Nqkxz/tqWE1AdMw/aXQwK9eV6KVSy5X1uMtxqs9437d9Cw1wKGb3g==";
+        hash = "sha512-9Ihz6lNAQ9IyiGNSD9fGMKYv+0NQQqAZVpn/GbHpTRIlC4ULGELRcHerEP29D2r1ugtZPyrtR2s8EAmMA42MdQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-Y25NMIMRfqz9xftyER4Ip9WTbBxmz418hDRIbnxEs/Rm7YTImMNA1spCXPjkYKNGuthjbMP0ycxcrIIP7LO9qA==";
+        hash = "sha512-L52p4oNNHR31GlGLgxekjOUM8EL0i1g+X/RRBFvaUdgCy9Uo1RCpsWX3aKaY2Ca93H3aa8wQBsMFCk/3HG9vDQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-4lzVKIyc39LowT2BJZve13EsBC3bzbPGXC6h1233QA2ROXEVoEQw0xb8MRMb0J9PHR/RnPs14E1p9soDZ5eD+Q==";
+        hash = "sha512-F8YKtHc6Z9KRAo1roiwNnqYCIC4OmGQmq/u1dwumD5Rt6dhRBnbzSVh7wl6OKRADLiX9MevObQ1EqY+pArvk6Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-ugY7GnQv+2h3a2huCseWo4twDkszWWLJ2QB6Y2pthaERkbqWF/+n6Xr0xLWVWQkI5hhsWZ6S2jOjrho2OAUi+g==";
+        hash = "sha512-svhK1og7b18+H2+pqPDerMtM+nFNI1MjvOFyfZ6Q66ALxDf2v4/TyTvekJqEFTeqAl1dG3tYTChRk5ftd5QSeQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-5BbS9hxja2XWQBNM2Wz313NevZUAt35dqThe7sPAGEYTvs33eEt5fCs4xPFxob8M8z0meFjwVrVodzzfXFodFA==";
+        hash = "sha512-99F1DpBPJN1n2CUfgTgI69e1UaEzT16bER1ROa7i04LJbla7Y4PTe81/wNfg8BFBXV8k9LJTErLDFTQcLRNK6g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-YE1DyntUFOnzuyhPn69dxyhuRCAlmYfMWDIGwolrV7mAa3wN2hgdTqK2bfUNdsT9Sw0lqk3W02XATfVolZ5aeg==";
+        hash = "sha512-FstPcH3XP9bH8nuTpq129w8M8Qt1LdJqhBNnPJJe6fgwMTaAsHzfmlcDQiPsuXkDY0nDMMug/TUrB3e7xRQwrA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-jL7rg+9zAfnGbJQXtoT+SQZ7U4Xg34As6oQwIG8VuR5wVynFdPUgXp1H3dem1EKG/obE6PgLT4MgJM1mhXNDQg==";
+        hash = "sha512-KPYuoUlT2noytN3CQxLSSorNUq0W/6KH8P41j2lXhTW8+EvH34osmFwOKSTZoCSLgZBLgTUhgGS/7sBwqPJgZw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-saNHscRs66/1FgZ7tQxiSK7E3AqLheC3neSMAC2bvyKigvli2tHK48y8kiuvWoa7oPL8+yTOpN1Xgx7/vcy32Q==";
+        hash = "sha512-hu2Ls1ISDdHRgWoNMDFykHxNGNx5AFf/tSniUEd+Y6filNBm+iwzZlP9Wfb9HQ+N0Dtd4awacc9wxjCibkwiqA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-S1KSrW7+6q7M2fLLhXXTdrAvfa2E/LJnVuHVWMpGz+9ISiV8XI4iSW7ehrGiQ3pi13y04JkgFs3Qhug2tFONPg==";
+        hash = "sha512-EBmqQ9WVYHtpGaiq4dKlJw1q/RhqKNRu/kTqx0gqyF2KlULEm759WVXvNsTbn5z4rHATmUlvMbKHl6aPGeEGSQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-75DcTB0ssV5GYzcEuftwrQ8k2LyDB2e53SQpUyAbfM1oGduUxWmntm43OWcCNeE8t6q7eq457pHl5fwI1Fr50Q==";
+        hash = "sha512-JeyTs/3XBT11xNgnJJW91++uJ1waJMoAp+FRQ9CyY9TPYscLOUDTe5cKAy/p0l1lbEOVFbqu/YhpjhJ4S7SH8g==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-3F7atPGjj6zBgdfWINFk02PVvvf90ldUxRHCGpvyFQW+DNmx7y/zqqnSDmM14eoVRZcVCRPaKCvPjfv1KNIlag==";
+        hash = "sha512-SY7EUX0XS4zl6TIqcv17AO5xQDPxrz0pRX2Bzn/KboWFObsLNfF4V+1HW4jLbSMsIK97MskDjfaedeNhYy8K0g==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-c8f2YKBlMf1WU5mgkDvfj2dC08ptngMc8KhcCpHRnOwPLMJUUA3luIe2J0pZ+nKBmux4Mt7t2QY8DUbmOrI/Cg==";
+        hash = "sha512-sTMXmk+7zY66dB2lTSeqbDAUvMW+iUb86MC5Q6ALnAcQfB0BS0Y0sCFAfqDrjb3+3l2NyGtkLdKA6oI379oWrA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-UGSb5nYKfDFV0dsRbRMemfrw1qeYNusbd7ILPLVN+PH27ge9IjbV80PiJApW2q7GB2xN35WMhWiwrmE2Y2JsIA==";
+        hash = "sha512-C2yLDWG6qVMh54srzmyNG+w8kl/gU4TPGKkQhtotemLdIaamHyLM8xTW6UQxubC7ygqV73RZ/gip80zGt3zw0Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-Bk+cjNd5fEgTB7FoXuUgV7ke/VMUDUnRryTq8m3wsnA7Il0RbjtFBW4Ut9RAKU1y3ZYs4ZN40rLgE4s0JvzHmw==";
+        hash = "sha512-9hmu86MCK6T8374cYyl+AbPpgocORRD7kPKlFjMp2vKusZSWvc5QhS3DvPD6Im9cS7wiiXNhN/IxIvMuOuA2yA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-T8KyQcQtCWwWcwzuBKvPvHu5xHneYQ1RA1PNuWGk27rBklXmxt98icULTYpdDmcGqn2BQb6GlM7UWBYPA/VFjA==";
+        hash = "sha512-g3WkCqIJocgTL0Ggcci/wRM57+APJh80V8dJtp2dK2ol2lYdR4cH2UcRLY/ePIPwpYZrbM4jbW1Pom3C9AjLEg==";
       })
     ];
   };
@@ -160,402 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-+NPQTOSkxtMikAfdRvHUccbJSRjgmJqhviHXB6xr17ZubKpbHBe1r8/5BmpUgNedykJhM+yjuM5cG12sLQ1lWQ==";
+        hash = "sha512-F978bKpKaTVK7yUMWyN99AxsaK6AmkOOkUelyGJLT2MGGNtUyEYoqG6Z9xlm6xMYNGYo5qiSPcFAjZsOXq7Jpw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-i77xcc7KGxpX1Ydaa5R15+eNtko4CoIiH6HcwaDtBmnSeoLe41v/sp4W/OXlqrd+Q3a6UW481ff7n9odhgxsKQ==";
+        hash = "sha512-jDGelxUC3MZT30iJzCQDgbTcHfnbeDUDnRYtNfQ2czkaRfrQcgfZrPWX34KRuU61KAxpLLYg9heUbmnevM4aIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-FBlNeLvbEAjmweRkAMyVxPuC2LorMXgVJmXomt3zqHmpy6JJzF0fVQuaIAQR9rPXwQxBNW08PmgXqRBf31i8RQ==";
+        hash = "sha512-P8KiD0vwj2ocq/3D/a3vxAkqB/FXHuZl1Os+lcqu4f4k3LmBsju2R+WZnsWljWCEfAm6bwjmtyMchPQnzkmVaQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-ekkS3SSPWUzKC54fK5zDz8ZMe5kyLIK6l9mlFZFPuJ/mvbJ+t7YQmy97Lp/rcjUDC0z2SvwDcbe4rw0JNCJyDQ==";
+        hash = "sha512-j3jihG333llTYG6zr9lCKGj7OPHjZE4hc5RHNkWJShJKecFHMnPk9UkFfzgyf6FouM1K4gA/OyZT/wjmDmdf2w==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-/AhNE7lNbGsFfMXWk6/AAN5vpkaqrnwzTZJ59lUSba1onpCJS8ageZNZZf2vFLpl2JYuNt7qTgcBRTWZ1I0CEQ==";
+        hash = "sha512-vQX6KFVBAeIo4SvLwlGw/MivqU3JC7mxsVLlNRQzX9W+vbDLdDgLrruCebjRqSdgDV9xoLx3hLGc5BZOdtOJ9Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-YBOl4EfiO8a9AIdr7hdbeHB4vu3HNQs60YKLakZnYGp+YYlY5VfOF+NMcAelrkbOf88HxMoKsPtV0WuQrn6Mzw==";
+        hash = "sha512-M6uGdxBqyzODiOmWE7VmnAYR/O76ZSr9sVNRCwYO7HOZYZylw5y51gRvgW1u4hFeIJxvMWGgicsHQ10FeAEKwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-ldmqB77CuVlSeYEvLXsOf8EbFgyDGNPm7hb23aweU0JEbpkYlq1+LhGMKavB67nckMhOkMWNJioWXP4+Cn02VA==";
+        hash = "sha512-atws8JTumHepwLA2m3dKlda/m25s+kYW1ROZD+AlpjQ76MWxa1YYRNVw8WC6eaa3VAqXOQdR9ve2jsBMnjKuwA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-ka7E4MUOFjZyNVyglGgVhXWp1Vj0lyBUJ7b1aHgegcXLSvDP0GwNF66IBjPxz9PNZF4MxNJr5F5Ny8u6FKI/gg==";
+        hash = "sha512-nGVfOa47L+KNChpXQN5PQjI6CSBFXvH63+EJPcusBiH+BcddA5VPFNGFj/Kb3VCrXNKKGFJR6A0Xlgp2UtQhtg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-0hK87O2vVKwqG9paC9hsVCKOZqjEHcCrLhR1a4A/sbUqQo8B0MFKvvr/p0w5PFmiQmho9lriLWcJ9gImsSt1FQ==";
+        hash = "sha512-qkZemav26phWQKiDIGhQjEmNYefeSJCUOHIF/eHiaDnRm2ZmE1zn0Gwiva1DtDScDgDpTMAk2LzRQIOUDwjbSQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-cjrfAzBmcTHSJno22YZG218HD1WjXe9CGVUN+sGBxP/c6fqGulOI5UDJJDmQ4FUV+rW0cdTre1DYLtWiMuI8Jw==";
+        hash = "sha512-lWz1s0VgvrE2DiDEoWzZALdICtr8+heyyGjut4tnmiclmQq6OooNIj272xxqUTd/fXbMm4SnroE34hUUhkiDHQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-kj9m+09fQalBWgRwfaYThuTK7NFPtyad8X63jZ7gfj7WnqsqZLWdsBtNihaJVoNj94cHHVut3MItFfCWtpPfZw==";
+        hash = "sha512-nR++CrvFiYs9LGxdTeRR9kVO4tLPV4hXQJuCPEywji0ikT0H71z3i/ZNhCLHOoFseddfb+x8wh0o346H49/Wdg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-Usx2GTbhdsrrBoIDG5ZX1DUfDBJGVGtf85VlH3tX0YXBzVBVCJJPx7IfcmakG1fozurBhNpWiGXbglyzskySnw==";
+        hash = "sha512-FrNN5JnBUVIrEjEggGLyKsQBhPmUUSHXtlSGo1A5YuAwNUtepbTbwLMCcrEfNJgNQ38+L8naAGu1ZqKtcRZt+g==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-MD2n0rlApp3G+Ur2lMQLh1iQl6afbm1Q4KwZpB1zV43HaZgxBL3djW4cKFjDYo0aP2Bgn1ycoL5aab9aZti/5w==";
+        hash = "sha512-ljwTM1F5KPl0wWaDks91B4+UHaSrPE9G6/U3vqQKspYXjd7D4cI/xBhnIrQrae5ntPAXHwk03Rt0VsbkIP41wA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-6qvqNn2PfL8YUY/CPyeZTgTTmi9Dw7w8aJrpn7DgpPVjnspb8vsuRd8T1Li2PTU5y6E8O3w6jetrdI6mgpX/Hw==";
+        hash = "sha512-wUkyIvfd0uKKSulkzfOTV1ACj9xroqDhAU39Ufz2ZWLoTsjsm1O3+O7KtqEwsJ7pUdy+am9TnIN5pG0hfsFepQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-oAQ1cHbW8ZdXvraB09nbu1V4b1eUN7ZH71+yFX21t+1ArT5H8PVQ/hrd2K6WhDGFJBXlNjYT6Trlg+gbqKAheg==";
+        hash = "sha512-HoPuExDtKhtkoJGwq+B6mDzTKtjKgrwIij0u9954TfjZyDDwJozmEnFgtoZZ4ltTH0sguKL1JSN7GFYFkQq3BQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-ku6jYk5c0aPkZ8JpyAZpjyEJkIqNalrRl8TQUF8c7LGaFEzjR7jrTaiXUeEojl7FX07Jrmo5bCwkbi+P+rMbxw==";
+        hash = "sha512-3qlad7bv/DSNzxH/mgvwM//MX4fA1OQmGjyBM6eujEm/K387JQ4OUgtpXHsu8jHvRARCuFB/qNacxbzvYInh4g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-GSnfCxkwq7J1PdJaNcVSclPNOftPWD6m+CDwYdkxmFFcI7Qn667+UAqof/zTDlrWBKSEnQ6Og0I7ldHzrbyOKw==";
+        hash = "sha512-sl8QufxXNfWIxOjZQtFJJG+5zRWZtxQc0CMOtVF5SURkZLz2Hy9KwF6bz2tlljohK/Akf0udaeYK2XhnHIKiug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-mvNpFSjrYU7/PMBy98idjunaBKU5PolHyFXbYyVPrlMWUWSo5F5baxM5rFmD27tEJOEs4BFbKGGAIgjTl0dL5Q==";
+        hash = "sha512-8TsHIOl31DLvkBgj8mHbjP6eSK5wpIGygkdSrBqUJbs+k6MIQrblw5Q6HwMsS8LcRtxvZ4PtoEBubvie/dGSfg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-csGlXEfhrF2w3JUJr0hBgCRkd7jAjOhTY9jsNbl1f8TIhjepUH8q4dPrRrjBzXopRW3iqD+3oSetnS2/AxqIAA==";
+        hash = "sha512-SXg/5ySrWhQuauFbw09ydh6uJadEAWSfOVDwdEb4Tbd+DkCkjk/bjGn0ALBcM8iEjLbbRMvPOd536pS07fQnWg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-IFZ4+4RboQyHCLwSJ/4hWFkRbBez2rDTp00GUC7tQRjH3d2vPBd5GPu0joBod7YqmjQCDw+APwgm/LXuF02RBA==";
+        hash = "sha512-5wYYJd1dr4n/CF/EOHVq4LT2KlEojcl5IWSxa0y4/fdO/1SEKOEPDBKqnR9kiPbNKTB4RRFehQr/kkaY6bCwsQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-P17+iLFLko8DK8zVsEwlsxVEsA2aMMdWpmEhTgyeHfG8uq5eOyMSTNMOWeOsDDpThNo+8U9d4xULnV46IRFwQQ==";
+        hash = "sha512-zTbTJ3M1BSPPTHkk4KHZJyrK6DhpMUiryHBZ1AYcRlLYCK6ZIpAjv4izhMQHAxMIqz6ovLZVuvc7vU8aKG9qrA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-MWQXJ5QsswPxfykUi4gHJ2X4pnQ7ZWeIiGRx9mEWoZPV/NkC64DBG5KC9u9+hCluij6BZEFjwBjl0KzCuOm4WA==";
+        hash = "sha512-ci5Uyc/L/+JSEsM6XtuY2W/94KWhAU6K/txAf7FXoups3/kLRQfSSTeSTZ3W6WbUuI2w40Xl0YYOHTo4lTSDJQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-eVf9gQ1qlT7uUVfYiSLpj1H/UnGqkSUuq4/evLuAxA4JHGFRpv/GdNmgMcM8nVTNm9KkQj4XtqoLy4iS3zNrmw==";
+        hash = "sha512-/RSgn8w2zG9pJOQx3qtyce5zvFHxGc3TV3BOTCa9IDM0U33rbNiLg3GEEaodvAuiXkY3jsnDd4HT5ZOHnfboAg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-nesIUxMmU5gIh8GRimFetwosmow5P5ij6USkbkM5f+iE/C91TbwZPrilv8Tix/Gj8OR2lOGlREhYHUsc+5H9uA==";
+        hash = "sha512-6vAs0KI14hm+AnP9gBoykxOadgp456o62SJ+o6yFDVqxn+nWb7t4Mra9oLi6YWH69m8mVQN6x0QCusDwdtgKuQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-noJBW2+TxZYce0afsgMJAAA//nxOWF+KASiQ3fPRpzZjeOGfdNyY6BcAt2i/DfVU5u/cqY0IwOfVBd6iq3dkLA==";
+        hash = "sha512-vKDr+mIfrFC4pGBS7xsN4kqa6YMXezozSfeWIgi9NUzI1tlrRIZrwEla6eIuU/tUzZrrE67bju4R3BnrFSTtwA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-DIJUSz/0MD3YBkhR17re92A9FGyu+1lhWJX4SkFdl7pILxSgJUqQNdZpnh2KssNWNbb5j0EtP9G3Tc2uUCH8bw==";
+        hash = "sha512-oYJlCtnHBn3dWqOgyE1E4ng+lXJRPzWNYsf+lj00bCLFkjaTLBmG35hMlkZ1ZmZDPBU4VvOuHDyVx3/QLJVheQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-h60P7+JXr8o1IPHe7pNxESjR8+pVvYT+AFaG5L8G9SIKVr+Rtt8P5rpgUXXLyydWDiarrRUdo52Dr4CXkc6Ojw==";
+        hash = "sha512-34Y4PO3TmpEaBf7DOQUlckzuJb6G7s3xubcJP3xPrwbLsVstOL6SGKBofWqjyygH3i4VgLYc3bqxoYDryXX2mw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-aZgVLnZjLpr6oPPSDX6DiOAnZoDukSn5xmqkWj8c89iNXHRE1xK5yRNzwRV4fyWIE0tIf3EvoPOlzE0BpEBSYA==";
+        hash = "sha512-RPzpHiUrXTqW/hLeUqZDA9AFSkVseZmvWY0wwjD5GGKsTRzQS0yT42PIVqsHbEN/nHRRKWyvTN7tokyYz+MiRQ==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-rSpPx3elDDELL5n1c8teBQWlv83Z62cYRltExoAA3D/HB/YKcqHNjnQc/4XB0O40mP391+h9bfvDSkMdUc9/3w==";
+        hash = "sha512-GOs5KT4SIzSpfe0WPbFVhnA8+klHq8FbfDeDUTvbhSIClPLEfwheeaM+HuQpZTzxpOaMTWcmrawm33ia3NZyMg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-+/DAiKxDjWba4DRXmw1dfaK+FWA6foy1sGssWxs5eAw2wh+uROtGsKJrz4rf1k7d9KP6jF+tVsV0vb/bBi89Cg==";
+        hash = "sha512-4oU3yJfh3HRrvRrCC2QU5wwhqiLc1Zl6Py4cmBVFgNdHOTk38/gt43tWiRBAL+xNr0mX0cltGPMirFdtFZt1wg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-b3UuGcvJHlP9ie1D6YLwCabrhRYZjbhPxYe9vMGPUGBlTNIZUz7kdwNyIyCAWT/dQRqOKD2EoNBpV5CEIRoUIA==";
+        hash = "sha512-cWumHZc5W8yX5c00U3t4WUymi16KojHUMgSkla5NvzuVPmDpopVKsiRB3j+iQtwA14apPr9fe11srPVVMH4WEw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-9p0JQzftQn+daDgkQOeTc0y4zMw1XSwfDVU/0r8GVXJ7uGnHnQ7nLE/7ZYbKuEesq3POXWz6zXvQG6IbsAzgQw==";
+        hash = "sha512-BODpAvApSDrrndr/6MIR52Sztu7iXCUt4Tn8ex3ZqDMsWgoiCXe70WT0loozMuU+ZnzsXyJf8m2JSlZ5NMsK+Q==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-OiHjmlNigwmhXEazRkn8KpJqBfHlXd1gT22J18v/hj5W5XMec8EYkdNSS0Pcj7mRHUmKJWeQB0bBx95sDJMQig==";
+        hash = "sha512-nn5X84wpzbMfJ1Vx8fgZdL7cq4d2KxWK3M9GBH4LggzYMnK79YDfoxHl+YLTK5EfqgxFfxunzZdNrpUBDP6F6A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-da1Bckkc0nO62ixInAZ822MXqMi7oMqcIo1/PRd/AtmNuL61tHRZB8VEVfT7hHBTM+VpvvZMquWcTg44nwkYdw==";
+        hash = "sha512-i6qupvYxI42nWLBGcj6Qe6oMPl1uk+9ANDTPz4x29O3/VEeUw7pJZar5dExUcc41cfgA30UHTkyzZ43umrFirQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-6eV83UTMgW9ysKifWY+qvz1KTC077Wxt4DobByn8I+Op5Zk4Cowta5IYrpTAaA2F84I8cKldyqDtcgMyuJ1ciw==";
+        hash = "sha512-i6rCnWy2wF4dseZ6IQcmBPs/A2rj8Yaji1UilfXyOtRnP3uQazDEC7Pd1JJeqzCTNRBgfvXw3r8IHXTxt107tA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-gkgM4PHEEP2doB8VNHiwBTazR/0CaX+fAB/mu2sC/yEDLGvFWF2wPwmVLho7YqEy65XkZUOxvoBdIQpYbxkd9w==";
+        hash = "sha512-sJgDF8XETA5JhPSvt3/DOIx9SSTuaG14oKcVpoJX4Yg8pPQJ85IqESoo3VSRR7HQWN/e5Nt6ySu7/jnfXC0szw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-/AneeKhgbNFFnlsbKwsHd7Pcjx8LVch4/sjtbLLYdeHCBEsdFTG4dObQAuaEG+JlcVE3r8yAGpyl/d2HB2nVlQ==";
+        hash = "sha512-7p8ELP0eWRjIb7/djqopJYoLoQstaBZFh7vDB91ikkXXlCxyHr14h0CygLkcUELTMvSS0jnAQ+icnYy5NBA0SA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-nE1uPy5By1aOy3qMujXO5N7/k3KlwhBNU0WB0BUUt7CSK8aRk9OZ+6LpZP0BnwktKy9lV4jlenF6ATimmH9yig==";
+        hash = "sha512-Yk+dlmzAg05RUkf3C4eUuEwpk+QFSR8lFpIe5EUT9owyCqCYBa2NrkqeRP2XoIPzbqhNIZqB6ChSbpg0wbPMlg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-vhGiijVula3UY5RCzFEFNdoOWLt6Gcm1FZRuE6EHOX5A4bx0poj4it6vkEZTe/p5HmjBiuLte9RD2uwd1aOC0Q==";
+        hash = "sha512-+oZ4sarYCA5fqawFE/9JFJtNnERKCMRY4SBNI6FVKtLomoOKbu5LxdxcV4SWYBqfXg08fWJEZX8qHr/Mmd/nHQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-lLsdNjROghJNpR66Twj233udoE8O+ZWnksQEvo1bzQzGw9zUUo4MooUGXZkuoD+FzUDDzdaBmwZVzJE6eEZZLA==";
+        hash = "sha512-ozFg9cjKG8pN56wrFPV+m0wbVyK+cOutTo8LrIVYeL3epXnahBIa6em7POXvJF2FRmTRjD85ASH8xIrVMc7z6w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-OPg+mErxqN/lfrtwyZ5OpFbcwx2m61G23cZucmaOs2K4ezh2cUzRuFyXs3jwaTgrl+x3uI/ZJoXxGlOIjDsfrQ==";
+        hash = "sha512-vgQaQhPWngepjw+y9qhNx9b/QDK1YmSlYzjO8WUGfYDPnUn40gLUzMKlPUAAMTPBIt3clULPLy5K6c6w3bvQxg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-prdOLgJLRRGXhqCgxXmWY/bEyqqFOS9crkM/wuguVnrTGO/hU3ARutgJxy4EDTGVVMXbkPj4CK3JFQl1qw+LBQ==";
+        hash = "sha512-ec2/bdKdUMyYC93cIJ6sqAG5yqdjJ1ikRwy7U12B77HrWMBUOI3UeHRmgcBNw775fYZ8Ut1P15WyaZmCJMW+fQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-8xBtrtU3QgkQJmPb3Cn1qNktfvgWO45GAqQipNUVF01CdWkNQEcYhreUEPiy84tgX1CziyKjWz95MM+/3kDf+w==";
+        hash = "sha512-yebdLREVWLaayNNfyAu1rffiP4GIpa+Tyz7dhGIF1AlYPWdFHGldYz1eYepzWqqiAXWWgEINQaLD8yaPgRLnSQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.6";
+        version = "9.0.7";
-        hash = "sha512-mt2dv5Xg0yqAjF8b363gOAWSfyyF+m/Aq9H8hN8P7lDGJ//VZ7m0qHsL74Kj81U/g1Ehkzj7CnQwoUB2oyL2gg==";
+        hash = "sha512-QAJEJd7C4MErPoK6kjzmL7aTiRYSDXRhl3WwDyGzIEav5Me7jDo1OWAENnRL2jw/tB4FAl0k8ADclshPyZRrPw==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.6";
+  release_9_0 = "9.0.7";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.6";
+    version = "9.0.7";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm.tar.gz";
-        hash = "sha512-Q18eHRmdi0kBVaTaNSQRN9FxGWsi3RnCM2g9BDHYSOE6QkRWP09DhJl0WfQKdnr3202yP22nIs75oRxzJQqd2Q==";
+        hash = "sha512-dMQjUb5A3W8gZWzC9AUz1fRddZM4/EnNvWnYP7TPTkFX3Ek8CAg8SEdES8RiidAz+TyXgHL53nK+56VBJRq6DA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-arm64.tar.gz";
-        hash = "sha512-inAkvRRCVPQAwHWO/Vw5hU66XX4xh/veLchXzt2QEq6TrO6xaDv2vzkM77pAxQ+VzDKVoajrgxM6jgG5EonfxQ==";
+        hash = "sha512-ebKN8rxSLUe9DqP4tKqkRxAvkgGdA4ZwdD+7weazHdIGSZ/238LTFiPe22Sp4sojYIx+pyJfHwcXRd5yyfgb9A==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-x64.tar.gz";
-        hash = "sha512-VMEixMYSfOfg8K0EeaEB2xRVSEyeW/+o/cDdctLbAovoaGHzMfLHwcsurumpLnQeTl2lZ3lVM+Rq8n5OSBwEUQ==";
+        hash = "sha512-sXXU0FePn11zXVne8/REWUYu82tL0H2coO2YU79C2Qx7rOGV/yZKnc9t1NbUUshwWQhRRiaPzjVA7Vjq85Yp6w==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm.tar.gz";
-        hash = "sha512-8OfrOheC79iKYMXEW4nyRAaP3Jz7GeD/0LR2Cg9xJfQ/K9AOqvaa1e0rXyt00oR8kW/3lXnHdiin01hl1yuqww==";
+        hash = "sha512-NJd8TzThH1Kr3A5I8E3JWrDRvf1kHdQKTFOQwJDSQuxF7VCvsXYTn87WpaU0ayU0X9+r/x6kOLhZS1JpLxSjrQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-arm64.tar.gz";
-        hash = "sha512-xh80kOf2wtQ72Y35WUo4qZE8n2AWiL8GMbviHVUyml9XMfzEwPa/YNtNjpnwtQcAsYhtNC0fiZqN2+nprpbw0A==";
+        hash = "sha512-1La1Q5lX9q0xwfiT4+dbToy7Py8dmn+iGukimuZSX8+Y1kO+pMuOeNscUJ49t1t4axI5/S3vIyjplUGisE5XqQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-linux-musl-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-linux-musl-x64.tar.gz";
-        hash = "sha512-22cIKmvRLSaN+zk9rBLfMWJo5SQBBm5GrtIa3MVaadMQLVegkwvVsOWiDlq89k1J7KmVGLKskS13mgBH02xFvg==";
+        hash = "sha512-rH/FG4C8uSwoIlIIOEksyQjAjQYBFILbOHdtaqxEIASvEKULrOJeLdmGxDC2HKzcGIyqHnJ8WCHO7maaC8sOlQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-osx-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-arm64.tar.gz";
-        hash = "sha512-iTQiffdr2Iq50nb9qKmrmBy4syAgF8TiY6RLwBzor+X1Pai6BGzFpIQaPeD3IXZ9kJZFWXl9A5cUT07RRv9pHg==";
+        hash = "sha512-A2Zf9tvfeAW/3rSrm51R8a4fqG5cyKQtPvqPiNFAK+J9Z9F4ihplnMQnrzQX2P1XLg2YUcBNSyzDdOJoKxIgOQ==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.6/aspnetcore-runtime-9.0.6-osx-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.7/aspnetcore-runtime-9.0.7-osx-x64.tar.gz";
-        hash = "sha512-SaXkIpnyK/0qpBb2aXernIdJ0uBGSSVZFebXugmJ1f0lObX+G6QV4fO106sVKBghoHo1853Rwl20mujK0SQn3w==";
+        hash = "sha512-aHivNpxydhhA7fLc1m1Yz0zdvKYYyfvXI6bW04Gc+sYVCo1yyZ93ESm1TC/z5v8lgFyI5w5d7zAeJChFi370Rg==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.6";
+    version = "9.0.7";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm.tar.gz";
-        hash = "sha512-S1SWWuuF0Ix5WAiFxp1Bt7oP3EeGGPQOOghnPXflmHAiFXso6wRCvgwv9PbmWQaOo9PjlnAQneaCB9O3BroGYw==";
+        hash = "sha512-hdyrtE15/rPwIuZXM7XDsUQWn/y6uWVFgLp6HvvxRY2qkxY5Wm29nMHaw5s066OSnmOhzshPtuVmrREBH63SNA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-arm64.tar.gz";
-        hash = "sha512-JKtB00vn9nGNepSJ4hmD6FfnNIyRQVfo+gSm/fAQ1DqUKpdXwFnYjIY+/Trq7WeB+SjaNVAhxQuWXo0JFQIeoA==";
+        hash = "sha512-5c/znYwk0eEUEG6lFWPwxkBUgmiJjoNJow1D8G0ix3WV4Gcl4oBzeT3QI7YSrxFYEjRZBuJszix4jwavYT1CUg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-x64.tar.gz";
-        hash = "sha512-v+JXt6bcBQU6eE06yWbKf9t6Lv1VOOJ8PqgiqrydOiD0SvRIbfEAIaX2TIkyJMLZR+/QZJLR3zcFVW33ZzcSbw==";
+        hash = "sha512-4nO1kq6eHHXpHOO+b08tIxQydpABQeKcZz1GSQEY0BFfbRlormz+1ZjKMA/oibog+gYHh+u1QDCEM1gKPGxc2A==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm.tar.gz";
-        hash = "sha512-p5eaEL+BJPg1ELaNn1A2vZKiHjtiX+M0zJcbec4haL3iZe92yS1fkJ4lOf1EOtfxQmUnBkfJh3Bxf8ZmrRW9ng==";
+        hash = "sha512-/LZMWeR3TNJw2Fbn4FalAjVnyEBI8BJUBGt3ZLanCNWCxK1Uj7XSMexLCzZp6+nOatJNbnrGlRtQtJAHuOuuoQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-arm64.tar.gz";
-        hash = "sha512-R5APJLFh3LJ6agxPrM03KkDgwMXrquFfrqF5CrOiNBT36v8zgUKzRQnAvGHsYylSoHvAutUTfThx/IVTpmz/xQ==";
+        hash = "sha512-9cJCVscL9qQS8iEY6EEp74EKY3hxWeNP4MjSH7vB++0jqBa6lXxlNUbowhUr7KKmpEGTlJwOh9a2pkUdr/s77g==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-linux-musl-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-linux-musl-x64.tar.gz";
-        hash = "sha512-cK6S/8TNHPB0Ro2Gcaa5fORN68yvckvLUXr2Vc0uddf5h2OJ49g8pOdF31HpfCsiCbc56inLJN1os02xL1iCfQ==";
+        hash = "sha512-B0CcgI2pzRmmTlJeYSm8P43k7zKzCHAel6ixQweB7bP4Y7Ds6a+tBIhyce4zIXEA9Rn5bYn+2UIAsGESrPrESg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-osx-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-arm64.tar.gz";
-        hash = "sha512-2nyZR+f4EqWnQxy11effGy+EwifLfEim/69B8saam3NhlIIgcKBQup5RZt51moFfQ+BtmdOF6Xc3BXyls1HUVQ==";
+        hash = "sha512-DesjrHFNrWm/fQxn5CUyVtCEWIG4BcyLnG8gUSg9X5u7AA02MFhSPc5Mc2HCtGABaoZbbWuqWEPJJjWR1TnrIA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.6/dotnet-runtime-9.0.6-osx-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.7/dotnet-runtime-9.0.7-osx-x64.tar.gz";
-        hash = "sha512-V2g2mCQAFs3NyNUwLoPRSKgg6ILlIe4YFuByXbd7WvHVIgbnAUmgp2KbsRmo5/eU+OgNO4ZvQxbqm4uoFT1Wbw==";
+        hash = "sha512-cOtHKrJPOKam6TBmHgmsZjXdoM8FSJkEDCXPMzLyTxy7PuwZ4c/PIhS0ZtAA9t3H1JRIpsYQbDtw/Qv3Bj9ubQ==";
       };
     };
   };
 
   sdk_9_0_3xx = buildNetSdk {
-    version = "9.0.301";
+    version = "9.0.302";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-arm.tar.gz";
-        hash = "sha512-qL8t2zWO4se9evwEDRhCb1ySIGys4FcnmPnOaSXJEN0aST7T41MEyahQmyYhpmRVn/RF0wFK4KA5VZx4ygArQQ==";
+        hash = "sha512-iAUAF2q8Jjuf5Nn9Wz93uXU3C8x2rxRTtbd22DUymlqfPgKQPO0+40Ga5vfg6Zy5ZLWFu0MNp11mI9wpZcRggQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-arm64.tar.gz";
-        hash = "sha512-JOIynEDPPkLNHodT2I/ORUvEqau60rAegPMxMKgBEjpTHiJ2c9OBy5cQtxWAXxiP4Ny5gz+30E2rLNk3ofSA7Q==";
+        hash = "sha512-3e1DfINrIBIZ74yxmT5Qw+lqnQnNJUH/4sCBBTDnN9+0StuN12bKovAt7w0LwqycVjoYnxyxympk2fcSUalBQQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-x64.tar.gz";
-        hash = "sha512-dBWiZIQ9PfeL1X+y8XB06BHgsZOXakW01neNPruSZoVMTgN8PN9LU03nuMZHmbDljc6frG8/PGyssylVVdMdTw==";
+        hash = "sha512-/kapbnlDiLNFEF5HiW5OkQmf/ZB6cSf/LK33ats6e+C0PwzY0sN2rkVSg9CPR1H37xGJD9JpcwTvEURHriCciA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-arm.tar.gz";
-        hash = "sha512-0B+cAc5u1sukC0OBsSduuAyqZY8f/I/zrkE2nMSq0DFzn94x5jy0J1A/G3EnRwDPu7jVTzpvOsRQVdkmCsrRWg==";
+        hash = "sha512-9CCSrnlxmzrBNun2NLuBJR11tzVR4NhmHovotd7LI2M/CHf/Hh/GCxZQlIPiC0naycekzGCThI0enaD3xqk8Nw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-arm64.tar.gz";
-        hash = "sha512-t4Jjj28NFKuRDeOVJ0sWlmTGUrU05HaznSGcVaRtYxTuUdSiykcJvsBFrB6yd/OJspDqxcmmt15QG+QsBxVj9w==";
+        hash = "sha512-yEsbQZqvLXeLCA4Bnwk3iX3Ipk0GEqPCIDrNy7H/WYhHqHo+w8aI89A6zLIYB1KzybEAQ6YEeDRxUbqzZV3tHw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-linux-musl-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-linux-musl-x64.tar.gz";
-        hash = "sha512-ggXwZUvRciNkVDWH6dLqQ7CpbsmSXDeR8uf0+wT0paNIyiOGCS6hVkpyfgA05Gd11ClJCeuEBTWNYu6DM9Xcjw==";
+        hash = "sha512-AaATj8XmsF9r939RsiXLtzYGVS8SH3yUfkqcXbRXddQDHXmkrh/G5rO11jiOzSsNUD5UR7Lokv7ZU5oHKOYk3Q==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-osx-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-osx-arm64.tar.gz";
-        hash = "sha512-NvGut6/yqsEXkZ9Xq61yXInay4eaPDuNQbAVdWAs6y1crYBdPG1noP2gIIskd9DVhmjBMyFTku5lv4hYZXHkPA==";
+        hash = "sha512-B+gXhllDfXgjAWk6T4Vy5DZt3Wbukyswmo1vAuohNMwVvcKg8dGSS6dW3ORUPXToGI2cUt4KF9Y5qcOTtPTxlA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.301/dotnet-sdk-9.0.301-osx-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.302/dotnet-sdk-9.0.302-osx-x64.tar.gz";
-        hash = "sha512-W7pAH5tkUMDuUd3DlDx5q5LtkYjh1CCAAf+Xr3my+1HbkkNVSMR/6UP2n6PC6I746UCMeCGlnYQyuEN5d3cGXA==";
+        hash = "sha512-EKhj7wgCBRBiWVhHHM5Ni0cN7TjF/JvMcilcYGa8ClqtmtIsW0ta0BXo1dw9syjftoLpB2YwDNlQLBcbXZMCRw==";
-      };
-    };
-    inherit commonPackages hostPackages targetPackages;
-    runtime = runtime_9_0;
-    aspnetcore = aspnetcore_9_0;
-  };
-
-  sdk_9_0_2xx = buildNetSdk {
-    version = "9.0.205";
-    srcs = {
-      linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-arm.tar.gz";
-        hash = "sha512-kAAySurNNVyxeALQIFeSW2CVuYp7Mb0G1sSecfky1LEhx1mp//d65A5Id+R1tbcMtx/RSc010P9/wxccasCyJA==";
-      };
-      linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-arm64.tar.gz";
-        hash = "sha512-ykyJxPqbPC0JZrEonkoKGpJrN3jZdPTjISSiGRwruZUrgMPTYjXu5zEDEAI/yfR54FuE+0qGdrl+G09zm34aEA==";
-      };
-      linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-x64.tar.gz";
-        hash = "sha512-344tlaYXBRxEpSRHETcwCGjVK1I8xB6PjTGq3paEB65AbVtuR/SE9gO+UsCm5WdYbw+cFv/CWUTzqPQviMPHgQ==";
-      };
-      linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-arm.tar.gz";
-        hash = "sha512-2WtVOm0dkME4LIDdpo3UIA+1fMNA84wSdYBlOugmdc2Z7zu2W38VP0OdQjQQJepOARYpRNiNpQuNdXv2qHFs/Q==";
-      };
-      linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-arm64.tar.gz";
-        hash = "sha512-l4LgozcmzOAb9oqEMcf+z67rqt4heW7wBBfC+Qch/00554WekejNZur0wGbpAZ98C8rKmESzcBTC6c5BYkuWRg==";
-      };
-      linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-linux-musl-x64.tar.gz";
-        hash = "sha512-zmsD+9lVviKgVRyGFPVsBOyA3iFDdeal3sLMm2xk+NbTDxha2NjO9C0FXPiZqliCF/10xvsNUbE4tqMn+APkkA==";
-      };
-      osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-osx-arm64.tar.gz";
-        hash = "sha512-nHUwIcJqAXjPu096LPS+ZeLvHGzmiRLFk2x8yZKwJg8UpEkAdzFMNjdE9Svpb0MvFpg4ot9LXdAL09P/mFW0oQ==";
-      };
-      osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.205/dotnet-sdk-9.0.205-osx-x64.tar.gz";
-        hash = "sha512-7kuNG2Gwj9z+mM320ctGNUroIDsSVgxz55hkid/NhcXBhusIXuRNavkKCnAsvQxc4dnrTx4NSTPrBD6ztvY7KA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -564,39 +523,39 @@ rec {
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.107";
+    version = "9.0.108";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm.tar.gz";
-        hash = "sha512-Netr9KteJY5TUHInT3Cq79H7KV60TTK1tCCG9yFhUjlPsKgqe+Ec2IPB1XQK1/CICfL52/zovADlok10bcZAeQ==";
+        hash = "sha512-FliKnG0DCOC2kqy4VHZMQvGuldzdpDebRKLZPIlwxcl0W0b7QITuwpYeknqloxI7fdO1RtAP14epsGza6/mG/w==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-arm64.tar.gz";
-        hash = "sha512-+j6JtbaaUAOOnsKttWoW1QZPxaCAG6jlZ2ouECprsiDU+duEvkm3RCFLOOWDyCmGMyROu09HyGT9fofq+xN2hQ==";
+        hash = "sha512-laP4pmKWsjrs2GyiluK9FHzzluL2p7bGvnlbcN8kEdYWPfFeKKa7JiSOILYZwXlN3Fux39Lwp9Xh5YqdLUU5gg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-x64.tar.gz";
-        hash = "sha512-WI6GA9vlFMIw7bAwfJhSLL1hUKN0JC3GphZ/m+h5MTqKKJUwUoKGV4TqopbI3ujL3gpnntuNy/etqmwfegtiBg==";
+        hash = "sha512-jC2YjpmLkGxxaEy+muycvytlyzHtjD6xWm5l+WGwMfrroy1xmX9Q1W4E5vAIH4YEgHItwWk8awFVQ+thrNtYdg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-arm.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm.tar.gz";
-        hash = "sha512-aGe+uyjP8y4e+/guk4P1mY0QlrCe5exYdRe1LAcAmQS0tLK83lSr3RBXQYGOalCr3DsVWBbsgsYdVZOnzpE71g==";
+        hash = "sha512-Qa5oViep0n/EsZom8OdgEVOEkDq7LjkZxPgCe6PnWotANLLpl1Zfd5nq4ZOFED/aHhMbI8F2oWBXiLvL31/BEQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-arm64.tar.gz";
-        hash = "sha512-jBd0X3G3xZmwm3VGzQ4gm89vz7R91Ie1lDSme+uvVPI6lWlO0wcpAlbeeA8iV9L1oAgCGTHx2kzJkKn1AHzVhg==";
+        hash = "sha512-L8eGZ6/7dXpwcXWjsMVXmF4s6TCnUD9KqE8gsILZiGo1oPDfVLoZAteLAtYY+3yImdxOqZaY6tQ8fMVlz1X/2A==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-linux-musl-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-linux-musl-x64.tar.gz";
-        hash = "sha512-JwIJpXfq2TOHOP17WlXmLoPHOpI/n9gfSXcdCtNt8fQaD6ThkkdXFD4V8bQQUioi0VksixaWrehVRH8eaIISdA==";
+        hash = "sha512-CmB51ISh0QT2+vBf7OJTUOnBi0lNy6M4aNkpTHwubJNuehnogsZadXezZ4xCHkDftpHqlQSmfWWqjVuJK5cxjA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-osx-arm64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-arm64.tar.gz";
-        hash = "sha512-DBGIKo5yDOekc/y8WQYZKqFO6HR+Gnis1Vz6CwozcZQJPmDVOodSf6Ph59QgqrwzLTq2qwntbrtcxr+hec71cQ==";
+        hash = "sha512-EeZLhqfvjyPAsLdoE1f//OjirZo42SgDeKYbnxUlssN1QTcM1VmL3iu8EkUftbnzklHF7LIORgbBNDSYu+MHEA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.107/dotnet-sdk-9.0.107-osx-x64.tar.gz";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.108/dotnet-sdk-9.0.108-osx-x64.tar.gz";
-        hash = "sha512-7DDDGmtizw3ONqaIK3E2T+dObWNaQ3sM6auA9Udw4mwAys69YqFGoeJUWRO611yLxTjl1TdO9Np3JdkpLD4p3w==";
+        hash = "sha512-knxa6JTbG9pShc3eoC9zzVWtPuSfE0iqFeMoiWOxymlQEvzlH8f6DCV0Tvty+c8Rzc9nqBzZ4EAI+N3gg7zfYg==";
       };
     };
     inherit commonPackages hostPackages targetPackages;

pkgs/development/libraries/alkimia/default.nix

@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "alkimia";
-  version = "8.1.95";
+  version = "8.2.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "office";
     repo = "alkimia";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nvaPdEgjunDUQeIDYnBQaC8SB+W/aUg6HxUDl9G127g=";
+    hash = "sha256-1unlpGTJaAMhYacMO2totq0JFNaYffgieJsYa18DtkY=";
   };
 
   nativeBuildInputs = [

pkgs/development/libraries/libcec/default.nix

@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libcec";
-  version = "7.1.0";
+  version = "7.1.1";
 
   src = fetchFromGitHub {
     owner = "Pulse-Eight";
     repo = "libcec";
     rev = "libcec-${version}";
-    sha256 = "sha256-VamOv26n8aXdoZZ/XqkogECqwQcpAdQE/WAeVyvv9l8=";
+    sha256 = "sha256-t8GUQKWTcxjyaAlsTP4C+heYiVYowG7x+fmjHPND7As=";
   };
 
   # Fix dlopen path

pkgs/development/libraries/libcef/default.nix

@@ -92,14 +92,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcef";
-  version = "137.0.17";
+  version = "138.0.17";
-  gitRevision = "f354b0e";
+  gitRevision = "ac9b751";
-  chromiumVersion = "137.0.7151.104";
+  chromiumVersion = "138.0.7204.97";
   buildType = "Release";
 
   srcHash = selectSystem {
-    aarch64-linux = "sha256-C9P4+TpzjyMD5z2qLbzubbrIr66usFjRx7QqiAxI2D8=";
+    aarch64-linux = "sha256-kdO7c9oUfv0HK8wTmvYzw9S6EapnSGEQNCGN9D1JSL0=";
-    x86_64-linux = "sha256-iDC3a/YN0NqjX/b2waKvUAZCaR0lkLmUPqBJphE037Q=";
+    x86_64-linux = "sha256-3qgIhen6l/kxttyw0z78nmwox62riVhlmFSGPkUot7g=";
   };
 
   src = fetchurl {

pkgs/development/ocaml-modules/ca-certs-nss/default.nix

@@ -14,13 +14,13 @@
 
 buildDunePackage rec {
   pname = "ca-certs-nss";
-  version = "3.108-1";
+  version = "3.113.1";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
     url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
-    hash = "sha256-soYi8sW1OrfznijCGYgFWY6gayguQs3/FcBXlC2FflY=";
+    hash = "sha256-N70Gl7o5ac5grGKZhk8TQymIo/2TNWmh5MISwOikKg8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/ocaml-modules/dream-html/pure.nix

@@ -7,13 +7,13 @@
 
 buildDunePackage rec {
   pname = "pure-html";
-  version = "3.10.1";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "yawaramin";
     repo = "dream-html";
     tag = "v${version}";
-    hash = "sha256-LywQG5AaQrrq8lW+aN1doB1MKPSMciZISOeo583Kr9k=";
+    hash = "sha256-YBzL9B1mDbomGr1kT6RW+wg4y0JH6IiIlJYVMRptFFg=";
   };
 
   propagatedBuildInputs = [ uri ];

pkgs/development/python-modules/aiogram/default.nix

@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "aiogram";
-  version = "3.20.0.post0";
+  version = "3.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "aiogram";
     repo = "aiogram";
     tag = "v${version}";
-    hash = "sha256-OQH5wes2RGSbT9GPKcZVVxpsFbtOnXd6aAeYfQST1Xs=";
+    hash = "sha256-2DRKJiIZXMK2PgAQFfa0GBgVITiOrNQTM8/fnCHiiw8=";
   };
 
   build-system = [ hatchling ];

pkgs/development/python-modules/cantools/default.nix

@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "cantools";
-  version = "40.2.2";
+  version = "40.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ba5GyqiiAL2/mIvDLw4/vLHbOE6wl+znynPAeeXu2Bw=";
+    hash = "sha256-PFXL19fVJ6VluYEj+7uPXfCRMvdM63Iv9UH9gLWZFCQ=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/openai-agents/default.nix

@@ -0,0 +1,59 @@
+{
+  lib,
+  nix-update-script,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  griffe,
+  mcp,
+  openai,
+  pydantic,
+  requests,
+  types-requests,
+  typing-extensions,
+}:
+
+buildPythonPackage rec {
+  pname = "openai-agents";
+  version = "0.0.13";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "openai_agents";
+    hash = "sha256-a4AxXnXAa1MCxfKtui+eo4RflGFdrtRwa/uHF0D1YaU=";
+  };
+
+  # OpenAI 1.76.0 seems to not build currently
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail "openai>=1.76.0" "openai"
+  '';
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    griffe
+    mcp
+    openai
+    pydantic
+    requests
+    types-requests
+    typing-extensions
+  ];
+
+  pythonImportsCheck = [
+    "agents"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/openai/openai-agents-python/releases/tag/${version}";
+    homepage = "https://github.com/openai/openai-agents-python";
+    description = "A lightweight, powerful framework for multi-agent workflows";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.bryanhonof ];
+  };
+}

pkgs/development/python-modules/scancode-toolkit/default.nix

@@ -61,14 +61,14 @@
 
 buildPythonPackage rec {
   pname = "scancode-toolkit";
-  version = "32.3.3";
+  version = "32.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rOQR9Rhssibo6M8kovlEJVUhfLi6SbdP4RyNOWsTnCU=";
+    hash = "sha256-kTIDmaXOQusDy0XIDui7cKnR1RcjMeQDjDijufh07cQ=";
   };
 
   dontConfigure = true;

pkgs/development/python-modules/sentence-transformers/default.nix

@@ -100,6 +100,10 @@ buildPythonPackage rec {
     "test_trainer"
     "test_trainer_invalid_column_names"
     "test_trainer_multi_dataset_errors"
+
+    # Assertion error: Sparse operations take too long
+    # (namely, load-sensitive test)
+    "test_performance_with_large_vectors"
   ];
 
   disabledTestPaths =

pkgs/development/python-modules/trytond/default.nix

@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "trytond";
-  version = "7.6.2";
+  version = "7.6.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-KD9gZ0ForX1iYQMYlsle2fJ+zlmQOymDf71p17aCr1k=";
+    hash = "sha256-i/EI9XGtQhdWPfyVIsiFX01b+nv2VmTOuevVKUu43nI=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/urllib3/default.nix

@@ -12,6 +12,7 @@
   brotli,
   brotlicffi,
   pysocks,
+  zstandard,
 
   # tests
   pytestCheckHook,
@@ -39,6 +40,7 @@ let
     optional-dependencies = {
       brotli = if isPyPy then [ brotlicffi ] else [ brotli ];
       socks = [ pysocks ];
+      zstd = [ zstandard ];
     };
 
     nativeCheckInputs = [

pkgs/development/tools/godot/common.nix

@@ -67,12 +67,13 @@ let
 
   arch = stdenv.hostPlatform.linuxArch;
 
-  dotnet-sdk = dotnetCorePackages.sdk_8_0-source;
+  dotnet-sdk = if withMono then dotnetCorePackages.sdk_8_0-source else null;
+  dotnet-sdk_alt = if withMono then dotnetCorePackages.sdk_9_0-source else null;
 
   dottedVersion = lib.replaceStrings [ "-" ] [ "." ] version + lib.optionalString withMono ".mono";
 
-  attrsForTarget =
+  mkTarget =
-    target: finalAttrs:
+    target:
     let
       editor = target == "editor";
       suffix = lib.optionalString withMono "-mono" + lib.optionalString (!editor) "-template";
@@ -86,266 +87,23 @@ let
         ++ [ arch ]
         ++ lib.optional withMono "mono"
       );
-    in
-    rec {
-      pname = "godot${suffix}";
-      inherit version;
 
-      src = fetchFromGitHub {
+      mkTests =
-        owner = "godotengine";
+        pkg: dotnet-sdk:
-        repo = "godot";
-        tag = version;
-        inherit hash;
-        # Required for the commit hash to be included in the version number.
-        #
-        # `methods.py` reads the commit hash from `.git/HEAD` and manually follows
-        # refs.
-        #
-        # See also 'hash' in
-        # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info
-        leaveDotGit = true;
-        # Only keep HEAD, because leaveDotGit is non-deterministic:
-        # https://github.com/NixOS/nixpkgs/issues/8567
-        postFetch = ''
-          hash=$(git -C "$out" rev-parse HEAD)
-          rm -r "$out"/.git
-          mkdir "$out"/.git
-          echo "$hash" > "$out"/.git/HEAD
-        '';
-      };
-
-      outputs = [
-        "out"
-      ] ++ lib.optional (editor) "man";
-      separateDebugInfo = true;
-
-      # Set the build name which is part of the version. In official downloads, this
-      # is set to 'official'. When not specified explicitly, it is set to
-      # 'custom_build'. Other platforms packaging Godot (Gentoo, Arch, Flatpack
-      # etc.) usually set this to their name as well.
-      #
-      # See also 'methods.py' in the Godot repo and 'build' in
-      # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info
-      BUILD_NAME = "nixpkgs";
-
-      preConfigure = lib.optionalString withMono ''
-        # TODO: avoid pulling in dependencies of windows-only project
-        dotnet sln modules/mono/editor/GodotTools/GodotTools.sln \
-          remove modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj
-
-        dotnet restore modules/mono/glue/GodotSharp/GodotSharp.sln
-        dotnet restore modules/mono/editor/GodotTools/GodotTools.sln
-        dotnet restore modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
-      '';
-
-      # From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct
-      sconsFlags = mkSconsFlagsFromAttrSet {
-        # Options from 'SConstruct'
-        precision = withPrecision; # Floating-point precision level
-        production = true; # Set defaults to build Godot for use in production
-        platform = withPlatform;
-        inherit target;
-        debug_symbols = true;
-
-        # Options from 'platform/linuxbsd/detect.py'
-        alsa = withAlsa;
-        dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
-        fontconfig = withFontconfig; # Use fontconfig for system fonts support
-        pulseaudio = withPulseaudio; # Use PulseAudio
-        speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
-        touch = withTouch; # Enable touch events
-        udev = withUdev; # Use udev for gamepad connection callbacks
-        wayland = withWayland; # Compile with Wayland support
-        x11 = withX11; # Compile with X11 support
-
-        module_mono_enabled = withMono;
-
-        # aliasing bugs exist with hardening+LTO
-        # https://github.com/godotengine/godot/pull/104501
-        ccflags = "-fno-strict-aliasing";
-        linkflags = "-Wl,--build-id";
-
-        use_sowrap = false;
-      };
-
-      enableParallelBuilding = true;
-
-      strictDeps = true;
-
-      patches = lib.optionals (lib.versionOlder version "4.4") [
-        (fetchpatch {
-          name = "wayland-header-fix.patch";
-          url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";
-          hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";
-        })
-        # Fix a crash in the mono test project build. It no longer seems to
-        # happen in 4.4, but an existing fix couldn't be identified.
-        ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch
-      ];
-
-      postPatch = ''
-        # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE
-        perl -pi -e '{ $r += s:(env = Environment\(.*):\1\nenv["ENV"] = os.environ: } END { exit ($r != 1) }' SConstruct
-
-        substituteInPlace thirdparty/glad/egl.c \
-          --replace-fail \
-            'static const char *NAMES[] = {"libEGL.so.1", "libEGL.so"}' \
-            'static const char *NAMES[] = {"${lib.getLib libGL}/lib/libEGL.so"}'
-
-        substituteInPlace thirdparty/glad/gl.c \
-          --replace-fail \
-            'static const char *NAMES[] = {"libGLESv2.so.2", "libGLESv2.so"}' \
-            'static const char *NAMES[] = {"${lib.getLib libGL}/lib/libGLESv2.so"}' \
-
-        substituteInPlace thirdparty/glad/gl{,x}.c \
-          --replace-fail \
-            '"libGL.so.1"' \
-            '"${lib.getLib libGL}/lib/libGL.so"'
-
-        substituteInPlace thirdparty/volk/volk.c \
-          --replace-fail \
-            'dlopen("libvulkan.so.1"' \
-            'dlopen("${lib.getLib vulkan-loader}/lib/libvulkan.so"'
-      '';
-
-      depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-        buildPackages.stdenv.cc
-        pkg-config
-      ];
-
-      buildInputs =
-        lib.optionals withMono dotnet-sdk.packages
-        ++ lib.optional withAlsa alsa-lib
-        ++ lib.optional (withX11 || withWayland) libxkbcommon
-        ++ lib.optionals withX11 [
-          libX11
-          libXcursor
-          libXext
-          libXfixes
-          libXi
-          libXinerama
-          libXrandr
-          libXrender
-        ]
-        ++ lib.optionals withWayland [
-          # libdecor
-          wayland
-        ]
-        ++ lib.optionals withDbus [
-          dbus
-        ]
-        ++ lib.optionals withFontconfig [
-          fontconfig
-        ]
-        ++ lib.optional withPulseaudio libpulseaudio
-        ++ lib.optionals withSpeechd [
-          speechd-minimal
-          glib
-        ]
-        ++ lib.optional withUdev udev;
-
-      nativeBuildInputs =
-        [
-          installShellFiles
-          perl
-          pkg-config
-          scons
-        ]
-        ++ lib.optionals withWayland [ wayland-scanner ]
-        ++ lib.optionals withMono [
-          dotnet-sdk
-          makeWrapper
-        ];
-
-      postBuild = lib.optionalString (editor && withMono) ''
-        echo "Generating Glue"
-        bin/${binary} --headless --generate-mono-glue modules/mono/glue
-        echo "Building C#/.NET Assemblies"
-        python modules/mono/build_scripts/build_assemblies.py --godot-output-dir bin --precision=${withPrecision}
-      '';
-
-      installPhase =
-        ''
-          runHook preInstall
-
-          mkdir -p "$out"/{bin,libexec}
-          cp -r bin/* "$out"/libexec
-
-          cd "$out"/bin
-          ln -s ../libexec/${binary} godot${lib.versions.majorMinor version}${suffix}
-          ln -s godot${lib.versions.majorMinor version}${suffix} godot${lib.versions.major version}${suffix}
-          ln -s godot${lib.versions.major version}${suffix} godot${suffix}
-          cd -
-        ''
-        + (
-          if editor then
-            ''
-              installManPage misc/dist/linux/godot.6
-
-              mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
-              cp misc/dist/linux/org.godotengine.Godot.desktop "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop"
-              substituteInPlace "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop" \
-                --replace "Exec=godot" "Exec=$out/bin/godot${suffix}" \
-                --replace "Godot Engine" "Godot Engine ${
-                  lib.versions.majorMinor version + lib.optionalString withMono " (Mono)"
-                }"
-              cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
-              cp icon.png "$out/share/icons/godot.png"
-            ''
-            + lib.optionalString withMono ''
-              mkdir -p "$out"/share/nuget
-              mv "$out"/libexec/GodotSharp/Tools/nupkgs "$out"/share/nuget/source
-
-              wrapProgram $out/libexec/${binary} \
-                --set DOTNET_ROOT ${dotnet-sdk}/share/dotnet \
-                --prefix PATH : "${
-                  lib.makeBinPath [
-                    dotnet-sdk
-                  ]
-                }"
-            ''
-          else
-            let
-              template =
-                (lib.replaceStrings
-                  [ "template" ]
-                  [
-                    {
-                      linuxbsd = "linux";
-                    }
-                    .${withPlatform}
-                  ]
-                  target
-                )
-                + "."
-                + arch;
-            in
-            ''
-              templates="$out"/share/godot/export_templates/${dottedVersion}
-              mkdir -p "$templates"
-              ln -s "$out"/libexec/${binary} "$templates"/${template}
-            ''
-        )
-        + ''
-          runHook postInstall
-        '';
-
-      passthru =
         {
-          inherit updateScript;
+          version = testers.testVersion {
-
+            package = pkg;
-          tests =
+            version = dottedVersion;
-            {
+          };
-              version = testers.testVersion {
+        }
-                package = finalAttrs.finalPackage;
+        // lib.optionalAttrs (editor) (
-                version = dottedVersion;
+          let
-              };
+            project-src =
-            }
+              runCommand "${pkg.name}-project-src"
-            // lib.optionalAttrs (editor) (
+                {
-              let
+                  nativeBuildInputs = [ pkg ] ++ lib.optional (dotnet-sdk != null) dotnet-sdk;
-                pkg = finalAttrs.finalPackage;
+                }
-
+                (
-                project-src = runCommand "${pkg.name}-project-src" { } (
                   ''
                     mkdir "$out"
                     cd "$out"
@@ -416,174 +174,474 @@ let
                     cat >UnnamedProject.csproj <<EOF
                     <Project Sdk="Godot.NET.Sdk/$sdk_version">
                       <PropertyGroup>
-                        <TargetFramework>net8.0</TargetFramework>
+                        <TargetFramework>net${lib.versions.majorMinor (lib.defaultTo pkg.dotnet-sdk dotnet-sdk).version}</TargetFramework>
                         <EnableDynamicLoading>true</EnableDynamicLoading>
                       </PropertyGroup>
                     </Project>
                     EOF
+
+                    configureNuget
+
+                    dotnet new sln -n UnnamedProject
+                    message=$(dotnet sln add UnnamedProject.csproj)
+                    echo "$message"
+                    # dotnet sln doesn't return an error when it fails to add the project
+                    [[ $message == "Project \`UnnamedProject.csproj\` added to the solution." ]]
+
+                    rm nuget.config
                   ''
                 );
 
-                export-tests = lib.makeExtensible (final: {
+            export-tests = lib.makeExtensible (final: {
-                  inherit (pkg) export-template;
+              inherit (pkg) export-template;
 
-                  export = stdenvNoCC.mkDerivation {
+              export = stdenvNoCC.mkDerivation {
-                    name = "${final.export-template.name}-export";
+                name = "${final.export-template.name}-export";
 
-                    nativeBuildInputs = [
+                nativeBuildInputs = [ pkg ] ++ lib.optional (dotnet-sdk != null) dotnet-sdk;
-                      pkg
-                    ] ++ lib.optional withMono dotnet-sdk;
 
-                    src = project-src;
+                src = project-src;
 
-                    postConfigure = lib.optionalString withMono ''
+                buildPhase = ''
-                      dotnet new sln -n UnnamedProject
+                  runHook preBuild
-                      message=$(dotnet sln add UnnamedProject.csproj)
-                      echo "$message"
-                      # dotnet sln doesn't return an error when it fails to add the project
-                      [[ $message == "Project \`UnnamedProject.csproj\` added to the solution." ]]
-                    '';
 
-                    exportTemplate = pkg.export-template;
+                  export HOME=$(mktemp -d)
+                  mkdir -p $HOME/.local/share/godot/
+                  ln -s "${final.export-template}"/share/godot/export_templates "$HOME"/.local/share/godot/
 
-                    buildPhase = ''
+                  godot${suffix} --headless --build-solutions -s create-scene.gd
-                      runHook preBuild
 
-                      export HOME=$(mktemp -d)
+                  runHook postBuild
-                      mkdir -p $HOME/.local/share/godot/
+                '';
-                      ln -s "${final.export-template}"/share/godot/export_templates "$HOME"/.local/share/godot/
 
-                      godot${suffix} --headless --build-solutions -s create-scene.gd
+                installPhase = ''
+                  runHook preInstall
 
-                      runHook postBuild
+                  mkdir -p "$out"/bin
-                    '';
+                  godot${suffix} --headless --export-release build "$out"/bin/test
 
-                    installPhase = ''
+                  runHook postInstall
-                      runHook preInstall
+                '';
+              };
 
-                      mkdir -p "$out"/bin
+              run = runCommand "${final.export.name}-runs" { passthru = { inherit (final) export; }; } (
-                      godot${suffix} --headless --export-release build "$out"/bin/test
+                ''
+                  (
+                    set -eo pipefail
+                    HOME=$(mktemp -d)
+                    "${final.export}"/bin/test --headless | tail -n+3 | (
+                ''
+                + lib.optionalString withMono ''
+                  # indent
+                      read output
+                      if [[ "$output" != "Hello, Mono!" ]]; then
+                        echo "unexpected output: $output" >&2
+                        exit 1
+                      fi
+                ''
+                + ''
+                      read output
+                      if [[ "$output" != "Hello, World!" ]]; then
+                        echo "unexpected output: $output" >&2
+                        exit 1
+                      fi
+                    )
+                    touch "$out"
+                  )
+                ''
+              );
+            });
 
-                      runHook postInstall
+          in
-                    '';
+          {
-                  };
+            export-runs = export-tests.run;
 
-                  run = runCommand "${final.export.name}-runs" { passthru = { inherit (final) export; }; } (
+            export-bin-runs =
-                    ''
+              (export-tests.extend (
-                      (
+                final: prev: {
-                        set -eo pipefail
+                  export-template = pkg.export-templates-bin;
-                        HOME=$(mktemp -d)
-                        "${final.export}"/bin/test --headless | tail -n+3 | (
-                    ''
-                    + lib.optionalString withMono ''
-                      # indent
-                          read output
-                          if [[ "$output" != "Hello, Mono!" ]]; then
-                            echo "unexpected output: $output" >&2
-                            exit 1
-                          fi
-                    ''
-                    + ''
-                          read output
-                          if [[ "$output" != "Hello, World!" ]]; then
-                            echo "unexpected output: $output" >&2
-                            exit 1
-                          fi
-                        )
-                        touch "$out"
-                      )
-                    ''
-                  );
-                });
 
-              in
+                  export = prev.export.overrideAttrs (prev: {
-              {
+                    nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [
-                export-runs = export-tests.run;
+                      autoPatchelfHook
+                    ];
 
-                export-bin-runs =
+                    # stripping dlls results in:
-                  (export-tests.extend (
+                    # Failed to load System.Private.CoreLib.dll (error code 0x8007000B)
-                    final: prev: {
+                    stripExclude = lib.optional withMono [ "*.dll" ];
-                      export-template = pkg.export-templates-bin;
 
-                      export = prev.export.overrideAttrs (prev: {
+                    runtimeDependencies =
-                        nativeBuildInputs = prev.nativeBuildInputs or [ ] ++ [
+                      prev.runtimeDependencies or [ ]
-                          autoPatchelfHook
+                      ++ map lib.getLib [
-                        ];
+                        alsa-lib
+                        libpulseaudio
+                        libX11
+                        libXcursor
+                        libXext
+                        libXi
+                        libXrandr
+                        udev
+                        vulkan-loader
+                      ];
+                  });
+                }
+              )).run;
+          }
+        );
 
-                        # stripping dlls results in:
+      attrs = finalAttrs: rec {
-                        # Failed to load System.Private.CoreLib.dll (error code 0x8007000B)
+        pname = "godot${suffix}";
-                        stripExclude = lib.optional withMono [ "*.dll" ];
+        inherit version;
 
-                        runtimeDependencies =
+        src = fetchFromGitHub {
-                          prev.runtimeDependencies or [ ]
+          owner = "godotengine";
-                          ++ map lib.getLib [
+          repo = "godot";
-                            alsa-lib
+          tag = version;
-                            libpulseaudio
+          inherit hash;
-                            libX11
+          # Required for the commit hash to be included in the version number.
-                            libXcursor
+          #
-                            libXext
+          # `methods.py` reads the commit hash from `.git/HEAD` and manually follows
-                            libXi
+          # refs.
-                            libXrandr
+          #
-                            udev
+          # See also 'hash' in
-                            vulkan-loader
+          # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info
-                          ];
+          leaveDotGit = true;
-                      });
+          # Only keep HEAD, because leaveDotGit is non-deterministic:
-                    }
+          # https://github.com/NixOS/nixpkgs/issues/8567
-                  )).run;
+          postFetch = ''
-              }
+            hash=$(git -C "$out" rev-parse HEAD)
-            );
+            rm -r "$out"/.git
-        }
+            mkdir "$out"/.git
-        // lib.optionalAttrs editor {
+            echo "$hash" > "$out"/.git/HEAD
-          export-template = mkTarget "template_release";
+          '';
-          export-templates-bin = (
-            callPackage ./export-templates-bin.nix {
-              inherit version withMono;
-              godot = finalAttrs.finalPackage;
-              hash = exportTemplatesHash;
-            }
-          );
         };
 
-      requiredSystemFeatures = [
+        outputs = [
-        # fixes: No space left on device
+          "out"
-        "big-parallel"
+        ] ++ lib.optional (editor) "man";
-      ];
+        separateDebugInfo = true;
 
-      meta = {
+        # Set the build name which is part of the version. In official downloads, this
-        changelog = "https://github.com/godotengine/godot/releases/tag/${version}";
+        # is set to 'official'. When not specified explicitly, it is set to
-        description = "Free and Open Source 2D and 3D game engine";
+        # 'custom_build'. Other platforms packaging Godot (Gentoo, Arch, Flatpack
-        homepage = "https://godotengine.org";
+        # etc.) usually set this to their name as well.
-        license = lib.licenses.mit;
+        #
-        platforms = [
+        # See also 'methods.py' in the Godot repo and 'build' in
-          "x86_64-linux"
+        # https://docs.godotengine.org/en/stable/classes/class_engine.html#class-engine-method-get-version-info
-          "aarch64-linux"
+        BUILD_NAME = "nixpkgs";
-        ] ++ lib.optional (!withMono) "i686-linux";
+
-        maintainers = with lib.maintainers; [
+        preConfigure = lib.optionalString (editor && withMono) ''
-          shiryel
+          # TODO: avoid pulling in dependencies of windows-only project
-          corngood
+          dotnet sln modules/mono/editor/GodotTools/GodotTools.sln \
+            remove modules/mono/editor/GodotTools/GodotTools.OpenVisualStudio/GodotTools.OpenVisualStudio.csproj
+
+          dotnet restore modules/mono/glue/GodotSharp/GodotSharp.sln
+          dotnet restore modules/mono/editor/GodotTools/GodotTools.sln
+          dotnet restore modules/mono/editor/Godot.NET.Sdk/Godot.NET.Sdk.sln
+        '';
+
+        # From: https://github.com/godotengine/godot/blob/4.2.2-stable/SConstruct
+        sconsFlags = mkSconsFlagsFromAttrSet {
+          # Options from 'SConstruct'
+          precision = withPrecision; # Floating-point precision level
+          production = true; # Set defaults to build Godot for use in production
+          platform = withPlatform;
+          inherit target;
+          debug_symbols = true;
+
+          # Options from 'platform/linuxbsd/detect.py'
+          alsa = withAlsa;
+          dbus = withDbus; # Use D-Bus to handle screensaver and portal desktop settings
+          fontconfig = withFontconfig; # Use fontconfig for system fonts support
+          pulseaudio = withPulseaudio; # Use PulseAudio
+          speechd = withSpeechd; # Use Speech Dispatcher for Text-to-Speech support
+          touch = withTouch; # Enable touch events
+          udev = withUdev; # Use udev for gamepad connection callbacks
+          wayland = withWayland; # Compile with Wayland support
+          x11 = withX11; # Compile with X11 support
+
+          module_mono_enabled = withMono;
+
+          # aliasing bugs exist with hardening+LTO
+          # https://github.com/godotengine/godot/pull/104501
+          ccflags = "-fno-strict-aliasing";
+          linkflags = "-Wl,--build-id";
+
+          use_sowrap = false;
+        };
+
+        enableParallelBuilding = true;
+
+        strictDeps = true;
+
+        patches = lib.optionals (lib.versionOlder version "4.4") [
+          (fetchpatch {
+            name = "wayland-header-fix.patch";
+            url = "https://github.com/godotengine/godot/commit/6ce71f0fb0a091cffb6adb4af8ab3f716ad8930b.patch";
+            hash = "sha256-hgAtAtCghF5InyGLdE9M+9PjPS1BWXWGKgIAyeuqkoU=";
+          })
+          # Fix a crash in the mono test project build. It no longer seems to
+          # happen in 4.4, but an existing fix couldn't be identified.
+          ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch
         ];
-        mainProgram = "godot${suffix}";
-      };
-    };
 
-  mkTarget =
+        postPatch = ''
-    target:
+          # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE
-    let
+          perl -pi -e '{ $r += s:(env = Environment\(.*):\1\nenv["ENV"] = os.environ: } END { exit ($r != 1) }' SConstruct
-      attrs = attrsForTarget target;
+
-    in
+          substituteInPlace thirdparty/glad/egl.c \
-    stdenv.mkDerivation (
+            --replace-fail \
-      if withMono then
+              'static const char *NAMES[] = {"libEGL.so.1", "libEGL.so"}' \
-        dotnetCorePackages.addNuGetDeps {
+              'static const char *NAMES[] = {"${lib.getLib libGL}/lib/libEGL.so"}'
-          inherit nugetDeps;
+
-          overrideFetchAttrs = old: rec {
+          substituteInPlace thirdparty/glad/gl.c \
-            runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) old.meta.platforms;
+            --replace-fail \
-            buildInputs =
+              'static const char *NAMES[] = {"libGLESv2.so.2", "libGLESv2.so"}' \
-              old.buildInputs
+              'static const char *NAMES[] = {"${lib.getLib libGL}/lib/libGLESv2.so"}' \
-              ++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk.targetPackages));
+
+          substituteInPlace thirdparty/glad/gl{,x}.c \
+            --replace-fail \
+              '"libGL.so.1"' \
+              '"${lib.getLib libGL}/lib/libGL.so"'
+
+          substituteInPlace thirdparty/volk/volk.c \
+            --replace-fail \
+              'dlopen("libvulkan.so.1"' \
+              'dlopen("${lib.getLib vulkan-loader}/lib/libvulkan.so"'
+        '';
+
+        depsBuildBuild = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
+          buildPackages.stdenv.cc
+          pkg-config
+        ];
+
+        buildInputs =
+          lib.optionals (editor && withMono) dotnet-sdk.packages
+          ++ lib.optional withAlsa alsa-lib
+          ++ lib.optional (withX11 || withWayland) libxkbcommon
+          ++ lib.optionals withX11 [
+            libX11
+            libXcursor
+            libXext
+            libXfixes
+            libXi
+            libXinerama
+            libXrandr
+            libXrender
+          ]
+          ++ lib.optionals withWayland [
+            # libdecor
+            wayland
+          ]
+          ++ lib.optionals withDbus [
+            dbus
+          ]
+          ++ lib.optionals withFontconfig [
+            fontconfig
+          ]
+          ++ lib.optional withPulseaudio libpulseaudio
+          ++ lib.optionals withSpeechd [
+            speechd-minimal
+            glib
+          ]
+          ++ lib.optional withUdev udev;
+
+        nativeBuildInputs =
+          [
+            installShellFiles
+            perl
+            pkg-config
+            scons
+          ]
+          ++ lib.optionals withWayland [ wayland-scanner ]
+          ++ lib.optional (editor && withMono) [
+            makeWrapper
+            dotnet-sdk
+          ];
+
+        postBuild = lib.optionalString (editor && withMono) ''
+          echo "Generating Glue"
+          bin/${binary} --headless --generate-mono-glue modules/mono/glue
+          echo "Building C#/.NET Assemblies"
+          python modules/mono/build_scripts/build_assemblies.py --godot-output-dir bin --precision=${withPrecision}
+        '';
+
+        installPhase =
+          ''
+            runHook preInstall
+
+            mkdir -p "$out"/{bin,libexec}
+            cp -r bin/* "$out"/libexec
+
+            cd "$out"/bin
+            ln -s ../libexec/${binary} godot${lib.versions.majorMinor version}${suffix}
+            ln -s godot${lib.versions.majorMinor version}${suffix} godot${lib.versions.major version}${suffix}
+            ln -s godot${lib.versions.major version}${suffix} godot${suffix}
+            cd -
+          ''
+          + (
+            if editor then
+              ''
+                installManPage misc/dist/linux/godot.6
+
+                mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps}
+                cp misc/dist/linux/org.godotengine.Godot.desktop \
+                  "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop"
+
+                substituteInPlace "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop" \
+                  --replace-fail "Exec=godot" "Exec=$out/bin/godot${suffix}" \
+                  --replace-fail "Godot Engine" "Godot Engine ${
+                    lib.versions.majorMinor version + lib.optionalString withMono " (Mono)"
+                  }"
+                cp icon.svg "$out/share/icons/hicolor/scalable/apps/godot.svg"
+                cp icon.png "$out/share/icons/godot.png"
+              ''
+              + lib.optionalString withMono ''
+                mkdir -p "$out"/share/nuget
+                mv "$out"/libexec/GodotSharp/Tools/nupkgs "$out"/share/nuget/source
+
+                wrapProgram "$out"/libexec/${binary} \
+                  --prefix NUGET_FALLBACK_PACKAGES ';' "$out"/share/nuget/packages/
+              ''
+            else
+              let
+                template =
+                  (lib.replaceStrings
+                    [ "template" ]
+                    [
+                      {
+                        linuxbsd = "linux";
+                      }
+                      .${withPlatform}
+                    ]
+                    target
+                  )
+                  + "."
+                  + arch;
+              in
+              ''
+                templates="$out"/share/godot/export_templates/${dottedVersion}
+                mkdir -p "$templates"
+                ln -s "$out"/libexec/${binary} "$templates"/${template}
+              ''
+          )
+          + ''
+            runHook postInstall
+          '';
+
+        passthru =
+          {
+            inherit updateScript;
+            tests =
+              mkTests finalAttrs.finalPackage dotnet-sdk
+              // lib.optionalAttrs (editor && withMono) {
+                sdk-override = mkTests finalAttrs.finalPackage dotnet-sdk_alt;
+              };
+          }
+          // lib.optionalAttrs editor {
+            export-template = mkTarget "template_release";
+            export-templates-bin = (
+              callPackage ./export-templates-bin.nix {
+                inherit version withMono;
+                godot = finalAttrs.finalPackage;
+                hash = exportTemplatesHash;
+              }
+            );
           };
-        } attrs
+
-      else
+        requiredSystemFeatures = [
-        attrs
+          # fixes: No space left on device
-    );
+          "big-parallel"
+        ];
+
+        meta = {
+          changelog = "https://github.com/godotengine/godot/releases/tag/${version}";
+          description = "Free and Open Source 2D and 3D game engine";
+          homepage = "https://godotengine.org";
+          license = lib.licenses.mit;
+          platforms = [
+            "x86_64-linux"
+            "aarch64-linux"
+          ] ++ lib.optional (!withMono) "i686-linux";
+          maintainers = with lib.maintainers; [
+            shiryel
+            corngood
+          ];
+          mainProgram = "godot${suffix}";
+        };
+      };
+
+      unwrapped = stdenv.mkDerivation (
+        if (editor && withMono) then
+          dotnetCorePackages.addNuGetDeps {
+            inherit nugetDeps;
+            overrideFetchAttrs = old: rec {
+              runtimeIds = map (system: dotnetCorePackages.systemToDotnetRid system) old.meta.platforms;
+              buildInputs =
+                old.buildInputs
+                ++ lib.concatLists (lib.attrValues (lib.getAttrs runtimeIds dotnet-sdk.targetPackages));
+            };
+          } attrs
+        else
+          attrs
+      );
+
+      wrapper =
+        if (editor && withMono) then
+          stdenv.mkDerivation (finalAttrs: {
+            __structuredAttrs = true;
+
+            pname = finalAttrs.unwrapped.pname + "-wrapper";
+            inherit (finalAttrs.unwrapped) version outputs meta;
+            inherit unwrapped dotnet-sdk;
+
+            dontUnpack = true;
+            dontConfigure = true;
+            dontBuild = true;
+
+            nativeBuildInputs = [ makeWrapper ];
+            strictDeps = true;
+
+            installPhase = ''
+              runHook preInstall
+
+              mkdir -p "$out"/{bin,libexec,share/applications,nix-support}
+
+              cp -d "$unwrapped"/bin/* "$out"/bin/
+              ln -s "$unwrapped"/libexec/* "$out"/libexec/
+              ln -s "$unwrapped"/share/nuget "$out"/share/
+              cp "$unwrapped/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop" \
+                "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop"
+
+              substituteInPlace "$out/share/applications/org.godotengine.Godot${lib.versions.majorMinor version}${suffix}.desktop" \
+                --replace-fail "Exec=$unwrapped/bin/godot${suffix}" "Exec=$out/bin/godot${suffix}"
+              ln -s "$unwrapped"/share/icons $out/share/
+
+              # ensure dotnet hooks get run
+              echo "${finalAttrs.dotnet-sdk}" >> "$out"/nix-support/propagated-build-inputs
+
+              wrapProgram "$out"/libexec/${binary} \
+                --prefix PATH : "${lib.makeBinPath [ finalAttrs.dotnet-sdk ]}"
+
+              runHook postInstall
+            '';
+
+            postFixup = lib.concatMapStringsSep "\n" (output: ''
+              [[ -e "''$${output}" ]] || ln -s "${unwrapped.${output}}" "''$${output}"
+            '') finalAttrs.unwrapped.outputs;
+
+            passthru = unwrapped.passthru // {
+              tests = mkTests finalAttrs.finalPackage null // {
+                unwrapped = lib.recurseIntoAttrs unwrapped.tests;
+                sdk-override = lib.recurseIntoAttrs (
+                  mkTests (finalAttrs.finalPackage.overrideAttrs { dotnet-sdk = dotnet-sdk_alt; }) null
+                );
+              };
+            };
+          })
+        else
+          unwrapped;
+    in
+    wrapper;
 in
 mkTarget "editor"

pkgs/os-specific/linux/akvcam/default.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "akvcam";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "webcamoid";
     repo = "akvcam";
     rev = version;
-    sha256 = "sha256-8jQxBvWRE9Bsh0oz76gO7o+ROm6Z5QGAIe3WERIouUw=";
+    sha256 = "sha256-I+dGfRLFOV8E35fLFnWtNWmqpzbWsA2dBx6pBKQsa7Q=";
   };
   sourceRoot = "${src.name}/src";
 

pkgs/os-specific/linux/hid-tmff2/default.nix

@@ -9,13 +9,13 @@
 stdenv.mkDerivation {
   pname = "hid-tmff2";
   # https://github.com/Kimplul/hid-tmff2/blob/ca168637fbfb085ebc9ade0c47fa0653dac5d25b/dkms/dkms-install.sh#L12
-  version = "0-unstable-2025-04-22";
+  version = "0-unstable-2025-06-28";
 
   src = fetchFromGitHub {
     owner = "Kimplul";
     repo = "hid-tmff2";
-    rev = "d4c9e065ca41b30e1cb7a9852ba182b53a669b9c";
+    rev = "49adf5c48ba2784d97384619a52e875daf4bc062";
-    hash = "sha256-SACkTzj3CFiU8HllW82oXtGF+BEH332AcC4w+ghwtjk=";
+    hash = "sha256-J/Ta1o6k4QHLHTEmoQgObv4uk69mAPlPgzdhLe5Pa+I=";
     # For hid-tminit. Source: https://github.com/scarburato/hid-tminit
     fetchSubmodules = true;
   };

pkgs/os-specific/linux/nct6687d/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "nct6687d";
-  version = "0-unstable-2025-06-19";
+  version = "0-unstable-2025-06-30";
 
   src = fetchFromGitHub {
     owner = "Fred78290";
     repo = "nct6687d";
-    rev = "cd6a28196ceb98531a045eb279eb6179176cdc82";
+    rev = "66ddfee6fb6b8515fb8a27698acbb9b2b8e9d2c2";
-    hash = "sha256-brJigUwQwzLsMIvJdY1CehOdYub+dsh3u3ALIn496VU=";
+    hash = "sha256-orlYpmU+wIxVyPjuk/faQrGKtEcliWI2Hgxcw5DReX4=";
   };
 
   setSourceRoot = ''

pkgs/os-specific/linux/rtw88/default.nix

@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2025-05-08";
+  version = "0-unstable-2025-06-26";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "461b696b51317ba4ca585a4ddb32f2e72cd4efc9";
+    rev = "b89af8cd40d9528b0cdb9a6251efe49d8a69bfc6";
-    hash = "sha256-PBAON2s7gKvpO40vppahEtkWJ4HIjbOjfUz+fx87gIA=";
+    hash = "sha256-gzWVfb8nAN0mmOpiats+VDG/6iwdrxcQHEsDgC7eFZU=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix

@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.27.65";
+  version = "2.27.67";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    hash = "sha256-panhKPoSs/rObr1kgAyznZCveiYKVJv1O0hI7dgdKKI=";
+    hash = "sha256-DIezuI8pexIzqiGWFrgQQER1wx0jCwTZgcluFCBvpCw=";
   };
 
   nativeBuildInputs = [

pkgs/top-level/aliases.nix

@@ -567,6 +567,7 @@ mapAliases {
   dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17
   dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
   dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
+  dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
   downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
   dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
   dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21

pkgs/top-level/all-packages.nix

@@ -498,10 +498,6 @@ with pkgs;
     autoPatchcilHook
     ;
 
-  dotnetenv = callPackage ../build-support/dotnet/dotnetenv {
-    dotnetfx = dotnetfx40;
-  };
-
   buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { };
   fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { };
   dupeguru = callPackage ../applications/misc/dupeguru {

pkgs/top-level/python-packages.nix

@@ -10661,6 +10661,8 @@ self: super: with self; {
 
   openaiauth = callPackage ../development/python-modules/openaiauth { };
 
+  openai-agents = callPackage ../development/python-modules/openai-agents { };
+
   openant = callPackage ../development/python-modules/openant { };
 
   openapi-core = callPackage ../development/python-modules/openapi-core { };