Merge master into haskell-updates

2022-08-15 00:14:06 +00:00 · 2022-08-15 00:14:06 +00:00 · 071fb34807
parent ddada35b50 86c285a353
commit 071fb34807
193 changed files with 4166 additions and 2377 deletions
--- a/doc/builders/fetchers.chapter.md
+++ b/doc/builders/fetchers.chapter.md
@ -91,7 +91,7 @@ Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this c

 Additionally, the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout.

-If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more information:
+If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) for more information:

 ```nix
 { stdenv, fetchgit }:
@ -101,8 +101,8 @@ stdenv.mkDerivation {
  src = fetchgit {
    url = "https://...";
    sparseCheckout = ''
-      path/to/be/included
-      another/path
+      directory/to/be/included
+      another/directory
    '';
    sha256 = "0000000000000000000000000000000000000000000000000000";
  };
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -8481,6 +8481,15 @@
    githubId = 9980864;
    name = "Max Hofer";
  };
+  miangraham = {
+    email = "miangraham@users.noreply.github.com";
+    github = "miangraham";
+    githubId = 704580;
+    name = "M. Ian Graham";
+    keys = [{
+      fingerprint = "8CE3 2906 516F C4D8 D373  308A E189 648A 55F5 9A9F";
+    }];
+  };
  mic92 = {
    email = "joerg@thalheim.io";
    matrix = "@mic92:nixos.dev";
@ -13677,6 +13686,12 @@
    githubId = 118959;
    name = "VinyMeuh";
  };
+  virchau13 = {
+    email = "virchau13@hexular.net";
+    github = "virchau13";
+    githubId = 16955157;
+    name = "Vir Chaudhury";
+  };
  viraptor = {
    email = "nix@viraptor.info";
    github = "viraptor";
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@ -251,6 +251,18 @@
          <literal>(with foo; isPower &amp;&amp; is32bit &amp;&amp; isBigEndian)</literal>.
        </para>
      </listitem>
+      <listitem>
+        <para>
+          The <literal>fetchgit</literal> fetcher now uses
+          <link xlink:href="https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling">cone
+          mode</link> by default for sparse checkouts.
+          <link xlink:href="https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems">Non-cone
+          mode</link> can be enabled by passing
+          <literal>nonConeMode = true</literal>, but note that non-cone
+          mode is deprecated and this option may be removed alongside a
+          future Git update without notice.
+        </para>
+      </listitem>
      <listitem>
        <para>
          <literal>bsp-layout</literal> no longer uses the command
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@ -97,6 +97,8 @@ In addition to numerous new and upgraded packages, this release has the followin

 - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion.  The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems.  If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`.

+- The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice.
+
 - `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`.

 - The Barco ClickShare driver/client package `pkgs.clickshare-csc1` and the option `programs.clickshare-csc1.enable` have been removed,
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@ -185,6 +185,16 @@ in
      '';
    };

+    security.wrapperDirSize = lib.mkOption {
+      default = "50%";
+      example = "10G";
+      type = lib.types.str;
+      description = ''
+        Size limit for the /run/wrappers tmpfs. Look at mount(8), tmpfs size option,
+        for the accepted syntax. WARNING: don't set to less than 64MB.
+      '';
+    };
+
    security.wrapperDir = lib.mkOption {
      type        = lib.types.path;
      default     = "/run/wrappers/bin";
@ -227,7 +237,7 @@ in

    boot.specialFileSystems.${parentWrapperDir} = {
      fsType = "tmpfs";
-      options = [ "nodev" "mode=755" ];
+      options = [ "nodev" "mode=755" "size=${config.security.wrapperDirSize}" ];
    };

    # Make sure our wrapperDir exports to the PATH env variable when
--- a/nixos/modules/virtualisation/includes-to-excludes.py
+++ b/nixos/modules/virtualisation/includes-to-excludes.py
@ -0,0 +1,86 @@
+
+# Convert a list of strings to a regex that matches everything but those strings
+# ... and it had to be a POSIX regex; no negative lookahead :(
+# This is a workaround for erofs supporting only exclude regex, not an include list
+
+import sys
+import re
+from collections import defaultdict
+
+# We can configure this script to match in different ways if we need to.
+# The regex got too long for the argument list, so we had to truncate the
+# hashes and use MATCH_STRING_PREFIX. That's less accurate, and might pick up some
+# garbage like .lock files, but only if the sandbox doesn't hide those. Even
+# then it should be harmless.
+
+# Produce the negation of ^a$
+MATCH_EXACTLY = ".+"
+# Produce the negation of ^a
+MATCH_STRING_PREFIX = "//X" # //X should be epsilon regex instead. Not supported??
+# Produce the negation of ^a/?
+MATCH_SUBPATHS = "[^/].*$"
+
+# match_end = MATCH_SUBPATHS
+match_end = MATCH_STRING_PREFIX
+# match_end = MATCH_EXACTLY
+
+def chars_to_inverted_class(letters):
+    assert len(letters) > 0
+    letters = list(letters)
+
+    s = "[^"
+
+    if "]" in letters:
+        s += "]"
+        letters.remove("]")
+
+    final = ""
+    if "-" in letters:
+        final = "-"
+        letters.remove("-")
+
+    s += "".join(letters)
+
+    s += final
+
+    s += "]"
+
+    return s
+
+# There's probably at least one bug in here, but it seems to works well enough
+# for filtering store paths.
+def strings_to_inverted_regex(strings):
+    s = "("
+
+    # Match anything that starts with the wrong character
+
+    chars = defaultdict(list)
+
+    for item in strings:
+        if item != "":
+            chars[item[0]].append(item[1:])
+
+    if len(chars) == 0:
+        s += match_end
+    else:
+        s += chars_to_inverted_class(chars)
+
+    # Now match anything that starts with the right char, but then goes wrong
+
+    for char, sub in chars.items():
+        s += "|(" + re.escape(char) + strings_to_inverted_regex(sub) + ")"
+
+    s += ")"
+    return s
+
+if __name__ == "__main__":
+    stdin_lines = []
+    for line in sys.stdin:
+        if line.strip() != "":
+            stdin_lines.append(line.strip())
+
+    print("^" + strings_to_inverted_regex(stdin_lines))
+
+# Test:
+# (echo foo; echo fo/; echo foo/; echo foo/ba/r; echo b; echo az; echo az/; echo az/a; echo ab; echo ab/a; echo ab/; echo abc; echo abcde; echo abb; echo ac; echo b) | grep -vE "$((echo ab; echo az; echo foo;) | python includes-to-excludes.py | tee /dev/stderr )"
+# should print ab, az, foo and their subpaths
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@ -17,6 +17,8 @@ let

  cfg = config.virtualisation;

+  opt = options.virtualisation;
+
  qemu = cfg.qemu.package;

  consoles = lib.concatMapStringsSep " " (c: "console=${c}") cfg.qemu.consoles;
@ -122,11 +124,32 @@ let
          TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
      fi

-      ${lib.optionalString cfg.useNixStoreImage
-      ''
-        # Create a writable copy/snapshot of the store image.
-        ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${storeImage}/nixos.qcow2 "$TMPDIR"/store.img
-      ''}
+      ${lib.optionalString (cfg.useNixStoreImage)
+        (if cfg.writableStore
+          then ''
+            # Create a writable copy/snapshot of the store image.
+            ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${storeImage}/nixos.qcow2 "$TMPDIR"/store.img
+          ''
+          else ''
+            (
+              cd ${builtins.storeDir}
+              ${pkgs.erofs-utils}/bin/mkfs.erofs \
+                --force-uid=0 \
+                --force-gid=0 \
+                -U eb176051-bd15-49b7-9e6b-462e0b467019 \
+                -T 0 \
+                --exclude-regex="$(
+                  <${pkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \
+                    sed -e 's^.*/^^g' \
+                  | cut -c -10 \
+                  | ${pkgs.python3}/bin/python ${./includes-to-excludes.py} )" \
+                "$TMPDIR"/store.img \
+                . \
+                </dev/null >/dev/null
+            )
+          ''
+        )
+      }

      # Create a directory for exchanging data with the VM.
      mkdir -p "$TMPDIR/xchg"
@ -746,6 +769,26 @@ in
          }
        ]));

+    warnings =
+      optional (
+        cfg.writableStore &&
+        cfg.useNixStoreImage &&
+        opt.writableStore.highestPrio > lib.modules.defaultPriority)
+        ''
+          You have enabled ${opt.useNixStoreImage} = true,
+          without setting ${opt.writableStore} = false.
+
+          This causes a store image to be written to the store, which is
+          costly, especially for the binary cache, and because of the need
+          for more frequent garbage collection.
+
+          If you really need this combination, you can set ${opt.writableStore}
+          explicitly to true, incur the cost and make this warning go away.
+          Otherwise, we recommend
+
+            ${opt.writableStore} = false;
+        '';
+
    # Note [Disk layout with `useBootLoader`]
    #
    # If `useBootLoader = true`, we configure 2 drives:
@ -769,6 +812,8 @@ in
    );
    boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}";

+    boot.initrd.kernelModules = optionals (cfg.useNixStoreImage && !cfg.writableStore) [ "erofs" ];
+
    boot.initrd.extraUtilsCommands = lib.mkIf (cfg.useDefaultFilesystems && !config.boot.initrd.systemd.enable)
      ''
        # We need mke2fs in the initrd.
@ -905,6 +950,7 @@ in
        name = "nix-store";
        file = ''"$TMPDIR"/store.img'';
        deviceExtraOpts.bootindex = if cfg.useBootLoader then "3" else "2";
+        driveExtraOpts.format = if cfg.writableStore then "qcow2" else "raw";
      }])
      (mkIf cfg.useBootLoader [
        # The order of this list determines the device names, see
--- a/nixos/tests/discourse.nix
+++ b/nixos/tests/discourse.nix
@ -30,6 +30,7 @@ import ./make-test-python.nix (
        virtualisation.memorySize = 2048;
        virtualisation.cores = 4;
        virtualisation.useNixStoreImage = true;
+        virtualisation.writableStore = false;

        imports = [ common/user-account.nix ];

--- a/nixos/tests/gitlab.nix
+++ b/nixos/tests/gitlab.nix
@ -38,6 +38,8 @@ in {
      virtualisation.memorySize = if pkgs.stdenv.is64bit then 4096 else 2047;
      virtualisation.cores = 4;
      virtualisation.useNixStoreImage = true;
+      virtualisation.writableStore = false;
+
      systemd.services.gitlab.serviceConfig.Restart = mkForce "no";
      systemd.services.gitlab-workhorse.serviceConfig.Restart = mkForce "no";
      systemd.services.gitaly.serviceConfig.Restart = mkForce "no";
--- a/pkgs/applications/audio/musikcube/default.nix
+++ b/pkgs/applications/audio/musikcube/default.nix
@ -76,6 +76,11 @@ stdenv.mkDerivation rec {
    "-DDISABLE_STRIP=true"
  ];

+  postFixup = lib.optionals stdenv.isDarwin ''
+    install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}
+    install_name_tool -add_rpath $out/share/${pname} $out/share/${pname}/${pname}d
+  '';
+
  meta = with lib; {
    description = "A fully functional terminal-based music player, library, and streaming audio server";
    homepage = "https://musikcube.com/";
--- a/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch
+++ b/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch
@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index f86b4b4..befc2bf 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -1326,7 +1326,7 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
+ 
+ [[package]]
+ name = "neovide"
+-version = "0.9.0"
+version = "0.10.0"
+ dependencies = [
+  "async-trait",
+  "cfg-if 1.0.0",
--- a/pkgs/applications/editors/neovim/neovide/default.nix
+++ b/pkgs/applications/editors/neovim/neovide/default.nix
@ -25,16 +25,20 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "neovide";
-  version = "0.9.0";
+  version = "0.10.0";

  src = fetchFromGitHub {
    owner = "Kethku";
    repo = "neovide";
    rev = version;
-    sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI=";
+    sha256 = "sha256-4oZJZd5Allh9Wc7YOvW9sF+38Sm15dL03TJZkHTbXXc=";
+    postFetch = ''
+      cd $out
+      patch -p1 -i ${./Cargo.lock.patch}
+    '';
  };

-  cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE=";
+  cargoSha256 = "sha256-E1Wp5tPVK+5WIQ+3OrzY3W9Vfy57DHgNccKtIp/vUy8=";

  SKIA_SOURCE_DIR =
    let
@ -42,8 +46,8 @@ rustPlatform.buildRustPackage rec {
        owner = "rust-skia";
        repo = "skia";
        # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia
-        rev = "m100-0.48.7";
-        sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs=";
+        rev = "m103-0.51.1";
+        sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw=";
      };
      # The externals for skia are taken from skia/DEPS
      externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json);
--- a/pkgs/applications/editors/neovim/neovide/skia-externals.json
+++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json
@ -6,8 +6,8 @@
  },
  "libjpeg-turbo": {
    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git",
-    "rev": "02959c3ee17abacfd1339ec22ea93301292ffd56",
-    "sha256": "sha256-cuSBVhHCX2Fh2SmmRpjinYtge8yaxcM06jlSXfvCywk="
+    "rev": "22f1a22c99e9dde8cd3c72ead333f425c5a7aa77",
+    "sha256": "sha256-5MaYvyrhADFGKBxcS3kbKcn9tj0FNXAN/rAXXYW6ljs="
  },
  "icu": {
    "url": "https://chromium.googlesource.com/chromium/deps/icu.git",
@ -21,8 +21,8 @@
  },
  "harfbuzz": {
    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git",
-    "rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc",
-    "sha256": "sha256-QyVkeBVl45gygOylhnojcQuDIBp2DT2d7pD+OcX29VU="
+    "rev": "8d1b000a3edc90c12267b836b4ef3f81c0e53edc",
+    "sha256": "sha256-nFAT7HnYkIWZcV6kjDQiRltbPcmbtuRM4m5ecY4/s6E="
  },
  "libpng": {
    "url": "https://skia.googlesource.com/third_party/libpng.git",
--- a/pkgs/applications/emulators/dolphin-emu/master.nix
+++ b/pkgs/applications/emulators/dolphin-emu/master.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "dolphin-emu";
-  version = "5.0-16380";
+  version = "5.0-16793";

  src = fetchFromGitHub {
    owner = "dolphin-emu";
    repo = "dolphin";
-    rev = "8335ec70e5fe253eb21509408ca6b5736ed57dfc";
-    sha256 = "sha256-WRQ3WfMTlIPoYrEFWLHL9KSfhzQl24AlkbWjh3a4fPE=";
+    rev = "3cd82b619388d0877436390093a6edc2319a6904";
+    sha256 = "sha256-0k+kmq/jkCy52wGcmvtwmnLxUfxk3k0mvsr5wfX8p30=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/emulators/ppsspp/default.nix
+++ b/pkgs/applications/emulators/ppsspp/default.nix
@ -1,37 +1,43 @@
-{ mkDerivation
+{ lib
+, stdenv
 , fetchFromGitHub
 , SDL2
 , cmake
 , ffmpeg
 , glew
-, lib
 , libzip
 , pkg-config
 , python3
 , qtbase
 , qtmultimedia
 , snappy
+, wrapQtAppsHook
 , zlib
 }:

-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "ppsspp";
  version = "1.13.1";

  src = fetchFromGitHub {
    owner = "hrydgard";
-    repo = pname;
-    rev = "v${version}";
+    repo = "ppsspp";
+    rev = "v${finalAttrs.version}";
    fetchSubmodules = true;
    sha256 = "sha256-WsFy2aSOmkII2Lte5et4W6qj0AXUKWWkYe88T0OQP08=";
  };

  postPatch = ''
-    substituteInPlace git-version.cmake --replace unknown ${src.rev}
+    substituteInPlace git-version.cmake --replace unknown ${finalAttrs.src.rev}
    substituteInPlace UI/NativeApp.cpp --replace /usr/share $out/share
  '';

-  nativeBuildInputs = [ cmake pkg-config python3 ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    python3
+    wrapQtAppsHook
+  ];

  buildInputs = [
    SDL2
@ -68,5 +74,5 @@ mkDerivation rec {
    maintainers = with maintainers; [ AndersonTorres ];
    platforms = platforms.linux;
  };
-}
+})
 # TODO: add SDL headless port
--- a/pkgs/applications/emulators/ryujinx/default.nix
+++ b/pkgs/applications/emulators/ryujinx/default.nix
@ -13,17 +13,18 @@
 , gtk3
 , gdk-pixbuf
 , wrapGAppsHook
+, vulkan-loader
 }:

 buildDotnetModule rec {
  pname = "ryujinx";
-  version = "1.1.181"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml
+  version = "1.1.213"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml

  src = fetchFromGitHub {
    owner = "Ryujinx";
    repo = "Ryujinx";
-    rev = "6eb85e846f25ae36a39685d6ac91025deaea306c";
-    sha256 = "0lc8hhcrad26sw2dx0lwml8lk2mxg4db4sgfxnd450xi2qd63kdc";
+    rev = "e8f1ca84277240c4d6215eb9cd85713aab73e2f7";
+    sha256 = "0ha5wn9h9rqxbkjbz7sm5m8q3rbsiiddh72wx0s3sga5w8054cb3";
  };

  projectFile = "Ryujinx.sln";
@ -53,10 +54,8 @@ buildDotnetModule rec {
    libsoundio
    sndio
    pulseaudio
-  ];
-
-  makeWrapperArgs = [
-    "--suffix PATH : ${lib.getBin ffmpeg}"
+    vulkan-loader
+    ffmpeg
  ];

  patches = [
--- a/pkgs/applications/emulators/ryujinx/deps.nix
+++ b/pkgs/applications/emulators/ryujinx/deps.nix
@ -56,7 +56,10 @@
  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; })
  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; })
+  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; })
  (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; })
+  (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; })
+  (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.1"; sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; })
  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; })
@ -93,6 +96,8 @@
  (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.2"; sha256 = "1wnf9x45ga336vq4px2a2fmma4zc9xrcr4qwrsmsh3l4w0d9s6ps"; })
  (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.2"; sha256 = "0ay1a8spmy8pn5nlvvac796smp74hjpxm3swvxdrbqqg4l4xqlfz"; })
  (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.2"; sha256 = "1m0wgf4khikyz2pvns5d9ffwm7psxjn9r4h128aqlca1iyay23f6"; })
+  (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.7.25"; sha256 = "0yf84sql0bayndjacr385lzar0vnjaxz5klrsxflfi48mgc8g55s"; })
+  (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.2"; sha256 = "14nswj5ws9yq6lkfyjj1y1pd6522rjqascxs5jy9cgnp954lv2hv"; })
  (fetchNuGet { pname = "PangoSharp"; version = "3.22.25.128"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; })
  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
@ -147,8 +152,13 @@
  (fetchNuGet { pname = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; })
  (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.1-build10"; sha256 = "05r3fh92raaydf4vcih77ivymbs97kqwjlgqdpaxa11aqq0hq753"; })
  (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.0.22-build20"; sha256 = "03d1rv0rlr2z7ynqixgj9xqlksplk1vsvq5wxjf5c6c6zcknx01r"; })
+  (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; })
  (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; })
  (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.14"; sha256 = "0ym0ayik0vq2za9h0kr8mhjd9zk4hx25hrrfyyg9wrc164xa11qb"; })
+  (fetchNuGet { pname = "Silk.NET.Core"; version = "2.10.1"; sha256 = "02fabxqhfn2a8kyqmxcmraq09m1pvd8gbw8xad6y9iqyhr0q8s0j"; })
+  (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.10.1"; sha256 = "03aapzb23lkn4qyq71lipcgj8h3ji12jjivrph535v0pwqx9db35"; })
+  (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.10.1"; sha256 = "0d8ml39dhxpj2rql88g7dw3rkcjxl5722rilw1wdnjaki7hqgrz7"; })
+  (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.10.1"; sha256 = "07zc7bjbg9h71m3l71i9gx5kwx7bhv4l7vha88wpi8h8f86zyvzd"; })
  (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; })
  (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; })
  (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; })
@ -163,7 +173,7 @@
  (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; })
  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; })
  (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; })
-  (fetchNuGet { pname = "SPB"; version = "0.0.4-build17"; sha256 = "0arp7mwdn1w67qx8a0m90xh8waj15154ynswrbsp5w4wmzkcss1i"; })
+  (fetchNuGet { pname = "SPB"; version = "0.0.4-build24"; sha256 = "13wfjx5n540mlxlvys39g2rajrqbycdkyci2pcp3wygkqn4d87hm"; })
  (fetchNuGet { pname = "Svg.Custom"; version = "0.5.14"; sha256 = "1wjghs2n5hk7zszzk2p2a8m6ga2gc8sfd5mdqi15sbfkmwg2nbw7"; })
  (fetchNuGet { pname = "Svg.Model"; version = "0.5.14"; sha256 = "1xilk95bmnsl93sbr7pah0jrjrnccf1ikcn8s7rkm0yjkj382hc8"; })
  (fetchNuGet { pname = "Svg.Skia"; version = "0.5.14"; sha256 = "02wv040wi8ijw9mwg3c84f8bfyfv9n99ji8q1v2bs11b463zsyd1"; })
@ -192,6 +202,7 @@
  (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; })
  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; })
+  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
  (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; })
  (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; })
  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; })
@ -220,6 +231,7 @@
  (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; })
  (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; })
+  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; })
  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; })
  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; })
@ -284,6 +296,7 @@
  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; })
  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; })
  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
@ -306,4 +319,5 @@
  (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; })
  (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; })
  (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; })
+  (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.3.4"; sha256 = "0w1bz5sr6y5fhgx1f54xyl8rx7y3kyf1fhacnd6akq8970zjdkdi"; })
 ]
--- a/pkgs/applications/emulators/yuzu/default.nix
+++ b/pkgs/applications/emulators/yuzu/default.nix
@ -15,13 +15,13 @@ let
 in {
  mainline = libsForQt5.callPackage ./generic.nix rec {
    pname = "yuzu-mainline";
-    version = "1092";
+    version = "1131";

    src = fetchFromGitHub {
      owner = "yuzu-emu";
      repo = "yuzu-mainline";
      rev = "mainline-0-${version}";
-      sha256 = "1avcq924q0r8pfv1s0a88iyii7yixcxpb3yhlj0xg9zqnwp9r23y";
+      sha256 = "0lh8s59hrysfjz69yr0f44s3l4aaznmclq0xfnyblsk0cw9ripf6";
      fetchSubmodules = true;
    };

@ -30,13 +30,13 @@ in {

  early-access = libsForQt5.callPackage ./generic.nix rec {
    pname = "yuzu-ea";
-    version = "2841";
+    version = "2901";

    src = fetchFromGitHub {
      owner = "pineappleEA";
      repo = "pineapple-src";
      rev = "EA-${version}";
-      sha256 = "16lrq9drv0x7gs1siq37m4zmh6d2g3vhnw9qcqajr9p0vmlpnh6l";
+      sha256 = "0jymm9sdsnayjaffmcbpjck4k2yslx8zid2vsm4jfdaajr244q2z";
      fetchSubmodules = true;
    };

--- a/pkgs/applications/emulators/yuzu/generic.nix
+++ b/pkgs/applications/emulators/yuzu/generic.nix
@ -47,8 +47,11 @@ stdenv.mkDerivation rec {

  # Replace icons licensed under CC BY-ND 3.0 with free ones to allow
  # for binary redistribution: https://github.com/yuzu-emu/yuzu/pull/8104
-  # The patch hosted on GitHub has the binary information stripped, so
-  # it has been regenerated with "git format-patch --text --full-index --binary"
+  # The patch hosted on GitHub has the binary information in git format, which
+  # can’t be applied with patch(1), so it has been regenerated with
+  # "git format-patch --text --full-index --binary".
+  # Because pineapple strips all files beginning with a dot, the patch needs to
+  # be edited manually afterwards to remove all changes to those.
  patches = [ ./yuzu-free-icons.patch ];

  nativeBuildInputs = [
--- a/pkgs/applications/emulators/yuzu/update.sh
+++ b/pkgs/applications/emulators/yuzu/update.sh
@ -53,7 +53,7 @@ updateEarlyAccess() {
    OLD_EA_HASH="$(getLocalHash "yuzu-ea")"

    NEW_EA_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \
-        "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2 | cut -d" " -f1)"
+        "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" | jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)"

    if [[ "${OLD_EA_VERSION}" = "${NEW_EA_VERSION}" ]]; then
        echo "yuzu-ea is already up to date!"
--- a/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch
+++ b/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch
--- a/pkgs/applications/misc/charm/default.nix
+++ b/pkgs/applications/misc/charm/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "charm";
-  version = "0.12.1";
+  version = "0.12.3";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = "charm";
    rev = "v${version}";
-    sha256 = "sha256-vNy2ai1s7TKCymYznvT0Wo6lg9qEyDzz8l3SYzScz8g=";
+    sha256 = "sha256-FQNOU75mZqeXAVFOxTXri6bfkJZx4A/YhXMf8bFAKxs=";
  };

-  vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4=";
+  vendorSha256 = "sha256-6Grg6/q4idhWk6slxV2GBblmOA5dclFh/PcGtPXUTd4=";

  ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];

--- a/pkgs/applications/misc/fnott/default.nix
+++ b/pkgs/applications/misc/fnott/default.nix
@ -19,14 +19,14 @@

 stdenv.mkDerivation rec {
  pname = "fnott";
-  version = "1.2.1";
+  version = "1.3.0";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "dnkl";
    repo = "fnott";
    rev = version;
-    sha256 = "sha256-Ni1LwsBkh+XekHEAPxoAkE3tjgUByvpLUGpx7WC54Jw=";
+    sha256 = "sha256-6NMMU39v8+Ir3rf7kVwBdEOuYnZC1MqtZnim8+0A7wM=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/nerd-font-patcher/default.nix
+++ b/pkgs/applications/misc/nerd-font-patcher/default.nix
@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec {
      font-patcher
      /src/glyphs
    '';
-    sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k=";
+    sha256 = "sha256-06dn6M2wCFO/uBHDR7VZHNHIybT4h/VGD9nHc4G0EKA=";
  };

  propagatedBuildInputs = with python3Packages; [ fontforge ];
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@ -25,14 +25,14 @@

 stdenv.mkDerivation rec {
  pname = "rofi-unwrapped";
-  version = "1.7.3";
+  version = "1.7.4";

  src = fetchFromGitHub {
    owner = "davatorium";
    repo = "rofi";
    rev = version;
    fetchSubmodules = true;
-    sha256 = "sha256-bUedRRmrfdmzNW+2PzJvLbCTIWta2rbQ3CTLRSdJqbs=";
+    sha256 = "sha256-xAGhwzm+L8/aBJ65zfbnHyZFlg5x0b2s1x1aTC2I5po=";
  };

  preConfigure = ''
--- a/pkgs/applications/misc/skate/default.nix
+++ b/pkgs/applications/misc/skate/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "skate";
-  version = "0.2.0";
+  version = "0.2.1";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = "skate";
    rev = "v${version}";
-    sha256 = "sha256-glqBiwW87BwGRZGDSvvE/WeK4BKqXGmC6Q9qBk+ROuc=";
+    sha256 = "sha256-7ieXQM1Z4q4f37YSEcGs7sBAZH+64OCrWp7uBP5VNqI=";
  };

-  vendorSha256 = "sha256-VQvumXQx5Q0gt51NI65kjSnzGRyScpli36vfCygtAjE=";
+  vendorSha256 = "sha256-/Q8T4/KaHglhdxMQg9v5H+mHZpuHFcLRAbh6CzaFJKU=";

  doCheck = false;

--- a/pkgs/applications/misc/tut/default.nix
+++ b/pkgs/applications/misc/tut/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "tut";
-  version = "1.0.16";
+  version = "1.0.17";

  src = fetchFromGitHub {
    owner = "RasmusLindroth";
    repo = pname;
    rev = version;
-    sha256 = "sha256-sJX9qpWkNe/v9PSAJ5iY8RKEJXs84Gf0Imce4VIFp2Q=";
+    sha256 = "sha256-XuN1qpcCUX8xAE7tj21g6U3ilhQIeGWlSqMVik5Qc5Q=";
  };

-  vendorSha256 = "sha256-LAVvaZqZzMYCGtVWmeYXI7L4f2tStkaWG4QlLSrSjfk=";
+  vendorSha256 = "sha256-WdhTdF8kdjAg6ztwSwx+smaA0rrLZjE76r4oVJqMtFU=";

  meta = with lib; {
    description = "A TUI for Mastodon with vim inspired keys";
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@ -90,11 +90,11 @@ in

 stdenv.mkDerivation rec {
  pname = "brave";
-  version = "1.41.100";
+  version = "1.42.88";

  src = fetchurl {
    url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "sha256-r5mMI7iLJ+q4dvt/IDcFlHz56sygYXsG8bb29UVxmTI=";
+    sha256 = "sha256-Or3eTLwap6KFhO7ieLyAXS0NKga5eUbd3KyFq/YNg+c=";
  };

  dontConfigure = true;
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@ -20,11 +20,11 @@ let
  vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
  pname = "vivaldi";
-  version = "5.3.2679.70-1";
+  version = "5.4.2753.33-1";

  src = fetchurl {
    url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb";
-    sha256 = "0mcq3nbbjw5x2gjah6hbbiv233bxwi68y7nziyqpp9d6nd2pixjn";
+    sha256 = "0bs6324m5l5vmg1x1sj6g3qb1958c5c8z35r87r3rpnv52lqr501";
  };

  unpackPhase = ''
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "chromium-codecs-ffmpeg-extra";
-  version = "103.0.5060.53";
+  version = "104.0.5112.79";

  src = fetchurl {
-    url = "https://launchpadlibrarian.net/607589056/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
-    sha256 = "sha256-Tsp5Y6sCn+mKrLGZSAWGFoSTHiyfANQ5VA7pesU1HyU=";
+    url = "https://launchpadlibrarian.net/616178945/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb";
+    sha256 = "sha256-JL14+2TsX1qXfRpA/tAADC0iujPj37ld6T9yPUD8R38=";
  };

  buildInputs = [ dpkg ];
--- a/pkgs/applications/networking/browsers/vivaldi/update.sh
+++ b/pkgs/applications/networking/browsers/vivaldi/update.sh
@ -37,7 +37,7 @@ git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}"
 # Check vivaldi-ffmpeg-codecs version.
 chromium_version_old=$(version vivaldi-ffmpeg-codecs)
 ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg)
-chromium_version=$(sed -rne 's/FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script)
+chromium_version=$(sed -rne 's/^FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script)
 download_subdir=$(sed -rne 's/.*FFMPEG_URL_DEB\=https:\/\/launchpadlibrarian\.net\/([0-9]+)\/.*_amd64\.deb/\1/p' <<< $ffmpeg_update_script)

 if [[ "$chromium_version" != "$chromium_version_old" ]]; then
--- a/pkgs/applications/networking/cluster/argo/default.nix
+++ b/pkgs/applications/networking/cluster/argo/default.nix
@ -19,16 +19,16 @@ let
 in
 buildGoModule rec {
  pname = "argo";
-  version = "3.3.8";
+  version = "3.3.9";

  src = fetchFromGitHub {
    owner = "argoproj";
    repo = "argo";
    rev = "v${version}";
-    sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww=";
+    sha256 = "sha256-BDanFiLhucNE4uvUxKDXAK1W755VfNytQ3gXuLIKfSE=";
  };

-  vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0=";
+  vendorSha256 = "sha256-303+LE3n3lltuCf+Pc7S+qHdsjQDt9IAu9Kd4sUaiYI=";

  doCheck = false;

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -32,10 +32,10 @@
    "owner": "aiven",
    "provider-source-address": "registry.terraform.io/aiven/aiven",
    "repo": "terraform-provider-aiven",
-    "rev": "v3.4.0",
-    "sha256": "sha256-AIQf2ArawnyvD9FyIoIbY6DV9XptxIk9MqY+vDKY51g=",
-    "vendorSha256": "sha256-SjgY7ZiFHOGAvwT5ysHnbsAOIuRZSh9JvSUiZhFbCvo=",
-    "version": "3.4.0"
+    "rev": "v3.5.0",
+    "sha256": "sha256-MLcC3fGQaXdtB+4/is30mn9+jbq7UUULFs7DxKE2jxM=",
+    "vendorSha256": "sha256-mnj8AlVKrTgCOexA9CZELxB1rYtOflXg+dBrSu++enI=",
+    "version": "3.5.0"
  },
  "akamai": {
    "owner": "akamai",
@ -51,10 +51,10 @@
    "owner": "aliyun",
    "provider-source-address": "registry.terraform.io/aliyun/alicloud",
    "repo": "terraform-provider-alicloud",
-    "rev": "v1.179.0",
-    "sha256": "sha256-J6DYXGVCQalXuxpOd4Bw9N9UCcunpvX4EMmiM9XzxQ8=",
-    "vendorSha256": "sha256-g8ZwzgcrHoPcw+cPi2cIW7ZDHy5TLxKUblDqLVlFlSw=",
-    "version": "1.179.0"
+    "rev": "v1.180.0",
+    "sha256": "sha256-vBRik7iS9hUCdj4RfiwXswuIGOHlCMt0QHV2k9yIiGs=",
+    "vendorSha256": "sha256-kjr93pVmMZgeJgeG8hG86CDWr95gCIAhf93OQ4tJ9kw=",
+    "version": "1.180.0"
  },
  "ansible": {
    "owner": "nbering",
@ -78,10 +78,10 @@
    "owner": "auth0",
    "provider-source-address": "registry.terraform.io/auth0/auth0",
    "repo": "terraform-provider-auth0",
-    "rev": "v0.34.0",
-    "sha256": "sha256-wjqJf3MgLL5NAXp0Nf9VWg8D8jEKvyXoLCMq9yyyFGM=",
-    "vendorSha256": "sha256-5OIMhuzM/jTXNeZpMG3BOOUTmJyoLrbOjR2O7ixDDlM=",
-    "version": "0.34.0"
+    "rev": "v0.35.0",
+    "sha256": "sha256-deXywsZkAms/T0j4YT4WmTvHPB4AUet4tDETYtRQOQo=",
+    "vendorSha256": "sha256-u1tBA/uWqWa2j2094zHNPinzOJ9ogwMNwsF6QSfnOy0=",
+    "version": "0.35.0"
  },
  "avi": {
    "owner": "vmware",
@ -96,19 +96,19 @@
    "owner": "AviatrixSystems",
    "provider-source-address": "registry.terraform.io/AviatrixSystems/aviatrix",
    "repo": "terraform-provider-aviatrix",
-    "rev": "v2.22.3",
-    "sha256": "sha256-yMzeeS8hpCeoejMYa1YQl6wvhki/BzFtNWgZ951bpLU=",
+    "rev": "v2.23.0",
+    "sha256": "sha256-ub8SKZC6l1+F2mEP4L6WP0VW/8k1ri80ruUjRvrl55A=",
    "vendorSha256": null,
-    "version": "2.22.3"
+    "version": "2.23.0"
  },
  "aws": {
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/aws",
    "repo": "terraform-provider-aws",
-    "rev": "v4.25.0",
-    "sha256": "sha256-0dRCgNK828aUFBDRBkRFY/1Rnesd3ZQrHtimbNquHO8=",
-    "vendorSha256": "sha256-b6RrsJnWm5dvmNN/zv04Ct6I28McpXWzw0fySHMRias=",
-    "version": "4.25.0"
+    "rev": "v4.26.0",
+    "sha256": "sha256-LC1Q1IjGXjCAQ1P2QdAiVaX/bW0m8w8obDd6ItKhcQo=",
+    "vendorSha256": "sha256-iNVG54Nuq7oWXpLRxDSgiVVreJ6kbPA6cDBy8XA0B4o=",
+    "version": "4.26.0"
  },
  "azuread": {
    "owner": "hashicorp",
@ -123,10 +123,10 @@
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/azurerm",
    "repo": "terraform-provider-azurerm",
-    "rev": "v3.17.0",
-    "sha256": "sha256-XeZwQxK0WhLv2Y7PFADsv4f6vO4E3/j/9HM1wJ8LXKE=",
+    "rev": "v3.18.0",
+    "sha256": "sha256-OmOmbPEkrwRm6AhvJRKGvZCVVspYKMKMgmhdqBq9aJI=",
    "vendorSha256": null,
-    "version": "3.17.0"
+    "version": "3.18.0"
  },
  "azurestack": {
    "owner": "hashicorp",
@ -138,13 +138,14 @@
    "version": "1.0.0"
  },
  "baiducloud": {
+    "deleteVendor": true,
    "owner": "baidubce",
    "provider-source-address": "registry.terraform.io/baidubce/baiducloud",
    "repo": "terraform-provider-baiducloud",
-    "rev": "v1.14.0",
-    "sha256": "sha256-D0Yddg4kC+NtBVeCzBA/0Aa4rl6xpGhyA5HdEKiJcX0=",
-    "vendorSha256": null,
-    "version": "1.14.0"
+    "rev": "v1.14.5",
+    "sha256": "sha256-fZOPtfAA1lXb6kf9oZnPeL5+spriEDhVCimFOVTyOsw=",
+    "vendorSha256": "sha256-p5xloe5ixgpoD7rPRiO9cNLm3Tmlk7pEJT+xXOZWA6o=",
+    "version": "1.14.5"
  },
  "bigip": {
    "owner": "F5Networks",
@ -224,10 +225,10 @@
    "owner": "cloudflare",
    "provider-source-address": "registry.terraform.io/cloudflare/cloudflare",
    "repo": "terraform-provider-cloudflare",
-    "rev": "v3.20.0",
-    "sha256": "sha256-NbnYFPtE/s7mbfKAAX2PS1ApdrLAlxaIWWr2jD8JUqs=",
-    "vendorSha256": "sha256-6PWeR9gau0Se19GuSR7ZZQK+IULoDlKDZOuALhOQOMM=",
-    "version": "3.20.0"
+    "rev": "v3.21.0",
+    "sha256": "sha256-qyF3FIDMr+kqx60x7LE/bDwH7tj4zSaASv8ApaxPATI=",
+    "vendorSha256": "sha256-5tJSdXmQto4c5On3mGca1Hji0sg5KtJXvYdbiObCC48=",
+    "version": "3.21.0"
  },
  "cloudfoundry": {
    "owner": "cloudfoundry-community",
@ -342,10 +343,10 @@
    "owner": "kreuzwerker",
    "provider-source-address": "registry.terraform.io/kreuzwerker/docker",
    "repo": "terraform-provider-docker",
-    "rev": "v2.20.0",
-    "sha256": "sha256-qMHssqCPQXWZYXATYpo1W43kq/9LSfh7q1bLgyhWXMQ=",
-    "vendorSha256": "sha256-uyUlhhne6EvM5vQk31uDPXcpJONVsw4ooGKmH4wYISQ=",
-    "version": "2.20.0"
+    "rev": "v2.20.2",
+    "sha256": "sha256-5xQRUHga83sIIyBiWhXLWkjsBuk/1n4cZg/Y+zYz7+o=",
+    "vendorSha256": "sha256-aPt1y7UEL+Y4aRm0rfHr/yJ393NP2oAqgz7+fo/msQo=",
+    "version": "2.20.2"
  },
  "dome9": {
    "owner": "dome9",
@ -360,10 +361,10 @@
    "owner": "phillbaker",
    "provider-source-address": "registry.terraform.io/phillbaker/elasticsearch",
    "repo": "terraform-provider-elasticsearch",
-    "rev": "v2.0.2",
-    "sha256": "sha256-hbdPapnnkv8nhD63UquS5DwfETkjNKwpkdmo9LgpvM0=",
+    "rev": "v2.0.4",
+    "sha256": "sha256-ir3bPtsghZkfJbRyh5nlK9cGPA49WGxZDb3jMtfWzms=",
    "vendorSha256": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw=",
-    "version": "2.0.2"
+    "version": "2.0.4"
  },
  "equinix": {
    "owner": "equinix",
@ -517,10 +518,10 @@
    "owner": "heroku",
    "provider-source-address": "registry.terraform.io/heroku/heroku",
    "repo": "terraform-provider-heroku",
-    "rev": "v5.1.1",
-    "sha256": "sha256-lXMxIxXgjW2hD4wJQBnc19WFym4zJSKq3dUeUbIqiOQ=",
+    "rev": "v5.1.2",
+    "sha256": "sha256-jZGjwJdQ/6j/kQvCmOwVUG+U4HXgQj5ca91hCUYaMGQ=",
    "vendorSha256": null,
-    "version": "5.1.1"
+    "version": "5.1.2"
  },
  "hetznerdns": {
    "owner": "timohirt",
@ -580,10 +581,10 @@
    "owner": "IBM-Cloud",
    "provider-source-address": "registry.terraform.io/IBM-Cloud/ibm",
    "repo": "terraform-provider-ibm",
-    "rev": "v1.44.1",
-    "sha256": "sha256-DpWxhDHQHGVQ0NliJXfn7o3nR9VVHE8QZs/h/tnclUg=",
-    "vendorSha256": "sha256-ugdkBCgSDWcC8oC3WYco2rAIhFc2ILBZjq8NmB+3mTM=",
-    "version": "1.44.1"
+    "rev": "v1.44.2",
+    "sha256": "sha256-rjpuuU456Kfnxxla6GwDnwnPp/EG6C3CMXNLWL5nwAE=",
+    "vendorSha256": "sha256-ew6aLScFXiBiBb4VbfsCJGG4pvO9yNbo3+IR0s4iH5Q=",
+    "version": "1.44.2"
  },
  "icinga2": {
    "owner": "Icinga",
@ -843,28 +844,28 @@
    "owner": "nutanix",
    "provider-source-address": "registry.terraform.io/nutanix/nutanix",
    "repo": "terraform-provider-nutanix",
-    "rev": "v1.6.1",
-    "sha256": "sha256-eqWx48ARoL2elnaqTgp/L6a0K8TFSvIFaNH72gdbrZA=",
+    "rev": "v1.7.0",
+    "sha256": "sha256-UWK5QGc/7IETQ+IBQA9uaCV1IBpgwSO24UKFflUw3CU=",
    "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=",
-    "version": "1.6.1"
+    "version": "1.7.0"
  },
  "oci": {
    "owner": "oracle",
    "provider-source-address": "registry.terraform.io/oracle/oci",
    "repo": "terraform-provider-oci",
-    "rev": "v4.87.0",
-    "sha256": "sha256-Db1CCKEeolVcNwtvRlPi2Tsq5JqHfRhFZlELTRrn0OA=",
+    "rev": "v4.88.1",
+    "sha256": "sha256-c0/CYp8FY6M8+qZ32vO0WfTxPpD50WzVQl+Fi6M6l0E=",
    "vendorSha256": null,
-    "version": "4.87.0"
+    "version": "4.88.1"
  },
  "okta": {
    "owner": "okta",
    "provider-source-address": "registry.terraform.io/okta/okta",
    "repo": "terraform-provider-okta",
-    "rev": "v3.33.0",
-    "sha256": "sha256-44rbvPfl/DU1wkV/2hPwnpA4R7VSI4TrFpetc52+1gk=",
-    "vendorSha256": "sha256-hOkhJn1Hc3hv8/+L1N3xZWS2bM4FcaFMXVq+F/1+cN8=",
-    "version": "3.33.0"
+    "rev": "v3.34.0",
+    "sha256": "sha256-q3e2vRFuBvdjCZ1kONmWOnAI1bM6g+3evCI4CiW9PIQ=",
+    "vendorSha256": "sha256-pCtE9zGIYBh+GKfMp+28IQD/FSerdCQfpbCw3sXCyeI=",
+    "version": "3.34.0"
  },
  "oktaasa": {
    "owner": "oktadeveloper",
@ -879,10 +880,10 @@
    "owner": "OpenNebula",
    "provider-source-address": "registry.terraform.io/OpenNebula/opennebula",
    "repo": "terraform-provider-opennebula",
-    "rev": "v0.5.1",
-    "sha256": "sha256-lrdL0aWgrODvgI0gUW1tmHEHldeD5jJzOCD2BMvGPM8=",
-    "vendorSha256": "sha256-NOIXn4RWMUz0invWRqAHxVWez7MD0DyWccwcKYz8jTY=",
-    "version": "0.5.1"
+    "rev": "v0.5.2",
+    "sha256": "sha256-BeaJUEnksjyA8CBAfxz6WjPYo7x8kx/sgFAsgSvdBBM=",
+    "vendorSha256": "sha256-iT3c0CBSP+FKM4CFsTopY4W41ZCaC8E3Iz1o+THI/fQ=",
+    "version": "0.5.2"
  },
  "openstack": {
    "owner": "terraform-provider-openstack",
@ -1077,10 +1078,10 @@
    "owner": "Snowflake-Labs",
    "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
    "repo": "terraform-provider-snowflake",
-    "rev": "v0.40.0",
-    "sha256": "sha256-xouzlgI7MkFfela0ZgaX318YhgBLN5/qN+yqZ7rxVGQ=",
+    "rev": "v0.41.0",
+    "sha256": "sha256-tN7Uryhy5qiIhlT68zaDlKzZUGbMGnGc2D9WebrzVfA=",
    "vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=",
-    "version": "0.40.0"
+    "version": "0.41.0"
  },
  "sops": {
    "owner": "carlpett",
@ -1113,28 +1114,28 @@
    "owner": "StatusCakeDev",
    "provider-source-address": "registry.terraform.io/StatusCakeDev/statuscake",
    "repo": "terraform-provider-statuscake",
-    "rev": "v2.0.2-pre",
-    "sha256": "sha256-a8F6jDSYDal6U0Uu/iXprUb2lrwwUMOOkIZDftIiaLI=",
+    "rev": "v2.0.3",
+    "sha256": "sha256-QqTHH4wtMMIodOUa2E94L8ICI0G3LddbxWkNEZp5NLU=",
    "vendorSha256": "sha256-E6DvzloOaamSX3jLKUQQmIccGiI6sFo4oNwU86td05E=",
-    "version": "2.0.2-pre"
+    "version": "2.0.3"
  },
  "sumologic": {
    "owner": "SumoLogic",
    "provider-source-address": "registry.terraform.io/SumoLogic/sumologic",
    "repo": "terraform-provider-sumologic",
-    "rev": "v2.17.0",
-    "sha256": "sha256-vrkH9QccurlQMLkyf4mosDit9tEhL2nhgW1VZSPqjhM=",
-    "vendorSha256": "sha256-XhAKWlEz7Y8rIGRRJhfS1Dtke6B0eU79Ef3WE3bTo4U=",
-    "version": "2.17.0"
+    "rev": "v2.18.0",
+    "sha256": "sha256-Ahj+twdryRx9EovytxEbm9e/s67/0YXBHdRkD8q3jnY=",
+    "vendorSha256": "sha256-W+dV6rmyOqCeQboYvpxYoNZixv2+uBd2+sc9BvTE+Ag=",
+    "version": "2.18.0"
  },
  "tencentcloud": {
    "owner": "tencentcloudstack",
    "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.76.4",
-    "sha256": "sha256-N1DkLDaZW/wZ6Vf0OG2sQ+YVGuCNqz37gi/LjEai1uk=",
+    "rev": "v1.77.1",
+    "sha256": "sha256-U/gmvLHu/Gt7pfxXAQYEQdpS1r7Epees2VkaHdnK1VI=",
    "vendorSha256": null,
-    "version": "1.76.4"
+    "version": "1.77.1"
  },
  "tfe": {
    "owner": "hashicorp",
@ -1158,10 +1159,10 @@
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/time",
    "repo": "terraform-provider-time",
-    "rev": "v0.7.2",
-    "sha256": "sha256-gj5OUvja/yD3uCG2IIjDNIrq1paqgK4ahLfuyIqhZwk=",
-    "vendorSha256": "sha256-oBgHd0KTAdlnAZZZdT1FOzcfC0afdIKoDEIwx/rMxRk=",
-    "version": "0.7.2"
+    "rev": "v0.8.0",
+    "sha256": "sha256-r1AzzO1fxmDZkxWKg+LUiYU19oAg8TthIJA7c0tktZE=",
+    "vendorSha256": "sha256-67V+lG6mkLuzoJnd8OoH73/XBnkgqDmv6aqpSSsHSqg=",
+    "version": "0.8.0"
  },
  "tls": {
    "owner": "hashicorp",
@ -1213,10 +1214,10 @@
    "owner": "hashicorp",
    "provider-source-address": "registry.terraform.io/hashicorp/vault",
    "repo": "terraform-provider-vault",
-    "rev": "v3.8.1",
-    "sha256": "sha256-7d3oOsDEbKZ6qOoRLslFDMgw8q6sBup3A+cA3ijkfXw=",
-    "vendorSha256": "sha256-D6O8N1WEdDM6sogJym+8dheBKE3eQmGTvbVJeiGreRc=",
-    "version": "3.8.1"
+    "rev": "v3.8.2",
+    "sha256": "sha256-fEITfA3XXyUiILPse7fOmBW8M6dzEIUMg+7b3l4z2vo=",
+    "vendorSha256": "sha256-x7uz6VFotS+/eLEeMfaTloKQe/zp47d8e5I63BsGvhM=",
+    "version": "3.8.2"
  },
  "vcd": {
    "owner": "vmware",
--- a/pkgs/applications/networking/cluster/vcluster/default.nix
+++ b/pkgs/applications/networking/cluster/vcluster/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "vcluster";
-  version = "0.7.0";
+  version = "0.11.1";

  src = fetchFromGitHub {
    owner = "loft-sh";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-Yf2ZLhB6yfXySvPajI9mvdcYQPPpKI+LZ6+PMvOS4qo=";
+    sha256 = "sha256-aFTugqWr/9e3wQLL4yre2T8CUKq8P0HZLsES8lFZKHY=";
  };

  vendorSha256 = null;
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@ -6,13 +6,13 @@

 buildDunePackage rec {
  pname = "google-drive-ocamlfuse";
-  version = "0.7.28";
+  version = "0.7.30";

  src = fetchFromGitHub {
    owner = "astrada";
    repo = "google-drive-ocamlfuse";
    rev = "v${version}";
-    sha256 = "sha256:1layxqz5iz6wnvk83579m1im9vzq608h7n1h04znpkan0fls6nad";
+    sha256 = "sha256-DWG0nBiqeVHaYQfGzU43gGwL4m8X61x5/RT5jD4AwYA=";
  };

  doCheck = true;
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix
@ -0,0 +1,109 @@
+{ lib
+, stdenv
+, fetchurl
+, autoPatchelfHook
+, copyDesktopItems
+, makeDesktopItem
+, makeWrapper
+, alsa-lib
+, at-spi2-atk
+, atk
+, cairo
+, cups
+, dbus
+, gcc-unwrapped
+, gdk-pixbuf
+, glib
+, gtk3
+, libdrm
+, libnotify
+, libpulseaudio
+, libxkbcommon
+, mesa
+, nss
+, udev
+, xorg
+}:
+
+stdenv.mkDerivation rec {
+  pname = "teamspeak5-client";
+  version = "5.0.0-beta70";
+
+  src = fetchurl {
+    # check https://teamspeak.com/en/downloads/#ts5 for version and checksum
+    url = "https://files.teamspeak-services.com/pre_releases/client/${version}/teamspeak-client.tar.gz";
+    sha256 = "44f1a29b915c3930e7385ce32b13e363a7be04c1e341226d0693600818411c6e";
+  };
+
+  sourceRoot = ".";
+
+  propagatedBuildInputs = [
+    alsa-lib
+    at-spi2-atk
+    atk
+    cairo
+    cups.lib
+    dbus
+    gcc-unwrapped.lib
+    gdk-pixbuf
+    glib
+    gtk3
+    libdrm
+    libnotify
+    libpulseaudio
+    libxkbcommon
+    mesa.drivers
+    nss
+    xorg.libX11
+    xorg.libXScrnSaver
+    xorg.libXdamage
+    xorg.libXfixes
+    xorg.libxshmfence
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    copyDesktopItems
+    makeWrapper
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "TeamSpeak";
+      exec = "TeamSpeak";
+      icon = pname;
+      desktopName = pname;
+      comment = "TeamSpeak Voice Communication Client";
+      categories = ["Audio" "AudioVideo" "Chat" "Network"];
+    })
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/share/${pname} $out/share/icons/hicolor/64x64/apps/
+
+    cp -a * $out/share/${pname}
+    cp logo-256.png $out/share/icons/hicolor/64x64/apps/${pname}.png
+
+    makeWrapper $out/share/${pname}/TeamSpeak $out/bin/TeamSpeak \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ udev ]}"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "The TeamSpeak voice communication tool (beta version)";
+    homepage = "https://teamspeak.com/";
+    license = {
+      fullName = "Teamspeak client license";
+      url = "https://www.teamspeak.com/en/privacy-and-terms/";
+      free = false;
+    };
+    maintainers = with maintainers; [ jojosch ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
--- a/pkgs/applications/networking/shellhub-agent/default.nix
+++ b/pkgs/applications/networking/shellhub-agent/default.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "shellhub-agent";
-  version = "0.9.4";
+  version = "0.9.5";

  src = fetchFromGitHub {
    owner = "shellhub-io";
    repo = "shellhub";
    rev = "v${version}";
-    sha256 = "WcxRVup7wjA9YNyL6UpFoMfkCmXixfbYatcrmA4OHh4=";
+    sha256 = "EBtQOli8jh5Ful39tR4U/H3KH517LmoYfqVyydQQTpA=";
  };

  modRoot = "./agent";
--- a/pkgs/applications/office/trilium/default.nix
+++ b/pkgs/applications/office/trilium/default.nix
@ -10,13 +10,13 @@ let
    maintainers = with maintainers; [ fliegendewurst ];
  };

-  version = "0.53.2";
+  version = "0.54.2";

  desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz";
-  desktopSource.sha256 = "0sjljyn7x0kv1692wccdjsll8h49r9lyqbrfnz4cn147xinclyw4";
+  desktopSource.sha256 = "15wbag2hk5pa6ds56ikxn9rj405jgbg6w1y896vl60sa02lm20df";

  serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz";
-  serverSource.sha256 = "0y5xjf4r0c2hw2ch4ml55fq1nlmgnakq4zh3ch8sdgzm86nchavb";
+  serverSource.sha256 = "03z7z0jr1s132f10lagj786fr198l2xvpr72x2325brqlny5fzng";

 in {

--- a/pkgs/applications/science/math/gretl/default.nix
+++ b/pkgs/applications/science/math/gretl/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "gretl";
-  version = "2022a";
+  version = "2022b";

  src = fetchurl {
    url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz";
-    sha256 = "sha256-J+JcuCda2xYJ5aVz6UXR+nWiid6QxpDtt4DXlb6L4UA=";
+    sha256 = "sha256-A+LyWPSUBBvnnyBrVSAUCiny24UAztUwy1nmRoDaGjI=";
  };

  buildInputs = [
--- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "ghorg";
-  version = "1.8.3";
+  version = "1.8.5";

  src = fetchFromGitHub {
    owner = "gabrie30";
    repo = "ghorg";
    rev = "v${version}";
-    sha256 = "sha256-O5+OKY0o9vIO0uQGDlA0PMugfLAf45B/iHrrC2p0G+4=";
+    sha256 = "sha256-r+w3r1owvAb8KTha5DcolMJ/jKue+7lAHKxLWe+YllE=";
  };

  doCheck = false;
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -20,6 +20,7 @@
 , gzip # needed at runtime by gitweb.cgi
 , withSsh ? false
 , doInstallCheck ? !stdenv.isDarwin  # extremely slow on darwin
+, tests
 }:

 assert osxkeychainSupport -> stdenv.isDarwin;
@ -374,6 +375,7 @@ stdenv.mkDerivation (finalAttrs: {
        doInstallCheck = true;
      });
      buildbot-integration = nixosTests.buildbot;
+      inherit (tests) fetchgit;
    };
  };

--- a/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix
+++ b/pkgs/applications/video/kodi/addons/inputstream-adaptive/default.nix
@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
  pname = "inputstream-adaptive";
  namespace = "inputstream.adaptive";
-  version = "19.0.3";
+  version = "19.0.7";

  src = fetchFromGitHub {
    owner = "xbmc";
    repo = "inputstream.adaptive";
    rev = "${version}-${rel}";
-    sha256 = "sha256-YYIPPxM8zVIugqLz0YntVZt1N+dReH+7V1Lkeif2wIY=";
+    sha256 = "sha256-2bQVTSMznh7soeL1VJJpXrlZd4ONmP9wq9pYLnwPnZE=";
  };

  extraNativeBuildInputs = [ gtest ];
--- a/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix
+++ b/pkgs/applications/video/kodi/addons/inputstream-ffmpegdirect/default.nix
@ -3,13 +3,13 @@
 buildKodiBinaryAddon rec {
  pname = "inputstream-ffmpegdirect";
  namespace = "inputstream.ffmpegdirect";
-  version = "19.0.1";
+  version = "19.0.3";

  src = fetchFromGitHub {
    owner = "xbmc";
    repo = "inputstream.ffmpegdirect";
    rev = "${version}-${rel}";
-    sha256 = "sha256-yVMo3cRsIww1y0jGrqRag2Bc1x98+e86AHlnY1O9klE=";
+    sha256 = "sha256-G1+WhF0iEOhgQPXPv0LjpLSvDk3JpkryaGJYuG+5P40=";
  };

  extraBuildInputs = [ bzip2 zlib kodi.ffmpeg ];
--- a/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
+++ b/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
@ -6,13 +6,13 @@
 buildKodiBinaryAddon rec {
  pname = "pvr-iptvsimple";
  namespace = "pvr.iptvsimple";
-  version = "19.1.0";
+  version = "19.1.1";

  src = fetchFromGitHub {
    owner = "kodi-pvr";
    repo = "pvr.iptvsimple";
    rev = "${version}-${rel}";
-    sha256 = "sha256-APRj/Z/GtRXNSVX5kB0o09FTa9me2ESzrZ/Q+QNrw0w=";
+    sha256 = "sha256-ZkB+Va9w/AHLZ+LSOJpJ93nVOw33tcNqjScbLt77zJw=";
  };

  extraBuildInputs = [
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@ -32,6 +32,7 @@
  , libXext
  , libXxf86vm
  , libXrandr
+  , libXpresent

 , cddaSupport ? false
  , libcdio
@ -160,7 +161,7 @@ in stdenv.mkDerivation rec {
    ++ lib.optionals vdpauSupport       [ libvdpau ]
    ++ lib.optionals vulkanSupport      [ libplacebo shaderc vulkan-headers vulkan-loader ]
    ++ lib.optionals waylandSupport     [ wayland wayland-protocols libxkbcommon ]
-    ++ lib.optionals x11Support         [ libX11 libXext libGLU libGL libXxf86vm libXrandr ]
+    ++ lib.optionals x11Support         [ libX11 libXext libGLU libGL libXxf86vm libXrandr libXpresent ]
    ++ lib.optionals xineramaSupport    [ libXinerama ]
    ++ lib.optionals xvSupport          [ libXv ]
    ++ lib.optionals zimgSupport        [ zimg ]
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@ -140,7 +140,7 @@ mkDerivation rec {
      video content, efficiently
    '';
    homepage = "https://obsproject.com";
-    maintainers = with maintainers; [ jb55 MP2E V ];
+    maintainers = with maintainers; [ jb55 MP2E V miangraham ];
    license = licenses.gpl2Plus;
    platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
    mainProgram = "obs";
--- a/pkgs/applications/video/obs-studio/wrapper.nix
+++ b/pkgs/applications/video/obs-studio/wrapper.nix
@ -6,7 +6,7 @@ symlinkJoin {
  name = "wrapped-${obs-studio.name}";

  nativeBuildInputs = [ makeWrapper ];
-  paths = [ obs-studio ] ++ plugins;
+  paths = [ obs-studio ];

  postBuild = with lib;
    let
@ -14,11 +14,21 @@ symlinkJoin {
      pluginArguments =
        lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins;

+      pluginsJoined = symlinkJoin {
+        name = "obs-studio-plugins";
+        paths = lists.map (plugin: "${plugin}/lib/obs-plugins") plugins;
+      };
+
+      pluginsDataJoined = symlinkJoin {
+        name = "obs-studio-plugins-data";
+        paths = lists.map (plugin: "${plugin}/share/obs/obs-plugins") plugins;
+      };
+
      wrapCommand = [
          "wrapProgram"
          "$out/bin/obs"
-          ''--set OBS_PLUGINS_PATH "$out/lib/obs-plugins"''
-          ''--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"''
+          ''--set OBS_PLUGINS_PATH "${pluginsJoined}"''
+          ''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"''
        ] ++ pluginArguments;
    in concatStringsSep " " wrapCommand;

--- a/pkgs/applications/virtualization/appvm/default.nix
+++ b/pkgs/applications/virtualization/appvm/default.nix
@ -32,7 +32,7 @@ buildGoModule rec {

  vendorSha256 = "sha256-8eU+Mf5dxL/bAMMShXvj8I1Kdd4ysBTWvgYIXwLStPI=";

-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];

  postFixup = ''
    wrapProgram $out/bin/appvm \
--- a/pkgs/applications/virtualization/arion/default.nix
+++ b/pkgs/applications/virtualization/arion/default.nix
@ -3,6 +3,7 @@
 , haskellPackages
 , haskell
 , runCommand
+, buildPackages
 }:

 let
@ -32,7 +33,7 @@ let
  inherit (haskellPackages) arion-compose;

  cabalOverrides = o: {
-    buildTools = (o.buildTools or []) ++ [pkgs.makeWrapper];
+    buildTools = (o.buildTools or []) ++ [buildPackages.makeWrapper];
    passthru = (o.passthru or {}) // {
      inherit eval build;
    };
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly }:
+{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin }:

 { name ? "${args.pname}-${args.version}"
 , pname ? name
@ -84,12 +84,30 @@ let
    then nugetDeps
    else mkNugetDeps { inherit name; nugetDeps = import nugetDeps; };

-  nuget-source = mkNugetSource {
-    name = "${name}-nuget-source";
+  # contains the actual package dependencies
+  _dependenciesSource = mkNugetSource {
+    name = "${name}-dependencies-source";
    description = "A Nuget source with the dependencies for ${name}";
    deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps;
  };

+  # this contains all the nuget packages that are implictly referenced by the dotnet
+  # build system. having them as separate deps allows us to avoid having to regenerate
+  # a packages dependencies when the dotnet-sdk version changes
+  _sdkDeps = mkNugetDeps {
+    name = "dotnet-sdk-${dotnet-sdk.version}-deps";
+    nugetDeps = dotnet-sdk.passthru.packages;
+  };
+
+  _sdkSource = mkNugetSource {
+    name = "dotnet-sdk-${dotnet-sdk.version}-source";
+    deps = [ _sdkDeps ];
+  };
+
+  nuget-source = symlinkJoin {
+    name = "${name}-nuget-source";
+    paths = [ _dependenciesSource _sdkSource ];
+  };
 in stdenvNoCC.mkDerivation (args // {
  nativeBuildInputs = args.nativeBuildInputs or [] ++ [
    dotnetConfigureHook
@ -116,7 +134,9 @@ in stdenvNoCC.mkDerivation (args // {
  passthru = {
    inherit nuget-source;

-    fetch-deps = writeScript "fetch-${pname}-deps" ''
+    fetch-deps = let
+      exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; };
+    in writeScript "fetch-${pname}-deps" ''
      set -euo pipefail
      cd "$(dirname "''${BASH_SOURCE[0]}")"

@ -146,8 +166,10 @@ in stdenvNoCC.mkDerivation (args // {
          ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)}
      done

+      echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions"
+
      echo "Writing lockfile..."
-      ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file"
+      ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" "$HOME/package_exclusions" > "$deps_file"
      echo "Succesfully wrote lockfile to: $deps_file"
    '';
  } // args.passthru or {};
--- a/pkgs/build-support/dotnet/nuget-to-nix/default.nix
+++ b/pkgs/build-support/dotnet/nuget-to-nix/default.nix
@ -8,6 +8,7 @@
 , gnused
 , jq
 , curl
+, gnugrep
 }:

 runCommandLocal "nuget-to-nix" {
@ -22,6 +23,7 @@ runCommandLocal "nuget-to-nix" {
      gnused
      jq
      curl
+      gnugrep
    ];
  };

--- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
+++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh
@ -5,11 +5,12 @@ set -euo pipefail
 export PATH="@binPath@"

 if [ $# -eq 0 ]; then
-  >&2 echo "Usage: $0 [packages directory] > deps.nix"
+  >&2 echo "Usage: $0 <packages directory> [path to file with a list of excluded packages] > deps.nix"
  exit 1
 fi

 pkgs=$1
+exclusions=$2
 tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX)
 trap "rm -f ${tmpfile}" EXIT

@ -21,6 +22,11 @@ while read pkg_spec; do
  { read pkg_name; read pkg_version; } < <(
    # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3`
    sed -nE 's/.*<id>([^<]*).*/\1/p; s/.*<version>([^<+]*).*/\1/p' "$pkg_spec")
+
+  if grep "$pkg_name" "$exclusions" > /dev/null; then
+    continue
+  fi
+
  pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)"

  pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")"
--- a/pkgs/build-support/fetchgit/builder.sh
+++ b/pkgs/build-support/fetchgit/builder.sh
@ -12,6 +12,7 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
  ${deepClone:+--deepClone} \
  ${fetchSubmodules:+--fetch-submodules} \
  ${sparseCheckout:+--sparse-checkout "$sparseCheckout"} \
+  ${nonConeMode:+--non-cone-mode} \
  ${branchName:+--branch-name "$branchName"}

 runHook postFetch
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@ -16,6 +16,7 @@ in
 , fetchSubmodules ? true, deepClone ? false
 , branchName ? null
 , sparseCheckout ? ""
+, nonConeMode ? false
 , name ? urlToName url rev
 , # Shell code executed after the file has been fetched
  # successfully. This can do things like check or transform the file.
@ -54,6 +55,7 @@ in
 */

 assert deepClone -> leaveDotGit;
+assert nonConeMode -> (sparseCheckout != "");

 if md5 != "" then
  throw "fetchgit does not support md5 anymore, please use sha256"
@ -77,7 +79,7 @@ stdenvNoCC.mkDerivation {
  else
    lib.fakeSha256;

-  inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout postFetch;
+  inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout nonConeMode postFetch;

  postHook = if netrcPhase == null then null else ''
    ${netrcPhase}
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@ -49,6 +49,7 @@ Options:
      --hash h        Expected hash.
      --branch-name   Branch name to check out into
      --sparse-checkout Only fetch and checkout part of the repository.
+      --non-cone-mode Use non-cone mode for sparse checkouts.
      --deepClone     Clone the entire repository.
      --no-deepClone  Make a shallow clone of just the required ref.
      --leave-dotGit  Keep the .git directories.
@ -77,6 +78,7 @@ for arg; do
            --branch-name) argfun=set_branchName;;
            --deepClone) deepClone=true;;
            --sparse-checkout) argfun=set_sparseCheckout;;
+            --non-cone-mode) nonConeMode=true;;
            --quiet) QUIET=true;;
            --no-deepClone) deepClone=;;
            --leave-dotGit) leaveDotGit=true;;
@ -116,7 +118,7 @@ init_remote(){
    clean_git remote add origin "$url"
    if [ -n "$sparseCheckout" ]; then
        git config remote.origin.partialclonefilter "blob:none"
-        echo "$sparseCheckout" | git sparse-checkout set --stdin
+        echo "$sparseCheckout" | git sparse-checkout set --stdin ${nonConeMode:+--no-cone}
    fi
    ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true
 }
--- a/pkgs/build-support/fetchgit/tests.nix
+++ b/pkgs/build-support/fetchgit/tests.nix
@ -16,6 +16,18 @@
      src
      tests
    '';
+    sha256 = "sha256-g1PHGTWgAcd/+sXHo1o6AjVWCvC6HiocOfMbMh873LQ=";
+  };
+
+  sparseCheckoutNonConeMode = testers.invalidateFetcherByDrvHash fetchgit {
+    name = "nix-source";
+    url = "https://github.com/NixOS/nix";
+    rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a";
+    sparseCheckout = ''
+      src
+      tests
+    '';
+    nonConeMode = true;
    sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4=";
  };
 }
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@ -117,14 +117,14 @@ in
    typeface = "Sans";
    version = "2.004";
    rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
-    sha256 = "sha256-11d/78i21yuzxrfB5t2VQN9OBz/qZKeozuS6BrLFjzw=";
+    sha256 = "sha256-PWpcTBnBRK87ZuRI/PsGp2UMQgCCyfkLHwvB1mOl5K0=";
  };

  noto-fonts-cjk-serif = mkNotoCJK {
    typeface = "Serif";
    version = "2.000";
    rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d";
-    sha256 = "sha256-G+yl3LZvSFpbEUuuvattPDctKTzBCshOi970DcbPliE=";
+    sha256 = "sha256-1w66Ge7DZjbONGhxSz69uFhfsjMsDiDkrGl6NsoB7dY=";
  };

  noto-fonts-emoji = let
--- a/pkgs/data/icons/beauty-line-icon-theme/default.nix
+++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
    sparseCheckout = ''
      BeautyLine-V3
    '';
-    sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk=";
+    sha256 = "sha256-VEQWMY77cVz6UDn7FeMYYyYgXmXl1lLYs8MlFUuGRZE=";
  };

  sourceRoot = "${src.name}/BeautyLine-V3";
--- a/pkgs/data/misc/spdx-license-list-data/default.nix
+++ b/pkgs/data/misc/spdx-license-list-data/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "spdx-license-list-data";
-  version = "3.17";
+  version = "3.18";

  src = fetchFromGitHub {
    owner = "spdx";
    repo = "license-list-data";
    rev = "v${version}";
-    hash = "sha256-wptjEdx1N2HMzeSVsztZ93Bu6OkMAgHGTUfMLYiePZY=";
+    hash = "sha256-iXuGJzURcRyiq2rVP5jabOmFByF0YuiZg4HPCM6mk3A=";
  };

  # List of file formats to package.
--- a/pkgs/desktops/gnome/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome/apps/gedit/default.nix
@ -25,11 +25,11 @@

 stdenv.mkDerivation rec {
  pname = "gedit";
-  version = "42.1";
+  version = "42.2";

  src = fetchurl {
    url = "mirror://gnome/sources/gedit/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "fx/UPfURDUw33mVBmT9B8PvD78eQkA6SBTR5ugaZIOk=";
+    sha256 = "PGIpER8KwGauRJZJIHkdEmX1u7VrC9lJppt7EmH8j8o=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/eog/default.nix
+++ b/pkgs/desktops/gnome/core/eog/default.nix
@ -29,13 +29,13 @@

 stdenv.mkDerivation rec {
  pname = "eog";
-  version = "42.2";
+  version = "42.3";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Dk1Kai7hokCui1hEnwK6LGS3+ZSQ0LiRXX9SyQpYBF4=";
+    sha256 = "sha256-MMGzwovG3ChU2Hjr0xoi6qFb+VnBNCBqKhkEGT5H9Do=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix
@ -28,11 +28,11 @@

 stdenv.mkDerivation rec {
  pname = "gnome-remote-desktop";
-  version = "42.3";
+  version = "42.4";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-opatWPizvawOLg2H2xKpOV5ydwqWDnh/vMG+PwBotkI=";
+    hash = "sha256-TU0jPvov+lRnMGo8w86Le6IyUtQtSxJy1crJ1d5Fy5o=";
  };

  nativeBuildInputs = [
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@ -67,13 +67,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "gnome-shell";
-  version = "42.3.1";
+  version = "42.4";

  outputs = [ "out" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "ffqzLfrDzWTUYSkYyph8+zMjjvoJJ5h1PIhF/xaTX30=";
+    sha256 = "h1/ylw6p+3oFUG4yoNUNyRf0G0yjcTS0E3f5yChzxU4=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-software/default.nix
@ -42,11 +42,11 @@ in

 stdenv.mkDerivation rec {
  pname = "gnome-software";
-  version = "42.3";
+  version = "42.4";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-software/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "OM9whWmj12TU0NLt7KqG9Og57CK5ZvQf2tVleKDdM8A=";
+    sha256 = "cRgp7mf58qG2S/oXQTdzuY8NxdIZ649sohfNZXK7SnQ=";
  };

  patches = [
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@ -46,13 +46,13 @@

 let self = stdenv.mkDerivation rec {
  pname = "mutter";
-  version = "42.3";
+  version = "42.4";

  outputs = [ "out" "dev" "man" ];

  src = fetchurl {
    url = "mirror://gnome/sources/mutter/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "naOmP5AoK7WUZ+fT39xoTnD6BVNX9qLd7R25jNzOELo=";
+    sha256 = "wix/o9GHBh2/KAw4UOEYt7UAkGXQHeMWFqzVAMSYKkA=";
  };

  patches = [
--- a/pkgs/desktops/gnome/games/tali/default.nix
+++ b/pkgs/desktops/gnome/games/tali/default.nix
@ -20,11 +20,11 @@

 stdenv.mkDerivation rec {
  pname = "tali";
-  version = "40.7";
+  version = "40.8";

  src = fetchurl {
    url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    sha256 = "cXqJfV0H4X4K89ZpI/USNhPEEPZSOdqX0JKeScf7C2c=";
+    sha256 = "bBeMFg/LtNEb49FWnVOODngUDVC721KnWDGI95XAF+4=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/compilers/chicken/4/chicken.nix
+++ b/pkgs/development/compilers/chicken/4/chicken.nix
@ -39,11 +39,13 @@ stdenv.mkDerivation {
    ./0001-Introduce-CHICKEN_REPOSITORY_EXTRA.patch
  ];

-  buildInputs = [
+  nativeBuildInputs = [
    makeWrapper
-  ] ++ (lib.optionals (bootstrap-chicken != null) [
+  ];
+
+  buildInputs = lib.optionals (bootstrap-chicken != null) [
    bootstrap-chicken
-  ]);
+  ];

  preBuild = lib.optionalString (bootstrap-chicken != null) ''
    # Backup the build* files - those are generated from hostname,
--- a/pkgs/development/compilers/chicken/5/chicken.nix
+++ b/pkgs/development/compilers/chicken/5/chicken.nix
@ -31,11 +31,13 @@ stdenv.mkDerivation rec {
    "C_COMPILER=$(CC)"
  ]);

-  buildInputs = [
+  nativeBuildInputs = [
    makeWrapper
-  ] ++ (lib.optionals (bootstrap-chicken != null) [
+  ];
+
+  buildInputs = lib.optionals (bootstrap-chicken != null) [
    bootstrap-chicken
-  ]);
+  ];

  postInstall = ''
    for f in $out/bin/*
--- a/pkgs/development/compilers/dotnet/build-dotnet.nix
+++ b/pkgs/development/compilers/dotnet/build-dotnet.nix
@ -1,10 +1,12 @@
 { type
 , version
 , srcs
-, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71
+, icu # passing icu as an argument, because dotnet 3.1 has troubles with icu71
+, packages ? null
 }:

 assert builtins.elem type [ "aspnetcore" "runtime" "sdk" ];
+assert if type == "sdk" then packages != null else true;

 { lib
 , stdenv
@ -104,7 +106,7 @@ stdenv.mkDerivation rec {
  '';

  passthru = {
-    inherit icu;
+    inherit icu packages;
  };

  meta = with lib; {
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@ -8,9 +8,16 @@ https://dotnet.microsoft.com/download/dotnet
 { callPackage, icu70, icu }:
 let
  buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {};
-  buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
-  buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; });
-  buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; });
+  buildAttrs = {
+    buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; });
+    buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; });
+    buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; });
+  };
+
+  ## Files in versions/ are generated automatically by update.sh ##
+  dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; });
+  dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; });
+  dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; });
 in
 rec {
  combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {};
@ -19,192 +26,4 @@ rec {
  sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
  sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
  sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)";
-
-  ##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh #####
-
-  # v3.1 (maintenance)
-  aspnetcore_3_1 = buildAspNetCore {
-    icu = icu70;
-    version = "3.1.26";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/6f72adf7-0e78-48ea-85ef-e72a39a1f8a1/1ec0238c236c3757e5628563a329fdc4/aspnetcore-runtime-3.1.26-linux-x64.tar.gz";
-        sha512  = "8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/6b68a14a-b4dd-4a75-bb32-26c08d19190f/1d6b637e290775f668701f8f6092ab35/aspnetcore-runtime-3.1.26-linux-arm64.tar.gz";
-        sha512  = "757ff6cbc31b1c8743077288d7fa621c73fa7f4d155d636ad100cda6e1f601e31d2f842d5cfef3dec5daa4c8c3efbcf76f02afd1c518cae7b67b2a46a9faab08";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/33e8be5c-5e6a-4dc2-9aa8-846aaffa6897/fe9d96af1d75f8d5f4cba4bff95f2fae/aspnetcore-runtime-3.1.26-osx-x64.tar.gz";
-        sha512  = "0657d8b11a58357f5374e5d8201b401e55f9f4710794be565f7b9022d10639c2e72aebc6b7433b34fd24a03e8e12541c998fad28b5263de4439b3d31a8252c4c";
-      };
-    };
-  };
-
-  runtime_3_1 = buildNetRuntime {
-    icu = icu70;
-    version = "3.1.26";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/a14c8e4d-a22b-47f8-953c-bb4337634513/58017d103d432f7106c44b0891936aba/dotnet-runtime-3.1.26-linux-x64.tar.gz";
-        sha512  = "03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/cb0e8b4b-7b2b-40cc-b7a6-30f0d4fabe6c/f5cb06cbb1b1b5d198792333b3db235a/dotnet-runtime-3.1.26-linux-arm64.tar.gz";
-        sha512  = "574409616f5cbef35a2bd6fd1a2f0bcb3bdaa81457aea3af5e0e237ba768ced5214c51a3045697fe7478e8211e2045fc2072e382d6f456509a8f2923e9b1fc26";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/6bedea65-b104-45b8-abe9-36cefbeedadf/05f4e472ec2395dad7103fda9ed278b2/dotnet-runtime-3.1.26-osx-x64.tar.gz";
-        sha512  = "7957b5e697db7548964c399197ae8e61cc31f15374df384b6db9b47472a7d6f1b5b3e256c191e203c4d18c18cc8bdb6c4a331c5875bd37bd6415f3c83b8062da";
-      };
-    };
-  };
-
-  sdk_3_1 = buildNetSdk {
-    icu = icu70;
-    version = "3.1.420";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/5424da8c-ce12-46de-a51a-8fa61aefdde6/52a9d6b5718ea40863db96901c780d4b/dotnet-sdk-3.1.420-linux-x64.tar.gz";
-        sha512  = "b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/a84bf296-ee6e-4e66-9694-90d3da7af2b4/b00b2efe2432938e5a19c45d3759d80f/dotnet-sdk-3.1.420-linux-arm64.tar.gz";
-        sha512  = "ac66b1544fe178153bb85c2e5be584464374ce4c036fc95720547c231c2730312018fbdfc735f9071579749415bc54e1f6b8f080cc2b08d5799a0da941e8a5f5";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/bb0efe58-450c-4e28-81c1-4081acd6ffa4/1d0eaf8b624dff000c8b10ea0497e731/dotnet-sdk-3.1.420-osx-x64.tar.gz";
-        sha512  = "370cba4685e07d1cdb5d7f9b754812b237802ace679c9b9985c6e5c4dc09f500580f1413679a288615079bd155b68b362adb00151b2b8f5ca7c3718ab9e16194";
-      };
-    };
-  };
-
-  # v5.0 (current)
-  aspnetcore_5_0 = buildAspNetCore {
-    inherit icu;
-    version = "5.0.12";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/ad0a54ca-4b88-4762-a790-aebeaba6b9e7/0f796fb90696d078046d90d8a05c027e/aspnetcore-runtime-5.0.12-linux-x64.tar.gz";
-        sha512  = "0529f23ffa651ac2c2807b70d6e5034f6ae4c88204afdaaa76965ef604d6533f9440d68d9f2cdd3a9f2ca37e9140e6c61a9f9207d430c71140094c7d5c33bf79";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/bfc8ae06-2830-4082-a09e-63b3c7134096/880a4712d4ba3491c88aa566553c4e8a/aspnetcore-runtime-5.0.12-linux-arm64.tar.gz";
-        sha512  = "70570177896943613f0cddeb046ffccaafb1c8245c146383e45fbcfb27779c70dff1ab22c2b13a14bf096173c9279e0a386f61665106a3abb5f623b50281a652";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/06d71ed5-0755-40d6-8b8e-14a24b8a9cb7/47a8b4deda0deecf3658716b642c69bf/aspnetcore-runtime-5.0.12-osx-x64.tar.gz";
-        sha512  = "bd9e7dd7f48c220121dde85b3acc4ce7eb2a1944d472f9340276718ef72d033f05fd9a62ffb9de93b8e7633843e731ff1cb5e8c836315f7571f519fdb0a119e1";
-      };
-    };
-  };
-
-  runtime_5_0 = buildNetRuntime {
-    inherit icu;
-    version = "5.0.12";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/781b7ae6-166c-4114-97f8-926d2bf74d34/fe51479e3138d672c512ef0322be23d3/dotnet-runtime-5.0.12-linux-x64.tar.gz";
-        sha512  = "32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/7c342ad2-2dae-471b-ae46-c0c820321c1f/a480ad8ca0bc826a48c9b1e56efd972b/dotnet-runtime-5.0.12-linux-arm64.tar.gz";
-        sha512  = "a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/8f990fa6-6b13-40ad-95f6-383391ff3d91/7531048d16c01efdf3885da367aa8b89/dotnet-runtime-5.0.12-osx-x64.tar.gz";
-        sha512  = "a3160eaec15d0e2b62a4a2cdbb6663ef2e817fd26a3a3b8b3d75c5e3538b2947ff66eaddafb39cc297b9f087794d5fbd5a0e097ec8522ab6fea562f230055264";
-      };
-    };
-  };
-
-  sdk_5_0 = buildNetSdk {
-    inherit icu;
-    version = "5.0.403";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/b77183fa-c045-4058-82c5-d37742ed5f2d/ddaccef3e448a6df348cae4d1d271339/dotnet-sdk-5.0.403-linux-x64.tar.gz";
-        sha512  = "7ba5f7f898dba64ea7027dc66184d60ac5ac35fabe750bd509711628442e098413878789fad5766be163fd2867cf22ef482a951e187cf629bbc6f54dd9293a4a";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/91015c72-ce5a-4840-9e87-5bfa4bb80224/b39692ac418d790ff7a2e092eb07de98/dotnet-sdk-5.0.403-linux-arm64.tar.gz";
-        sha512  = "6cc705fe45c0d8df6a493eb2923539ef5b62d048d5218859bf3af06fb3934c9c716c16f98ee1a28c818d77adff8430bf39a2ae54a59a1468b704b4ba192234ac";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/5ccdb916-531f-4064-84e8-5475b273a4de/80dcfa0c2eb528f8b0e7c313ed36f4f1/dotnet-sdk-5.0.403-osx-x64.tar.gz";
-        sha512  = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792";
-      };
-    };
-  };
-
-  # v6.0 (lts)
-  aspnetcore_6_0 = buildAspNetCore {
-    inherit icu;
-    version = "6.0.6";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/afd5344f-a9e9-45f9-85b5-de4551c53736/c30996daa407f9bb540ebc5edfcf16fc/aspnetcore-runtime-6.0.6-linux-x64.tar.gz";
-        sha512  = "1a5c0f85820f0eb589700df94de6dbff45fe4089a37f1cd5b1fac33476a2cbd8d5c6f129e55b3716f5a7a2616f1a5a720c52238f21b28a510a3e5c8bcb8c516c";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/94553ccb-ce1a-401c-8840-bdffb4e9d0cb/ab8a0024df90506d953904ac38b5a978/aspnetcore-runtime-6.0.6-linux-arm64.tar.gz";
-        sha512  = "a3bd7ce99ffb9b87766c49fcf28d802f4072af1d55f1d53ef4043a1a0b038a0fc8046669bbd82f64fb37e4c73703fa8f54a460caaa473d952baf941d23341c90";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/0f5eb01e-6b46-4ef3-8c1c-7b99657a36df/7d4807a527cd5bc5a6a864f1fcd354e7/aspnetcore-runtime-6.0.6-osx-x64.tar.gz";
-        sha512  = "d1a469a5d27afd2f035f9865a295b8948bb2fcefd0e734c61ea8d0fe1b272fd1e0ba3aa4ad414aa68491fc611695c8d94064d1bb02d62cf1e7ea071a73a844da";
-      };
-      aarch64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/550f6609-521f-42e4-9b53-ff6c88bbe26a/1abbac456fe075a1b6f0f578716e0c4a/aspnetcore-runtime-6.0.6-osx-arm64.tar.gz";
-        sha512  = "0d62c151b4d25d606becbc0a99d4ed3988aaae97a95990a8d5b6e0e220bdf661e3f7fad64dad6a479f8c9bbd42971d6e5fab7dca43b74ca7ccbc423fa5b200af";
-      };
-    };
-  };
-
-  runtime_6_0 = buildNetRuntime {
-    inherit icu;
-    version = "6.0.6";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/ec4172e3-077a-42c0-859d-349e517d7935/82d945cdc4c33fbe440a86a240a58a41/dotnet-runtime-6.0.6-linux-x64.tar.gz";
-        sha512  = "4fe090f934f0ba4e64a63dfccbac97d49b19a913f2a7d73abe85efd604ee5577cefd65d6e0dc02086e9fa28be4ce2bbaecb33ea70d022714138ed54deea58c72";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/44ed3398-9838-4fd0-b225-60d5aadfb00e/00fd4a320d09a380753b45106e2a8e94/dotnet-runtime-6.0.6-linux-arm64.tar.gz";
-        sha512  = "659bf64c5f2e11f2b8cf01dc595a4280d1960bf484fc379d3a382660eea7adb6e69ace49d84522a85920ed53fa2ffb95a3b0ca0ebf63dc909b865028174ed29f";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/30056482-998a-42ed-b3a7-8fc057977e2e/698c75b7f2429e796dd3c13f980e4188/dotnet-runtime-6.0.6-osx-x64.tar.gz";
-        sha512  = "efe5b6287c4a62688bc94aae2d4ed8831ca5d62280ba477bb3efa49666c9fdbb9b091980837882b1b52ddfba566a8ab0071746cbfa63efea99a0bb3ebf19a2a1";
-      };
-      aarch64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/f91e108d-487b-4a47-b6e9-52bcc56df7ed/d722468512150e73489f2cee0b2d7087/dotnet-runtime-6.0.6-osx-arm64.tar.gz";
-        sha512  = "0cb4f3c808ae5476ebdbc18840846fb625a51ac5ce53688e83c3ae22a062095f9012c066dbcce231eca50ca3f057d7a29721d4b9cd04c9891ca26fc0c1c4a481";
-      };
-    };
-  };
-
-  sdk_6_0 = buildNetSdk {
-    inherit icu;
-    version = "6.0.301";
-    srcs = {
-      x86_64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/77d472e5-194c-421e-992d-e4ca1d08e6cc/56c61ac303ddf1b12026151f4f000a2b/dotnet-sdk-6.0.301-linux-x64.tar.gz";
-        sha512  = "2f434ea4860ee637e9cf19991a80e1febb1105531dd96b4fbc728d538ca0ab202a0bdff128fd13b269fac3ba3bc9d5f9c49039a6e0d7d32751e8a2bb6d790446";
-      };
-      aarch64-linux = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/06c4ee8e-bf2c-4e46-ab1c-e14dd72311c1/f7bc6c9677eaccadd1d0e76c55d361ea/dotnet-sdk-6.0.301-linux-arm64.tar.gz";
-        sha512  = "978dd04f78ac3d6b594c47f1482bba0abe93f0b37379c1c46a2b9b33bdf5188576b055250546295de39bb22cba93ea9b31c31bb026a319ad1b3fc507db44481f";
-      };
-      x86_64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/cf3e1c73-a9a9-4e08-8607-8f9edae5f3f2/40a021a98a6b6e430a1f170037735f6f/dotnet-sdk-6.0.301-osx-x64.tar.gz";
-        sha512  = "027328a353b65fad0618d1e5abeb973c9f05787d9432631bf9ab5fafe636ea2f494f70c0704e81a1664fe7a3519174bd269dbc795b651b14e9a86c83f8e3adec";
-      };
-      aarch64-darwin = {
-        url     = "https://download.visualstudio.microsoft.com/download/pr/3859fff3-f8a9-4e05-87cd-bd6db75833f5/64ec1099d45f85d14099da3c1f92a5c3/dotnet-sdk-6.0.301-osx-arm64.tar.gz";
-        sha512  = "899558be856769ad6ccc4606f3a9f996327a7395a72acb18a5fb0899e0c4c4ba8c90b94f16771439193f87a974e1e884dd55a9fc6649fe929ebe47ef19cb4efc";
-      };
-    };
-  };
-}
+} // dotnet_3_1 // dotnet_5_0 // dotnet_6_0
--- a/pkgs/development/compilers/dotnet/print-hashes.sh
+++ b/pkgs/development/compilers/dotnet/print-hashes.sh
@ -1,118 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl jq
-
-set -eu
-
-release () {
-  local content="$1"
-  local version="$2"
-
-  jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content"
-}
-
-release_files () {
-  local release="$1"
-  local type="$2"
-
-  jq -r '[."'"$type"'".files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release"
-}
-
-release_platform_attr () {
-  local release_files="$1"
-  local platform="$2"
-  local attr="$3"
-
-  jq -r '.[] | select(.rid == "'"$platform"'") | ."'"$attr"'"' <<< "$release_files"
-}
-
-platform_sources () {
-  local release_files="$1"
-  local platforms=( \
-    "x86_64-linux   linux-x64" \
-    "aarch64-linux  linux-arm64" \
-    "x86_64-darwin  osx-x64" \
-    "aarch64-darwin osx-arm64" \
-  )
-
-  echo "srcs = {"
-  for kv in "${platforms[@]}"; do
-    local nix_platform=${kv%% *}
-    local ms_platform=${kv##* }
-
-    local url=$(release_platform_attr "$release_files" "$ms_platform" url)
-    local hash=$(release_platform_attr "$release_files" "$ms_platform" hash)
-
-    [[ -z "$url" || -z "$hash" ]] && continue
-    echo "      $nix_platform = {
-        url     = \"$url\";
-        sha512  = \"$hash\";
-      }; "
-    done
-    echo "    };"
-}
-
-main () {
-  pname=$(basename "$0")
-  if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then
-    echo "Usage: $pname [sem-versions]
-Get updated dotnet src (platform - url & sha512) expressions for specified versions
-
-Examples:
-  $pname 3.1.21 5.0.12    - specific x.y.z versions
-  $pname 3.1 5.0 6.0      - latest x.y versions
-" >&2
-    exit 1
-  fi
-
-  for sem_version in "$@"; do
-    patch_specified=false
-    if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$ ]]; then
-        patch_specified=true
-    elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then
-        continue
-    fi
-
-    major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version")
-    content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json)
-    major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content")
-
-    release_content=$(release "$content" "$major_minor_patch")
-    aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content")
-    runtime_version=$(jq -r '.runtime.version' <<< "$release_content")
-    sdk_version=$(jq -r '.sdk.version' <<< "$release_content")
-
-    aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")"
-    runtime_files="$(release_files "$release_content" "runtime")"
-    sdk_files="$(release_files "$release_content" "sdk")"
-    if [ $major_minor = "3.1" ]; then
-      icu_attr="icu = icu70;"
-    else
-      icu_attr="inherit icu;"
-    fi
-
-    major_minor_underscore=${major_minor/./_}
-    channel_version=$(jq -r '."channel-version"' <<< "$content")
-    support_phase=$(jq -r '."support-phase"' <<< "$content")
-    echo "
-  # v$channel_version ($support_phase)
-  aspnetcore_$major_minor_underscore = buildAspNetCore {
-    $icu_attr
-    version = \"${aspnetcore_version}\";
-    $(platform_sources "$aspnetcore_files")
-  };
-
-  runtime_$major_minor_underscore = buildNetRuntime {
-    $icu_attr
-    version = \"${runtime_version}\";
-    $(platform_sources "$runtime_files")
-  };
-
-  sdk_$major_minor_underscore = buildNetSdk {
-    $icu_attr
-    version = \"${sdk_version}\";
-    $(platform_sources "$sdk_files")
-  }; "
-  done
-}
-
-main "$@"
--- a/pkgs/development/compilers/dotnet/update.sh
+++ b/pkgs/development/compilers/dotnet/update.sh
@ -0,0 +1,255 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=../../../../. -i bash -p curl jq nix gnused
+
+set -euo pipefail
+
+release () {
+  local content="$1"
+  local version="$2"
+
+  jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content"
+}
+
+release_files () {
+  local release="$1"
+  local type="$2"
+
+  jq -r '[."'"$type"'".files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release"
+}
+
+release_platform_attr () {
+  local release_files="$1"
+  local platform="$2"
+  local attr="$3"
+
+  jq -r '.[] | select(.rid == "'"$platform"'") | ."'"$attr"'"' <<< "$release_files"
+}
+
+platform_sources () {
+  local release_files="$1"
+  local platforms=( \
+    "x86_64-linux   linux-x64" \
+    "aarch64-linux  linux-arm64" \
+    "x86_64-darwin  osx-x64" \
+    "aarch64-darwin osx-arm64" \
+  )
+
+  echo "srcs = {"
+  for kv in "${platforms[@]}"; do
+    local nix_platform=${kv%% *}
+    local ms_platform=${kv##* }
+
+    local url=$(release_platform_attr "$release_files" "$ms_platform" url)
+    local hash=$(release_platform_attr "$release_files" "$ms_platform" hash)
+
+    [[ -z "$url" || -z "$hash" ]] && continue
+    echo "      $nix_platform = {
+        url     = \"$url\";
+        sha512  = \"$hash\";
+      };"
+    done
+    echo "    };"
+}
+
+sdk_packages () {
+    local version=$1
+    # These packages are implicitly references by the build process,
+    # based on the specific project configurations (RIDs, used features, etc.)
+    # They are always referenced with the same version as the SDK used for building.
+    # Since we lock nuget dependencies, when these packages are included in the generated
+    # lock files (deps.nix), every update of SDK required those lock files to be
+    # updated to reflect the new versions of these packages - otherwise, the build
+    # would fail due to missing dependencies.
+    #
+    # Moving them to a separate list stored alongside the SDK package definitions,
+    # and implictly including them along in buildDotnetModule allows us
+    # to make updating .NET SDK packages a lot easier - we now just update
+    # the versions of these packages in one place, and all packages that
+    # use buildDotnetModule continue building with the new .NET version without changes.
+    #
+    # Keep in mind that there is no canonical list of these implicitly
+    # referenced packages - this list was created based on looking into
+    # the deps.nix files of existing packages, and which dependencies required
+    # updating after a SDK version bump.
+    #
+    # Due to this, make sure to check if new SDK versions introduce any new packages.
+    # This should not happend in minor or bugfix updates, but probably happens
+    # with every new major .NET release.
+    local pkgs=( \
+      "Microsoft.AspNetCore.App.Ref" \
+      "Microsoft.AspNetCore.App.Runtime.linux-arm" \
+      "Microsoft.AspNetCore.App.Runtime.linux-arm64" \
+      "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" \
+      "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" \
+      "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" \
+      "Microsoft.AspNetCore.App.Runtime.linux-x64" \
+      "Microsoft.AspNetCore.App.Runtime.osx-arm64" \
+      "Microsoft.AspNetCore.App.Runtime.osx-x64" \
+      "Microsoft.AspNetCore.App.Runtime.win-arm" \
+      "Microsoft.AspNetCore.App.Runtime.win-arm64" \
+      "Microsoft.AspNetCore.App.Runtime.win-x64" \
+      "Microsoft.AspNetCore.App.Runtime.win-x86" \
+      "Microsoft.NETCore.App.Composite" \
+      "Microsoft.NETCore.App.Host.linux-arm" \
+      "Microsoft.NETCore.App.Host.linux-arm64" \
+      "Microsoft.NETCore.App.Host.linux-musl-arm" \
+      "Microsoft.NETCore.App.Host.linux-musl-arm64" \
+      "Microsoft.NETCore.App.Host.linux-musl-x64" \
+      "Microsoft.NETCore.App.Host.linux-x64" \
+      "Microsoft.NETCore.App.Host.osx-arm64" \
+      "Microsoft.NETCore.App.Host.osx-x64" \
+      "Microsoft.NETCore.App.Host.win-arm" \
+      "Microsoft.NETCore.App.Host.win-arm64" \
+      "Microsoft.NETCore.App.Host.win-x64" \
+      "Microsoft.NETCore.App.Host.win-x86" \
+      "Microsoft.NETCore.App.Ref" \
+      "Microsoft.NETCore.App.Runtime.linux-arm" \
+      "Microsoft.NETCore.App.Runtime.linux-arm64" \
+      "Microsoft.NETCore.App.Runtime.linux-musl-arm" \
+      "Microsoft.NETCore.App.Runtime.linux-musl-arm64" \
+      "Microsoft.NETCore.App.Runtime.linux-musl-x64" \
+      "Microsoft.NETCore.App.Runtime.linux-x64" \
+      "Microsoft.NETCore.App.Runtime.osx-arm64" \
+      "Microsoft.NETCore.App.Runtime.osx-x64" \
+      "Microsoft.NETCore.App.Runtime.win-arm" \
+      "Microsoft.NETCore.App.Runtime.win-arm64" \
+      "Microsoft.NETCore.App.Runtime.win-x64" \
+      "Microsoft.NETCore.App.Runtime.win-x86" \
+      "Microsoft.NETCore.DotNetAppHost" \
+      "Microsoft.NETCore.DotNetHost" \
+      "Microsoft.NETCore.DotNetHostPolicy" \
+      "Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" \
+      "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.linux-arm.Microsoft.NETCore.DotNetHost" \
+      "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" \
+      "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \
+      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" \
+      "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.linux-x64.Microsoft.NETCore.DotNetHost" \
+      "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \
+      "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.osx-x64.Microsoft.NETCore.DotNetHost" \
+      "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.win-arm64.Microsoft.NETCore.DotNetHost" \
+      "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.win-arm.Microsoft.NETCore.DotNetHost" \
+      "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.win-x64.Microsoft.NETCore.DotNetHost" \
+      "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" \
+      "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" \
+      "runtime.win-x86.Microsoft.NETCore.DotNetHost" \
+      "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" \
+      "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" \
+    )
+
+    local nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')"
+
+    for pkg in "${pkgs[@]}"; do
+        local url hash
+        url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg"
+        hash="$(nix-prefetch-url "$url")"
+        echo "      (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })"
+    done
+}
+
+main () {
+  pname=$(basename "$0")
+  if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then
+    echo "Usage: $pname [sem-versions]
+Get updated dotnet src (platform - url & sha512) expressions for specified versions
+
+Examples:
+  $pname 3.1.21 5.0.12    - specific x.y.z versions
+  $pname 3.1 5.0 6.0      - latest x.y versions
+" >&2
+    exit 1
+  fi
+
+  for sem_version in "$@"; do
+    echo "Generating ./versions/${sem_version}.nix"
+    patch_specified=false
+    # Check if a patch was specified as an argument.
+    # If so, generate file for the specific version.
+    # If only x.y version was provided, get the latest patch
+    # version of the given x.y version.
+    if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$ ]]; then
+        patch_specified=true
+    elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then
+        continue
+    fi
+
+    # Make sure the x.y version is properly passed to .NET release metadata url.
+    # Then get the json file and parse it to find the latest patch release.
+    major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version")
+    content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json)
+    major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content")
+
+    release_content=$(release "$content" "$major_minor_patch")
+    aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content")
+    runtime_version=$(jq -r '.runtime.version' <<< "$release_content")
+    sdk_version=$(jq -r '.sdk.version' <<< "$release_content")
+
+    aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")"
+    runtime_files="$(release_files "$release_content" "runtime")"
+    sdk_files="$(release_files "$release_content" "sdk")"
+
+    major_minor_underscore=${major_minor/./_}
+    channel_version=$(jq -r '."channel-version"' <<< "$content")
+    support_phase=$(jq -r '."support-phase"' <<< "$content")
+    echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }:
+
+# v$channel_version ($support_phase)
+{
+  aspnetcore_$major_minor_underscore = buildAspNetCore {
+    inherit icu;
+    version = \"${aspnetcore_version}\";
+    $(platform_sources "$aspnetcore_files")
+  };
+
+  runtime_$major_minor_underscore = buildNetRuntime {
+    inherit icu;
+    version = \"${runtime_version}\";
+    $(platform_sources "$runtime_files")
+  };
+
+  sdk_$major_minor_underscore = buildNetSdk {
+    inherit icu;
+    version = \"${sdk_version}\";
+    $(platform_sources "$sdk_files")
+    packages = { fetchNuGet }: [
+$(sdk_packages "${runtime_version}")
+    ];
+  };
+}" > "./versions/${sem_version}.nix"
+    echo "Generated ./versions/${sem_version}.nix"
+  done
+}
+
+main "$@"
--- a/pkgs/development/compilers/dotnet/versions/3.1.nix
+++ b/pkgs/development/compilers/dotnet/versions/3.1.nix
@ -0,0 +1,64 @@
+{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }:
+
+# v3.1 (maintenance)
+{
+  aspnetcore_3_1 = buildAspNetCore {
+    inherit icu;
+    version = "3.1.26";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/6f72adf7-0e78-48ea-85ef-e72a39a1f8a1/1ec0238c236c3757e5628563a329fdc4/aspnetcore-runtime-3.1.26-linux-x64.tar.gz";
+        sha512  = "8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/6b68a14a-b4dd-4a75-bb32-26c08d19190f/1d6b637e290775f668701f8f6092ab35/aspnetcore-runtime-3.1.26-linux-arm64.tar.gz";
+        sha512  = "757ff6cbc31b1c8743077288d7fa621c73fa7f4d155d636ad100cda6e1f601e31d2f842d5cfef3dec5daa4c8c3efbcf76f02afd1c518cae7b67b2a46a9faab08";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/33e8be5c-5e6a-4dc2-9aa8-846aaffa6897/fe9d96af1d75f8d5f4cba4bff95f2fae/aspnetcore-runtime-3.1.26-osx-x64.tar.gz";
+        sha512  = "0657d8b11a58357f5374e5d8201b401e55f9f4710794be565f7b9022d10639c2e72aebc6b7433b34fd24a03e8e12541c998fad28b5263de4439b3d31a8252c4c";
+      };
+    };
+  };
+
+  runtime_3_1 = buildNetRuntime {
+    inherit icu;
+    version = "3.1.26";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/a14c8e4d-a22b-47f8-953c-bb4337634513/58017d103d432f7106c44b0891936aba/dotnet-runtime-3.1.26-linux-x64.tar.gz";
+        sha512  = "03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/cb0e8b4b-7b2b-40cc-b7a6-30f0d4fabe6c/f5cb06cbb1b1b5d198792333b3db235a/dotnet-runtime-3.1.26-linux-arm64.tar.gz";
+        sha512  = "574409616f5cbef35a2bd6fd1a2f0bcb3bdaa81457aea3af5e0e237ba768ced5214c51a3045697fe7478e8211e2045fc2072e382d6f456509a8f2923e9b1fc26";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/6bedea65-b104-45b8-abe9-36cefbeedadf/05f4e472ec2395dad7103fda9ed278b2/dotnet-runtime-3.1.26-osx-x64.tar.gz";
+        sha512  = "7957b5e697db7548964c399197ae8e61cc31f15374df384b6db9b47472a7d6f1b5b3e256c191e203c4d18c18cc8bdb6c4a331c5875bd37bd6415f3c83b8062da";
+      };
+    };
+  };
+
+  sdk_3_1 = buildNetSdk {
+    inherit icu;
+    version = "3.1.420";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/5424da8c-ce12-46de-a51a-8fa61aefdde6/52a9d6b5718ea40863db96901c780d4b/dotnet-sdk-3.1.420-linux-x64.tar.gz";
+        sha512  = "b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/a84bf296-ee6e-4e66-9694-90d3da7af2b4/b00b2efe2432938e5a19c45d3759d80f/dotnet-sdk-3.1.420-linux-arm64.tar.gz";
+        sha512  = "ac66b1544fe178153bb85c2e5be584464374ce4c036fc95720547c231c2730312018fbdfc735f9071579749415bc54e1f6b8f080cc2b08d5799a0da941e8a5f5";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/bb0efe58-450c-4e28-81c1-4081acd6ffa4/1d0eaf8b624dff000c8b10ea0497e731/dotnet-sdk-3.1.420-osx-x64.tar.gz";
+        sha512  = "370cba4685e07d1cdb5d7f9b754812b237802ace679c9b9985c6e5c4dc09f500580f1413679a288615079bd155b68b362adb00151b2b8f5ca7c3718ab9e16194";
+      };
+    };
+    packages = { fetchNuGet }: [
+
+    ];
+  };
+}
--- a/pkgs/development/compilers/dotnet/versions/5.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/5.0.nix
@ -0,0 +1,64 @@
+{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }:
+
+# v5.0 (eol)
+{
+  aspnetcore_5_0 = buildAspNetCore {
+    inherit icu;
+    version = "5.0.12";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/ad0a54ca-4b88-4762-a790-aebeaba6b9e7/0f796fb90696d078046d90d8a05c027e/aspnetcore-runtime-5.0.12-linux-x64.tar.gz";
+        sha512  = "0529f23ffa651ac2c2807b70d6e5034f6ae4c88204afdaaa76965ef604d6533f9440d68d9f2cdd3a9f2ca37e9140e6c61a9f9207d430c71140094c7d5c33bf79";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/bfc8ae06-2830-4082-a09e-63b3c7134096/880a4712d4ba3491c88aa566553c4e8a/aspnetcore-runtime-5.0.12-linux-arm64.tar.gz";
+        sha512  = "70570177896943613f0cddeb046ffccaafb1c8245c146383e45fbcfb27779c70dff1ab22c2b13a14bf096173c9279e0a386f61665106a3abb5f623b50281a652";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/06d71ed5-0755-40d6-8b8e-14a24b8a9cb7/47a8b4deda0deecf3658716b642c69bf/aspnetcore-runtime-5.0.12-osx-x64.tar.gz";
+        sha512  = "bd9e7dd7f48c220121dde85b3acc4ce7eb2a1944d472f9340276718ef72d033f05fd9a62ffb9de93b8e7633843e731ff1cb5e8c836315f7571f519fdb0a119e1";
+      };
+    };
+  };
+
+  runtime_5_0 = buildNetRuntime {
+    inherit icu;
+    version = "5.0.12";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/781b7ae6-166c-4114-97f8-926d2bf74d34/fe51479e3138d672c512ef0322be23d3/dotnet-runtime-5.0.12-linux-x64.tar.gz";
+        sha512  = "32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/7c342ad2-2dae-471b-ae46-c0c820321c1f/a480ad8ca0bc826a48c9b1e56efd972b/dotnet-runtime-5.0.12-linux-arm64.tar.gz";
+        sha512  = "a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/8f990fa6-6b13-40ad-95f6-383391ff3d91/7531048d16c01efdf3885da367aa8b89/dotnet-runtime-5.0.12-osx-x64.tar.gz";
+        sha512  = "a3160eaec15d0e2b62a4a2cdbb6663ef2e817fd26a3a3b8b3d75c5e3538b2947ff66eaddafb39cc297b9f087794d5fbd5a0e097ec8522ab6fea562f230055264";
+      };
+    };
+  };
+
+  sdk_5_0 = buildNetSdk {
+    inherit icu;
+    version = "5.0.403";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/b77183fa-c045-4058-82c5-d37742ed5f2d/ddaccef3e448a6df348cae4d1d271339/dotnet-sdk-5.0.403-linux-x64.tar.gz";
+        sha512  = "7ba5f7f898dba64ea7027dc66184d60ac5ac35fabe750bd509711628442e098413878789fad5766be163fd2867cf22ef482a951e187cf629bbc6f54dd9293a4a";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/91015c72-ce5a-4840-9e87-5bfa4bb80224/b39692ac418d790ff7a2e092eb07de98/dotnet-sdk-5.0.403-linux-arm64.tar.gz";
+        sha512  = "6cc705fe45c0d8df6a493eb2923539ef5b62d048d5218859bf3af06fb3934c9c716c16f98ee1a28c818d77adff8430bf39a2ae54a59a1468b704b4ba192234ac";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/5ccdb916-531f-4064-84e8-5475b273a4de/80dcfa0c2eb528f8b0e7c313ed36f4f1/dotnet-sdk-5.0.403-osx-x64.tar.gz";
+        sha512  = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792";
+      };
+    };
+    packages = { fetchNuGet }: [
+
+    ];
+  };
+}
--- a/pkgs/development/compilers/dotnet/versions/6.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/6.0.nix
@ -0,0 +1,166 @@
+{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }:
+
+# v6.0 (lts)
+{
+  aspnetcore_6_0 = buildAspNetCore {
+    inherit icu;
+    version = "6.0.8";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/5cc06c3a-4d8a-4fb2-8f7a-ecd23cd8c4e0/dd386c0e3a41ea54f459907c834acedf/aspnetcore-runtime-6.0.8-linux-x64.tar.gz";
+        sha512  = "b74676ca0d2f47a95533739fd36977bb1552890a81820ee51b29b3d6514398f0952362417bbb31fad4bdf031803cb3e8d2aaf065dfb154a78a1b471a536d4abd";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/83695c9b-c954-459e-b9bf-2f1ac269e34e/1316ff4a6fe4c6916e7ecb3623d67cee/aspnetcore-runtime-6.0.8-linux-arm64.tar.gz";
+        sha512  = "07babe85c8872ca303a17268b0d23c382a9ac49f8b923c45c496db039f6c01094303cd18cd31f964ba7369bb993c896eeadbb7e458a77d5b86992222b91db52c";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/0601cae2-aa41-4318-a996-36633cd641f3/ffc290161ae37b28894ff7465dd50c17/aspnetcore-runtime-6.0.8-osx-x64.tar.gz";
+        sha512  = "73d3569c13965de927e9d1eb02ce7d31b44643335a351ddc6392be1a693837263287d9bc5e82a89f2456b7a9cf1bd6c217d9f98cf9fa8da1b6c820e9ddf43933";
+      };
+      aarch64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/7859a31f-74c9-4756-a9ab-f040550666ac/3c4ad4317e732436f8c092eb9cdb4168/aspnetcore-runtime-6.0.8-osx-arm64.tar.gz";
+        sha512  = "a6cabc3b4c7350deb141e122c194c7eefaf99127cee726ee227e4218add7155b8decdb2a5cd217f757410e267f2370a78806c22a0294098f245105cea925a7b2";
+      };
+    };
+  };
+
+  runtime_6_0 = buildNetRuntime {
+    inherit icu;
+    version = "6.0.8";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/5596ef6f-a174-4fba-aef1-99173e3f3c67/77edd755d605688885ca7114bc4f9ae9/dotnet-runtime-6.0.8-linux-x64.tar.gz";
+        sha512  = "c776813bf87c25766b31a3a514d124d0526086ceea514a10f104d70ba435c91a6bd3c8bf10c6662b4df2b13ffcdf385518f3418e51d05cccec6a2cf2c26099de";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/866ce4df-8aaa-417d-ad81-26131a2b8734/7ba8391188bc194156ee7d82f494ee00/dotnet-runtime-6.0.8-linux-arm64.tar.gz";
+        sha512  = "7cd60eda5219a6b882e53e85e2b6543dedc91605503ce8085f447835382fd1b6abd7c8810e0fd865ecaa33167cedf2a33884dd4eb2bdd2857fe69d509cd62a9c";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/1c11dcab-2b1b-4f89-88a8-32665c56a131/c1654a9f3d01805033b7fd8d505050e8/dotnet-runtime-6.0.8-osx-x64.tar.gz";
+        sha512  = "8100003430b073e9f1f16910eef8af5a5ea806754a1818971ba15f4ba44e12455330334bd1488088880f7ed3ff67c2a4c4a3d8037f4202c95e6bc029806c8b15";
+      };
+      aarch64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/0b8a7b71-8f77-439b-a4d8-b4fd863466d3/7a852ca4536bdef2e63d9f5e98731777/dotnet-runtime-6.0.8-osx-arm64.tar.gz";
+        sha512  = "99264f4e34e2b6e1a82f3716cce5753967f3386348593e7f51085d96dbec4acf1400a451e9320afbfb45a9b777df1f8bbed8e78d7c4810336f3d226bdfd4343f";
+      };
+    };
+  };
+
+  sdk_6_0 = buildNetSdk {
+    inherit icu;
+    version = "6.0.400";
+    srcs = {
+      x86_64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/cd0d0a4d-2a6a-4d0d-b42e-dfd3b880e222/008a93f83aba6d1acf75ded3d2cfba24/dotnet-sdk-6.0.400-linux-x64.tar.gz";
+        sha512  = "8decbba0a6b09501daede52cbb5a9ae9e5f31ade201918c03efcd1b4cc345ec934f88321704ec3beb1f90f2204934be7259c76f66d9204cbdd15933582602763";
+      };
+      aarch64-linux = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/901f7928-5479-4d32-a9e5-ba66162ca0e4/d00b935ec4dc79a27f5bde00712ed3d7/dotnet-sdk-6.0.400-linux-arm64.tar.gz";
+        sha512  = "a21010f9e0e091bf0a4df9dfc4ec9893c056c2b07b10be093ea392a4fa5c8a38bad9535f66e570b45dc25165b685199fb729434b845bcfb35f8b79cceb22c632";
+      };
+      x86_64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/f52fb2f4-a0a3-4094-9f75-add72fcbc21e/d46eda7abf39baf278c0b0b040c7b81d/dotnet-sdk-6.0.400-osx-x64.tar.gz";
+        sha512  = "35b80347e31baefdbd42e7434ffa0df1069367a4f8deec8b4051a44658b3ed531832f0e92357887a2f5a27c6433304537c846cdd4793aac874bace82a899053e";
+      };
+      aarch64-darwin = {
+        url     = "https://download.visualstudio.microsoft.com/download/pr/0e45597f-a72d-42fa-95c5-85a811a7a8b6/1d77d2eeb8c08815edd1a6e9e9dfda4a/dotnet-sdk-6.0.400-osx-arm64.tar.gz";
+        sha512  = "c3b016bc558f42fba29a8aebcc04be7b3aa3b0290755b6ee2fea1f48f921da78b86cb31913c4b7e32c0421b45a617b551ba593f98f349fae43ea1faa38348412";
+      };
+    };
+    packages = { fetchNuGet }: [
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.8"; sha256 = "1sxl6nsv8magamqbykdr6jnd9q6r1afavc7pzm2jmcqyxv121hv3"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.8"; sha256 = "1qksplqav4nrjbib6hrbdqg8rd8lxr63ljq57p4h7lbgw0wpxa5c"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.8"; sha256 = "049s2617s3aqcqxbvb0idrmjw6vnwjjfnqrn7s6hi2w4w5f4z10x"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.8"; sha256 = "0pphpvag4i0zq7c51r72b9zjlj726wv2hn1vxd1mdsj85f2q77zz"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.8"; sha256 = "00hhv36d8wjdhnz10jjdv3nikpd4x0sj6v2jfi5p3firl64p5wf2"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.8"; sha256 = "1lcvphg7s6iwh3dkl9c2c0h5mx9gsp0aic7v2xaqgaq3sz0jalnk"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.8"; sha256 = "1lmcy66m1yrm0ii1agydn8zmvydjf2sdvng5x07vda574shrr39h"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.8"; sha256 = "14q6sjbcs1xvd1lz670bnq4pgi1cgayih2bpsjbv33z6w1wshay5"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.8"; sha256 = "14968kh3c0028nyyxivx01wj1k6a6mk2wm4fk0sbh6p2g7wpaqdp"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.8"; sha256 = "1dmajf3hqs5njm6yd6g9vy72sndf93g4p6ghsjkxizgz46z3qsxh"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.8"; sha256 = "1cyczl8a4b3plb7f1w0jp06v65yd1fk7mcx2y1jr8qpcmxrad3gl"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.8"; sha256 = "1qcg7awjd9xf6bvn5wsbd8kiy3vf6iag8q2myzzzy5jj4azbl2wd"; })
+      (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.8"; sha256 = "1dm953nh7d1k9cpclxxf3831rlx739skrxxw1whqnczffd8rjfmd"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.8"; sha256 = "1g21mp68ljpvv6g4xgzihpfn96szchpny1h0g9g71bwbgp93aad8"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.8"; sha256 = "0gp93f4ch0h95wl30xbz60xn7i752hvjkiivn3q7wnkary2g8mpr"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.8"; sha256 = "1bdfpxs31x0a6cbb911vl3ncy26gsffgba3v598k6ki4662xlawv"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.8"; sha256 = "0w5pxahcgxr4826hv6b72aq60gpbbrj6va2hvj4gzi917dkqdb94"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.8"; sha256 = "03x0zz9ig1m78gmf2r8wny1y1ripyzsdxak6cqha1zl8gbf0bcck"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.8"; sha256 = "167kc0766ppkfrv66b0xg844cm7vj7q6p3bm695j8m0gakz71kx3"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.8"; sha256 = "0a0zrk6lcmbjyl0wkal9p0xw3n5qzvbc72by492vi3cwl8j6qv6d"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.8"; sha256 = "04l1smar1hrg0r5pzqa5580aw17jx4cbk7i2mrgj7yy2m86m3d4s"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.8"; sha256 = "0j1qdixwxj2bwgcfxf6fbs2krw6gcm7s9mcx41z9l9q4lq9qh1gc"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.8"; sha256 = "17ji5vjqw59dkrjqfrdbmwf318x9f61ch855l6z3099g84bp9nqk"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.8"; sha256 = "0c9pxqsi99m91c25n7j2pq9gmyl88k9bf4a5bisqv7v5w7mi2h9x"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.8"; sha256 = "1k8jh8s2rqyp7rr2vdwqfj35zkr77vnba4jnmgx5ank87z24vmhd"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.8"; sha256 = "1z5ja82jxmlndivxrm4abapg41zkgs5bjc7ks2azzn8znghksvya"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.8"; sha256 = "1654jcqp80i3gkasf9axnfrjnk8iaxkhgfkbrgv5fi5vz0lbgi2h"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.8"; sha256 = "0999pi4dyr4l7grrw47xip8prqsc3inpz9gkxjd34dzi7wcpfy47"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.8"; sha256 = "040c6505idayhym3j90ixw85h4l6m23nlwp5g9zf4p9dl2mfgicv"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.8"; sha256 = "0qd9pz33wibc3db2sn452wd5vipzq6kf7gclc6lfzz4cavlzqxc4"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.8"; sha256 = "0qzkybsfx4pps97kzyy8325brljdi4h9vqapcgyfb2rmkvvfqsby"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.8"; sha256 = "0fxp7zz6pjxhmasy7xza9gi83zag81b2gpp08cam69kjn1razlq1"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.8"; sha256 = "01fci2411qhi6gxp0jddmy4pb248n08ng8wxap37ysh5zc1qmjcm"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.8"; sha256 = "06ahjlsr43vx3dnw28fpkk2vmagrrn1m8jds8pdgj44jpn57lc8r"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.8"; sha256 = "0bz6qja5lbi1a7iqkbin4p97dinn9iykw0x0nmmjs4ihx33ic1jr"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.8"; sha256 = "080jaw5y9zwfsj3b0ziw3s75whankyn99q5sjhq7pmpi6763xw48"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.8"; sha256 = "0wmb4jx6l9dg17ng5cf4k3s54s08lf220gzphdgrcl0w1jihg7n5"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.8"; sha256 = "067blnpwccsfp201803yrb4j4gp9vzkppgc4h7s13dxjz78cf7ss"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.8"; sha256 = "1ws1sbsly7n7p6p5k057m063vk5by88fxfkkqw5i61vh6iwkcbnd"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "04dknyln95q0qx0h374d3xxs5rwh4sm0j489p370bkv0czl0ha4b"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1rav7v08nc01b443cy58gk32n6d30zkjx99m8hpsz17vcxw8jiqq"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1g03lm7ckqa67m9l701lmw6pwxym8l390zlf8km02gfq0x1g2fyj"; })
+      (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1wb9db76nnm9sr2kj8q53j8wamybkrk7x6gwqw17xk6cxq2fgxq4"; })
+      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "02l7ahcrhq8lnxnf323d6qk3saha73d2sbmgjmp1rcy5q2mqly05"; })
+      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0cinkimphbrpjmz38acrmjqr9md4vi7ad7r757gm363z0hal2783"; })
+      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1dr2a2bgia8i5pwk8b8z3jwlbkshh9pb8hhzbkhjmc56sx49h0lx"; })
+      (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1kj8a9l65slgb3r45b8x5qnhcs80bx8437cfisyfbhjkw17i5cgg"; })
+      (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "1v06qri2f6h2ndbaydgsnpas6nfhvi58yx68v3w4gdbdablnycvb"; })
+      (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0vskm16p0aj7jlwsp5mfbilszwvfaglp6p69196v7kdqmskwxw8c"; })
+      (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1j1j81az67rwdnqfapjnvxx35fjr1n035pwb2nlg6kz2r2mfw4ph"; })
+      (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "0sfqc7v6zi3ma446jgrd4bjfjl0d48wpyb40wc1frcsvms9zskwr"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "0sp90fz8qyz7gn2fmgavsq909dpk44ymq3cs1mxdwfp3v9dssmyh"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "08k90llf2p1bg62w1mk7vv5lk8s4ymfq5j6hdl1al5an4gl7niif"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1akvfw5p9s7w9jr09s20ph4x82kfbabsbd5dafpvakd4zw7cawfx"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "0r4fbkjqy1g9cmaa55rpbsphslcmlpzmag5w47kmq4hxz0ll68d2"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "015dadmlghkbvxz7d7m3fanrq2lqls094immxdv0laxl3smkg7pw"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0gnnpxv0pnbrsx4zf28agwrgra7y3zm0z4lsr09i0wvrz97n65p7"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "136kjcl98n019764sy3pck9v4pmrz6q68qi8a2cdqm6hw7canc05"; })
+      (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "0ibrah9jzcs7i27z9alllg1d46dx0px0m3mgvnsg34zhbpqfbilp"; })
+      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "0i4vmdgrvnr9fkmk2h88h1x37m4g4ksz7c24l585q6sg0343p0hp"; })
+      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0rpb7py9j40jqhi9ndfpvspdkrbl4vwqq8r6hva7kfjva61x9ky2"; })
+      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "06jf5qv6ldsapbjd8g01pwm0yw20w7slpi9yrgxr8q2y0f9fqnhy"; })
+      (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1mj8gzvnk5f16vchwc94bp6726m6n8j6bi9d3rzbly8k63xdnnv3"; })
+      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "05491m5xzd6sbbpad6v7z1apkf00ip13sl23d9r2g5hv22i61qr9"; })
+      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1wsafi273xsh9q9cbfq123p33k2kgvrqz7hvkj4hlshl0dzlky7z"; })
+      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1661dn6v40g8yzwxdfskv0llvwf422zs5b5ndrhbs15cihh10axw"; })
+      (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "17dicgyc24x4krjy37j36cln0770cl52ihyyrg40n8l1b6q3hcdx"; })
+      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "0pjhfxkzbgf0zxibrwrkzjhqz163qhczc476pzvd5fy9cxcdnkl5"; })
+      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "145zkswksir8q0n83jw1kv2xsg5x4sf6w80hyynfjmpfhv7klmcw"; })
+      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1r473bl4g9xgn69q9jp1mfxrvllsg7a2z4lan7nv58anwsz1bfyl"; })
+      (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1kcx09jsklbnjl6mhdarg0c2j84553q6zj9bs73n70idczzn6iyp"; })
+      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "1g7vb2dba007aqw51k1ab962d63xh549zd3j9jsrnrmwpbk7yp58"; })
+      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0p2rv3n9pkv27q20jmps4xl29dmraqc1wgcyw78wm5pgz1717wr4"; })
+      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "0153c9n7zx4cpxwa71yddgjpy021c98r7h2w6mxg4fqnb8hrk23b"; })
+      (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "199qscm2is4xrbhnvyjp0lb4wwgw71c436vfxn7g6qmq7c4y1cyz"; })
+      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "1h5ndqz2djp21d3qj2rqcf41z7y6njb5gjflvhzgjgpqb2xmsqaz"; })
+      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0d10q75a645gdfk2krcwyhj3ncivmgbdkr1j7p7varl38ml1631i"; })
+      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1lb78gjg28r3s0wwjsz3hvannlhqafc5jf8aqlyfk6w92c7p9y3z"; })
+      (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "05nay2zf8fp2y2ki232pkgwb29119fkhhg3z5dgbqn44dpsk7x1h"; })
+      (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "14yn29p83il7jympnnl34srqcygvlzn797702vg1qfdjs18iy6j9"; })
+      (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1d8z4yk06qcqzfhs1424bwvvpy07m4dafilgxl3qlnynfb2i4jzi"; })
+      (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1np746181wn7mzf424qg4j68bs7nwr2iylq18hi1jcl2ysrdcfn3"; })
+      (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1b4qb36sgqbp5mpfni3iz2qs2kvvj341xn6w2rncvjajvgl73mpx"; })
+      (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "19ha49v8wfn48v011jhrg9mlpalmb254rvkv409s4zj089612nfc"; })
+      (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1g6raxhpx7vlwl68xcw4r0xjra95zcbwifnj95w21wzv0nndna91"; })
+      (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1imhc4a3yb9q0cslp0mnsvrvjm152kmj8iiw58c9j8g8sypxcw5g"; })
+      (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1ynn1apan8czndb4n8pdvday2jw6jc19zx8nsla8rv6m7q3vc23r"; })
+      (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "03xkg1yg2h4k2y774vc438ahs0mlrbgh0w7nxyzn15pvlp95yyc6"; })
+      (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0dgcnlsmjhqz8m2y8lpyd0s626pj48whb8fzsxv51l125acinsn7"; })
+      (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "05xisaphkmpfx2w1irb7vhc0f2rfycxkicbyjhgmpqq9cbdxg09l"; })
+      (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1p5h36si87c461k854ky7hn5h5354mh9cprlkf6k814bhi4hjx7y"; })
+    ];
+  };
+}
--- a/pkgs/development/compilers/inklecate/default.nix
+++ b/pkgs/development/compilers/inklecate/default.nix
@ -25,6 +25,7 @@ buildDotnetModule rec {
  executables = [ "inklecate" ];

  dotnet-runtime = dotnetCorePackages.runtime_3_1;
+  dotnet-sdk = dotnetCorePackages.sdk_3_1;

  meta = with lib; {
    description = "Compiler for ink, inkle's scripting language";
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@ -10,7 +10,7 @@ let
  # ACL2 system itself; see
  # https://www.cs.utexas.edu/users/moore/acl2/current/HTML/installation/requirements.html#Obtaining-SBCL
  sbcl' = args.sbcl.override { disableImmobileSpace = true; };
-  sbcl = runCommandLocal args.sbcl.name { buildInputs = [ makeWrapper ]; } ''
+  sbcl = runCommandLocal args.sbcl.name { nativeBuildInputs = [ makeWrapper ]; } ''
    makeWrapper ${sbcl'}/bin/sbcl $out/bin/sbcl \
      --add-flags "--dynamic-space-size 2000"
  '';
@ -40,12 +40,14 @@ in stdenv.mkDerivation rec {
    libcrypto = "${lib.getLib openssl}/lib/libcrypto${stdenv.hostPlatform.extensions.sharedLibrary}";
  })];

+  nativeBuildInputs = lib.optional certifyBooks makeWrapper;
+
  buildInputs = [
    # ACL2 itself only needs a Common Lisp compiler/interpreter:
    sbcl
  ] ++ lib.optionals certifyBooks [
    # To build community books, we need Perl and a couple of utilities:
-    which perl hostname makeWrapper
+    which perl hostname
    # Some of the books require one or more of these external tools:
    glucose minisat abc-verifier libipasir
    z3 (python2.withPackages (ps: [ ps.z3 ]))
--- a/pkgs/development/interpreters/cling/default.nix
+++ b/pkgs/development/interpreters/cling/default.nix
@ -94,7 +94,7 @@ let
 in

 runCommand "cling-${unwrapped.version}" {
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
  inherit unwrapped flags compilerIncludeFlags;
  inherit (unwrapped) meta;
 } ''
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@ -56,6 +56,7 @@ jruby = stdenv.mkDerivation rec {
    license = with licenses; [ cpl10 gpl2 lgpl21 ];
    platforms = platforms.unix;
    maintainers = [ maintainers.fzakaria ];
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
  };
 };
 in jruby.overrideAttrs (oldAttrs: {
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "glib-networking";
-  version = "2.72.1";
+  version = "2.72.2";

  outputs = [ "out" "installedTests" ];

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "b8G+3IBiSE3IoCBJZZle8jZ8PbXJNAWP8WB+WiTZWnQ=";
+    sha256 = "zSoITHu5HXjoSftV1A5HL22PaGLN3J8Sw5FJNZuhgmg=";
  };

  patches = [
--- a/pkgs/development/libraries/java/hsqldb/default.nix
+++ b/pkgs/development/libraries/java/hsqldb/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "hsqldb";
-  version = "2.6.1";
+  version = "2.7.0";
  underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version);

  src = fetchurl {
    url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip";
-    sha256 = "sha256-cixyEwjEt68UOotd1TcJNyVUxTRDx4XyfyYg9k6kRtQ=";
+    sha256 = "sha256-nLBCigQMPF6QbjrUuSDjP2ir38TmzC5Pa8Rjpk1BkcQ=";
  };

  nativeBuildInputs = [ unzip makeWrapper ];
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@ -152,8 +152,8 @@ let
    # TIER 3
      baloo = callPackage ./baloo.nix {};
      kbookmarks = callPackage ./kbookmarks.nix {};
-      kcmutils = callPackage ./kcmutils {};
-      kconfigwidgets = callPackage ./kconfigwidgets {};
+      kcmutils = callPackage ./kcmutils.nix {};
+      kconfigwidgets = callPackage ./kconfigwidgets.nix {};
      kdav = callPackage ./kdav.nix {};
      kdeclarative = callPackage ./kdeclarative.nix {};
      kded = callPackage ./kded.nix {};
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.96/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.97/ -A '*.tar.xz' )
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@ -13,7 +13,4 @@ mkDerivation {
    qtdeclarative
  ];
  propagatedBuildInputs = [ kconfigwidgets kservice ];
-  patches = [
-    ./0001-kcmutils-follow-symlinks.patch
-  ];
 }
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch
@ -1,25 +0,0 @@
-From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Mon, 13 Jul 2020 11:23:36 -0500
-Subject: [PATCH] kcmutils follow symlinks
-
---
- src/kpluginselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index 46deef5..2eacb9f 100644
--- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     for (const QString &dir : dirs) {
-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
-- 
-2.25.4
-
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
@ -8,7 +8,6 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [ kguiaddons ki18n qtbase qttools ];
  propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
-  patches = [ ./0001-QDirIterator-follow-symlinks.patch ];
  outputs = [ "out" "dev" ];
  outputBin = "dev";
  postInstall = ''
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch
@ -1,25 +0,0 @@
-From 05c0eb5d803ac52c0dd97a98f6d2821650c3c14c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Sun, 28 Mar 2021 06:09:47 -0500
-Subject: [PATCH] QDirIterator follow symlinks
-
---
- src/khelpclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index a053cd7..787d375 100644
--- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -34,7 +34,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     for (const QString &dir : desktopDirs) {
-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
-- 
-2.30.1
-
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@ -3,7 +3,7 @@
  extra-cmake-modules, kdoctools,
  kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n,
  kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem,
-  libgcrypt, qgpgme, qtbase,
+  libgcrypt, qgpgme, qtbase, qca-qt5
 }:

 mkDerivation {
@ -11,7 +11,8 @@ mkDerivation {
  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
  buildInputs = [
    kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
-    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
+    knotifications kservice kwidgetsaddons kwindowsystem
+    libgcrypt qgpgme qca-qt5
  ];
  propagatedBuildInputs = [ qtbase ];
 }
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@ -4,667 +4,667 @@

 {
  attica = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/attica-5.96.0.tar.xz";
-      sha256 = "1xlg2sbfd45p9dw0sprpk0fancasp4idxacsf5xksf2ddn2crzp7";
-      name = "attica-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/attica-5.97.0.tar.xz";
+      sha256 = "0ciq7dbr027g8dgkfs4l3ys9fdhxlgkr0hd1mip3fngwcjn2my65";
+      name = "attica-5.97.0.tar.xz";
    };
  };
  baloo = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/baloo-5.96.0.tar.xz";
-      sha256 = "1icpxmmxhvgdr6zxpz0wybc82nyy595cmr09067i82kh7v5dj66l";
-      name = "baloo-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/baloo-5.97.0.tar.xz";
+      sha256 = "0s2rpaz5dk0zixm6x51h6h9g4997g3sjj6mmqjx2fnyaxh79r1hz";
+      name = "baloo-5.97.0.tar.xz";
    };
  };
  bluez-qt = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/bluez-qt-5.96.0.tar.xz";
-      sha256 = "0yc7mq9bnanp5dfv43vp8wpqw5l8qh4aahqpi9sid7jmd6sbywl2";
-      name = "bluez-qt-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/bluez-qt-5.97.0.tar.xz";
+      sha256 = "16gawrq75008r70hjf38fk7w9y1ns2x9vrxs953gbg58ygaryfh3";
+      name = "bluez-qt-5.97.0.tar.xz";
    };
  };
  breeze-icons = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz";
-      sha256 = "1ij723qy6xfkys8a9vp2ll2z2yp7667hfw559gi8cxn825hjx823";
-      name = "breeze-icons-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/breeze-icons-5.97.0.tar.xz";
+      sha256 = "18vij7ihdyd6mar971yci2925c2j5l9q0479931h563ph8i49bkf";
+      name = "breeze-icons-5.97.0.tar.xz";
    };
  };
  extra-cmake-modules = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/extra-cmake-modules-5.96.0.tar.xz";
-      sha256 = "1ngxjvf584zgfb93s5sbr5f5nyw0sqc5i0jlbcgbrjg2n83l9ddx";
-      name = "extra-cmake-modules-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/extra-cmake-modules-5.97.0.tar.xz";
+      sha256 = "02n5xywig2pksbkxfckd0dn97mdn6qjv3shyqryscayqvbrkblly";
+      name = "extra-cmake-modules-5.97.0.tar.xz";
    };
  };
  frameworkintegration = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/frameworkintegration-5.96.0.tar.xz";
-      sha256 = "19piq6h51qh64nbkqnpy6jg91vbl67vg2sh4hlwzsb2lcrmwxgk9";
-      name = "frameworkintegration-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/frameworkintegration-5.97.0.tar.xz";
+      sha256 = "1srj8gnvb3mhppiiy2p489vwj0rcq0j91h4q4halmbl3hd9j4s1v";
+      name = "frameworkintegration-5.97.0.tar.xz";
    };
  };
  kactivities = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kactivities-5.96.0.tar.xz";
-      sha256 = "0g16k3v6i20rc6h0js4pk00d6yg236bs0kxj88q21d5c934hbksk";
-      name = "kactivities-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kactivities-5.97.0.tar.xz";
+      sha256 = "0dyg0rd8cwc3vyb7p3d1n5c670d4f87s09q017ml88pndxpbnbfi";
+      name = "kactivities-5.97.0.tar.xz";
    };
  };
  kactivities-stats = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kactivities-stats-5.96.0.tar.xz";
-      sha256 = "0lfanv55b7zx5s0a7gh4r41w9yb641j1zjjcvdjfrj7pdh52576s";
-      name = "kactivities-stats-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kactivities-stats-5.97.0.tar.xz";
+      sha256 = "1nwbp36p8hk6wwyf4mq4ijy57ig6lass8kyla31dkhy95nqc79p8";
+      name = "kactivities-stats-5.97.0.tar.xz";
    };
  };
  kapidox = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kapidox-5.96.0.tar.xz";
-      sha256 = "1w5h4xwscix0yjn8d0rcjd7hlmrnbmkjg20diqjabb5wcxsrjiwi";
-      name = "kapidox-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kapidox-5.97.0.tar.xz";
+      sha256 = "0rg91cv60r4my7cvj9kjrp06jghgk5kwslqi8b5s9hjh2c0w73wx";
+      name = "kapidox-5.97.0.tar.xz";
    };
  };
  karchive = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/karchive-5.96.0.tar.xz";
-      sha256 = "1bra1q225xhh8dilwmzc0jgnj5m3dmi4nkz4y8f42si97b4xxxf5";
-      name = "karchive-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/karchive-5.97.0.tar.xz";
+      sha256 = "14ldrbkzlm59sjysirvj8yhihgyy4x85w54ydj8khnmvvm4q5zqv";
+      name = "karchive-5.97.0.tar.xz";
    };
  };
  kauth = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kauth-5.96.0.tar.xz";
-      sha256 = "1hi36504bbr0266wl08kqiq61xysl3dw3kpgjfbgx169m0m3gmx9";
-      name = "kauth-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kauth-5.97.0.tar.xz";
+      sha256 = "1xa2r9qwi0h3740f07dj4qxzvr9qgaqjjwbf3lj5g1k2nd9wakfp";
+      name = "kauth-5.97.0.tar.xz";
    };
  };
  kbookmarks = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kbookmarks-5.96.0.tar.xz";
-      sha256 = "131yng8wmxrnf3x1i6gg60q3rrya19yk4jnzi5ylafvaw7q2r8b4";
-      name = "kbookmarks-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kbookmarks-5.97.0.tar.xz";
+      sha256 = "0skbw5m3ihg8v4g46gfvbvgrhdfav6sx26l9jcjx0pfi85ksqvbp";
+      name = "kbookmarks-5.97.0.tar.xz";
    };
  };
  kcalendarcore = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kcalendarcore-5.96.0.tar.xz";
-      sha256 = "181yif830v4gg7nw9s15pvgfm98rmm6xwi2xxy3nxg7nkp14vs5k";
-      name = "kcalendarcore-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kcalendarcore-5.97.0.tar.xz";
+      sha256 = "1476yjbww2cwxnc84nmdgc3r7wi50hj2jjmh6qgfa8067w2sx9yq";
+      name = "kcalendarcore-5.97.0.tar.xz";
    };
  };
  kcmutils = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kcmutils-5.96.0.tar.xz";
-      sha256 = "0vff93kja9dq8rf1aapxpfgjxsinm75f5nydxqcihskp8girz0c8";
-      name = "kcmutils-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kcmutils-5.97.0.tar.xz";
+      sha256 = "0xasda9bi455fmmqdhmapdm6n7sg5m1kgvzh5zx7r43s6jshf6dd";
+      name = "kcmutils-5.97.0.tar.xz";
    };
  };
  kcodecs = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kcodecs-5.96.0.tar.xz";
-      sha256 = "05266wjxmzf3qpb2xwlm40cr9h266l5r9dqww81m8bq856pf8ivi";
-      name = "kcodecs-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kcodecs-5.97.0.tar.xz";
+      sha256 = "0w16il3gqy76x4l7135jgi1sfxz4yl9zss2r53mgm583m0bybrk3";
+      name = "kcodecs-5.97.0.tar.xz";
    };
  };
  kcompletion = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kcompletion-5.96.0.tar.xz";
-      sha256 = "1jmrd2mfz27qfn6dq1mk6bcqlagmifbf9vnayi1mkqa9jsj4dwdj";
-      name = "kcompletion-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kcompletion-5.97.0.tar.xz";
+      sha256 = "19lygg1x12yx41rrh1fklzhrg86nbhg6cji2i25g50ycsd7f1cba";
+      name = "kcompletion-5.97.0.tar.xz";
    };
  };
  kconfig = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kconfig-5.96.0.tar.xz";
-      sha256 = "1xa8xxm2x9783fqb26wyvg1mp6ybjikngznqdhsk9slhaca73yhz";
-      name = "kconfig-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kconfig-5.97.0.tar.xz";
+      sha256 = "0bgnagh8kljakvx9rg461fvispf1f37pcd8z9qxr6flwgw67gzlh";
+      name = "kconfig-5.97.0.tar.xz";
    };
  };
  kconfigwidgets = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kconfigwidgets-5.96.0.tar.xz";
-      sha256 = "045j6gkp5sf1lc12zwlkr1dz0fd89yrg5b31j4ybk3dyc8jz90hl";
-      name = "kconfigwidgets-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kconfigwidgets-5.97.0.tar.xz";
+      sha256 = "0a44qp3c3isi7xgjcqhs0npiisgf379nxlswmyblmlm00rn03ii0";
+      name = "kconfigwidgets-5.97.0.tar.xz";
    };
  };
  kcontacts = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kcontacts-5.96.0.tar.xz";
-      sha256 = "075mw7clqf7qycngly21q3m0js3g8pcgqc2x3alp28f4zq3c8m21";
-      name = "kcontacts-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kcontacts-5.97.0.tar.xz";
+      sha256 = "026rjgmi6lgvm30799klkbcmwfhzlixsbdqyjvzcpsszxh0nj6dq";
+      name = "kcontacts-5.97.0.tar.xz";
    };
  };
  kcoreaddons = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kcoreaddons-5.96.0.tar.xz";
-      sha256 = "1n5mzj02si8allg907l6vn77c2i95qdgfvn48gsqgalwlyd4q6nj";
-      name = "kcoreaddons-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kcoreaddons-5.97.0.tar.xz";
+      sha256 = "1ah28900l7j8nb3v3q7xsmmvrq6cv63b8gyisbcw6kryhw9kah09";
+      name = "kcoreaddons-5.97.0.tar.xz";
    };
  };
  kcrash = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kcrash-5.96.0.tar.xz";
-      sha256 = "05sw3lh4lw5jgl7gvxvpyl6nims9j4b1hjsn365fa2p48qmsx6v5";
-      name = "kcrash-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kcrash-5.97.0.tar.xz";
+      sha256 = "1ipmm012v9zvxf7fxcl811xzxw9h6a6d6lzmnn589h9h3n6j8wgg";
+      name = "kcrash-5.97.0.tar.xz";
    };
  };
  kdav = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kdav-5.96.0.tar.xz";
-      sha256 = "1zqib8km4fg9aj4gmhx4hm7n7bbrz62l41qb48nz1pc3qia2x1wl";
-      name = "kdav-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kdav-5.97.0.tar.xz";
+      sha256 = "1nx5zks5svxszhnm4732w9kh17p20bh66z90gl77zxgixqsq93fm";
+      name = "kdav-5.97.0.tar.xz";
    };
  };
  kdbusaddons = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kdbusaddons-5.96.0.tar.xz";
-      sha256 = "1y0fd0a1nwgchsk3vx8hvvkw96f0l0533g57xakq4j4xkvxd8l3y";
-      name = "kdbusaddons-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kdbusaddons-5.97.0.tar.xz";
+      sha256 = "0b8j2bj4zn7a9yhba44almsvq1s6vg7s3s5gr97mj7mz2hlyiiqk";
+      name = "kdbusaddons-5.97.0.tar.xz";
    };
  };
  kdeclarative = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kdeclarative-5.96.0.tar.xz";
-      sha256 = "1x4r231g0l5im4ala21m5fz5q6nixbx0z6lfia5zjinzlp7x5534";
-      name = "kdeclarative-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kdeclarative-5.97.0.tar.xz";
+      sha256 = "0w2s3139xz7001awzs9wpjd23qp5hxzw0k3sgljnwqa36scd4s5y";
+      name = "kdeclarative-5.97.0.tar.xz";
    };
  };
  kded = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kded-5.96.0.tar.xz";
-      sha256 = "0x40yvcx2gjb4pngyk2vfrn3z7dbyvksbj1h3ck04fyyma8z3gb3";
-      name = "kded-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kded-5.97.0.tar.xz";
+      sha256 = "19znbzhifix0r2wzsr5f7fj839ymlpjwlpagpkwsx57pg21k9p2b";
+      name = "kded-5.97.0.tar.xz";
    };
  };
  kdelibs4support = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kdelibs4support-5.96.0.tar.xz";
-      sha256 = "18f99g1g1z1mrkgq3l8kgxjxi60a632p0sg8d46r67b9n008w9m7";
-      name = "kdelibs4support-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kdelibs4support-5.97.0.tar.xz";
+      sha256 = "04a14i0g59wj54lzq34s8av9mxkfw8jcvlgv3pg87l8xwq4xvpqs";
+      name = "kdelibs4support-5.97.0.tar.xz";
    };
  };
  kdesignerplugin = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kdesignerplugin-5.96.0.tar.xz";
-      sha256 = "0cddad1rdi06l28iiwizfds78dplbvv7j40vphww0ix7cmsh3rh9";
-      name = "kdesignerplugin-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kdesignerplugin-5.97.0.tar.xz";
+      sha256 = "087xycnizfw7psnha2f9v16nxphvdnly3ymqywcjwv213cd7y1r8";
+      name = "kdesignerplugin-5.97.0.tar.xz";
    };
  };
  kdesu = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kdesu-5.96.0.tar.xz";
-      sha256 = "1wjjjwpfjr7sx10x0236zqjx3jrw6mz60724s5qg269dwfbpahvj";
-      name = "kdesu-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kdesu-5.97.0.tar.xz";
+      sha256 = "1csgsrj1jld4p9rqpda4c9wckk224m6zyhhybfqh0mhz78pvcbk5";
+      name = "kdesu-5.97.0.tar.xz";
    };
  };
  kdewebkit = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kdewebkit-5.96.0.tar.xz";
-      sha256 = "0l8nnar4s84igxih5w0fhwd9nvccp7zm53jy2gk6lfbj6gqarfbf";
-      name = "kdewebkit-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kdewebkit-5.97.0.tar.xz";
+      sha256 = "1dijacbg76mn9l13fk8cl0kgj98g8wkky3z1210x65gjgqgzl97f";
+      name = "kdewebkit-5.97.0.tar.xz";
    };
  };
  kdnssd = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kdnssd-5.96.0.tar.xz";
-      sha256 = "1d3jq64gyj3bc3sf46gnpbmjrm809hva47z7fkwkk9i2lmnmy70w";
-      name = "kdnssd-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kdnssd-5.97.0.tar.xz";
+      sha256 = "0lmlwb4b06fy8myvai76srx4i1w60vw58mn14sy7l88kr28xc12d";
+      name = "kdnssd-5.97.0.tar.xz";
    };
  };
  kdoctools = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kdoctools-5.96.0.tar.xz";
-      sha256 = "04nk87dbmnf9840401s40mxlsfh9is1l1mqky9xi5mcghbp0308b";
-      name = "kdoctools-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kdoctools-5.97.0.tar.xz";
+      sha256 = "1xha2l0sqf4zyqbwglfc946pw483fcl9g43vlmnxrk9qsfr75b31";
+      name = "kdoctools-5.97.0.tar.xz";
    };
  };
  kemoticons = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kemoticons-5.96.0.tar.xz";
-      sha256 = "03b5axwvd6ayw1kbl1jv6h04cihp1y1pa835gs3m1qx2ivgj7f75";
-      name = "kemoticons-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kemoticons-5.97.0.tar.xz";
+      sha256 = "02ii85h7l508xhf9f05pfw0c4vldr102v7lbygk5mlrcpgmgqnp2";
+      name = "kemoticons-5.97.0.tar.xz";
    };
  };
  kfilemetadata = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kfilemetadata-5.96.0.tar.xz";
-      sha256 = "0sh3malq6007fp5m4hica20ha8z5abqzq5ifcmrpm8zqmm5aa2bq";
-      name = "kfilemetadata-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kfilemetadata-5.97.0.tar.xz";
+      sha256 = "08bhs3nq5q362qfqhz3z4znm0svbjy8blcdgy3l0smfpfr8xhbrz";
+      name = "kfilemetadata-5.97.0.tar.xz";
    };
  };
  kglobalaccel = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kglobalaccel-5.96.0.tar.xz";
-      sha256 = "1sx4fmy8xy22im0i3dw0xdmxrgw2jhnk2wsfy2xw74dsj3adg2iq";
-      name = "kglobalaccel-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kglobalaccel-5.97.0.tar.xz";
+      sha256 = "0cdbwyckad5a7rlv1kcmpp51q32clbi86cbggap9l9r8h99x7i75";
+      name = "kglobalaccel-5.97.0.tar.xz";
    };
  };
  kguiaddons = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kguiaddons-5.96.0.tar.xz";
-      sha256 = "028kn9lcvzv8f8b17a3clki7013dmhhcp1l9svvf6hydv97vkfbv";
-      name = "kguiaddons-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kguiaddons-5.97.0.tar.xz";
+      sha256 = "10kmjq38ykbxhp5vr797vmgcv8jf28g2nrkx0j3myhwq1xgmjy7v";
+      name = "kguiaddons-5.97.0.tar.xz";
    };
  };
  kholidays = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kholidays-5.96.0.tar.xz";
-      sha256 = "0rcd8k2x1w6jszxj18pkzimn5q4v2k7zs9x1pfwszn7xl59b3n4k";
-      name = "kholidays-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kholidays-5.97.0.tar.xz";
+      sha256 = "0b5qr7vmrshp5hghxbab0q26i01aafw2za4qmj779cj9givpm3vj";
+      name = "kholidays-5.97.0.tar.xz";
    };
  };
  khtml = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz";
-      sha256 = "0lc933z4568962xj7grzy44aj97h76s5vvv1cnj351dzwr5qahpx";
-      name = "khtml-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/khtml-5.97.0.tar.xz";
+      sha256 = "14dv3734z0m53rc1clx4qdm020pwc251ac9dvmpvg2x294vlj5kc";
+      name = "khtml-5.97.0.tar.xz";
    };
  };
  ki18n = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/ki18n-5.96.0.tar.xz";
-      sha256 = "1jry8bdjgxkcqln7awkj3k8996lh76vya2mf5kwpyxagk6vmr0gy";
-      name = "ki18n-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/ki18n-5.97.0.tar.xz";
+      sha256 = "07hyz3vaqwd12g92gwrmzd3p2wx3qksfnnd560kan5f8g1pnsbq3";
+      name = "ki18n-5.97.0.tar.xz";
    };
  };
  kiconthemes = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kiconthemes-5.96.0.tar.xz";
-      sha256 = "0w9m956xfpfxp7a63a5v2y10lb9zp2gqfjyfvq3ksxfl961g4hsg";
-      name = "kiconthemes-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kiconthemes-5.97.0.tar.xz";
+      sha256 = "04csm9hb6inp1v0471xsqgxim5748s2k1fxl5lzmpzmbmslcdwcl";
+      name = "kiconthemes-5.97.0.tar.xz";
    };
  };
  kidletime = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kidletime-5.96.0.tar.xz";
-      sha256 = "13piv607n9hmlbd7kkhl7b1wcxj1jq2b5386c6pxrz5caxjwgnmd";
-      name = "kidletime-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kidletime-5.97.0.tar.xz";
+      sha256 = "0aq4qpplafzsipflfjf463xp5p68gpcfssdr8lpkx84lqqa0k89m";
+      name = "kidletime-5.97.0.tar.xz";
    };
  };
  kimageformats = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kimageformats-5.96.0.tar.xz";
-      sha256 = "0dbl2varirp5f1bd8173jlhmkc3ql16yg0d6w04nc56hy973bkm5";
-      name = "kimageformats-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kimageformats-5.97.0.tar.xz";
+      sha256 = "04ajq25xh4iyxfnm658h6fd9z8ipn5dgwd640ax9walbp4pkd0zb";
+      name = "kimageformats-5.97.0.tar.xz";
    };
  };
  kinit = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kinit-5.96.0.tar.xz";
-      sha256 = "1y7x80icm2jv9c8917481w1hs1vm2rvvvnc9drw4q7vrjzfx73dq";
-      name = "kinit-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kinit-5.97.0.tar.xz";
+      sha256 = "19ac8i0dvh6q2sqrgk3rjg231x5n4k6d4hd0vgjycyxjmi3aqmjq";
+      name = "kinit-5.97.0.tar.xz";
    };
  };
  kio = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kio-5.96.0.tar.xz";
-      sha256 = "0xmvgq7cp1kkicmngxjj4cmijaah91jmfqdzzxziphq1rl23k64m";
-      name = "kio-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kio-5.97.0.tar.xz";
+      sha256 = "11sqcy0m3867ss9hgs5n7jmwck0rmdql2b1mp5q99d4fg98816yc";
+      name = "kio-5.97.0.tar.xz";
    };
  };
  kirigami2 = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kirigami2-5.96.0.tar.xz";
-      sha256 = "12ir4q9njl60b242j9raj1xsjs0cizsk7bixwb1hssfn6fzpzqkv";
-      name = "kirigami2-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kirigami2-5.97.0.tar.xz";
+      sha256 = "016ny2pf34cll4zwxxfj0r4fjkvbm0mmac5z7d22dq6cgqrdz7j4";
+      name = "kirigami2-5.97.0.tar.xz";
    };
  };
  kitemmodels = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kitemmodels-5.96.0.tar.xz";
-      sha256 = "1j6kffvgbd07zzzv0kab8mbwa69fmw4b8jczd0wzvmp56idsfc2v";
-      name = "kitemmodels-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kitemmodels-5.97.0.tar.xz";
+      sha256 = "0vxlajl8lvddxrwnq3zdcm4sj36r6nyczplwk97xsr5q52minpbw";
+      name = "kitemmodels-5.97.0.tar.xz";
    };
  };
  kitemviews = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kitemviews-5.96.0.tar.xz";
-      sha256 = "1wr62z6jwlg40m8kl9bpiyzkyjmsqx0fhgwc01192k58nl2696lb";
-      name = "kitemviews-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kitemviews-5.97.0.tar.xz";
+      sha256 = "1ggv3lf1z5986g837kq0dw2pkwd032zzdx2c9zs5zal1y7aid6f5";
+      name = "kitemviews-5.97.0.tar.xz";
    };
  };
  kjobwidgets = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kjobwidgets-5.96.0.tar.xz";
-      sha256 = "1w1h9vnlq1j72812558cl5dlq7f80nnh5i30qmkpbvv49xhhq2dl";
-      name = "kjobwidgets-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kjobwidgets-5.97.0.tar.xz";
+      sha256 = "16s2rjbmxz6x1kmnx9mg8sa42p65ps5jk074s86vg9qnhk0jxkf9";
+      name = "kjobwidgets-5.97.0.tar.xz";
    };
  };
  kjs = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kjs-5.96.0.tar.xz";
-      sha256 = "0jhfjjpv5hzbib3p30ngn6ic023fnrvnr8jrbjdzyacjywj69vvp";
-      name = "kjs-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kjs-5.97.0.tar.xz";
+      sha256 = "1y6wgfc85smlp3kqxyma0h0nnn5z5hzszy0xdvbl76c1azby2n8f";
+      name = "kjs-5.97.0.tar.xz";
    };
  };
  kjsembed = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kjsembed-5.96.0.tar.xz";
-      sha256 = "1z8h0n4v1qgs2lsxflrzhdfb91jna3y2dxal1qz7i3szjvrf63h0";
-      name = "kjsembed-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kjsembed-5.97.0.tar.xz";
+      sha256 = "07s0xpcvxslnyk6z6ilz2h57in5g4a1xa6yi896isqwihqc28kxx";
+      name = "kjsembed-5.97.0.tar.xz";
    };
  };
  kmediaplayer = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kmediaplayer-5.96.0.tar.xz";
-      sha256 = "0qqlah4zi0b7b6yb4009kkjqw7fkp1lgvp2mcpxs8vbbshs3376c";
-      name = "kmediaplayer-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kmediaplayer-5.97.0.tar.xz";
+      sha256 = "14hc5kz98smihlnnf5lg5i6mw8xnblix7jaql2x1ym6vj7vbnjks";
+      name = "kmediaplayer-5.97.0.tar.xz";
    };
  };
  knewstuff = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/knewstuff-5.96.0.tar.xz";
-      sha256 = "0kls40wlqkqirfjhf8kn83saxwahlh4rkm7iypqd81h93gi81fgc";
-      name = "knewstuff-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/knewstuff-5.97.0.tar.xz";
+      sha256 = "0k49zbypxw0b79nbmhc59q2bz4h0whaq72if5nfa4jdxrvfvn9yp";
+      name = "knewstuff-5.97.0.tar.xz";
    };
  };
  knotifications = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/knotifications-5.96.0.tar.xz";
-      sha256 = "11fbqylchzvm0pfw8bvy03px5zcg4jbch39vzcvnl6si7vikm4qj";
-      name = "knotifications-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/knotifications-5.97.0.tar.xz";
+      sha256 = "07ylq0ynb66cp5v7p26j49w65kadza8zkww3wl32nnvi3qa68qz3";
+      name = "knotifications-5.97.0.tar.xz";
    };
  };
  knotifyconfig = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/knotifyconfig-5.96.0.tar.xz";
-      sha256 = "09bcw47zp6rsnk7f83gkmlpylg428a7phn7bbi9mpkdpzc6zvfd2";
-      name = "knotifyconfig-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/knotifyconfig-5.97.0.tar.xz";
+      sha256 = "1yldfc44k1z7s1f3yqzdm0dgg84xlzqddllkrxc60cf6aaq7pnhv";
+      name = "knotifyconfig-5.97.0.tar.xz";
    };
  };
  kpackage = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kpackage-5.96.0.tar.xz";
-      sha256 = "0gsxizpqa47apbvchga3f0w86v4jh8z1vyf0kifipz17fay4ws8d";
-      name = "kpackage-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kpackage-5.97.0.tar.xz";
+      sha256 = "03j184bnv7lnbx2srqxhv9q5klgr0dvrfdwhx1b56jpmxjrdf79c";
+      name = "kpackage-5.97.0.tar.xz";
    };
  };
  kparts = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kparts-5.96.0.tar.xz";
-      sha256 = "0b68kyi7l3ndw798sll2hrzf6qq6w875n48sc11q6882xilzinh2";
-      name = "kparts-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kparts-5.97.0.tar.xz";
+      sha256 = "0l95af7c9m79z1pwyzzhdihd2wksjxy0vnl6h4a5qi35a553v0zg";
+      name = "kparts-5.97.0.tar.xz";
    };
  };
  kpeople = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kpeople-5.96.0.tar.xz";
-      sha256 = "0q3c0ghxa9km5xcq6h0cwa7swfd18h491jpfafy4qgq3nwp0115b";
-      name = "kpeople-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kpeople-5.97.0.tar.xz";
+      sha256 = "1fy2dpfbhcmi0v08ik6pbb31z29m1g91l14p98ny3g6sy6r1l83v";
+      name = "kpeople-5.97.0.tar.xz";
    };
  };
  kplotting = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kplotting-5.96.0.tar.xz";
-      sha256 = "1yqx260r3dzcinp8s685yzp5f2ihc0s1csckb9zv7z1bzljkn3h9";
-      name = "kplotting-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kplotting-5.97.0.tar.xz";
+      sha256 = "03pa2qbpm6qsc9v6i6wqr15jwjkgywzdwy7jl6cxrh9acdmy3ljy";
+      name = "kplotting-5.97.0.tar.xz";
    };
  };
  kpty = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kpty-5.96.0.tar.xz";
-      sha256 = "15swvv6qhvc654wyvxzbjbnzrd2vwn0mr4lby1x6x5f4c9br0cip";
-      name = "kpty-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kpty-5.97.0.tar.xz";
+      sha256 = "1i0a53l1ik44blxy7xg3lf2l2x2idxfrxn1rnjdgm119klysdic7";
+      name = "kpty-5.97.0.tar.xz";
    };
  };
  kquickcharts = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kquickcharts-5.96.0.tar.xz";
-      sha256 = "1sd9mfxk72xfa1kz77s7z312scfm0vwvvgmyi4pypb9cs7d9dq3j";
-      name = "kquickcharts-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kquickcharts-5.97.0.tar.xz";
+      sha256 = "1v2zky53hvwbqnbh0wj8n6rp0lp59qii4k5gm3j2pfcjzrdj8an1";
+      name = "kquickcharts-5.97.0.tar.xz";
    };
  };
  kross = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kross-5.96.0.tar.xz";
-      sha256 = "03dvg2jh9587kcp2f9nir727z0qvkcywrgxfi1p1hxq1bx6y8fm2";
-      name = "kross-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kross-5.97.0.tar.xz";
+      sha256 = "0143l7nxq0j207cjvs0srcllvfyzpwrzxmcrdl22hrj951j1aq5s";
+      name = "kross-5.97.0.tar.xz";
    };
  };
  krunner = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/krunner-5.96.0.tar.xz";
-      sha256 = "0wd2nmhw9mb09mm88cnkmirwgxdnvkrkyjvaiqh9k74xqsggnplk";
-      name = "krunner-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/krunner-5.97.0.tar.xz";
+      sha256 = "0addv0whngqzfvsi1gcsiissin3sa7gg8n5kd3nnp03w7kqbapr9";
+      name = "krunner-5.97.0.tar.xz";
    };
  };
  kservice = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kservice-5.96.0.tar.xz";
-      sha256 = "1zg3a35my8ba5ikmlg9s3wc9r0s5a2x0rggiiv9znhfi3snvi6gd";
-      name = "kservice-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kservice-5.97.0.tar.xz";
+      sha256 = "0bi07qdnl99g4kwxikh5nb4n6ihnn5hg8g1sl64jkggd06l1c03d";
+      name = "kservice-5.97.0.tar.xz";
    };
  };
  ktexteditor = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/ktexteditor-5.96.0.tar.xz";
-      sha256 = "071jx26ycyk31bh167cq5fwx8xkr4ldjg8zlhn9dh7wa3rjpp183";
-      name = "ktexteditor-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/ktexteditor-5.97.0.tar.xz";
+      sha256 = "02hwh736zlb98vkd83sz8a2ywqcv3wbik2pscdg746ff2pvqnwlb";
+      name = "ktexteditor-5.97.0.tar.xz";
    };
  };
  ktextwidgets = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/ktextwidgets-5.96.0.tar.xz";
-      sha256 = "1vab4qmqq9268bwzx6xia2bcz8rdmiwlgjkbkk8nci2pnmhjrzpj";
-      name = "ktextwidgets-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/ktextwidgets-5.97.0.tar.xz";
+      sha256 = "1kwa52f1nyidxjkcipp5r3p1cp5m4xdm57cr77vv9krzhcaznhmx";
+      name = "ktextwidgets-5.97.0.tar.xz";
    };
  };
  kunitconversion = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kunitconversion-5.96.0.tar.xz";
-      sha256 = "1qls3319gwn1nzaq04wrqjhbchk0s0pfx97m4za63yzvapvym73g";
-      name = "kunitconversion-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kunitconversion-5.97.0.tar.xz";
+      sha256 = "1pspm7ka6yvy7pbdsfliyzr0xi20m8krd4qvy24jy4rn0wa5xy6v";
+      name = "kunitconversion-5.97.0.tar.xz";
    };
  };
  kwallet = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kwallet-5.96.0.tar.xz";
-      sha256 = "0rj610c7i66fbv1x0i0sfn9mac8fkqir4vwgaq1ad5i9ca36h1jq";
-      name = "kwallet-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kwallet-5.97.0.tar.xz";
+      sha256 = "08fqjxsnqiifp5knsb0w5ajx5713c1z4p5s7cbg6395bqsq7i6xb";
+      name = "kwallet-5.97.0.tar.xz";
    };
  };
  kwayland = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kwayland-5.96.0.tar.xz";
-      sha256 = "0dcnsiippwxvwvf1gvp75lx97c4nydzn3x1l8lfy86w9lfslw7zb";
-      name = "kwayland-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kwayland-5.97.0.tar.xz";
+      sha256 = "0g6a618kdgsra0b7mkg3hyvxm3lzwnmz5j2mlkhmmkfci5n02wg5";
+      name = "kwayland-5.97.0.tar.xz";
    };
  };
  kwidgetsaddons = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kwidgetsaddons-5.96.0.tar.xz";
-      sha256 = "1igbkrn8qaalan0lyn8r2gqv5v3rwbmb3xv3w26yw77vwp0n789r";
-      name = "kwidgetsaddons-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kwidgetsaddons-5.97.0.tar.xz";
+      sha256 = "05xcnrv27m7xfhgkfmgrbrfg6m6bb3p65iqb8gxjjs0357jcgh3s";
+      name = "kwidgetsaddons-5.97.0.tar.xz";
    };
  };
  kwindowsystem = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kwindowsystem-5.96.0.tar.xz";
-      sha256 = "1ilb3zl3mlndfrqz6gi28x6qqqs45l65d0wmy3lk07lppcw3wxzx";
-      name = "kwindowsystem-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kwindowsystem-5.97.0.tar.xz";
+      sha256 = "1wgybsf3n16q66pkgcg3hjypmfl9cam69bcz98xf074s6ybaf8mq";
+      name = "kwindowsystem-5.97.0.tar.xz";
    };
  };
  kxmlgui = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/kxmlgui-5.96.0.tar.xz";
-      sha256 = "1hiz2fgwpc4mgh2zzir0qi18pjsc3052lf888rc1pgql90faxb1k";
-      name = "kxmlgui-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/kxmlgui-5.97.0.tar.xz";
+      sha256 = "1xdd30r9a3f611h8kmk53mybyil870159b7qr7v13g5asqlpkwds";
+      name = "kxmlgui-5.97.0.tar.xz";
    };
  };
  kxmlrpcclient = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/portingAids/kxmlrpcclient-5.96.0.tar.xz";
-      sha256 = "1jrmrzcvnnw7q7pxgfpcz8608jmxqxf89habmgwv71b8kjz3vgaw";
-      name = "kxmlrpcclient-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/portingAids/kxmlrpcclient-5.97.0.tar.xz";
+      sha256 = "02fkzf9z983r2mfyjwyhpzf9b3qpk8bavh1pixbvwd6iddmqhnj9";
+      name = "kxmlrpcclient-5.97.0.tar.xz";
    };
  };
  modemmanager-qt = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/modemmanager-qt-5.96.0.tar.xz";
-      sha256 = "1rbiqh1sj328cy7flz9pw6vbvgiy3vyv6xp3fk4xv91sxviz1mhd";
-      name = "modemmanager-qt-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/modemmanager-qt-5.97.0.tar.xz";
+      sha256 = "0qg56r4j3mlyp27zjdrhwckw4a10zfp4bpzwr35m37ccsb80304k";
+      name = "modemmanager-qt-5.97.0.tar.xz";
    };
  };
  networkmanager-qt = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/networkmanager-qt-5.96.0.tar.xz";
-      sha256 = "1gyvgy0wl00asg9bkhjgvqnz32xmazvazcarh3p0640jy2fjrzfz";
-      name = "networkmanager-qt-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/networkmanager-qt-5.97.0.tar.xz";
+      sha256 = "10bczach9x3az29h32rn6h0gnz4ghj8dn8ynm93jkkjmw87asml5";
+      name = "networkmanager-qt-5.97.0.tar.xz";
    };
  };
  oxygen-icons5 = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/oxygen-icons5-5.96.0.tar.xz";
-      sha256 = "1f3fj6zr5iygb3s6f8vq2ayy749gxlx5j9h6v2zmkbf4m96sfmq5";
-      name = "oxygen-icons5-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/oxygen-icons5-5.97.0.tar.xz";
+      sha256 = "1ypr4l1205jzc9cpdin64a2rk0bz4x0wjy7k87lswm2643w6sjsm";
+      name = "oxygen-icons5-5.97.0.tar.xz";
    };
  };
  plasma-framework = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/plasma-framework-5.96.0.tar.xz";
-      sha256 = "14myvv70pixygb20c136sk7prv5f5dca53fgc74dk6c28hwyldh2";
-      name = "plasma-framework-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/plasma-framework-5.97.0.tar.xz";
+      sha256 = "09xmjmv9l26dpyngwks66lb48clfwfagpndavf2djcfjid4pv63k";
+      name = "plasma-framework-5.97.0.tar.xz";
    };
  };
  prison = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/prison-5.96.0.tar.xz";
-      sha256 = "1kzl8rbyj9ik83p1qb8jl32vr06vkzzvr1hpasj50sg3ajq8a9xs";
-      name = "prison-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/prison-5.97.0.tar.xz";
+      sha256 = "06skmwxb1hkg2h1q2fhgkbbsdnvhg6l930533n446g42p7qlzw56";
+      name = "prison-5.97.0.tar.xz";
    };
  };
  purpose = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/purpose-5.96.0.tar.xz";
-      sha256 = "0gji3dsccbii1gm83dpwry02cqmjrimhj8gnkb6nzvzrnq5xfh3r";
-      name = "purpose-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/purpose-5.97.0.tar.xz";
+      sha256 = "17sih5a5v28qpwrvc1jq3b2hhi7qrbwaw14swg0iz89icbaxizl3";
+      name = "purpose-5.97.0.tar.xz";
    };
  };
  qqc2-desktop-style = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/qqc2-desktop-style-5.96.0.tar.xz";
-      sha256 = "0ff9vd34wss9na2m3gzm8wc2bwq0flda6bv6yqygv5iallw2lz88";
-      name = "qqc2-desktop-style-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/qqc2-desktop-style-5.97.0.tar.xz";
+      sha256 = "19ily5hn1hmyqw9d2qwm7440zzr3kjdz1qf2n073w2miqgp6fsa6";
+      name = "qqc2-desktop-style-5.97.0.tar.xz";
    };
  };
  solid = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/solid-5.96.0.tar.xz";
-      sha256 = "0j64glc1g7mwy2ysaj09w5f7sd2992h91ncknk9gpfsrxhpm814i";
-      name = "solid-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/solid-5.97.0.tar.xz";
+      sha256 = "17aclbb8jwdj4hd6kz3svgla5i5rm03xj7cavdinbvy2g13avh44";
+      name = "solid-5.97.0.tar.xz";
    };
  };
  sonnet = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/sonnet-5.96.0.tar.xz";
-      sha256 = "0i0gksdkfyl8hfbqgrgklqanbvfm3h9gjnv42p2qq40b0zjj0sh4";
-      name = "sonnet-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/sonnet-5.97.0.tar.xz";
+      sha256 = "14qijjhm0ar14nw03dp192gnmlx13xgybw2iv71nrxg7cybp74m3";
+      name = "sonnet-5.97.0.tar.xz";
    };
  };
  syndication = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/syndication-5.96.0.tar.xz";
-      sha256 = "1q60dznlkbncqqgjnp3lq3x0f6r7wvz141ajkymmxlgfq3wdpcd4";
-      name = "syndication-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/syndication-5.97.0.tar.xz";
+      sha256 = "0qcxmsirzqbycndw4grvpcmvyfz01crj7cdlazj92a5gckz640jn";
+      name = "syndication-5.97.0.tar.xz";
    };
  };
  syntax-highlighting = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/syntax-highlighting-5.96.0.tar.xz";
-      sha256 = "176prghxfrb7i68jacmq9vkl7j9arsn6gnkzyc2hlkph35js3zqs";
-      name = "syntax-highlighting-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/syntax-highlighting-5.97.0.tar.xz";
+      sha256 = "17d9a2mr0g3l62nqvrsmwkhraxjc26bw8hxf27xwpngazy8rd2z8";
+      name = "syntax-highlighting-5.97.0.tar.xz";
    };
  };
  threadweaver = {
-    version = "5.96.0";
+    version = "5.97.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.96/threadweaver-5.96.0.tar.xz";
-      sha256 = "0ljjnbwmc2zz4q0q1njqny43cj6xdf976vrvijcsqdsril5wzdbq";
-      name = "threadweaver-5.96.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.97/threadweaver-5.97.0.tar.xz";
+      sha256 = "13s0zjmjwqpzxv14h7x8d12av4icgdnhgzb9qcdc82gazq1mv5s6";
+      name = "threadweaver-5.97.0.tar.xz";
    };
  };
 }
--- a/pkgs/development/libraries/libglibutil/default.nix
+++ b/pkgs/development/libraries/libglibutil/default.nix
@ -1,15 +1,14 @@
-{ stdenv, lib, fetchFromGitLab, pkg-config, glib }:
+{ stdenv, lib, fetchFromGitHub, pkg-config, glib }:

 stdenv.mkDerivation rec {
  pname = "libglibutil";
-  version = "1.0.55";
+  version = "1.0.66";

-  src = fetchFromGitLab {
-    domain = "git.sailfishos.org";
-    owner = "mer-core";
+  src = fetchFromGitHub {
+    owner = "sailfishos";
    repo = pname;
    rev = version;
-    sha256 = "0zrxccpyfz4jf14zr6fj9b88p340s66lw5cnqkapfa72kl1rnp4q";
+    sha256 = "sha256-CYZDlmnHOCT0HC7sG0dN7zWkhcSRzX6XXPrEFmFEye8=";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
+++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix
@ -8,11 +8,11 @@

 stdenv.mkDerivation rec {
  pname = "libmysqlconnectorcpp";
-  version = "8.0.28";
+  version = "8.0.29";

  src = fetchurl {
    url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz";
-    sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs=";
+    sha256 = "sha256-mmI2oovKM66VHYzKq7j/UaGIhj6FmfkJb0rgodoZ+H8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/libnats-c/default.nix
+++ b/pkgs/development/libraries/libnats-c/default.nix
@ -5,13 +5,13 @@

 stdenv.mkDerivation rec {
  pname   = "libnats";
-  version = "3.2.0";
+  version = "3.3.0";

  src = fetchFromGitHub {
    owner  = "nats-io";
    repo   = "nats.c";
    rev    = "v${version}";
-    sha256 = "1ngji3sa44y27lnq4x5dzbd117s9psx4w0j50b4c2b72cf2z139q";
+    sha256 = "sha256-2z+r0OIVYE7NPQQAd5vOK8KkFo4Zzi2pPcwPByJTyPc=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/sdbus-cpp/default.nix
+++ b/pkgs/development/libraries/sdbus-cpp/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "sdbus-cpp";
-  version = "1.1.0";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "kistler-group";
    repo = "sdbus-cpp";
    rev = "v${version}";
-    sha256 = "sha256-AjaZ6YmMlnN0jAcUBkft01XHkrze0nSr3dUMechsLrQ=";
+    sha256 = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/sentencepiece/default.nix
+++ b/pkgs/development/libraries/sentencepiece/default.nix
@ -9,13 +9,13 @@

 stdenv.mkDerivation rec {
  pname = "sentencepiece";
-  version = "0.1.96";
+  version = "0.1.97";

  src = fetchFromGitHub {
    owner = "google";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-jo8XlQJsnWpeeezDjNNhh6T473XMqe8fsApUr82Y3BU=";
+    sha256 = "sha256-T6qQtLmuPKVha0CwX4fBH7IQoAlwVj64X2qDecWd7s8=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/sentry-native/default.nix
+++ b/pkgs/development/libraries/sentry-native/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "sentry-native";
-  version = "0.4.18";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "getsentry";
    repo = "sentry-native";
    rev = version;
-    sha256 = "sha256-2WNmpx6ReVmsRvKHAaZznGuugvmLxK25P1WdmorNj/g=";
+    sha256 = "sha256-whbzoKIYLwj4yoFaT3frghJd/WzfpolSAuZzQRtnP5E=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/python-modules/adlfs/default.nix
+++ b/pkgs/development/python-modules/adlfs/default.nix
@ -0,0 +1,49 @@
+{ lib
+, aiohttp
+, azure-core
+, azure-datalake-store
+, azure-identity
+, azure-storage-blob
+, buildPythonPackage
+, fetchFromGitHub
+, fsspec
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "adlfs";
+  version = "2022.7.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "fsspec";
+    repo = pname;
+    rev = version;
+    hash = "sha256-79HPJip+nocYo/r8LCb9vdYKVuEh0BBrz/eTJF0eGTA=";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+    azure-core
+    azure-datalake-store
+    azure-identity
+    azure-storage-blob
+    fsspec
+  ];
+
+  # Tests require a running Docker instance
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "adlfs"
+  ];
+
+  meta = with lib; {
+    description = "Filesystem interface to Azure-Datalake Gen1 and Gen2 Storage";
+    homepage = "https://github.com/fsspec/adlfs";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "aiohomekit";
-  version = "1.2.9";
+  version = "1.2.10";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "Jc2k";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-9ejha07hYwB/BZ7hmJHhmLb313ZrTvEXBylswJMlBmU=";
+    hash = "sha256-JJaBspM1s8n+eZfRQQfX8EY2uBWdy23403AmCXbZ1Uw=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/aiohttp-retry/default.nix
+++ b/pkgs/development/python-modules/aiohttp-retry/default.nix
@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "aiohttp-retry";
-  version = "2.7.0";
+  version = "2.8.3";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "inyutin";
    repo = "aiohttp_retry";
    rev = "v${version}";
-    hash = "sha256-vMnk7OHXTgFLcnqauAPB/vxVt8bP1To6KTIgNv7Ek+Q=";
+    hash = "sha256-Zr68gx8ZR9jKrogmqaFLvpBAIHE9ptHm0zZ/b49cCLw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
@ -0,0 +1,37 @@
+{ lib
+, aliyun-python-sdk-core
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aliyun-python-sdk-cdn";
+  version = "3.7.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-GAY4o9lr+1m8g1T7EhL5jLjEdfMWC/1vJ3UC4PQzvjI=";
+  };
+
+  propagatedBuildInputs = [
+    aliyun-python-sdk-core
+  ];
+
+  # All components are stored in a mono repo
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "aliyunsdkcdn"
+  ];
+
+  meta = with lib; {
+    description = "CDN module of Aliyun Python SDK";
+    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
@ -0,0 +1,37 @@
+{ lib
+, aliyun-python-sdk-core
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aliyun-python-sdk-config";
+  version = "2.2.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-FQNj11G2d985KkpVycJyUqugul/EXu4PpuvD/YGPkBc=";
+  };
+
+  propagatedBuildInputs = [
+    aliyun-python-sdk-core
+  ];
+
+  # All components are stored in a mono repo
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "aliyunsdkconfig"
+  ];
+
+  meta = with lib; {
+    description = "Configuration module of Aliyun Python SDK";
+    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/Show more
+++ b/Show more