Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
- pkgs/development/libraries/SDL2/default.nix

nixos/modules/programs/chromium.nix

@@ -19,6 +19,8 @@ in
     programs.chromium = {
       enable = lib.mkEnableOption "{command}`chromium` policies";
 
+      package = lib.mkPackageOption pkgs "chromium" { };
+
       enablePlasmaBrowserIntegration = lib.mkEnableOption "Native Messaging Host for Plasma Browser Integration";
 
       plasmaBrowserIntegrationPackage = lib.mkPackageOption pkgs [ "plasma5Packages" "plasma-browser-integration" ] { };
@@ -119,8 +121,9 @@ in
 
   ###### implementation
 
-  config = {
+  config = lib.mkIf cfg.enable {
-    environment.etc = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    environment.etc = {
       # for chromium
       "chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json" = lib.mkIf cfg.enablePlasmaBrowserIntegration
         { source = "${cfg.plasmaBrowserIntegrationPackage}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; };

pkgs/applications/blockchains/optimism/default.nix

@@ -6,19 +6,19 @@
 
 buildGoModule rec {
   pname = "optimism";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "ethereum-optimism";
     repo = "optimism";
     rev = "op-node/v${version}";
-    hash = "sha256-sryXVqbAvmHIOg8osBecmU6/TIZjJvcFipimWMcHqME=";
+    hash = "sha256-TIxA+Dyxdwm3Q8U6xh7x7hBPNXmH+vVDK2lAaRFKSN0=";
     fetchSubmodules = true;
   };
 
   subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
 
-  vendorHash = "sha256-UQ/appKaBvHkya9RNIYvSd4E+22DDFjJgJ3g82IShNY=";
+  vendorHash = "sha256-xoflPeUeFlbMBUSas+dmBOCFOOvrBHEvYWEk7QkNW14=";
 
   buildInputs = [
     libpcap

pkgs/applications/editors/vscode/vscode.nix

@@ -30,21 +30,21 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1q8krqhwlqj3a76hp830nhz27sqwz9i0klh2q2b3n5l29x9cvd34";
+    x86_64-linux = "13572vj8izdkglrpk36z1nb3va3lbmsh885g1ix38x49hr3wjwaq";
-    x86_64-darwin = "1d0sp42g582ykzdpzmr1wqkc0ivg09l9zxm201fxd6irr6i6lvqz";
+    x86_64-darwin = "1xz0rhkpwiji60vy7klm424fdzs8393jggaswsbyapkj3g9nrkpb";
-    aarch64-linux = "0z48qlz8b7mvznr4d4vi47mibkffbsmbr2bp712h1z9s4jhx40h4";
+    aarch64-linux = "17rci7w2g595ziv1ylvzc5dhh0bc9l3a7mkl4lfljv6gaprdk766";
-    aarch64-darwin = "01hmcnhpfdckaslz7133692n1haiq4ifbv72vbsdnzsrdxs7wd3m";
+    aarch64-darwin = "1rxvlc36yrzdji0qdackp14a0xlhyj0iylxscz50gvnvfv2pdysm";
-    armv7l-linux = "1ifd7z1mvimckb26l1nzv6qd3vjamfrzm0h655367d93fqz4iph4";
+    armv7l-linux = "09iwsnr09cry9f6c4v7pkrdbcr8fnydjrmypjk5942dzz0b07lkr";
   }.${system} or throwSystem;
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.92.0";
+    version = "1.92.1";
     pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
     # This is used for VS Code - Remote SSH test
-    rev = "b1c0a14de1414fcdaa400695b4db1c0799bc3124";
+    rev = "eaa41d57266683296de7d118f574d0c2652e1fc4";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
     longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
       src = fetchurl {
         name = "vscode-server-${rev}.tar.gz";
         url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "03skx6cla4k5clncxx8wlp0j40gkqggqcs9wl0dqkrv18cljy5zz";
+        sha256 = "0g131nicp5j71phsfi187ggjx5952awvl0gy9983990sdxaah01x";
       };
     };
 

pkgs/applications/misc/cobalt/default.nix

@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cobalt";
-  version = "0.19.5";
+  version = "0.19.6";
 
   src = fetchFromGitHub {
     owner = "cobalt-org";
     repo = "cobalt.rs";
     rev = "v${version}";
-    sha256 = "sha256-a9fo6qSLTVK6vC40nKwrpCvEvw1iIxQFmngkA3ttAdQ=";
+    sha256 = "sha256-6fsKEIgcBu0SE/f0TNfvTdpZX3zc5Bd0F1T82COOqVQ=";
   };
 
-  cargoHash = "sha256-vr4G0L74qzsjpPKteV7wrW+pJGmbUVDLyc9MhSB1HfQ=";
+  cargoHash = "sha256-g25Pw3BlRbuaGjsQav6mU9zVyS1mVUKkgKDOILm8R6U=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 

pkgs/applications/version-management/merge-fmt/default.nix

@@ -15,6 +15,9 @@ buildDunePackage rec {
 
   buildInputs = [ cmdliner base stdio ];
 
+  # core v0.17 compatibility, obtained by `git diff -r 3e37827~2..3e37827`
+  patches = [ ./merge-fmt.patch ];
+
   meta = with lib; {
     description = "Git mergetool leveraging code formatters";
     homepage = "https://github.com/hhugo/merge-fmt";

pkgs/applications/version-management/merge-fmt/merge-fmt.patch

@@ -0,0 +1,248 @@
+diff --git a/.ocamlformat b/.ocamlformat
+index fe6ed57..3532006 100644
+--- a/.ocamlformat
++++ b/.ocamlformat
+@@ -3,4 +3,4 @@ type-decl=sparse
+ break-separators=before
+ if-then-else=keyword-first
+ dock-collection-brackets=false
+-version=0.24.1
+\ No newline at end of file
++version=0.26.1
+\ No newline at end of file
+diff --git a/dune b/dune
+index 61ec19c..9446de9 100644
+--- a/dune
++++ b/dune
+@@ -2,22 +2,34 @@
+  (targets merge-fmt-help.txt)
+  (deps ./src/merge_fmt.exe)
+  (mode promote)
+- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe --help=plain))))
++ (action
++  (with-stdout-to
++   %{targets}
++   (run ./src/merge_fmt.exe --help=plain))))
+ 
+ (rule
+  (targets merge-fmt-mergetool-help.txt)
+  (deps ./src/merge_fmt.exe)
+  (mode promote)
+- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe mergetool --help=plain))))
++ (action
++  (with-stdout-to
++   %{targets}
++   (run ./src/merge_fmt.exe mergetool --help=plain))))
+ 
+ (rule
+  (targets merge-fmt-setup-mergetool-help.txt)
+  (deps ./src/merge_fmt.exe)
+  (mode promote)
+- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe setup-mergetool --help=plain))))
++ (action
++  (with-stdout-to
++   %{targets}
++   (run ./src/merge_fmt.exe setup-mergetool --help=plain))))
+ 
+ (rule
+  (targets merge-fmt-setup-merge-help.txt)
+  (deps ./src/merge_fmt.exe)
+  (mode promote)
+- (action (with-stdout-to %{targets} (run ./src/merge_fmt.exe setup-merge --help=plain))))
++ (action
++  (with-stdout-to
++   %{targets}
++   (run ./src/merge_fmt.exe setup-merge --help=plain))))
+diff --git a/dune-project b/dune-project
+index 4b39e3f..2bc4ec2 100644
+--- a/dune-project
++++ b/dune-project
+@@ -1,3 +1,2 @@
+-(lang dune 1.6)
+-(using fmt 1.0)
++(lang dune 3.0)
+ (name merge-fmt)
+diff --git a/merge-fmt.opam b/merge-fmt.opam
+index 6827173..579f6a1 100644
+--- a/merge-fmt.opam
++++ b/merge-fmt.opam
+@@ -11,7 +11,7 @@ build: [["dune" "build" "-p" name "-j" jobs]]
+ 
+ depends: [
+   "ocaml" {>= "4.06.1"}
+-  "dune" {>= "1.6"}
++  "dune" {>= "3.0"}
+   "cmdliner" {>= "1.1.0"}
+   "base"
+   "stdio"
+diff --git a/src/common.ml b/src/common.ml
+index 3ca6809..f88bbd9 100644
+--- a/src/common.ml
++++ b/src/common.ml
+@@ -18,8 +18,8 @@ let open_process_in_respect_exit ~echo fmt =
+       let contents = In_channel.input_all ic in
+       match Unix.close_process_in ic with
+       | WEXITED 0 -> contents
+-      | WEXITED n -> Caml.exit n
+-      | WSIGNALED _ | WSTOPPED _ -> Caml.exit 1)
++      | WEXITED n -> Stdlib.exit n
++      | WSIGNALED _ | WSTOPPED _ -> Stdlib.exit 1)
+     fmt
+ 
+ let system ~echo fmt =
+@@ -35,8 +35,8 @@ let system_respect_exit ~echo fmt =
+       if echo then eprintf "+ %s\n%!" s;
+       match Unix.system s with
+       | WEXITED 0 -> ()
+-      | WEXITED n -> Caml.exit n
+-      | WSIGNALED _ | WSTOPPED _ -> Caml.exit 1)
++      | WEXITED n -> Stdlib.exit n
++      | WSIGNALED _ | WSTOPPED _ -> Stdlib.exit 1)
+     fmt
+ 
+ module Flags = struct
+diff --git a/src/dune b/src/dune
+index 1ae55ce..1cfd576 100644
+--- a/src/dune
++++ b/src/dune
+@@ -1,5 +1,4 @@
+ (executables
+-  (names merge_fmt)
+-  (public_names merge-fmt)
+-  (libraries base stdio unix cmdliner)
+-)
+\ No newline at end of file
++ (names merge_fmt)
++ (public_names merge-fmt)
++ (libraries base stdio unix cmdliner))
+diff --git a/src/fmters.ml b/src/fmters.ml
+index e190f4b..43616ab 100644
+--- a/src/fmters.ml
++++ b/src/fmters.ml
+@@ -36,7 +36,7 @@ let dune ~bin =
+ 
+ let find ~config ~filename ~name =
+   let filename = Option.value ~default:filename name in
+-  match (filename, Caml.Filename.extension filename, config) with
++  match (filename, Stdlib.Filename.extension filename, config) with
+   | _, (".ml" | ".mli"), { ocamlformat_path; _ } ->
+       Some (ocamlformat ~bin:ocamlformat_path ~name)
+   | _, (".re" | ".rei"), { refmt_path; _ } -> Some (refmt ~bin:refmt_path)
+diff --git a/src/merge_cmd.ml b/src/merge_cmd.ml
+index a0fa68f..6cd5377 100644
+--- a/src/merge_cmd.ml
++++ b/src/merge_cmd.ml
+@@ -2,7 +2,12 @@ open Base
+ open Stdio
+ open Common
+ 
+-let debug_oc = lazy (Out_channel.create ~append:true "/tmp/merge-fmt.log")
++let debug_oc =
++  lazy
++    (Out_channel.create ~append:true
++       (Stdlib.Filename.concat
++          (Stdlib.Filename.get_temp_dir_name ())
++          "merge-fmt.log"))
+ 
+ let debug fmt =
+   if true
+@@ -12,7 +17,7 @@ let debug fmt =
+ let merge config echo current base other output name =
+   match (current, base, other) with
+   | (None | Some ""), _, _ | _, (None | Some ""), _ | _, _, (None | Some "") ->
+-      Caml.exit 1
++      Stdlib.exit 1
+   | Some current, Some base, Some other -> (
+       match Fmters.find ~config ~filename:current ~name with
+       | None ->
+@@ -30,7 +35,7 @@ let merge config echo current base other output name =
+             |> Result.map_error ~f:(Fn.const "base")
+           in
+           match Result.combine_errors [ x; y; z ] with
+-          | Error _ -> Caml.exit 1
++          | Error _ -> Stdlib.exit 1
+           | Ok (_ : unit list) ->
+               debug "process all three revision successfully\n%!";
+               debug "running git merge-file\n%!";
+@@ -41,7 +46,7 @@ let merge config echo current base other output name =
+               (match output with
+               | None -> Out_channel.output_string stdout result
+               | Some o -> Out_channel.write_all o ~data:result);
+-              Caml.exit 0))
++              Stdlib.exit 0))
+ 
+ open Cmdliner
+ 
+diff --git a/src/resolve_cmd.ml b/src/resolve_cmd.ml
+index bd7f5e3..60a36a4 100644
+--- a/src/resolve_cmd.ml
++++ b/src/resolve_cmd.ml
+@@ -67,9 +67,9 @@ let show ~echo version versions =
+ 
+ let create_tmp ~echo fn version versions =
+   let content = show ~echo version versions in
+-  let ext = Caml.Filename.extension fn in
++  let ext = Stdlib.Filename.extension fn in
+   let base =
+-    if String.equal ext "" then fn else Caml.Filename.chop_extension fn
++    if String.equal ext "" then fn else Stdlib.Filename.chop_extension fn
+   in
+   let fn' = sprintf "%s.%s%s" base (string_of_version version) ext in
+   let oc = Out_channel.create fn' in
+@@ -114,7 +114,7 @@ let resolve config echo () =
+   if Map.is_empty all
+   then (
+     eprintf "Nothing to resolve\n%!";
+-    Caml.exit 1);
++    Stdlib.exit 1);
+   Map.iteri all ~f:(fun ~key:filename ~data:versions ->
+       match versions with
+       | Ok versions -> (
+@@ -131,7 +131,7 @@ let resolve config echo () =
+           | None -> eprintf "Ignore %s (no formatter register)\n%!" filename)
+       | Error reason -> eprintf "Ignore %s (%s)\n%!" filename reason);
+   let all = ls ~echo () in
+-  if Map.is_empty all then Caml.exit 0 else Caml.exit 1
++  if Map.is_empty all then Stdlib.exit 0 else Stdlib.exit 1
+ 
+ open Cmdliner
+ 
+diff --git a/test/dune b/test/dune
+index c0e4f3a..2fde0ee 100644
+--- a/test/dune
++++ b/test/dune
+@@ -1,17 +1,22 @@
+ (library
+-  (name merge_fmt_test)
+-  (libraries base stdio unix core_unix core_unix.filename_unix)
+-  (inline_tests)
+-  (preprocessor_deps ../src/merge_fmt.exe)
+-  (preprocess (pps ppx_expect)))
+-
++ (name merge_fmt_test)
++ (libraries base stdio unix core_unix core_unix.filename_unix)
++ (inline_tests)
++ (preprocessor_deps ../src/merge_fmt.exe)
++ (preprocess
++  (pps ppx_expect)))
+ 
+ ;; [rebase_a.ml] and [rebase_b.ml] should be the same expect that
+ ;; [rebase_b.ml] does rebase in an intermediate revision.
++
+ (rule
+-  (targets rebase.diff.gen)
+-  (action (with-stdout-to %{targets} (bash "diff %{dep:rebase_a.ml} %{dep:rebase_b.ml} || true"))))
++ (targets rebase.diff.gen)
++ (action
++  (with-stdout-to
++   %{targets}
++   (bash "diff %{dep:rebase_a.ml} %{dep:rebase_b.ml} || true"))))
+ 
+-(alias
+-  (name runtest)
+-  (action (diff rebase.diff rebase.diff.gen)))
+\ No newline at end of file
++(rule
++ (alias runtest)
++ (action
++  (diff rebase.diff rebase.diff.gen)))

pkgs/applications/virtualization/xen/README.md

@@ -40,7 +40,8 @@ but you should verify this information by seeking the fingerprint from other tru
 sources, as this document may be compromised. Once the PGP key is verified, it will
 use `git verify-tag` to ascertain the validity of the cloned Xen sources.
 
-After the script is done, follow the steps in [**For Both Update Methods**](#for-both-update-methods) below.
+After the script is done, follow the steps in
+[**For Both Update Methods**](#for-both-update-methods) below.
 
 #### Downstream Patch Names
 
@@ -87,8 +88,17 @@ open a PR fixing the script, and update Xen manually:
 
 ### For Both Update Methods
 
+1. Update `packages.nix` with the new versions. Don't forget the `slim` packages!
 1. Make sure all branches build. (Both the `standard` and `slim` versions)
 1. Use the NixOS module to test if dom0 boots successfully on all new versions.
+1. Make sure the `meta` attributes evaluate to something that makes sense. The
+   following one-line command is useful for testing this:
+
+   ```console
+   xenToEvaluate=xen; echo -e "\033[1m$(nix eval .#"$xenToEvaluate".meta.description 2> /dev/null | tail -c +2 | head -c -2)\033[0m\n\n$(nix eval .#"$xenToEvaluate".meta.longDescription 2> /dev/null | tail -c +2 | head -c -2)"
+   ```
+
+   Change the value of `xenToEvaluate` to evaluate all relevant Xen packages.
 1. Clean up your changes and commit them, making sure to follow the
    [Nixpkgs Contribution Guidelines](../../../../CONTRIBUTING.md).
 1. Open a PR and await a review from the current maintainers.

pkgs/applications/virtualization/xen/generic.nix

@@ -59,6 +59,7 @@ versionDefinition:
 
   # Documentation
   fig2dev,
+  imagemagick,
   pandoc,
 
   # Scripts
@@ -273,6 +274,7 @@ stdenv.mkDerivation (finalAttrs: {
   outputs = [
     "out" # TODO: Split $out in $bin for binaries and $lib for libraries.
     "man" # Manual pages for Xen userspace utilities.
+    "doc" # The full Xen documentation in HTML format.
     "dev" # Development headers.
     "boot" # xen.gz kernel, policy file if Flask is enabled, xen.efi if EFI is enabled.
   ];
@@ -293,6 +295,7 @@ stdenv.mkDerivation (finalAttrs: {
       bison
       cmake
       fig2dev
+      imagemagick # Causes build failures in Hydra related to fig generation if not included.
       flex
       pandoc
       pkg-config
@@ -561,10 +564,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   postFixup =
-    # Fix binaries in $out/lib/xen/bin.
+    # Fix binaries in $out/libexec/xen/bin.
     ''
       addAutoPatchelfSearchPath $out/lib
-      autoPatchelf $out/libexec/xen/bin/
+      autoPatchelf $out/libexec/xen/bin
     ''
     # Flask is particularly hard to disable. Even after
     # setting the make flags to `n`, it still gets compiled.
@@ -628,11 +631,11 @@ stdenv.mkDerivation (finalAttrs: {
     longDescription =
       # Starts with the longDescription from ./packages.nix.
       (packageDefinition.meta.longDescription or "")
-      +
+      + lib.strings.optionalString (!withInternalQEMU) (
-        lib.strings.optionalString (!withInternalQEMU)
+        "\nUse with `qemu_xen_${lib.stringAsChars (x: if x == "." then "_" else x) branch}`"
-          "\nUse with `qemu_xen_${lib.stringAsChars (x: if x == "." then "_" else x) branch}`"
+        + lib.strings.optionalString latest " or `qemu_xen`"
-      + lib.strings.optionalString latest "or `qemu_xen`"
+        + ".\n"
-      + "."
+      )
       # Then, if any of the optional with* components are being built, add the "Includes:" string.
       +
         lib.strings.optionalString
@@ -645,22 +648,22 @@ stdenv.mkDerivation (finalAttrs: {
             || withFlask
           )
           (
-            "\nIncludes:\n"
+            "\nIncludes:"
             # Originally, this was a call for the complicated withPrefetchedSources. Since there aren't
             # that many optional components, we just use lib.strings.optionalString, because it's simpler.
             # Optional components that aren't being built are automatically hidden.
-            + lib.strings.optionalString withEFI "* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package.\n"
+            + lib.strings.optionalString withEFI "\n* `xen.efi`: Xen's [EFI binary](https://xenbits.xenproject.org/docs/${branch}-testing/misc/efi.html), available on the `boot` output of this package."
-            + lib.strings.optionalString withFlask "* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package.\n"
+            + lib.strings.optionalString withFlask "\n* `xsm-flask`: The [FLASK Xen Security Module](https://wiki.xenproject.org/wiki/Xen_Security_Modules_:_XSM-FLASK). The `xenpolicy-${version}` file is available on the `boot` output of this package."
-            + lib.strings.optionalString withInternalQEMU "* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/).\n"
+            + lib.strings.optionalString withInternalQEMU "\n* `qemu-xen`: Xen's mirror of [QEMU](https://www.qemu.org/)."
-            + lib.strings.optionalString withInternalSeaBIOS "* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS).\n"
+            + lib.strings.optionalString withInternalSeaBIOS "\n* `seabios-xen`: Xen's mirror of [SeaBIOS](https://www.seabios.org/SeaBIOS)."
-            + lib.strings.optionalString withInternalOVMF "* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF).\n"
+            + lib.strings.optionalString withInternalOVMF "\n* `ovmf-xen`: Xen's mirror of [OVMF](https://github.com/tianocore/tianocore.github.io/wiki/OVMF)."
-            + lib.strings.optionalString withInternalIPXE "* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/).\n"
+            + lib.strings.optionalString withInternalIPXE "\n* `ipxe-xen`: Xen's pinned version of [iPXE](https://ipxe.org/)."
           )
       # Finally, we write a notice explaining which vulnerabilities this Xen is NOT vulnerable to.
       # This will hopefully give users the peace of mind that their Xen is secure, without needing
       # to search the source code for the XSA patches.
       + lib.strings.optionalString (writeAdvisoryDescription != [ ]) (
-        "\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n"
+        "\n\nThis Xen (${version}) has been patched against the following known security vulnerabilities:\n"
         + lib.strings.removeSuffix "\n" (lib.strings.concatLines writeAdvisoryDescription)
       );
     homepage = "https://xenproject.org/";

pkgs/applications/virtualization/xen/patches.nix

@@ -64,7 +64,10 @@ in
   #
   # "XSA_100" = xsaPatch {
   #   id = "100";
-  #   name = "Verbatim Title of XSA";
+  #   title = "Verbatim Title of XSA";
+  #   description = ''
+  #     Verbatim description of XSA.
+  #   '';
   #   cve = [ "CVE-1999-0001" "CVE-1999-0002" ]; # Not all XSAs have CVEs. This attribute is optional.
   #   hash = "sha256-0000000000000000000000000000000000000000000000000000";
   # };

pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix

@@ -22,7 +22,7 @@ mkHyprlandPlugin hyprland {
     runHook preInstall
 
     mkdir -p $out/lib
-    mv out/dynamic-cursors.so $out/lib/libdynamic-cursors.so
+    mv out/dynamic-cursors.so $out/lib/libhypr-dynamic-cursors.so
 
     runHook postInstall
   '';

pkgs/by-name/al/alpaca/flatpak_path_fixes.patch

@@ -1,159 +0,0 @@
-diff --git a/src/internal.py b/src/internal.py
-new file mode 100644
-index 0000000..b41e415
---- /dev/null
-+++ b/src/internal.py
-@@ -0,0 +1,22 @@
-+import os
-+
-+app_id = "com.jeffser.Alpaca"
-+
-+in_flatpak = True if os.getenv("FLATPAK_ID") else False
-+
-+def get_xdg_home(env, default):
-+    if in_flatpak:
-+        return os.getenv(env)
-+    else:
-+        base = os.getenv(env) or os.path.expanduser(default)
-+        path = os.path.join(base, app_id)
-+        if not os.path.exists(path):
-+            os.makedirs(path)
-+        return path
-+
-+
-+data_dir = get_xdg_home("XDG_DATA_HOME", "~/.local/share")
-+config_dir = get_xdg_home("XDG_CONFIG_HOME", "~/.config")
-+cache_dir = get_xdg_home("XDG_CACHE_HOME", "~/.cache")
-+
-+source_dir = os.path.abspath(os.path.dirname(__file__))
-diff --git a/src/local_instance.py b/src/local_instance.py
-index cb3ee51..1866f83 100644
---- a/src/local_instance.py
-+++ b/src/local_instance.py
-@@ -2,24 +2,24 @@
- import subprocess, os, threading
- from time import sleep
- from logging import getLogger
-+from .internal import data_dir, cache_dir
- 
- 
- logger = getLogger(__name__)
- 
- instance = None
- port = 11435
--data_dir = os.getenv("XDG_DATA_HOME")
- overrides = {}
- 
- def start():
--    if not os.path.isdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp/ollama')):
--        os.mkdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp/ollama'))
-+    if not os.path.isdir(os.path.join(cache_dir, 'tmp/ollama')):
-+        os.mkdir(os.path.join(cache_dir, 'tmp/ollama'))
-     global instance, overrides
-     params = overrides.copy()
-     params["OLLAMA_HOST"] = f"127.0.0.1:{port}" # You can't change this directly sorry :3
-     params["HOME"] = data_dir
--    params["TMPDIR"] = os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp/ollama')
--    instance = subprocess.Popen(["/app/bin/ollama", "serve"], env={**os.environ, **params}, stderr=subprocess.PIPE, text=True)
-+    params["TMPDIR"] = os.path.join(cache_dir, 'tmp/ollama')
-+    instance = subprocess.Popen(["ollama", "serve"], env={**os.environ, **params}, stderr=subprocess.PIPE, text=True)
-     logger.info("Starting Alpaca's Ollama instance...")
-     logger.debug(params)
-     sleep(1)
-diff --git a/src/main.py b/src/main.py
-index 278914f..eeb54cd 100644
---- a/src/main.py
-+++ b/src/main.py
-@@ -27,6 +27,7 @@ gi.require_version('Adw', '1')
- 
- from gi.repository import Gtk, Gio, Adw, GLib
- from .window import AlpacaWindow
-+from .internal import cache_dir, data_dir
- 
- 
- logger = logging.getLogger(__name__)
-@@ -63,7 +64,7 @@ class AlpacaApplication(Adw.Application):
-             issue_url='https://github.com/Jeffser/Alpaca/issues',
-             license_type=3,
-             website="https://jeffser.com/alpaca",
--            debug_info=open(os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log'), 'r').read())
-+            debug_info=open(os.path.join(data_dir, 'tmp.log'), 'r').read())
-         about.present(parent=self.props.active_window)
- 
-     def create_action(self, name, callback, shortcuts=None):
-@@ -75,16 +76,16 @@ class AlpacaApplication(Adw.Application):
- 
- 
- def main(version):
--    if os.path.isfile(os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log')):
--        os.remove(os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log'))
--    if os.path.isdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp')):
--        os.system('rm -rf ' + os.path.join(os.getenv("XDG_CACHE_HOME"), "tmp/*"))
-+    if os.path.isfile(os.path.join(data_dir, 'tmp.log')):
-+        os.remove(os.path.join(data_dir, 'tmp.log'))
-+    if os.path.isdir(os.path.join(cache_dir, 'tmp')):
-+        os.system('rm -rf ' + os.path.join(cache_dir, "tmp/*"))
-     else:
--        os.mkdir(os.path.join(os.getenv("XDG_CACHE_HOME"), 'tmp'))
-+        os.mkdir(os.path.join(cache_dir, 'tmp'))
-     logging.basicConfig(
-         format="%(levelname)s\t[%(filename)s | %(funcName)s] %(message)s",
-         level=logging.INFO,
--        handlers=[logging.FileHandler(filename=os.path.join(os.getenv("XDG_DATA_HOME"), 'tmp.log')), logging.StreamHandler(stream=sys.stdout)]
-+        handlers=[logging.FileHandler(filename=os.path.join(data_dir, 'tmp.log')), logging.StreamHandler(stream=sys.stdout)]
-     )
-     app = AlpacaApplication(version)
-     logger.info(f"Alpaca version: {app.version}")
-diff --git a/src/meson.build b/src/meson.build
-index 1781b7a..b212cbf 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -44,7 +44,8 @@ alpaca_sources = [
-   'local_instance.py',
-   'available_models.json',
-   'available_models_descriptions.py',
--  'table_widget.py'
-+  'table_widget.py',
-+  'internal.py'
- ]
- 
- install_data(alpaca_sources, install_dir: moduledir)
-diff --git a/src/window.py b/src/window.py
-index 0771919..0f3b892 100644
---- a/src/window.py
-+++ b/src/window.py
-@@ -29,20 +29,21 @@ from pypdf import PdfReader
- from datetime import datetime
- from . import dialogs, local_instance, connection_handler, available_models_descriptions
- from .table_widget import TableWidget
-+from .internal import config_dir, data_dir, cache_dir, source_dir
- 
- logger = logging.getLogger(__name__)
- 
- 
- @Gtk.Template(resource_path='/com/jeffser/Alpaca/window.ui')
- class AlpacaWindow(Adw.ApplicationWindow):
--    config_dir = os.getenv("XDG_CONFIG_HOME")
--    data_dir = os.getenv("XDG_DATA_HOME")
-     app_dir = os.getenv("FLATPAK_DEST")
--    cache_dir = os.getenv("XDG_CACHE_HOME")
-+    config_dir = config_dir
-+    data_dir = data_dir
-+    cache_dir = cache_dir
- 
-     __gtype_name__ = 'AlpacaWindow'
- 
--    localedir = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'locale')
-+    localedir = os.path.join(source_dir, 'locale')
- 
-     gettext.bindtextdomain('com.jeffser.Alpaca', localedir)
-     gettext.textdomain('com.jeffser.Alpaca')
-@@ -1602,7 +1603,7 @@ Generate a title following these rules:
-     def __init__(self, **kwargs):
-         super().__init__(**kwargs)
-         GtkSource.init()
--        with open('/app/share/Alpaca/alpaca/available_models.json', 'r') as f:
-+        with open(os.path.join(source_dir, 'available_models.json'), 'r') as f:
-             self.available_models = json.load(f)
-         if not os.path.exists(os.path.join(self.data_dir, "chats")):
-             os.makedirs(os.path.join(self.data_dir, "chats"))

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

@@ -17,22 +17,16 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "1.0.5";
+  version = "1.0.6";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     rev = version;
-    hash = "sha256-xNQLaMvZaJq7Bmz+c8OQhta3IdFXpVB2bSNwXCRj6rY=";
+    hash = "sha256-3xsntOPkcCV8ZizRS6du8cG1ZZEekehjf+4m3pofZBs=";
   };
 
-  patches = [
-    # Change the way XDG paths are handled so it makes sense outside of flatpak
-    # https://github.com/Jeffser/Alpaca/pull/187
-    ./flatpak_path_fixes.patch
-  ];
-
   nativeBuildInputs = [
     appstream
     meson

pkgs/by-name/an/anytype/package.nix

@@ -2,12 +2,12 @@
 
 let
   pname = "anytype";
-  version = "0.41.1";
+  version = "0.42.3";
   name = "Anytype-${version}";
   src = fetchurl {
     url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage";
     name = "Anytype-${version}.AppImage";
-    hash = "sha256-z/Htqq2HgCKNPzF81/nvLK/32KuMUYdHRTQbM8hZSIw=";
+    hash = "sha256-4Tz080lNQXqTq+LEax4fYV27/DDSRUalpkO46KZ1ay8=";
   };
   appimageContents = appimageTools.extractType2 { inherit name src; };
 in appimageTools.wrapType2 {

pkgs/by-name/ar/argc/package.nix

@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "argc";
-  version = "1.19.0";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "argc";
     rev = "v${version}";
-    hash = "sha256-I5dx0/aHCGmzgAEBL9gZcG7DFWCkSpndGvv2enQIZGU=";
+    hash = "sha256-Oh2vV4Dr4suVEGrwGNyzVlKrOh+lXwdEwDPNzFzqmOo=";
   };
 
-  cargoHash = "sha256-30BY6ceJj0UeZE30O/LovR+YXSd7jIxFo6ojKFuecFM=";
+  cargoHash = "sha256-3zVO0ZAL+npijGg6/Idb7MD80WW5vi1qxbZqCwwhmIU=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc;
 

pkgs/by-name/c2/c2fmzq/package.nix

@@ -6,20 +6,20 @@
 
 buildGoModule rec {
   pname = "c2FmZQ";
-  version = "0.4.21";
+  version = "0.4.22";
 
   src = fetchFromGitHub {
     owner = "c2FmZQ";
     repo = "c2FmZQ";
     rev = "v${version}";
-    hash = "sha256-i2IO+07Ne3Q5/aBWuAYmkDcDrp5S/yc1eY1vkQI4kgA=";
+    hash = "sha256-IqLG8dLi47Swp6YPxDXsM6LVDPvzcH5rWeqpgghbYsE=";
   };
 
   ldflags = [ "-s" "-w" ];
 
   sourceRoot = "${src.name}/c2FmZQ";
 
-  vendorHash = "sha256-cGFI9HSpszi7nXbUCx1MBoj7QOzYseha7+udAbGL+P8=";
+  vendorHash = "sha256-PTWi/M51cydmWoOj1JPyaI0wbjd0BMLlaSlQRIcmShg=";
 
   subPackages = [ "c2FmZQ-client" "c2FmZQ-server" ];
 

pkgs/by-name/nw/nwg-panel/package.nix

@@ -16,13 +16,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.9.36";
+  version = "0.9.37";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MDQht1qqz7dm3Q6INpJEDZqAwvAa7uUp7mCDW/to3+E=";
+    hash = "sha256-CKufaOAh7wH2ECN+zsPk4PQNYuewT2BzTci8nt8EhlU=";
   };
 
   # No tests

pkgs/by-name/od/odin/package.nix

@@ -13,15 +13,15 @@
 let
   inherit (llvmPackages) stdenv;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "odin";
-  version = "dev-2024-07";
+  version = "0-unstable-2024-08-05";
 
   src = fetchFromGitHub {
     owner = "odin-lang";
     repo = "Odin";
-    rev = version;
+    rev = "a1c3c38f0453dcf94ba13d572fa392cb5331a878";
-    hash = "sha256-FeiVTLwgP0x1EZqqiYkGbKALhZWC4xE6a/3PPcEElAc=";
+    hash = "sha256-LYUy/llW3BFnRx6sdTF/8QdvK/v+5/ShKJR+ZXocC+4=";
   };
 
   postPatch =

pkgs/by-name/ol/ols/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "ols";
-  version = "0-unstable-2024-07-01";
+  version = "0-unstable-2024-08-05";
 
   src = fetchFromGitHub {
     owner = "DanielGavin";
     repo = "ols";
-    rev = "ee368d473146d33e89f9be9f754fd6d0ee08ecc6";
+    rev = "5f53ba1670b4bd44f6faf589823aa404f3c1a62b";
-    hash = "sha256-WowbFsec8oZVPTMDefQJYOb4GfH3xa40bN3P9AIjflE=";
+    hash = "sha256-4Rw3eNXkmdRMLz9k1UaK6xr0KS4g4AnFpOcrWLos2jg=";
   };
 
   postPatch = ''

pkgs/by-name/pu/pupdate/package.nix

@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "pupdate";
-  version = "3.11.0";
+  version = "3.11.1";
 
   src = fetchFromGitHub {
     owner = "mattpannella";
     repo = "${pname}";
     rev = "${version}";
-    hash = "sha256-SqEmpmjI0m6bJT43TLEmEciNEqR/ggQZqFLCm7oFSnY=";
+    hash = "sha256-odlKNp6kjOAYeRIHnLniqkCXTi1UXF3szn8tJtrxzQU=";
   };
 
   buildInputs = [

pkgs/by-name/sc/scrcpy/package.nix

@@ -16,12 +16,12 @@
 }:
 
 let
-  version = "2.5";
+  version = "2.6.1";
   prebuilt_server = fetchurl {
     name = "scrcpy-server";
     inherit version;
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    hash = "sha256-FIixEF1q/1NIc6Jr9hDNKuoG7oZ916TZxrssCROW6xU=";
+    hash = "sha256-ynq1Cy4loOWvdZnDA4PjZZg/pbgI5lzi4cG7pb/o3Ds=";
   };
 in
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VdZZ23tlWYvDgETfce7kYy/kdwDGBEBzB6UfplorAbE=";
+    hash = "sha256-p5OQKi6JEam+bmtMKUY9WsQlI7tpExsIZQgGdgOj2sE=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.

pkgs/by-name/ty/typstyle/package.nix

@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typstyle";
-  version = "0.11.30";
+  version = "0.11.31";
 
   src = fetchFromGitHub {
     owner = "Enter-tainer";
     repo = "typstyle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pdIgngLn0y4+N4nD5b6E8UL1ftinWO9ofde1Vw3Pn7o=";
+    hash = "sha256-RJeeYN5bw161UcORKPUkdNExyoWdL6w4ey/p/UCPSG0=";
   };
 
-  cargoHash = "sha256-+iBxVTwAzYpLio9BKD1hYsTw4GgK6CkmbyM5QIiswck=";
+  cargoHash = "sha256-hBOoFIQxLqrJG7jR0ONlWSzxEVl9ctsR85REJtODZWw=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/va/vault-unseal/package.nix

@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "0.5.1";
+  version = "0.6.0";
 in
 buildGoModule {
   pname = "vault-unseal";
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "lrstanley";
     repo = "vault-unseal";
     rev = "v${version}";
-    hash = "sha256-vjU4080uCId/73F7CJKDtk9b1siCPIZOaSczKMNf0LE=";
+    hash = "sha256-lryjinTzJNty2euvWP5rNyf7BZxlTD4x6zIEERF4vag=";
   };
 
-  vendorHash = "sha256-SEA74Tk0R3BHyLMZEgKatfLGbX7l8Zyn/JkQVfEckI4=";
+  vendorHash = "sha256-vbVUIiFBmjH1ROKNBeV19NeHI1msqgJ1RonVh/Lp/CE=";
 
   meta = {
     changelog = "https://github.com/lrstanley/vault-unseal/releases/tag/v${version}";

pkgs/data/themes/alacritty-theme/default.nix

@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (self: {
   pname = "alacritty-theme";
-  version = "0-unstable-2024-07-25";
+  version = "0-unstable-2024-07-31";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = "alacritty-theme";
-    rev = "bcc5ec1bdecb4a799a6bc8ad3a5b206b3058d6df";
+    rev = "4091fddff8da892d5594e94116927c7445620867";
-    hash = "sha256-IRAUY/59InKYLRfMYI78wSKC6+KI/7aOtOhQNUqdjOA=";
+    hash = "sha256-1tt4GL3KNa3S4dEFiRZf4B1+CM6e7/gO3Q34847lYkI=";
   };
 
   dontConfigure = true;

pkgs/development/compilers/erg/default.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "erg";
-  version = "0.6.40";
+  version = "0.6.41";
 
   src = fetchFromGitHub {
     owner = "erg-lang";
     repo = "erg";
     rev = "v${version}";
-    hash = "sha256-j2H8haSyoIqhvoAWDqKdgX+CL2BseT0PyPi3tamvaeM=";
+    hash = "sha256-CXaHiyPZy454HJfmXnNsUNo30v4PdhupgGz0a8y/q0Y=";
   };
 
-  cargoHash = "sha256-G2aM5joIumnOcTJhx9rpaYJfCOBPnNaoZ8VJZaoZ1bc=";
+  cargoHash = "sha256-D3RixepsH6WR7W1REbFLuIzn1eoAacqw0Ripp9lgnpE=";
 
   nativeBuildInputs = [
     makeWrapper

pkgs/development/compilers/julia/generic.nix

@@ -14,6 +14,7 @@
 , gnum4
 , openssl
 , libxml2
+, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libxml2
+    zlib
   ];
 
   dontUseCmakeConfigure = true;

pkgs/development/libraries/SDL2/default.nix

@@ -52,6 +52,15 @@
   withStatic ? stdenv.hostPlatform.isMinGW,
   # passthru.tests
   testers,
+  guile-sdl2,
+  jazz2,
+  SDL2_ttf,
+  SDL2_net,
+  SDL2_gfx,
+  SDL2_sound,
+  SDL2_mixer,
+  SDL2_image,
+  python3Packages,
 }:
 
 # NOTE: When editing this expression see if the same change applies to
@@ -217,7 +226,20 @@ stdenv.mkDerivation (finalAttrs: {
         "release-(.*)"
       ];
     };
-    tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+    tests = {
+      pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+      inherit
+        guile-sdl2
+        jazz2
+        SDL2_ttf
+        SDL2_net
+        SDL2_gfx
+        SDL2_sound
+        SDL2_mixer
+        SDL2_image
+        ;
+      inherit (python3Packages) pygame pygame-ce pygame-sdl2;
+    };
   };
 
   meta = with lib; {

pkgs/development/ocaml-modules/bistro/default.nix

@@ -16,19 +16,15 @@
 
 buildDunePackage rec {
   pname = "bistro";
-  version = "unstable-2022-05-07";
+  version = "unstable-2024-05-17";
-
-  duneVersion = "3";
 
   src = fetchFromGitHub {
     owner = "pveber";
     repo = pname;
-    rev = "d363bd2d8257babbcb6db15bd83fd6465df7c268";
+    rev = "d44c44b52148e58ca3842c3efedf3115e376d800";
-    sha256 = "0g11324j1s2631zzf7zxc8s0nqd4fwvcni0kbvfpfxg96gy2wwfm";
+    sha256 = "sha256-naoCEVBfydqSeGGbXYBXfg0PP+Fzk05jFoul7XAz/tM=";
   };
 
-  patches = [ ./janestreet-0.16.patch ];
-
   propagatedBuildInputs = [
     base64
     bos
@@ -43,7 +39,7 @@ buildDunePackage rec {
     tyxml
   ];
 
-  minimalOCamlVersion = "4.12";
+  minimalOCamlVersion = "4.14";
 
   meta = {
     inherit (src.meta) homepage;

pkgs/development/ocaml-modules/bistro/janestreet-0.16.patch

@@ -1,205 +0,0 @@
-diff --git a/lib/engine/scheduler.ml b/lib/engine/scheduler.ml
-index e32bd0f..93b566b 100644
---- a/lib/engine/scheduler.ml
-+++ b/lib/engine/scheduler.ml
-@@ -601,7 +601,7 @@ module Make(Backend : Backend) = struct
-               )
-         )
-       | Trywith tw -> (
--          match Table.find sched.traces (Workflow.id tw.w) with
-+          match Hashtbl.find sched.traces (Workflow.id tw.w) with
-           | Some eventual_trace -> (
-               eventual_trace >>= function
-               | Ok (Run r) ->
-@@ -667,10 +667,10 @@ module Make(Backend : Backend) = struct
-   let register_build sched ~id ~build_trace =
-     let open Eval_thread.Infix in
-     (
--      match Table.find sched.traces id with
-+      match Hashtbl.find sched.traces id with
-       | None ->
-         let trace = build_trace () in
--        Table.set sched.traces ~key:id ~data:trace ;
-+        Hashtbl.set sched.traces ~key:id ~data:trace ;
-         trace
-       | Some trace -> trace
-     ) >>= fun trace ->
-@@ -854,7 +854,7 @@ module Make(Backend : Backend) = struct
-         Eval_thread.join l.elts ~f:(build ?target sched)
-       | Trywith tw -> (
-           build sched ?target tw.w >> fun w_result ->
--          match Table.find sched.traces (Workflow.id tw.w) with
-+          match Hashtbl.find sched.traces (Workflow.id tw.w) with
-           | Some eventual_trace -> (
-               eventual_trace >> function
-               | Ok (Run r) when run_trywith_recovery r.details ->
-diff --git a/lib/multinode/bistro_multinode.ml b/lib/multinode/bistro_multinode.ml
-index 01dc5ac..3fc6b0e 100644
---- a/lib/multinode/bistro_multinode.ml
-+++ b/lib/multinode/bistro_multinode.ml
-@@ -130,7 +130,7 @@ module Server = struct
-       let search (type s) (table : s String.Table.t) ~f =
-         let module M = struct exception Found of string * s end in
-         try
--          String.Table.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ;
-+          Hashtbl.fold table ~init:() ~f:(fun ~key ~data () -> if f ~key ~data then raise (M.Found (key, data))) ;
-           None
-         with M.Found (k, v) -> Some (k, v)
- 
-@@ -145,7 +145,7 @@ module Server = struct
-               match allocation_attempt with
-               | None -> Some elt
-               | Some (worker_id, (Resource curr)) ->
--                String.Table.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ;
-+                Hashtbl.set pool.available ~key:worker_id ~data:(Resource { np = curr.np - np ; mem = curr.mem - mem }) ;
-                 Lwt.wakeup u (worker_id, Resource { np ; mem }) ;
-                 None
-             )
-@@ -163,12 +163,12 @@ module Server = struct
-         t
- 
-       let add_worker pool (Worker { id ; np ; mem ; _ }) =
--        match String.Table.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with
-+        match Hashtbl.add pool.available ~key:id ~data:(Allocator.Resource { np ; mem }) with
-         | `Ok -> allocation_pass pool
-         | `Duplicate -> failwith "A worker has been added twice"
- 
-       let release pool worker_id (Allocator.Resource { np ; mem }) =
--        String.Table.update pool.available worker_id ~f:(function
-+        Hashtbl.update pool.available worker_id ~f:(function
-             | None -> failwith "Tried to release resources of inexistent worker"
-             | Some (Resource r) -> Resource { np = r.np + np ; mem = r.mem + mem }
-           )
-@@ -235,13 +235,13 @@ module Server = struct
-       | Subscript { np ; mem } ->
-         let id = new_id () in
-         let w = create_worker ~np ~mem id in
--        String.Table.set state.workers ~key:id ~data:w ;
-+        Hashtbl.set state.workers ~key:id ~data:w ;
-         Worker_allocator.add_worker state.alloc w ;
-         log (Logger.Debug (sprintf "new worker %s" id)) ;
-         Lwt.return (Client_id id)
- 
-       | Get_job { client_id } -> (
--          match String.Table.find state.workers client_id with
-+          match Hashtbl.find state.workers client_id with
-           | None -> Lwt.return None
-           | Some (Worker worker) ->
-             Lwt.choose [
-@@ -250,22 +250,22 @@ module Server = struct
-             ] >>= function
-             | `Job wp ->
-               let workflow_id = workflow_id_of_job_waiter wp in
--              String.Table.set worker.running_jobs ~key:workflow_id ~data:wp ;
-+              Hashtbl.set worker.running_jobs ~key:workflow_id ~data:wp ;
-               Lwt.return (Some (job_of_job_waiter wp))
-             | `Stop -> Lwt.return None
-         )
- 
-       | Plugin_result r ->
--        let Worker worker = String.Table.find_exn state.workers r.client_id in
-+        let Worker worker = Hashtbl.find_exn state.workers r.client_id in
-         Lwt.return (
--          match String.Table.find_exn worker.running_jobs r.workflow_id with
-+          match Hashtbl.find_exn worker.running_jobs r.workflow_id with
-           | Waiting_plugin wp -> Lwt.wakeup wp.waiter r.result
-           | Waiting_shell_command _ -> assert false (* should never happen *)
-         )
-       | Shell_command_result r ->
--        let Worker worker = String.Table.find_exn state.workers r.client_id in
-+        let Worker worker = Hashtbl.find_exn state.workers r.client_id in
-         Lwt.return (
--          match String.Table.find_exn worker.running_jobs r.workflow_id with
-+          match Hashtbl.find_exn worker.running_jobs r.workflow_id with
-           | Waiting_plugin _ -> assert false (* should never happen *)
-           | Waiting_shell_command wp -> Lwt.wakeup wp.waiter r.result
-         )
-@@ -307,7 +307,7 @@ module Server = struct
- 
-     let request_resource backend req =
-       Worker_allocator.request backend.state.alloc req >|= fun (worker_id, resource) ->
--      String.Table.find_exn backend.state.workers worker_id, resource
-+      Hashtbl.find_exn backend.state.workers worker_id, resource
- 
-     let release_resource backend worker_id res =
-       Worker_allocator.release backend.state.alloc worker_id res
-@@ -334,7 +334,7 @@ module Server = struct
-          *   loop () *)
- 
-     let eval backend { worker_id ; workflow_id } f x =
--      let Worker worker = String.Table.find_exn backend.state.workers worker_id in
-+      let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in
-       let f () = f x in
-       let t, u = Lwt.wait () in
-       let job_waiter = Waiting_plugin { waiter = u ; f ; workflow_id } in
-@@ -342,7 +342,7 @@ module Server = struct
-       t
- 
-     let run_shell_command backend { worker_id ; workflow_id } cmd =
--      let Worker worker = String.Table.find_exn backend.state.workers worker_id in
-+      let Worker worker = Hashtbl.find_exn backend.state.workers worker_id in
-       let t, u = Lwt.wait () in
-       let job = Waiting_shell_command { waiter = u ; cmd ; workflow_id } in
-       Lwt_queue.push worker.pending_jobs job ;
-diff --git a/lib/utils/dot_output.ml b/lib/utils/dot_output.ml
-index 90c299f..d13fceb 100644
---- a/lib/utils/dot_output.ml
-+++ b/lib/utils/dot_output.ml
-@@ -24,7 +24,7 @@ module G = struct
-   (* let successors   g u = fold_succ (fun h t -> h :: t) g u [] *)
- 
-   let rec of_workflow_aux seen acc u =
--    if S.mem seen u then (seen, acc)
-+    if Set.mem seen u then (seen, acc)
-     else (
-       let deps = W.Any.deps u in
-       let seen, acc =
-@@ -34,7 +34,7 @@ module G = struct
-       in
-       let acc = add_vertex acc u in
-       let acc = List.fold deps ~init:acc ~f:(fun acc v -> add_edge acc u v) in
--      let seen = S.add seen u in
-+      let seen = Set.add seen u in
-       seen, acc
-     )
- 
-@@ -109,7 +109,7 @@ let dot_output ?db oc g ~needed =
-     ]
-   in
-   let vertex_attributes u =
--    let needed = (match db with None -> true | Some _ -> false) || S.mem needed u in
-+    let needed = (match db with None -> true | Some _ -> false) || Set.mem needed u in
-     let color = if needed then black else light_gray in
-     let shape = `Shape (shape u) in
-     let W.Any w = u in
-@@ -141,7 +141,7 @@ let dot_output ?db oc g ~needed =
-       | _ -> []
-     in
-     let color =
--      if (match db with None -> true | Some _ -> false) || (S.mem needed u && not (already_done u))
-+      if (match db with None -> true | Some _ -> false) || (Set.mem needed u && not (already_done u))
-       then black else light_gray in
-     style @ [ `Color color ]
-   in
-diff --git a/lib/utils/repo.ml b/lib/utils/repo.ml
-index 06abcd5..206a99e 100644
---- a/lib/utils/repo.ml
-+++ b/lib/utils/repo.ml
-@@ -160,7 +160,7 @@ let protected_set repo =
-     | Select s -> fold_path_workflow acc (W.Any s.dir)
-     | Input _ -> acc
-     | Shell _
--    | Plugin _ -> String.Set.add acc (W.id w)
-+    | Plugin _ -> Set.add acc (W.id w)
-     | Trywith tw ->
-       fold_path_workflow (fold_path_workflow acc (W.Any tw.w)) (W.Any tw.failsafe)
-     | Ifelse ie ->
-@@ -187,7 +187,7 @@ let cache_clip_fold ~bistro_dir repo ~f ~init =
-   let protected = protected_set repo in
-   let db = Db.init_exn bistro_dir in
-   Db.fold_cache db ~init ~f:(fun acc id ->
--      f db acc (if String.Set.mem protected id then `Protected id else `Unprotected id)
-+      f db acc (if Set.mem protected id then `Protected id else `Unprotected id)
-     )
- 
- let cache_clip_dry_run ~bistro_dir repo =

pkgs/development/ocaml-modules/camlimages/camlimages.patch

@@ -0,0 +1,103 @@
+diff --git a/config/xConfigurator.ml b/config/xConfigurator.ml
+index 268df4a..73e1850 100644
+--- a/config/xConfigurator.ml
++++ b/config/xConfigurator.ml
+@@ -8,7 +8,7 @@ let (!%) fmt = Printf.sprintf fmt
+ module Configurator = struct
+   include Configurator.V1
+ 
+-  let ( ^/ ) = Caml.Filename.concat
++  let ( ^/ ) = Stdlib.Filename.concat
+ 
+   let path_sep =
+     if Sys.win32 then
+@@ -19,7 +19,7 @@ module Configurator = struct
+   let exe = if Sys.win32 then ".exe" else ""
+ 
+   let get_path () =
+-    match Caml.Sys.getenv "PATH" with
++    match Stdlib.Sys.getenv "PATH" with
+     | exception Not_found -> []
+     | s -> String.split ~on:path_sep s
+ 
+@@ -27,7 +27,7 @@ module Configurator = struct
+     List.find_map dirs ~f:(fun dir ->
+       List.find_map bases ~f:(fun base ->
+         let path = dir ^/ base in
+-        if Caml.Sys.file_exists path then Some path else None))
++        if Stdlib.Sys.file_exists path then Some path else None))
+ 
+   let find_program prog =
+     let prog = prog ^ exe in
+@@ -45,13 +45,13 @@ module Configurator = struct
+     | s -> 
+         (* findlib 1.7.3 installs META file for graphics 
+            even when there is no graphics library installed. *)
+-        let dest = Caml.Filename.temp_file "test" ".cma" in
+-        let res = match Caml.Sys.command & !% "ocamlfind ocamlc -package %s -o %s -linkpkg" n dest with
++        let dest = Stdlib.Filename.temp_file "test" ".cma" in
++        let res = match Stdlib.Sys.command & !% "ocamlfind ocamlc -package %s -o %s -linkpkg" n dest with
+           | 0 -> Some s
+           | _ -> None
+           | exception _ -> None
+         in
+-        (try Caml.Sys.remove dest with _ -> ());
++        (try Stdlib.Sys.remove dest with _ -> ());
+         res
+     | exception Findlib.No_such_package _ -> None
+ 
+@@ -83,14 +83,14 @@ type item =
+ module Make(A : sig val name : string end) = struct
+   let t = create A.name
+ 
+-  let log fmt = Caml.Format.eprintf fmt
++  let log fmt = Stdlib.Format.eprintf fmt
+ 
+   module Package_conf = Package_conf
+   open Package_conf
+ 
+   let extract_package_conf xs =
+-    Caml.List.fold_left merge empty
+-      (Caml.List.map (fun item -> match item with
++    Stdlib.List.fold_left merge empty
++      (Stdlib.List.map (fun item -> match item with
+            | Library (Some pkc) -> pkc
+            | _ -> empty) xs)
+ 
+@@ -167,8 +167,8 @@ module Make(A : sig val name : string end) = struct
+   let by_cc ~c_flags ~link_flags ~headers ~functions:fnames () =
+     log "Checking library %s by using C compiler... " (String.concat ~sep:" " link_flags);
+     let headers = "stdio.h" :: headers in
+-    let includes = Caml.List.map (!% "#include <%s>") headers in
+-    let fcalls = Caml.List.map (!% "  ( (void(*)()) (%s) )();") fnames in
++    let includes = Stdlib.List.map (!% "#include <%s>") headers in
++    let fcalls = Stdlib.List.map (!% "  ( (void(*)()) (%s) )();") fnames in
+     let code = 
+       String.concat ~sep:"\n" 
+       & includes 
+diff --git a/core/images.ml b/core/images.ml
+index 563ab7e..a53a6a4 100644
+--- a/core/images.ml
++++ b/core/images.ml
+@@ -102,7 +102,7 @@ let get_extension s =
+   | _ -> s, ""
+ 
+ let guess_extension s =
+-  let s = String.lowercase s in
++  let s = String.lowercase_ascii s in
+   match s with
+   | "gif" -> Gif
+   | "bmp" -> Bmp
+diff --git a/core/units.ml b/core/units.ml
+index 634bc9c..ddd6eae 100644
+--- a/core/units.ml
++++ b/core/units.ml
+@@ -30,7 +30,7 @@ let parse_length s = (* return in pt *)
+     let digit,unit =
+       if l > 2 then String.sub s 0 2, String.sub s (l-2) 2 else "", "" in
+     try
+-      (List.assoc (String.lowercase unit) units) *. float_of_string digit
++      (List.assoc (String.lowercase_ascii unit) units) *. float_of_string digit
+     with
+     | Not_found -> (* think it is in "pt" *)
+       float_of_string s in

pkgs/development/ocaml-modules/camlimages/default.nix

@@ -15,9 +15,8 @@ buildDunePackage rec {
     sha256 = "1m2c76ghisg73dikz2ifdkrbkgiwa0hcmp21f2fm2rkbf02rq3f4";
   };
 
-  postPatch = ''
+  # stdio v0.17 compatibility; also replaces `String.lowercase` with `String.lowercase_ascii`
-    substituteInPlace core/{images,units}.ml --replace String.lowercase String.lowercase_ascii
+  patches = [ ./camlimages.patch ];
-  '';
 
   nativeBuildInputs = [ cppo ];
   buildInputs = [ dune-configurator findlib graphics lablgtk stdio ];

pkgs/development/ocaml-modules/cfstream/default.nix

@@ -13,7 +13,7 @@ buildDunePackage rec {
     hash = "sha256-iSg0QsTcU0MT/Cletl+hW6bKyH0jkp7Jixqu8H59UmQ=";
   };
 
-  patches = [ ./git_commit.patch ./janestreet-0.16.patch ];
+  patches = [ ./git_commit.patch ./janestreet-0.17.patch ];
 
   strictDeps = true;
 

pkgs/development/ocaml-modules/cfstream/janestreet-0.17.patch

@@ -1,7 +1,29 @@
+diff --git a/app/cfstream_test.ml b/app/cfstream_test.ml
+index 457c5e5..c6a01a5 100644
+--- a/app/cfstream_test.ml
++++ b/app/cfstream_test.ml
+@@ -73,7 +73,7 @@ let test_uncombine () =
+ let test_partition () =
+   let f x = x mod 2 = 0 in
+   let l = List.init 100 ~f:(fun _ -> Random.int 10) in
+-  let r1 = Caml.List.partition f l in
++  let r1 = Stdlib.List.partition f l in
+   let r2 = of_list l |> partition ~f |> fun (a, b) -> to_list a, to_list b in
+   assert_equal
+     ~printer:int_list_tuple_printer
 diff --git a/lib/CFStream_stream.ml b/lib/CFStream_stream.ml
-index 25c0e5a..94da2e3 100644
+index 25c0e5a..835791c 100644
 --- a/lib/CFStream_stream.ml
 +++ b/lib/CFStream_stream.ml
+@@ -83,7 +83,7 @@ let find xs ~f = find_map xs ~f:(fun x -> if f x then Some x else None)
+ let find_exn xs ~f =
+   match find xs ~f with
+   | Some x -> x
+-  | None -> raise Caml.Not_found
++  | None -> raise Stdlib.Not_found
+ ;;
+ 
+ let exists xs ~f =
 @@ -287,7 +287,7 @@ let group_aux xs map eq =
  ;;
  

pkgs/development/ocaml-modules/dbf/default.nix

@@ -3,7 +3,7 @@
 
 buildDunePackage rec {
   pname = "dbf";
-  version = "0.1.1";
+  version = "0.2.0";
 
   minimalOCamlVersion = "4.08";
 
@@ -12,8 +12,8 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "pveber";
     repo = "dbf";
-    rev = version;
+    rev = "v${version}";
-    hash = "sha256-h1K5YDLbXGEJi/quKXvSR0gZ+WkBzut7AsVFv+Bm8/g=";
+    hash = "sha256-096GodM3J/4dsVdylG+6xz/p6ogUkhDGdFjiPwl/jLQ=";
   };
 
   buildInputs = [ ppx_cstruct ];

pkgs/development/ocaml-modules/genspio/default.nix

@@ -17,6 +17,9 @@ buildDunePackage rec {
 
   propagatedBuildInputs = [ base fmt ];
 
+  # base v0.17 compatibility
+  patches = [ ./genspio.patch ];
+
   doCheck = true;
 
   meta = with lib; {

pkgs/development/ocaml-modules/genspio/genspio.patch

@@ -0,0 +1,714 @@
+diff --git a/src/examples/downloader.ml b/src/examples/downloader.ml
+index 93638e5..a785549 100644
+--- a/src/examples/downloader.ml
++++ b/src/examples/downloader.ml
+@@ -1,5 +1,5 @@
+ open! Base
+-module Filename = Caml.Filename
++module Filename = Stdlib.Filename
+ 
+ let downloader () =
+   let open Genspio.EDSL in
+@@ -154,7 +154,7 @@ let downloader () =
+                    ; string " -> not HTTP(s) or FTP: NOT IMPLEMENTED" ] ] ) ] )
+ 
+ let () =
+-  match Caml.Sys.argv |> Array.to_list |> List.tl_exn with
++  match Stdlib.Sys.argv |> Array.to_list |> List.tl_exn with
+   | ["make"; path] -> (
+       let script = Genspio.Compile.to_many_lines (downloader ()) in
+       let content =
+@@ -163,12 +163,12 @@ let () =
+       match path with
+       | "-" -> Fmt.pr "\n`````\n%s`````\n%!" content
+       | other ->
+-          let o = Caml.open_out other in
+-          Caml.Printf.fprintf o "%s%!" content ;
+-          Caml.close_out o )
++          let o = Stdlib.open_out other in
++          Stdlib.Printf.fprintf o "%s%!" content ;
++          Stdlib.close_out o )
+   | other ->
+       Fmt.epr "Wrong command line: [%s]\n"
+         (List.map ~f:(Fmt.str "%S") other |> String.concat ~sep:"; ") ;
+       Fmt.epr "Usage:\n%s make <path>\n   Create the downloader script.\n%!"
+-        Caml.Sys.argv.(0) ;
+-      Caml.exit 1
++        Stdlib.Sys.argv.(0) ;
++      Stdlib.exit 1
+diff --git a/src/examples/multigit.ml b/src/examples/multigit.ml
+index e05885c..b0e5fd2 100644
+--- a/src/examples/multigit.ml
++++ b/src/examples/multigit.ml
+@@ -7,7 +7,7 @@
+       $genspio_multigit $BINNPATH
+ *)
+ open! Base
+-module Filename = Caml.Filename
++module Filename = Stdlib.Filename
+ 
+ let ( // ) = Filename.concat
+ let msg fmt = Fmt.kstr (Fmt.epr "%s\n%!") fmt
+@@ -62,7 +62,7 @@ end
+ 
+ let version_string =
+   Fmt.str "%s (Genspio: %s)"
+-    (try Caml.Sys.getenv "multigit_version" with _ -> "0")
++    (try Stdlib.Sys.getenv "multigit_version" with _ -> "0")
+     Genspio.Meta.version
+ 
+ module Multi_status = struct
+@@ -504,7 +504,7 @@ end
+ let cmdf fmt =
+   Fmt.kstr
+     (fun s ->
+-      match Caml.Sys.command s with
++      match Stdlib.Sys.command s with
+       | 0 -> ()
+       | other -> Fmt.kstr failwith "CMD: %S failed with %d" s other )
+     fmt
+@@ -531,13 +531,13 @@ module Meta_repository = struct
+   let cmd_to_string_list cmd =
+     let i = Unix.open_process_in cmd in
+     let rec loop acc =
+-      try loop (Caml.input_line i :: acc)
+-      with _ -> Caml.close_in i ; List.rev acc in
++      try loop (Stdlib.input_line i :: acc)
++      with _ -> Stdlib.close_in i ; List.rev acc in
+     loop []
+ 
+   let readme_md ~path:_ ~output =
+-    let o = Caml.open_out output in
+-    let open Caml.Format in
++    let o = Stdlib.open_out output in
++    let open Stdlib.Format in
+     let fmt = formatter_of_out_channel o in
+     let out f = fprintf fmt f in
+     let sec c s = out "%s\n%s\n\n" s (String.make (String.length s) c) in
+@@ -591,7 +591,7 @@ module Meta_repository = struct
+     par "" ;
+     section "Authors / Making-of" ;
+     par
+-      "This repository is generated by an OCaml program which itself was \
++      "This repository is generated by an OStdlib.program which itself was \
+        written by [Seb Mondet](https://seb.mondet.org), it uses the \
+        [Genspio](https://smondet.gitlab.io/genspio-doc/) EDSL library, and \
+        serves as one of its examples of usage, see also its \
+@@ -599,7 +599,7 @@ module Meta_repository = struct
+     par
+       "Similarly, you may check out the <https://github.com/smondet/cosc> \
+        repository, which is also a bunch of shell scripts maintained by an \
+-       OCaml program." ;
++       OStdlib.program." ;
+     section "Example Session / Demo" ;
+     let git_repos_top = "/tmp/git-repos-example" in
+     let git_repos_hammerlab = git_repos_top // "hammerlab" in
+@@ -724,21 +724,21 @@ end
+ *)
+ 
+ let () =
+-  let path = Caml.Sys.argv.(1) in
++  let path = Stdlib.Sys.argv.(1) in
+   cmdf "mkdir -p %s" (Filename.quote path) ;
+   let repomode =
+-    try String.(Caml.Sys.getenv "repomode" = "true") with _ -> false in
++    try String.(Stdlib.Sys.getenv "repomode" = "true") with _ -> false in
+   let output filename script long_description =
+     let gms = if repomode then path // "bin" // filename else path // filename in
+     msg "Outputting %S" gms ;
+     cmdf "mkdir -p %s" Filename.(quote (dirname gms)) ;
+-    let o = Caml.open_out gms in
+-    Caml.Format.(
++    let o = Stdlib.open_out gms in
++    Stdlib.Format.(
+       fprintf
+         (formatter_of_out_channel o)
+         "#!/bin/sh\n\n%s\n\n%a\n"
+         ( long_description ()
+-          @ [ "The following is generated by an OCaml program using the \
++          @ [ "The following is generated by an OStdlib.program using the \
+                Genspio EDSL."; "See <https://smondet.gitlab.io/genspio-doc/>."
+             ]
+         |> List.map ~f:(Fmt.str "# %s")
+@@ -746,7 +746,7 @@ let () =
+         Genspio.Compile.To_slow_flow.Script.pp_posix
+         (Genspio.Compile.To_slow_flow.compile
+            (script () |> Genspio.Transform.Constant_propagation.process) )) ;
+-    Caml.close_out o ;
++    Stdlib.close_out o ;
+     cmdf "chmod +x %s" (Filename.quote gms) in
+   Multi_status.(output name script long_description) ;
+   Activity_report.(output name script long_description) ;
+diff --git a/src/examples/service_composer.ml b/src/examples/service_composer.ml
+index ef3c69b..b52969f 100644
+--- a/src/examples/service_composer.ml
++++ b/src/examples/service_composer.ml
+@@ -36,7 +36,7 @@
+   `cosc config show` is actually able to call `cosc-configuration-display`.
+ *)
+ open! Base
+-module Filename = Caml.Filename
++module Filename = Stdlib.Filename
+ 
+ let ( // ) = Filename.concat
+ let msg fmt = Fmt.kstr (Fmt.epr "%s\n%!") fmt
+@@ -46,7 +46,7 @@ module Gedsl = Genspio.EDSL
+ let cmdf fmt =
+   Fmt.kstr
+     (fun s ->
+-      match Caml.Sys.command s with
++      match Stdlib.Sys.command s with
+       | 0 -> ()
+       | other -> Fmt.kstr failwith "CMD: %S failed with %d" s other )
+     fmt
+@@ -87,24 +87,24 @@ module Script = struct
+       output_path // String.concat ~sep:"-" (root :: t.relative_path)
+     ```
+ 
+-    The function `write` is the only real I/O of this whole OCaml program.
++    The function `write` is the only real I/O of this whole OStdlib.program.
+   *)
+   let write ?(compiler = `Slow_flow) t ~output_path ~root =
+     let path = output_path // String.concat ~sep:"-" (root :: t.relative_path) in
+-    let o = Caml.open_out path in
++    let o = Stdlib.open_out path in
+     msg "Outputting “%s” to %s\n%!" t.description path ;
+     ( match compiler with
+     | `Slow_flow ->
+         Fmt.(
+           pf
+-            (Caml.Format.formatter_of_out_channel o)
++            (Stdlib.Format.formatter_of_out_channel o)
+             "#!/bin/sh\n\n%a\n" Genspio.Compile.To_slow_flow.Script.pp_posix
+             (Genspio.Compile.To_slow_flow.compile
+                (t.make ~root |> Genspio.Transform.Constant_propagation.process) ))
+     | `Standard ->
+-        Caml.Printf.fprintf o "#!/bin/sh\n\n%s\n"
++        Stdlib.Printf.fprintf o "#!/bin/sh\n\n%s\n"
+           (Genspio.Compile.to_many_lines (t.make ~root)) ) ;
+-    Caml.close_out o ; cmdf "chmod +x %s" path
++    Stdlib.close_out o ; cmdf "chmod +x %s" path
+ end
+ 
+ (*md Configuration of the scripts is bootstrapped with an environment
+@@ -275,7 +275,7 @@ module Manual = struct
+               (Environment.var_configuration_path env)
+               env.Environment.default_configuration_path root root
+           @ par
+-              "The scripts are generated by an OCaml program which uses the \
++              "The scripts are generated by an OStdlib.program which uses the \
+                [Genspio](https://smondet.gitlab.io/genspio-doc) EDSL/library. \
+                The code generator serves as one of the usage examples of the \
+                library, see its \
+@@ -341,7 +341,7 @@ module Manual = struct
+               let image = "smondet/genspio-doc-dockerfiles:apps406" in
+               Fmt.kstr par
+                 "If you have [`opam`](https://opam.ocaml.org), setting up the \
+-                 genspio repository is easy (only simple, pure OCaml \
++                 genspio repository is easy (only simple, pure OStdlib.\
+                  dependencies), if not, or if you just like Docker™, the \
+                  generator is available in the `%s` image, see:"
+                 image
+@@ -912,7 +912,7 @@ module Example_script = struct
+   let basic env root =
+     let call s = Fmt.str "%s %s" root s in
+     let conf = "/tmp/example-basic.d" in
+-    let cmt fmt = Fmt.str Caml.("# " ^^ fmt) in
++    let cmt fmt = Fmt.str Stdlib.("# " ^^ fmt) in
+     ( "basic"
+     , [ cmt "We setup the configuration root path:"
+       ; Fmt.str "export %s=%s" (Environment.var_configuration_path env) conf
+@@ -1051,13 +1051,13 @@ let make ?default_configuration_path ?default_screen_name ~name ~output_path ()
+ let () =
+   let anon = ref [] in
+   let anon_fun p = anon := p :: !anon in
+-  let usage = Fmt.str "%s [-help] <path>" Caml.Sys.argv.(0) in
++  let usage = Fmt.str "%s [-help] <path>" Stdlib.Sys.argv.(0) in
+   let name = ref None in
+   let output_path = ref None in
+   let config_path = ref None in
+   let screen_name = ref None in
+   let output_readme = ref false in
+-  let module Arg = Caml.Arg in
++  let module Arg = Stdlib.Arg in
+   let args =
+     Arg.align
+       [ ( "--name"
+@@ -1077,7 +1077,7 @@ let () =
+         , Fmt.str "<script-name> Where to write the scripts." ) ] in
+   Arg.parse args anon_fun usage ;
+   List.iter !anon ~f:(msg "Ignoring %s") ;
+-  let die () = Caml.exit 2 in
++  let die () = Stdlib.exit 2 in
+   let need opt = function
+     | Some o -> o
+     | None ->
+diff --git a/src/examples/small.ml b/src/examples/small.ml
+index f6e4504..8c776a6 100644
+--- a/src/examples/small.ml
++++ b/src/examples/small.ml
+@@ -1,10 +1,10 @@
+ open! Base
+ 
+-let examples = ref ([] : (Caml.out_channel -> unit) list)
++let examples = ref ([] : (Stdlib.out_channel -> unit) list)
+ 
+ let example ?show name description code =
+   let f o =
+-    Caml.Printf.fprintf o
++    Stdlib.Printf.fprintf o
+       "let () = examples := Example.make ~ocaml:%S %s %S %S %s :: !examples\n"
+       code
+       (match show with None -> "" | Some s -> Fmt.str "~show:%s" s)
+@@ -303,7 +303,7 @@ Genspio.EDSL.(
+ (******************************************************************************)
+ 
+ let () =
+-  let open Caml in
++  let open Stdlib.in
+   let open Printf in
+   let o = open_out Sys.argv.(1) in
+   fprintf o "%s"
+@@ -318,7 +318,7 @@ let examples = ref []
+   fprintf o "%s"
+     {ocaml|
+ let () =
+-    List.iter (List.rev !examples) ~f:(Example.run Caml.Format.std_formatter)
++    List.iter (List.rev !examples) ~f:(Example.run Stdlib.Format.std_formatter)
+ |ocaml} ;
+   close_out o ;
+   printf "%s: Done.\n%!" Sys.argv.(0)
+diff --git a/src/examples/vm_tester.ml b/src/examples/vm_tester.ml
+index f8272b9..59c81e0 100644
+--- a/src/examples/vm_tester.ml
++++ b/src/examples/vm_tester.ml
+@@ -1,5 +1,5 @@
+ open! Base
+-module Filename = Caml.Filename
++module Filename = Stdlib.Filename
+ 
+ let ( // ) = Filename.concat
+ 
+@@ -18,7 +18,7 @@ module Shell_script = struct
+     try String.sub ~pos:0 ~len:40 m with _ -> m
+ 
+   let path {name; content; _} =
+-    let open Caml in
++    let open Stdlib.in
+     let hash = Marshal.to_string content [] |> Digest.string |> Digest.to_hex in
+     let tag = String.sub hash 0 8 in
+     "_scripts" // Fmt.str "%s_%s.sh" (sanitize_name name) tag
+@@ -54,7 +54,7 @@ module Run_environment = struct
+ 
+     let tmp_name_of_url = function
+       | Http (url, ext) ->
+-          ("_cache" // Caml.Digest.(string url |> to_hex))
++          ("_cache" // Stdlib.Digest.(string url |> to_hex))
+           ^ Option.value_map ~default:"" ext ~f:(fun `Xz -> ".xz")
+ 
+     let make_files files =
+@@ -410,14 +410,14 @@ end
+ let cmdf fmt =
+   Fmt.kstr
+     (fun cmd ->
+-      match Caml.Sys.command cmd with
++      match Stdlib.Sys.command cmd with
+       | 0 -> ()
+       | other -> Fmt.kstr failwith "Command %S did not return 0: %d" cmd other
+       )
+     fmt
+ 
+ let write_lines p l =
+-  let open Caml in
++  let open Stdlib.in
+   let o = open_out p in
+   Base.List.iter l ~f:(Printf.fprintf o "%s\n") ;
+   close_out o
+@@ -427,7 +427,7 @@ let () =
+     Fmt.kstr
+       (fun s ->
+         Fmt.epr "Wrong CLI: %s\n%!" s ;
+-        Caml.exit 2 )
++        Stdlib.exit 2 )
+       fmt in
+   let example = ref None in
+   let path = ref None in
+@@ -458,7 +458,7 @@ let () =
+               with
+             | Some s -> s
+             | None -> fail "Don't know VM %S" arg ) in
+-  let module Arg = Caml.Arg in
++  let module Arg = Stdlib.Arg in
+   let args =
+     Arg.align
+       [ ( "--ssh-port"
+diff --git a/src/lib/EDSL.ml b/src/lib/EDSL.ml
+index 9663489..9d31805 100644
+--- a/src/lib/EDSL.ml
++++ b/src/lib/EDSL.ml
+@@ -5,7 +5,7 @@ type c_string = Language.c_string
+ type byte_array = Language.byte_array
+ type fd_redirection = Language.fd_redirection
+ 
+-let ( // ) = Caml.Filename.concat
++let ( // ) = Stdlib.Filename.concat
+ 
+ open Language.Construct
+ include Language.Construct.Base
+@@ -109,7 +109,7 @@ let tmp_file ?tmp_dir name : file =
+       [ get_tmp_dir; str "/"
+       ; str
+           (Fmt.str "genspio-tmp-file-%s-%s" clean
+-             Caml.Digest.(string name |> to_hex) ) ] in
++             Stdlib.Digest.(string name |> to_hex) ) ] in
+   let tmp = Str.concat_list [path; string "-tmp"] in
+   object (_self)
+     method get = get_stdout (call [string "cat"; path])
+@@ -172,7 +172,7 @@ module Command_line = struct
+     let variable {switches; _} =
+       Fmt.str "%s_%s" prefix
+         ( String.concat ~sep:"" switches
+-        |> Caml.Digest.string |> Caml.Digest.to_hex ) in
++        |> Stdlib.Digest.string |> Stdlib.Digest.to_hex ) in
+     let inits = ref [] in
+     let to_init s = inits := s :: !inits in
+     let cases = ref [] in
+@@ -331,7 +331,7 @@ let fresh_name suf =
+     object
+       method v = 42
+     end in
+-  Fmt.str "g-%d-%d-%s" (Caml.Oo.id x) (Random.int 100_000) suf
++  Fmt.str "g-%d-%d-%s" (Stdlib.Oo.id x) (Random.int 100_000) suf
+ 
+ let sanitize_name n =
+   String.map n ~f:(function
+diff --git a/src/lib/EDSL_v0.ml b/src/lib/EDSL_v0.ml
+index 1ac12de..dd82023 100644
+--- a/src/lib/EDSL_v0.ml
++++ b/src/lib/EDSL_v0.ml
+@@ -5,7 +5,7 @@ type c_string = Language.c_string
+ type byte_array = Language.byte_array
+ type fd_redirection = Language.fd_redirection
+ 
+-let ( // ) = Caml.Filename.concat
++let ( // ) = Stdlib.Filename.concat
+ 
+ include Language.Construct
+ 
+@@ -63,7 +63,7 @@ let tmp_file ?tmp_dir name : file =
+       [ get_tmp_dir; c_string "/"
+       ; c_string
+           (Fmt.str "genspio-tmp-file-%s-%s" clean
+-             Caml.Digest.(string name |> to_hex) ) ] in
++             Stdlib.Digest.(string name |> to_hex) ) ] in
+   let tmp = C_string.concat_list [path; string "-tmp"] in
+   object (self)
+     method get = get_stdout (call [string "cat"; path])
+@@ -127,7 +127,7 @@ module Command_line = struct
+     let variable {switches; _} =
+       Fmt.str "%s_%s" prefix
+         ( String.concat ~sep:"" switches
+-        |> Caml.Digest.string |> Caml.Digest.to_hex ) in
++        |> Stdlib.Digest.string |> Stdlib.Digest.to_hex ) in
+     let inits = ref [] in
+     let to_init s = inits := s :: !inits in
+     let cases = ref [] in
+@@ -139,7 +139,7 @@ module Command_line = struct
+     let bool_of_var var = getenv (string var) |> Bool.of_string in
+     let anon_tmp =
+       Fmt.kstr tmp_file "parse-cli-%s"
+-        Caml.(Marshal.to_string options [] |> Digest.string |> Digest.to_hex)
++        Stdlib.(Marshal.to_string options [] |> Digest.string |> Digest.to_hex)
+     in
+     let anon = anon_tmp#get |> Elist.deserialize_to_c_string_list in
+     let applied_action =
+@@ -293,7 +293,7 @@ let fresh_name suf =
+     object
+       method v = 42
+     end in
+-  Fmt.str "g-%d-%d-%s" (Caml.Oo.id x) (Random.int 100_000) suf
++  Fmt.str "g-%d-%d-%s" (Stdlib.Oo.id x) (Random.int 100_000) suf
+ 
+ let sanitize_name n =
+   String.map n ~f:(function
+diff --git a/src/lib/common.ml b/src/lib/common.ml
+index fe9cfee..d98d697 100644
+--- a/src/lib/common.ml
++++ b/src/lib/common.ml
+@@ -4,7 +4,7 @@ module Unique_name = struct
+   let x = ref 0
+ 
+   let create prefix =
+-    Caml.incr x ;
++    Stdlib.incr x ;
+     Fmt.str "%s_%d_%d" prefix !x (Random.int 100_000)
+ 
+   let variable = create
+diff --git a/src/lib/compile.ml b/src/lib/compile.ml
+index 12cc836..d365e37 100644
+--- a/src/lib/compile.ml
++++ b/src/lib/compile.ml
+@@ -53,7 +53,7 @@ module To_posix = struct
+                    (fun ppf s -> pf ppf "@[`%s`@]" s) )
+                 more )
+         ()
+-      |> Caml.Filename.quote in
++      |> Stdlib.Filename.quote in
+     str " printf -- '%%s\\n' %s >&2 " msg_str
+ 
+   let one_liner =
+@@ -116,7 +116,7 @@ let to_many_lines ?max_argument_length ?no_trap e =
+   to_legacy `Multi_line ?max_argument_length ?no_trap e
+ 
+ let quick_run_exn ?max_argument_length ?no_trap e =
+-  match to_many_lines ?max_argument_length ?no_trap e |> Caml.Sys.command with
++  match to_many_lines ?max_argument_length ?no_trap e |> Stdlib.Sys.command with
+   | 0 -> ()
+   | other -> Fmt.failwith "Command returned %d" other
+ 
+@@ -125,7 +125,7 @@ let to_string_hum e = Fmt.str "%a" pp_hum e
+ 
+ let to_one_line_hum e =
+   let buf = Buffer.create 42 in
+-  let formatter = Caml.Format.formatter_of_buffer buf in
+-  Caml.Format.pp_set_margin formatter 10_000_000 ;
+-  Caml.Format.fprintf formatter "@[<h>%a@]@?" pp_hum e ;
++  let formatter = Stdlib.Format.formatter_of_buffer buf in
++  Stdlib.Format.pp_set_margin formatter 10_000_000 ;
++  Stdlib.Format.fprintf formatter "@[<h>%a@]@?" pp_hum e ;
+   Buffer.contents buf
+diff --git a/src/lib/language.ml b/src/lib/language.ml
+index cf7b810..6f71027 100644
+--- a/src/lib/language.ml
++++ b/src/lib/language.ml
+@@ -1,7 +1,7 @@
+ open Common
+ 
+ (* Here we use the legacy module (too much code to change at once): *)
+-module Format = Caml.Format
++module Format = Stdlib.Format
+ 
+ type c_string = C_string
+ type byte_array = Byte_Array
+diff --git a/src/lib/standard_compiler.ml b/src/lib/standard_compiler.ml
+index 7e639c6..bc8848b 100644
+--- a/src/lib/standard_compiler.ml
++++ b/src/lib/standard_compiler.ml
+@@ -147,7 +147,7 @@ let rec to_ir : type a. _ -> _ -> a Language.t -> internal_representation =
+       match c_str with
+       | Byte_array_to_c_string (Literal (Literal.String s))
+         when Literal.Str.easy_to_escape s ->
+-          argument (Caml.Filename.quote s |> check_length)
++          argument (Stdlib.Filename.quote s |> check_length)
+       | Byte_array_to_c_string (Literal (Literal.String s))
+         when Literal.Str.impossible_to_escape_for_variable s ->
+           error ~comment_backtrace:comments (`Not_a_c_string s)
+diff --git a/src/lib/to_slow_flow.ml b/src/lib/to_slow_flow.ml
+index e1305ce..0f812aa 100644
+--- a/src/lib/to_slow_flow.ml
++++ b/src/lib/to_slow_flow.ml
+@@ -33,10 +33,10 @@ let expand_octal_command ~remove_l s =
+ let m = ref 0
+ 
+ let var_name ?expression ?script tag =
+-  Caml.incr m ;
++  Stdlib.incr m ;
+   let stag = String.map tag ~f:(function '-' -> '_' | a -> a) in
+   Fmt.str "genspio_%s_%d_%d_%s" stag (Random.int 100_000_000) !m
+-    Caml.(
++    Stdlib.(
+       Marshal.to_string (expression, script) [Marshal.Closures]
+       |> Digest.string |> Digest.to_hex)
+ 
+@@ -49,7 +49,7 @@ module Tmp_db = struct
+   let make ?(deletion_grouping = 20) how =
+     let default_tmpdir =
+       match how with
+-      | `Fresh -> Caml.Filename.concat "/tmp" (var_name "tmpdir")
++      | `Fresh -> Stdlib.Filename.concat "/tmp" (var_name "tmpdir")
+       | `Use p -> p in
+     {default_tmpdir; tmp_file_db= []; deletion_grouping}
+ 
+@@ -122,10 +122,10 @@ module Script = struct
+         let v = Fmt.str "$(%s)" (expand_octal_command ~remove_l:false oct) in
+         if not arithmetic then Fmt.str "\"%s\"" v else v
+     | Literal_value s ->
+-        let v = Caml.Filename.quote s in
++        let v = Stdlib.Filename.quote s in
+         if arithmetic then Fmt.str "$(printf -- %s)" v else v
+     | File s ->
+-        let v = Fmt.str "$(cat %s)" (Caml.Filename.quote s) in
++        let v = Fmt.str "$(cat %s)" (Stdlib.Filename.quote s) in
+         if not arithmetic then Fmt.str "\"%s\"" v else v
+     | Tmp_file_in_variable s ->
+         (* Parameters.(tmp_file_db := s :: !tmp_file_db) ; *)
+@@ -150,7 +150,7 @@ module Script = struct
+     | Literal_value s -> string_to_octal s
+     | File f ->
+         Fmt.str "$(cat %s | od -t o1 -An -v | tr -d ' \\n')"
+-          (Caml.Filename.quote f)
++          (Stdlib.Filename.quote f)
+     | Tmp_file_in_variable f ->
+         (* Parameters.(tmp_file_db := f :: !tmp_file_db) ; *)
+         Fmt.str "$(cat \"${%s}\" | od -t o1 -An -v | tr -d ' \\n')" f
+@@ -162,7 +162,7 @@ module Script = struct
+     | Unit -> assert false
+     | Raw_inline s -> s
+     | Literal_value _ -> assert false
+-    | File f -> Caml.Filename.quote f
++    | File f -> Stdlib.Filename.quote f
+     | Tmp_file_in_variable f ->
+         (* Parameters.(tmp_file_db := f :: !tmp_file_db) ; *)
+         Fmt.str "\"${%s}\"" f
+@@ -343,7 +343,7 @@ let rec to_ir : type a. fail_commands:_ -> tmpdb:_ -> a t -> Script.t =
+         let esc = string_to_octal v ~prefix:"\\" in
+         mk (rawf "printf -- '%s' > %s" esc tmparg, tmp)
+     | Literal_value v ->
+-        mk (rawf "printf -- '%%s' %s > %s" (Caml.Filename.quote v) tmparg, tmp)
++        mk (rawf "printf -- '%%s' %s > %s" (Stdlib.Filename.quote v) tmparg, tmp)
+     | File p -> mk (rawf ":", make [] (File p))
+     | Tmp_file_in_variable p -> mk (rawf "cp \"${%s}\" %s" p tmparg, tmp)
+     | Raw_inline s -> mk (rawf "printf -- '%%s' %s > %s" s tmparg, tmp)
+@@ -725,7 +725,7 @@ let compile ?(default_tmpdir = `Fresh) ?(signal_name = "USR1")
+   let fail_commands s =
+     match trap with
+     | `Exit_with _ ->
+-        [ rawf "printf '%%s\\n' %s > %s " (Caml.Filename.quote s) tmparg
++        [ rawf "printf '%%s\\n' %s > %s " (Stdlib.Filename.quote s) tmparg
+         ; rawf "kill -s %s ${%s}" signal_name pid ]
+     | `None ->
+         failwith "You cannot use the `fail` construct with no `trap` strategy"
+@@ -851,9 +851,9 @@ let test () =
+       let ir = compile expr in
+       fprintf std_formatter "==== TEST %d ====\n%a\n%!" idx Script.pp_posix ir ;
+       let script_file = Fmt.str "/tmp/script-%d.sh" idx in
+-      let o = Caml.open_out script_file in
++      let o = Stdlib.open_out script_file in
+       fprintf (formatter_of_out_channel o) "\n%a\n%!" Script.pp_posix ir ;
+-      Caml.flush o ;
+-      Caml.close_out o ;
+-      let res = Fmt.kstr Caml.Sys.command "sh %s" script_file in
++      Stdlib.flush o ;
++      Stdlib.close_out o ;
++      let res = Fmt.kstr Stdlib.Sys.command "sh %s" script_file in
+       fprintf std_formatter "\nRESULT: %d\n" res )
+diff --git a/src/lib/transform.ml b/src/lib/transform.ml
+index a1f16a3..78bb202 100644
+--- a/src/lib/transform.ml
++++ b/src/lib/transform.ml
+@@ -370,7 +370,7 @@ module Constant_propagation = struct
+     let count = ref 0 in
+     let check ?trace name e res =
+       let p = process ?trace e in
+-      Caml.incr count ;
++      Stdlib.incr count ;
+       match Poly.(p = res) with
+       | true -> ()
+       | false ->
+diff --git a/src/test-lib/test_lib.ml b/src/test-lib/test_lib.ml
+index eba7adf..ecf765d 100644
+--- a/src/test-lib/test_lib.ml
++++ b/src/test-lib/test_lib.ml
+@@ -1,9 +1,9 @@
+ open! Base
+ 
+-let ( // ) = Caml.Filename.concat
++let ( // ) = Stdlib.Filename.concat
+ 
+-module Filename = Caml.Filename
+-module Sys = Caml.Sys
++module Filename = Stdlib.Filename
++module Sys = Stdlib.Sys
+ 
+ module Test = struct
+   type t =
+@@ -82,7 +82,7 @@ module Shell_directory = struct
+            if String.length long > 30 then String.sub long ~pos:0 ~len:30
+            else long )
+           (List.length args) returns
+-          Caml.(
++          Stdlib.(
+             Marshal.to_string script [Marshal.Closures]
+             |> Digest.string |> Digest.to_hex
+             |> fun s -> String.sub s 0 10)
+@@ -358,9 +358,9 @@ module Example = struct
+         ( match Genspio.Compile.To_posix.(string ~options:multi_line) code with
+         | Ok script ->
+             let tmp = Filename.temp_file "genspio-example" ".sh" in
+-            let o = Caml.open_out tmp in
+-            Caml.Printf.fprintf o "\n%s\n" script ;
+-            Caml.close_out o ;
++            let o = Stdlib.open_out tmp in
++            Stdlib.Printf.fprintf o "\n%s\n" script ;
++            Stdlib.close_out o ;
+             (* ff fmt "@[<hov 2>* Compiled:@ `%s`@ (%d bytes)@]@\n" tmp (String.length script); *)
+             let out = Filename.temp_file "genspio-example" ".out" in
+             let err = Filename.temp_file "genspio-example" ".err" in
+@@ -371,10 +371,10 @@ module Example = struct
+             let show_file name path =
+               let fence = String.make 50 '`' in
+               ff fmt "@\n%s:@\n@\n%s@\n" name fence ;
+-              let i = Caml.open_in path in
++              let i = Stdlib.open_in path in
+               let rec loop () =
+                 try
+-                  ff fmt "%c" @@ Caml.input_char i ;
++                  ff fmt "%c" @@ Stdlib.input_char i ;
+                   loop ()
+                 with _ -> () in
+               loop () ; ff fmt "@\n%s@\n@\n" fence in
+diff --git a/src/test/main.ml b/src/test/main.ml
+index 3374bdf..44d4e3f 100644
+--- a/src/test/main.ml
++++ b/src/test/main.ml
+@@ -1,5 +1,5 @@
+ open! Base
+-module Filename = Caml.Filename
++module Filename = Stdlib.Filename
+ open Tests.Test_lib
+ module Compile = Genspio.Language
+ module Construct = Genspio.EDSL_v0
+@@ -635,7 +635,7 @@ let () =
+   @@ exits ~name:"getenv" 25
+        (let open Construct in
+        let alternate_get_env v =
+-         (* We cannot use OCaml's Sys.getenv because the compilation output may
++         (* We cannot use OStdlib.s Sys.getenv because the compilation output may
+             be run on a different host/system (through SSH or alike). *)
+          exec ["sh"; "-c"; Fmt.str "echo ${%s} | tr -d '\\n'" v]
+          |> get_stdout |> Byte_array.to_c in
+@@ -1224,14 +1224,14 @@ let () =
+     Fmt.kstr
+       (fun s ->
+         Fmt.epr "Error: %s\nUsage: %s\n%!" s usage ;
+-        Caml.exit 1 )
++        Stdlib.exit 1 )
+       fmt in
+   let anon_fun p = anon := p :: !anon in
+   let no_compilation_tests = ref false in
+   let extra_slow_flow_tests = ref false in
+   let extra_transform_cp_tests = ref false in
+   let filter_tests = ref None in
+-  let module Arg = Caml.Arg in
++  let module Arg = Stdlib.Arg in
+   let args =
+     Arg.align
+       [ ( "--important-shells"
+@@ -1294,13 +1294,13 @@ let () =
+       let todo = Test_directory.contents testdir ~path testlist in
+       List.iter todo ~f:(function
+         | `File (p, v) ->
+-            let mo = Caml.open_out p in
+-            Caml.Printf.fprintf mo "%s\n" v ;
+-            Caml.close_out mo
++            let mo = Stdlib.open_out p in
++            Stdlib.Printf.fprintf mo "%s\n" v ;
++            Stdlib.close_out mo
+         | `Directory v -> Fmt.kstr Sys.command "mkdir -p '%s'" v |> ignore ) ) ;
+   let errors =
+     if !no_compilation_tests then false else compilation_error_tests () in
+   if !extra_slow_flow_tests then Genspio.To_slow_flow.test () ;
+   if !extra_transform_cp_tests then
+     Genspio.Transform.Constant_propagation.test () ;
+-  Caml.exit (if errors then 23 else 0)
++  Stdlib.exit (if errors then 23 else 0)

pkgs/development/ocaml-modules/janestreet/janePackage_0_17.nix

@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  defaultVersion ? "0.17.0",
+}:
+
+{
+  pname,
+  version ? defaultVersion,
+  hash,
+  minimalOCamlVersion ? "5.1",
+  doCheck ? true,
+  buildInputs ? [ ],
+  ...
+}@args:
+
+buildDunePackage (
+  args
+  // {
+    inherit version buildInputs;
+
+    inherit minimalOCamlVersion;
+
+    src = fetchFromGitHub {
+      owner = "janestreet";
+      repo = pname;
+      rev = "v${version}";
+      sha256 = hash;
+    };
+
+    inherit doCheck;
+
+    meta = {
+      license = lib.licenses.mit;
+      homepage = "https://github.com/janestreet/${pname}";
+    } // args.meta;
+  }
+)

pkgs/development/ocaml-modules/janestreet/js_of_ocaml_patches.patch

@@ -0,0 +1,24 @@
+diff --git a/js_of_ocaml_patches.ml b/js_of_ocaml_patches.ml
+index 58dd9d5..964b55e 100644
+--- a/js_of_ocaml_patches.ml
++++ b/js_of_ocaml_patches.ml
+@@ -15,6 +15,6 @@ module Dom_html = struct
+     inherit Js_of_ocaml.Dom_html.canvasRenderingContext2D
+ 
+     method ellipse :
+-      float -> float -> float -> float -> float -> float -> float -> unit meth
++      float -> float -> float -> float -> float -> float -> float -> bool t -> unit meth
+   end
+ end
+diff --git a/js_of_ocaml_patches.mli b/js_of_ocaml_patches.mli
+index 4aecc41..8ed5d50 100644
+--- a/js_of_ocaml_patches.mli
++++ b/js_of_ocaml_patches.mli
+@@ -14,6 +14,6 @@ module Dom_html : sig
+     inherit Js_of_ocaml.Dom_html.canvasRenderingContext2D
+ 
+     method ellipse :
+-      float -> float -> float -> float -> float -> float -> float -> unit meth
++      float -> float -> float -> float -> float -> float -> float -> bool t -> unit meth
+   end
+ end

pkgs/development/ocaml-modules/ocamlformat/generic.nix

@@ -1,6 +1,7 @@
 { lib, fetchurl, version ? "0.26.2", astring, base, camlp-streams, cmdliner_1_0
 , cmdliner_1_1, csexp, dune-build-info, either, fix, fpath, menhirLib, menhirSdk
-, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf, ... }:
+, ocaml-version, ocp-indent, odoc-parser, result, stdio, uuseg, uutf
+, janeStreet_0_15, ... }:
 
 # The ocamlformat package have been split into two in version 0.25.1:
 # one for the library and one for the executable.
@@ -42,8 +43,12 @@ rec {
   cmdliner_v =
     if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0;
 
-  library_deps = [
+  base_v = if lib.versionAtLeast version "0.25.1" then base else janeStreet_0_15.base;
-    base
+
+  stdio_v =if lib.versionAtLeast version "0.25.1" then stdio else janeStreet_0_15.stdio;
+
+  library_deps= [
+    base_v
     cmdliner_v
     dune-build-info
     fix
@@ -51,7 +56,7 @@ rec {
     menhirLib
     menhirSdk
     ocp-indent
-    stdio
+    stdio_v
     uuseg
     uutf
   ] ++ lib.optionals (lib.versionAtLeast version "0.20.0") [

pkgs/development/ocaml-modules/tdigest/default.nix

@@ -17,6 +17,9 @@ buildDunePackage rec {
 
   minimalOCamlVersion = "4.14";
 
+  # base v0.17 compatibility
+  patches = [ ./tdigest.patch ];
+
   propagatedBuildInputs = [
     base
     ppx_sexp_conv

pkgs/development/ocaml-modules/tdigest/tdigest.patch

@@ -0,0 +1,17 @@
+diff --git a/src/cmap.ml b/src/cmap.ml
+index 69f447b..3afb2b6 100644
+--- a/src/cmap.ml
++++ b/src/cmap.ml
+@@ -173,6 +173,12 @@ end = struct
+   let of_list_with_key_multi list ~get_key =
+     Using_comparator.of_list_with_key_multi ~comparator list ~get_key
+ 
++  let of_list_with_key_fold list ~get_key ~init ~f =
++    failwith "Map.of_list_with_key_fold: not implemented yet"
++
++  let of_list_with_key_reduce list ~get_key ~f =
++    failwith "Map.of_list_with_key_reduce: not implemented yet"
++
+   let of_alist alist = Using_comparator.of_alist ~comparator alist
+ 
+   let of_alist_or_error alist = Using_comparator.of_alist_or_error ~comparator alist

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

@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "courlan";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-DLycrIOXDGUbk3p4I6XZLL67a2AUVOoPtstNDuXRhF0=";
+    hash = "sha256-OGjziBIvKwnRVIAgQ/6S39YsPqenAOquirwFGYz4vCU=";
   };
 
   # Tests try to write to /tmp directly. use $TMPDIR instead.

pkgs/development/python-modules/django-modeltranslation/default.nix

@@ -12,7 +12,7 @@
 let
   # 0.18.12 was yanked from PyPI, it refers to this issue:
   # https://github.com/deschler/django-modeltranslation/issues/701
-  version = "0.19.5";
+  version = "0.19.6";
 in
 buildPythonPackage {
   pname = "django-modeltranslation";
@@ -22,7 +22,7 @@ buildPythonPackage {
     owner = "deschler";
     repo = "django-modeltranslation";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wIvX9m3AGa6rLAWI56B7sEyj04g8cPIF37JWgVzbtig=";
+    hash = "sha256-zFY8YsM1Qp6rdcb+Upfk0/6mTv0o1zwxGqKzTupZ1zI=";
   };
 
   # Remove all references to pytest-cov

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

@@ -57,7 +57,7 @@
 
 buildPythonPackage rec {
   pname = "dvc";
-  version = "3.51.2";
+  version = "3.53.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -66,7 +66,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc";
     rev = "refs/tags/${version}";
-    hash = "sha256-MjzunpPWzGfa62Jr+krEdm+i+N10QNmW7qRWaU/58OM=";
+    hash = "sha256-YX65jAkM0LFFtKf+MX0w1BfhyR2Dzr5Vpwxl2jJ/GGw=";
   };
 
   pythonRelaxDeps = [

pkgs/development/python-modules/flufl/lock.nix

@@ -1,34 +1,36 @@
 {
   lib,
+  atpublic,
   buildPythonPackage,
   fetchPypi,
-  pytestCheckHook,
+  hatchling,
-  pythonOlder,
-  atpublic,
   psutil,
   pytest-cov,
+  pytestCheckHook,
+  pythonOlder,
   sybil,
-  pdm-pep517,
 }:
 
 buildPythonPackage rec {
   pname = "flufl-lock";
-  version = "7.1.1";
+  version = "8.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    pname = "flufl.lock";
+    pname = "flufl_lock";
     inherit version;
-    hash = "sha256-rxQXKzW7xYaHvQa3DRaT/Y1Iy/D/3n5RphjBSK4kBC0=";
+    hash = "sha256-2IMCAFaSpj2YtgCAFY+vCJvl7K5pafcGQJ2oJ2/c58s=";
   };
 
-  nativeBuildInputs = [ pdm-pep517 ];
+  build-system = [ hatchling ];
-  propagatedBuildInputs = [
+
+  dependencies = [
     atpublic
     psutil
   ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-cov
@@ -45,10 +47,10 @@ buildPythonPackage rec {
   pythonNamespaces = [ "flufl" ];
 
   meta = with lib; {
-    homepage = "https://flufllock.readthedocs.io/";
     description = "NFS-safe file locking with timeouts for POSIX and Windows";
+    homepage = "https://flufllock.readthedocs.io/";
     changelog = "https://gitlab.com/warsaw/flufl.lock/-/blob/${version}/docs/NEWS.rst";
-    maintainers = with maintainers; [ qyliss ];
     license = licenses.asl20;
+    maintainers = with maintainers; [ qyliss ];
   };
 }

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

@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "meraki";
-  version = "1.48.0";
+  version = "1.49.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Jl4968yXPseSzbPIG7d7KPWY6It8xgy6Gz9DamlCQd0=";
+    hash = "sha256-4/FiF8eEziaD3ka/XVdAxDI8WWuWlYoMoLupQXVCBA8=";
   };
 
   propagatedBuildInputs = [

pkgs/development/tools/continuous-integration/github-runner/default.nix

@@ -22,13 +22,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
 
 buildDotnetModule rec {
   pname = "github-runner";
-  version = "2.317.0";
+  version = "2.319.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-+VwEH4hmEjeYFWm7TOndD5SOJwsyPZEhKkCSyl7x8cE=";
+    hash = "sha256-02vIMuaeU5CsdwmJzUdfa6BFKewsKGFsEWKza3CqRtQ=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision

pkgs/development/tools/continuous-integration/github-runner/deps.nix

@@ -2,269 +2,269 @@
 # Please dont edit it manually, your changes might get overwritten!
 
 { fetchNuGet }: [
-  (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; sha256 = "14lsc6zik7s5by3gp86pf77wh58fcqrjy2xhx5p03gmhdn6iz2cn"; })
+  (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; hash = "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI="; })
-  (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; sha256 = "0rdgvlbqkcyc356xs0wzwbm92lf95621mf2shk30i3ahp0k0gd0k"; })
+  (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; hash = "sha256-E7QHJrhQjQjGhFq4GoQpyVGR6uKfA91NGcyziRfdr2U="; })
-  (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; sha256 = "1hjzggfv24598601jhcdfcaflbd5b97aglhxy7a5ymy1aszhwp9k"; })
+  (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; hash = "sha256-M10Ov1bBV1/U8R3Sp05apS3qFHONQRmAQakQsd17X8I="; })
-  (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; sha256 = "0rpcbmyhckvlvp6vbzpj03c1gqz56ixc6f15vgmxmyf1g40c24pf"; })
+  (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; hash = "sha256-7hLBAHnB+drr2yU4w3o05eMX2ADy/rXN3XRPBn1d7GY="; })
-  (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; sha256 = "1sy1q36bm9fz3gi780w4jgysw3dwaz2f3a5gcn6jxw1gkmdasb08"; })
+  (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "5.2.9"; hash = "sha256-CCytWp0v8C6NZa+o4cRXvA2u/ZOEA3TiG9+luszAwes="; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; sha256 = "0a1ahssqds2ympr7s4xcxv5y8jgxs7ahd6ah6fbgglj4rki1f1vw"; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.1.1"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; })
-  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; sha256 = "018yl113i037m5qhm3z6csb0c4l8kj412dxw2dagdbj07qbxwikj"; })
+  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; hash = "sha256-ckbeFz5ArvZUE7w3EYiciBIGlmbmjwpxqWeAOEKgHgU="; })
-  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; })
+  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; sha256 = "1gpka9jm2gl6f07pcwzwvaxw9xq1a19i9fskn0qs921c5grhlp3g"; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; hash = "sha256-b1wK8yssiKQxsFO7FFNQAffEu9r8c3YPcIY+UWVS874="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; sha256 = "03v6145vr1winq8xxfikydicds4f10qmy1ybyz2gfimnzzx51w00"; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; hash = "sha256-APBQ+v+2RvfE98sHXzEIjujGYvMzut4RtpGHvAsJZg8="; })
-  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; sha256 = "0ncnq378pk1immy2dyf75xjf2xn72r4m5gma1njhc4rvhzx9qz11"; })
+  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.2.0"; hash = "sha256-IXyc+oc7EwalDaq+UkkWx3bhZC/H+SZ8rTHMi87Allk="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; sha256 = "1a0w5fv8slfr4q7m3mh78lb9awdwyz4zv3bb73vybkyq1f6z7lx8"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1-rc2-24027"; hash = "sha256-qNPzjQvYz+X3OGuN/cn3vHGVFkUH1lEPJtlRjbYrHKg="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Runtime"; version = "1.0.2-rc2-24027"; sha256 = "0ippdn16381l8i2iy63i45nk0p303fjbd4amh7biwvqxgagfbvhh"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Runtime"; version = "1.0.2-rc2-24027"; hash = "sha256-EO7lnnodbx7XgVWRtqQbYFwwbSFxGB9FRDSgYYJt90Y="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2-rc2-24027"; sha256 = "05y0jz6vfl9zs0lmmwsz6arf7r0mg2dm93ymizrzmqn706krz45x"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Runtime.CoreCLR"; version = "1.0.2-rc2-24027"; hash = "sha256-vZCfpwHH4vrzj9WPVJt4FeTjsjJf81op0D9Rt82XwBc="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Runtime.Native"; version = "1.0.2-rc2-24027"; sha256 = "11hpbbmnjbskw7s6sx32l6qzz63kshx0gyp3sawyxk82nbqrissl"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Runtime.Native"; version = "1.0.2-rc2-24027"; hash = "sha256-VOuY8bICze650uP6BzrUc5j/saFidG304VMvaetaF4Y="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1-rc2-24027"; sha256 = "1j1458jska7540ng7fdf5i06k2vy71mxl5dld4x5s8gfndxpdzdj"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1-rc2-24027"; hash = "sha256-sv12e7PuIV06abQV2ms4fotpQCyuufMsIOWoqSUqJMg="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; sha256 = "05smkcyxir59rgrmp7d6327vvrlacdgldfxhmyr1azclvga1zfsq"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1-rc2-24027"; sha256 = "034m9p417iq3yzipg393wp4bddsh80di9iad78vvvh7w5difdv0x"; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1-rc2-24027"; hash = "sha256-HezmYiv8wL03Ok3FFBtAULe2yOUjjXfj9wPHE8hNlQw="; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; sha256 = "0l05smcgjzdfa5f60f9q5lylap3i21aswxbava92s19bgv46w2rv"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; hash = "sha256-OwtuyH4rBS2S2mp1rlUQcVxFPS04OWBcUa59+VjVBVA="; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; sha256 = "1238hx3hdg22s123cxygdfm89h54abw1jv6az6hl8h76ip39ybdp"; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; hash = "sha256-ty2fxo3mQESh+cpsGfhSpMCEqmvPdzZE0EK8BkeHaIg="; })
-  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1rvb076s4ksvmbvnxi4sv2f9f22izqp2rca0scjqya5x1qhcgkp0"; })
+  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1-rc2-24027"; hash = "sha256-4M7HIA69KI8l00CxLC7+UQiXnNiaxG73qltPos0Ba+c="; })
-  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; })
+  (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.4.0"; sha256 = "088j2anh1rnkxdcycw5kgp97ahk7cj741y6kask84880835arsb6"; })
+  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.4.0"; hash = "sha256-ZumsykAAIYKmVtP4QI5kZ0J10n2zcOZZ69PmAK0SEiE="; })
-  (fetchNuGet { pname = "Minimatch"; version = "2.0.0"; sha256 = "1k84q1bz1qq2nh35nip8vmi65wixsh5y7piln5b4n172xzhfqvx0"; })
+  (fetchNuGet { pname = "Minimatch"; version = "2.0.0"; hash = "sha256-oG/s4O/iBEtWsTTe4wvUPfJiYt3oRlsGtALj8FfABM0="; })
-  (fetchNuGet { pname = "Moq"; version = "4.11.0"; sha256 = "08bnk80scjjqnkdbjam8grcqrw2rvj9z7556hiznac7in3fcp77w"; })
+  (fetchNuGet { pname = "Moq"; version = "4.11.0"; hash = "sha256-/JzL3LDxMGV/hKaU85PcWfCMWX6oKrnatFhKpgGadiE="; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; sha256 = "1kazwidj63w53r1s6fd8sgykb70kdic27fg9qhg74qzwm354imwm"; })
+  (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; hash = "sha256-lddIyqj8Y3IexOm5I1hsE5w1/dOoOaNDHoUPI1vkX80="; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; sha256 = "1z70wvsx2d847a2cjfii7b83pjfs34q05gb037fdjikv5kbagml8"; })
+  (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; sha256 = "0xrwysmrn4midrjal8g2hr1bbg38iyisl0svamb11arqws4w2bw7"; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; })
-  (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; sha256 = "1r1hvj5gjl466bya2bfl5aaj8rbwyf5x1msg710wf3k2llbci1xa"; })
+  (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; })
-  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
+  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; })
-  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; })
+  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; })
-  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; })
+  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; })
-  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; })
+  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; })
-  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; })
+  (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; hash = "sha256-PaiITTFI2FfPylTEk7DwzfKeiA/g/aooSU1pDcdwWLU="; })
-  (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; })
+  (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-AYh39tgXJVFu8aLi9Y/4rK8yWMaza4S4eaxjfcuEEL4="; })
-  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; })
+  (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; hash = "sha256-vej7ySRhyvM3pYh/ITMdC25ivSd0WLZAaIQbYj/6HVE="; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; hash = "sha256-ns6f++lSA+bi1xXgmW1JkWFb2NaMD+w+YNTfMvyAiQk="; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-Y2AnhOcJwJVYv7Rp6Jz6ma0fpITFqJW+8rsw106K2X8="; })
-  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; })
+  (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-LkPXtiDQM3BcdYkAm5uSNOiz3uF4J45qpxn5aBiqNXQ="; })
-  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; })
+  (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-9EvnmZslLgLLhJ00o5MWaPuJQlbUFcUF8itGQNVkcQ4="; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; hash = "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-PQRACwnSUuxgVySO1840KvqCC9F8iI9iTzxNW0RcBS4="; })
-  (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; })
+  (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-Kaw5PnLYIiqWbsoF3VKJhy7pkpoGsUwn4ZDCKscbbzA="; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; })
+  (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; hash = "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="; })
-  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; })
+  (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-6MYj0RmLh4EVqMtO/MRqBi0HOn5iG4x9JimgCCJ+EFM="; })
-  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; })
+  (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-agdOM0NXupfHbKAQzQT8XgbI9B8hVEh+a/2vqeHctg4="; })
-  (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; })
+  (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; hash = "sha256-BgHxXCIbicVZtpgMimSXixhFC3V+p5ODqeljDjO8hCs="; })
-  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; })
+  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="; })
-  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; })
+  (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EbnOqPOrAgI9eNheXLR++VnY4pHzMsEKw1dFPJ/Fl2c="; })
-  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; })
+  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="; })
-  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; })
+  (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-mVg02TNvJc1BuHU03q3fH3M6cMgkKaQPBxraSHl/Btg="; })
-  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; })
+  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="; })
-  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; })
+  (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-g9Uiikrl+M40hYe0JMlGHe/lrR0+nN05YF64wzLmBBA="; })
-  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; })
+  (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; })
-  (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0-rc2-24027"; sha256 = "1qnd05bsrz88cr4wnkq7haf2bwml2zzjcscjk94v8ka4isi1i89b"; })
+  (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.1.0-rc2-24027"; hash = "sha256-K6EYoo5ETbRJmpJpJv8XtPIlnIIHT8tJZgj9rFcBzeI="; })
-  (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; sha256 = "1vvivbqsk6y4hzcid27pqpm5bsi6sc50hvqwbcx8aap5ifrxfs8d"; })
+  (fetchNuGet { pname = "runtime.native.System.IO.Compression"; version = "4.3.0"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; })
-  (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; })
+  (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; hash = "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; })
+  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; })
+  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; })
-  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; })
+  (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-xqF6LbbtpzNC9n1Ua16PnYgXHU0LvblEROTfK4vIxX8="; })
-  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; })
+  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="; })
-  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; })
+  (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-aJBu6Frcg6webvzVcKNoUP1b462OAqReF2giTSyBzCQ="; })
-  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; })
+  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="; })
-  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; })
+  (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-Mpt7KN2Kq51QYOEVesEjhWcCGTqWckuPf8HlQ110qLY="; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; })
+  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; hash = "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; })
+  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="; })
-  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; })
+  (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-JvMltmfVC53mCZtKDHE69G3RT6Id28hnskntP9MMP9U="; })
-  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; })
+  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="; })
-  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; })
+  (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-QfFxWTVRNBhN4Dm1XRbCf+soNQpy81PsZed3x6op/bI="; })
-  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; })
+  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="; })
-  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; })
+  (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-EaJHVc9aDZ6F7ltM2JwlIuiJvqM67CKRq682iVSo+pU="; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-PHR0+6rIjJswn89eoiWYY1DuU8u6xRJLrtjykAMuFmA="; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="; })
-  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; })
+  (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; hash = "sha256-LFkh7ua7R4rI5w2KGjcHlGXLecsncCy6kDXLuy4qD/Q="; })
-  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; })
+  (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; hash = "sha256-LZb23lRXzr26tRS5aA0xyB08JxiblPDoA7HBvn6awXg="; })
-  (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; sha256 = "15kfi3761mk2i29zg135ipsvavm50nwm4334cy5m5q7iagzsf73p"; })
+  (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.1"; hash = "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="; })
-  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; })
+  (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-ReoazscfbGH+R6s6jkg5sIEHWNEvjEoHtIsMbpc7+tI="; })
-  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; })
+  (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-Pf4mRl6YDK2x2KMh0WdyNgv0VUNdSKVDLlHqozecy5I="; })
-  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; })
+  (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; hash = "sha256-pHJ+I6i16MV6m77uhTC6GPY6jWGReE3SSP3fVB59ti0="; })
-  (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; })
+  (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; hash = "sha256-IvgOeA2JuBjKl5yAVGjPYMPDzs9phb3KANs95H9v1w4="; })
-  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; })
+  (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; hash = "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="; })
-  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; })
+  (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; })
-  (fetchNuGet { pname = "System.AppContext"; version = "4.1.0-rc2-24027"; sha256 = "0c0x3sg12a5zwiamvxs9c4bhdwmmm9by6x5da58fbrzz7afbaaag"; })
+  (fetchNuGet { pname = "System.AppContext"; version = "4.1.0-rc2-24027"; hash = "sha256-Tym1nDr/5+VQUa1041eqtfIGF2FJ911V5L8oEZ4eHTA="; })
-  (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; sha256 = "1649qvy3dar900z3g817h17nl8jp4ka5vcfmsr05kh0fshn7j3ya"; })
+  (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.0.0-rc2-24027"; sha256 = "1mqnay87pkxih73984jf5fm14d0m6yjq4cv4cqbj37nmgm54ssjp"; })
+  (fetchNuGet { pname = "System.Buffers"; version = "4.0.0-rc2-24027"; hash = "sha256-V2pNSn3VniEXZmQzgqU3FTQSqitOEpTGgbHPe5BXFtc="; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; })
+  (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; })
-  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; })
+  (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; })
+  (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; sha256 = "0ijpgf7iy3mcvr9327craxsb0lsznprajqzjy59sspc75gk0yahq"; })
+  (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; hash = "sha256-GCoP5iuHXa1T8fJjqfK1X1OwdFeZHTFS3qwOH497V0Y="; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; })
+  (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; })
-  (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12-rc2-24027"; sha256 = "0yhc5q74vb9vb9cmyrr9p4dfql62dr7c8ajbaxnzzs917v2z68q4"; })
+  (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12-rc2-24027"; hash = "sha256-BCPzxT4h6f9tV0sqxE5uwlDsGrkpZ19ZWjutTQ4uDHo="; })
-  (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; })
+  (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; })
-  (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; })
+  (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; })
-  (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; })
+  (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; })
-  (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; })
+  (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; })
-  (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; })
+  (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; })
-  (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; })
+  (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; })
-  (fetchNuGet { pname = "System.Console"; version = "4.0.0-rc2-24027"; sha256 = "072m313av0s5cfpr2rpq07p7c13dy4rh1ngigv3dnr1yyvab9081"; })
+  (fetchNuGet { pname = "System.Console"; version = "4.0.0-rc2-24027"; hash = "sha256-AYG01PY+ZNvGfvHZADPxbQR27gH4ZpGvY0WDrUYYVRw="; })
-  (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; })
+  (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; })
-  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; })
+  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; hash = "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="; })
-  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11-rc2-24027"; sha256 = "11rz0kdzk4bw9yc85jmskxla7i1bs61kladqzvymrg8xn3lk488a"; })
+  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11-rc2-24027"; hash = "sha256-CiEy6bAdvVz9/rgpOoPRK8SjaJ+6yoKYT3yR+dsEP4c="; })
-  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; })
+  (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; sha256 = "17h8bkcv0vf9a7gp9ajkd107zid98wql5kzlzwrjm5nm92nk0bsy"; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; })
-  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; })
+  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; })
-  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1-rc2-24027"; sha256 = "080gd86c1pkfkzz67ispkzxc426lfh82zajayiizbgwd6yqa7fv5"; })
+  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1-rc2-24027"; hash = "sha256-ZbujsDeNv/Vj9EqqLxB01AjC+p9Xx2P+n27ewAxqDyA="; })
-  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "0in3pic3s2ddyibi8cvgl102zmvp9r9mchh82ns9f0ms4basylw1"; })
+  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; })
-  (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; sha256 = "1kyw4d7dpjczhw6634nrmg7yyyzq72k75x38y0l0nwhigdlp1766"; })
+  (fetchNuGet { pname = "System.Diagnostics.TraceSource"; version = "4.3.0"; hash = "sha256-xpxwaXsRcgso8Gj0cqY4+Hvvz6vZkmEMh5/J204j3M8="; })
-  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0-rc2-24027"; sha256 = "0a0c24lm8yn0hbvd5m64lv7xhs2bmhm5fdpk89xvxj14zdarqhm6"; })
+  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0-rc2-24027"; hash = "sha256-pkKcVfskyL57QvM2VyqsS2jYz6bE1NL2gsB6VCkRDCg="; })
-  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; })
+  (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; })
-  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; })
+  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; })
-  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; })
+  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; })
+  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11-rc2-24027"; sha256 = "0yl161lr85smzdfzb7fbk0lfrqk5ns71hcnws6vm3sn2aqvfmhpn"; })
+  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11-rc2-24027"; hash = "sha256-9sLqNlbC6lG30dwyGI62ZeLsKJjLnfVd+1UXlGkwgXo="; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; })
+  (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; })
-  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1-rc2-24027"; sha256 = "0whr2qird567iyc137s10qs0xi6607kjii9wi8a8g1f9lybzlz5k"; })
+  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1-rc2-24027"; hash = "sha256-s3z6l6fJhYcUijzFKOcBxsQONAZBnxGYj8eUliMWGXI="; })
-  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; })
+  (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; })
-  (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; })
+  (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; })
-  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.2.1"; sha256 = "08n1z9ngsi26qlhwpjzxafhwl3p279widfci64l2ahxf1gprfqsx"; })
+  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.2.1"; hash = "sha256-XWOX7wuuQyUoMZG5Fnk64g7KoVP9y8shxUZE/Wz6wSI="; })
-  (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; })
+  (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; })
-  (fetchNuGet { pname = "System.IO"; version = "4.1.0-rc2-24027"; sha256 = "0rwqmn743gl21xnb3rwqkdacshd5l86pn23mc4bviva3pbncbjs4"; })
+  (fetchNuGet { pname = "System.IO"; version = "4.1.0-rc2-24027"; hash = "sha256-RMvF7LpD7bgXYXUIew2ipUHNVJuY57FsD4K+QY6tmGc="; })
-  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; })
+  (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; })
-  (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0-rc2-24027"; sha256 = "07s5zxdw3ihxdv0mjxb2ywzg9phcp4bayrhkadzm95l4kcv0xaij"; })
+  (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0-rc2-24027"; hash = "sha256-MqoONpuEllR/UxNmrxa5DN70PvdidVnBbh3GwVv/RR8="; })
-  (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; sha256 = "084zc82yi6yllgda0zkgl2ys48sypiswbiwrv7irb3r0ai1fp4vz"; })
+  (fetchNuGet { pname = "System.IO.Compression"; version = "4.3.0"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; })
-  (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1-rc2-24027"; sha256 = "0np6vf9rnfasz0sqys56kpryc84qcqi1a1rfskmycdlxk182p3s2"; })
+  (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1-rc2-24027"; hash = "sha256-Qo8rUJidNubr1C4HFSJmmCDm852maI81+Fo5m5Pb5lo="; })
-  (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; sha256 = "1yxy5pq4dnsm9hlkg9ysh5f6bf3fahqqb6p8668ndy5c0lk7w2ar"; })
+  (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.3.0"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; })
-  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; })
+  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; })
-  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1-rc2-24027"; sha256 = "0hpw3ssnbcv9l1lnlcym2bv3h3sf2znif4brys2i3868s6h946k6"; })
+  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1-rc2-24027"; hash = "sha256-ZhqSoNHIoBGF9nkRF+0XTg849hLVM2ppoGmzZbUe/EI="; })
-  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; })
+  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; })
-  (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.4.0"; sha256 = "11sna2bv5ai4sivrs7g2gp7g0yjp02s0kasl01j3fa1cvnwwvgkv"; })
+  (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.4.0"; hash = "sha256-e77Nud0sKDdkAFSrCbQAV3rwzn3iHZ131CSqspdQVoc="; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; })
+  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "04q3sxrfxqgig9scmxblxlb6n6fypv535lby26pi20ixszs19dxc"; })
+  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1-rc2-24027"; hash = "sha256-rLcU9Nc9AhGvEX7RMsq+3hlrFu109cp0evHh7nLXAxM="; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; })
+  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; })
-  (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; sha256 = "0lga30s3cllg2jkwldgabwrb0jg3dzj859bwj95xhnm3zcklnb41"; })
+  (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; hash = "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="; })
-  (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; })
+  (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; })
-  (fetchNuGet { pname = "System.Linq"; version = "4.1.0-rc2-24027"; sha256 = "0icbsy0vq07achclz32jvnnfdchkgylsjj67gra3fn5906s40n24"; })
+  (fetchNuGet { pname = "System.Linq"; version = "4.1.0-rc2-24027"; hash = "sha256-RFhAtAGpWDdUfsdIqal/E7LmrN1SjE8ZZOoAvIHXi0U="; })
-  (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; })
+  (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
-  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; })
+  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; })
-  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; })
+  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; })
-  (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; sha256 = "1p8qdg0gzxhjvabryc3xws2629pj8w5zz2iqh86kw8sh0rann9ay"; })
+  (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; hash = "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="; })
-  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; sha256 = "1i4gc757xqrzflbk7kc5ksn20kwwfjhw9w7pgdkn19y3cgnl302j"; })
+  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; })
-  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; })
+  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; })
-  (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; })
+  (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; })
-  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11-rc2-24027"; sha256 = "16wv24cb39639i7fcw005hh1rggyz2bgn51dpkdc67aq9lz76ivm"; })
+  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11-rc2-24027"; hash = "sha256-dUdzPk1YHcPavC0U+5b4/r0cICwAcOZOTMOksRgRm5s="; })
-  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; })
+  (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; })
-  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0-rc2-24027"; sha256 = "062kbbvm17nhwmcxjnakfv3i23vrk6c9gmz6x8q79kcr5hxr40qs"; })
+  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0-rc2-24027"; hash = "sha256-GgOSOyyZzXQw6ubXl5iZeQ8Rx3ZTWdlZ5dCeUPdaUxg="; })
-  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; sha256 = "1ssa65k6chcgi6mfmzrznvqaxk8jp0gvl77xhf1hbzakjnpxspla"; })
+  (fetchNuGet { pname = "System.Net.Sockets"; version = "4.3.0"; hash = "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="; })
-  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; })
+  (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
-  (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; })
+  (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; })
-  (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; sha256 = "065p89awfiz9kb304hqs7wkfpykd9z9kkv84ihm813msv54i8lvj"; })
+  (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; hash = "sha256-clMUSdm6joAqjATtOdNPbfrrJj8aQwLGmulHx1VCtxg="; })
-  (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; })
+  (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; })
-  (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; sha256 = "06fjipqvjp559rrm825x6pll8gimdj9x1n3larigh5hsm584gndw"; })
+  (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; hash = "sha256-vNlHUKkaFvhiVnTY0JNsNT5E6TW9CFRzTqVcufGN0hk="; })
-  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; })
+  (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; })
+  (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.1.0-rc2-24027"; sha256 = "0717y8iqcw19g2zkcs0hkalvjhnpaq5mapd82kxkhiq1djgjhhi2"; })
+  (fetchNuGet { pname = "System.Reflection"; version = "4.1.0-rc2-24027"; hash = "sha256-IkIon2wBRzj7FKhdVQtW10K5qZoQaDa/eClwhiPyJxw="; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; })
+  (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; })
+  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; })
+  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; })
-  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; })
+  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; hash = "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="; })
-  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; })
+  (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; })
+  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; })
+  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; })
-  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; })
+  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; hash = "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="; })
-  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1-rc2-24027"; sha256 = "0lgz7wwdb02vapa17hgdkf1jnq1mcsbq8gwy6a9iqd04d2mfanv7"; })
+  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1-rc2-24027"; hash = "sha256-Z1vlqmgENByTMp4/hJdmNWArg5vtwRPUVVuA1Tg//1E="; })
-  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; })
+  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; })
-  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
+  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; })
+  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1-rc2-24027"; sha256 = "1xjbwji89s69f9lq8wcjfkz8y9ym9zffgj2mg9bv0rxwyqcynpz8"; })
+  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1-rc2-24027"; hash = "sha256-6F/rGfa8Z7BXelXI59xP1SeP/nSScYRpcsnohKLkS/Y="; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; })
+  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; })
-  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; })
+  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; })
-  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.4.0"; sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; })
+  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.4.0"; hash = "sha256-sGgfV4pG9Kr+PLAR/DyRGiTP09Tkvol9U/WLSwkPOVk="; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; })
+  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1-rc2-24027"; sha256 = "06lkqk5hjkcna19inpda5fqbxvd9pq5cs61di7kmhrd2sgzbs6xj"; })
+  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1-rc2-24027"; hash = "sha256-shu9/tOiZVjniS0YzQq+qe2+sCuqXRtTUJZNCcvEkxo="; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; })
+  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; })
+  (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; sha256 = "1g5ghiyfb8njzfz39cswizjbxgaamil7kgkzgab93fhgk7jksmyg"; })
+  (fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; hash = "sha256-z1c95ZkPupGWen++eWisSr2+5I9cszS++9Ki5XyEr7w="; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; })
+  (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; })
+  (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; hash = "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="; })
-  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; })
+  (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; })
+  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0-rc2-24027"; sha256 = "09k4c6is31dpccwgb749055m2ad0b84rnapk69fmj3wjswacg26p"; })
+  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0-rc2-24027"; hash = "sha256-14jHFNeSD1ldMvMqmwlaoClRSwGJnPU4Y7eFoaNhZCY="; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; })
+  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; })
+  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1-rc2-24027"; sha256 = "0lw4amgaryahvija5xxb2vmybq7ks4b4ir7g7nc1xw6x9x58jf2q"; })
+  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1-rc2-24027"; hash = "sha256-WDiJSk/d8B6YPe/kSBbR8+Dl6xar96Jk3FD5rF5VhFM="; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; })
+  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; hash = "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0-rc2-24027"; sha256 = "0v5phdy7yr6d1q13fvb6hhd32k89l93z6x4hlkh5qhm1zlavaabl"; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0-rc2-24027"; hash = "sha256-dCm1Ff2hQlzgpJB080eiCU0xGoRmbTcCDs1kf3yDt2w="; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; hash = "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices.PInvoke"; version = "4.0.0-rc2-24027"; sha256 = "0qsgwvr6ppvllblb64p5plr7ssbmwfxxc4qf6l1xfincza8np34r"; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices.PInvoke"; version = "4.0.0-rc2-24027"; hash = "sha256-mYxrkfrMRtcDNQ4T1rvjdWl9Mr3lErPoonTfa/LmT2M="; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0-rc2-24027"; sha256 = "03pgqbgahfgvigyrsd08snzsryg90shfjlbdv4jk6yzfr27va3n2"; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0-rc2-24027"; hash = "sha256-wg61j8juezMl2W1R6aAG6fmsv9UINJ39i/s5qN7C7w4="; })
-  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; })
+  (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; })
-  (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; sha256 = "07fgipa93g1xxgf7193a6vw677mpzgr0z0cfswbvqqb364cva8dk"; })
+  (fetchNuGet { pname = "System.Runtime.Loader"; version = "4.3.0"; hash = "sha256-syG1GTFjYbwX146BD/L7t55j+DZqpHDc6z28kdSNzx0="; })
-  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1-rc2-24027"; sha256 = "1gkkc7njymmb12dd952q89x2h2jdrhp171vszsjqzh5q2ryj25gh"; })
+  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1-rc2-24027"; hash = "sha256-8BUhfRa4wI+l/nqHEy7MTQooekJYlNSaCKtWL+1hc74="; })
-  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; })
+  (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; })
-  (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; })
+  (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; })
-  (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; sha256 = "01vv2p8h4hsz217xxs0rixvb7f2xzbh6wv1gzbfykcbfrza6dvnf"; })
+  (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; hash = "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="; })
-  (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; sha256 = "1b2cxl2h7s8cydbhbmxhvvq071n9ck61g08npg4gyw7nvg37rfni"; })
+  (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; hash = "sha256-0bp8xtv2cP/IuxaBF8xkyYYD8N6w1wVX8wzpAwXtTKw="; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.4.0"; sha256 = "0ixqw47krkazsw0ycm22ivkv7dpg6cjz8z8g0ii44bsx4l8gcx17"; })
+  (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.4.0"; hash = "sha256-J3T2ECVdL0JiBA999CUz77az545CVOYB11/NPA/huEc="; })
-  (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; })
+  (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.4.0"; sha256 = "1grg9id80m358crr5y4q4rhhbrm122yw8jrlcl1ybi7nkmmck40n"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.4.0"; hash = "sha256-FpDJap32xOUDZTRLxL0QoeYFYSaY+JIzQ2VUgFpML78="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; hash = "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.4.0"; sha256 = "1bn7d2czpc994qzdph4drv7p1cv4x55j2dhbmr113p0gs4hx33zh"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.4.0"; hash = "sha256-8I/RIdEP3BFCrgs2IUvpZLNwz86NwNs+Jimx+5lox64="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; hash = "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; sha256 = "1q8ljvqhasyynp94a1d7jknk946m20lkwy2c3wa8zw2pc517fbj6"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.4.0"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; })
+  (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; })
-  (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; })
+  (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; sha256 = "00a0a7c40i3v4cb20s2cmh9csb5jv2l0frvnlzyfxh848xalpdwr"; })
+  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.4.0"; sha256 = "11rr16fp68apc0arsymgj18w8ajs9a4366wgx9iqwny4glrl20wp"; })
+  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.4.0"; hash = "sha256-lwNBM33EW45j6o8bM4hKWirEUZCvep0VYFchc50JOYc="; })
-  (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "4.4.0"; sha256 = "0hyijvysbcjh20mbbgajg9wh04nkjd6y5lqxgm0a6m28zjcjshl6"; })
+  (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "4.4.0"; hash = "sha256-hkItmfxIVKNAfR3T4k2T0xIAeXpSvbUqEFCypf2W0UM="; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; })
+  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11-rc2-24027"; sha256 = "0qkaldb06dwmi8gb940h75n9cs5rgy6sqcpa6f443mhahmagmsbd"; })
+  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11-rc2-24027"; hash = "sha256-ben6VIUK1kGIM+oyrI1/uWiWbDkQkLQeipU3A1ajamI="; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; })
+  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.4.0"; sha256 = "07bzjnflxjk9vgpljfybrpqmvsr9qr2f20nq5wf11imwa5pbhgfc"; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.4.0"; hash = "sha256-zD24blG8xhAcL9gC4UTGKetd8c3LO0nv22nKTp2Vfx0="; })
-  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; })
+  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; })
-  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11-rc2-24027"; sha256 = "02xic3hhfy48s50bxh25as1l9v3afgrhlxqfnd5ki4qirxly7qs6"; })
+  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11-rc2-24027"; hash = "sha256-RuPjac8RkzhLsw53CvNzauxEg1ZFwL5A0Yh4B+FgsQs="; })
-  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; })
+  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; hash = "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; })
-  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; })
+  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
-  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; })
+  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
-  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; sha256 = "1hr4qqzrij3y2ayi8jj70yfg0i9imf6fpdam1gr8qgp795kh86qg"; })
+  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; hash = "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM="; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; })
+  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.0.11-rc2-24027"; sha256 = "0aa4zaqma4yagjd44m2j13gr9qzn8rv8dbz3p9mjdk0dx1zpi4iq"; })
+  (fetchNuGet { pname = "System.Threading"; version = "4.0.11-rc2-24027"; hash = "sha256-OJJ4f+gNzCZruuOvhnZG9uOU3whSVEKafMoTVbH6RCk="; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; })
+  (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; })
-  (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; sha256 = "0n6z3wjia7h2a5vl727p97riydnb6jhhkb1pdcnizza02dwkz0nz"; })
+  (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; hash = "sha256-34I/eRNA/R8tazesCaE0yzYf80n3iEN3UQIeFSUf31g="; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; })
+  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11-rc2-24027"; sha256 = "0fsgdzdxm3yj1cym421ymn8x8anhyzgzc1529q5xd1vq4yknwfq0"; })
+  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11-rc2-24027"; hash = "sha256-ADtupyd4h9YLTqIE9t/30CrUka0+CFI9C9KP2ttvTzs="; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; })
+  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; hash = "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0-rc2-24027"; sha256 = "108sdqpy3ga6gzksl59w1k21a3jlrh8x2igyxh3dm3212rca1pyg"; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0-rc2-24027"; hash = "sha256-z9+gWBZBjNoG7P5F0RHMVA4VxAw8Farnf0a94S9uGoE="; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; hash = "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; sha256 = "1ikrplvw4m6pzjbq3bfbpr572n4i9mni577zvmrkaygvx85q3myw"; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.1"; hash = "sha256-3NeBC+r7eTVz3f+cEm1NkVhxSr7LrYGX/NdUwje9ecY="; })
-  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; })
+  (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; })
-  (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; })
+  (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; })
-  (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1-rc2-24027"; sha256 = "06kwi42lgf3zw3b5yw668ammbjl6208y182wyqaaqrxgn5gs4yh7"; })
+  (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1-rc2-24027"; hash = "sha256-B3qiX7GvZ6wU9lyg4BEQhspVq0LGcF/W4H+4RwWJfBo="; })
-  (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; sha256 = "1nx773nsx6z5whv8kaa1wjh037id2f1cxhb69pvgv12hd2b6qs56"; })
+  (fetchNuGet { pname = "System.Threading.Timer"; version = "4.3.0"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; })
-  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; })
+  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; })
-  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11-rc2-24027"; sha256 = "0vywggi6mqkbr6g1a1fh821hqfnyq1k829vlhfw908l7mj75k34d"; })
+  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11-rc2-24027"; hash = "sha256-jYxZjqyHIpC4g3QngWbA3joMg0DQBRWeyWviauJ73G8="; })
-  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; })
+  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
-  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; })
+  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; hash = "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="; })
-  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11-rc2-24027"; sha256 = "1rvglifac6xq1lawm78w49fq9cl8zvs1g4vrsd2hhf0vb4i85p1z"; })
+  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11-rc2-24027"; hash = "sha256-P9yCIlkbOAhF03mTF/T+iLKEXSIcncoVDbgbplykb+c="; })
-  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; sha256 = "08h8fm4l77n0nd4i4fk2386y809bfbwqb7ih9d7564ifcxr5ssxd"; })
+  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
-  (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; })
+  (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; })
-  (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; })
+  (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; hash = "sha256-IqTGPENWYoI06x2NHFPVtHlLEq9tazbom32bFLom6h4="; })
-  (fetchNuGet { pname = "xunit"; version = "2.7.1"; sha256 = "18bvbmqzkyia862x0jaj3ax5zlnlgsdpl52ai53g0fn8hcnnzzvi"; })
+  (fetchNuGet { pname = "xunit"; version = "2.7.1"; hash = "sha256-cf9vLYPIOvBGiUoUept+1NJfuhpSSdCFQSr6+XFde6E="; })
-  (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; sha256 = "00wl8qksgkxld76fgir3ycc5rjqv1sqds6x8yx40927q5py74gfh"; })
+  (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; })
-  (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; sha256 = "1shs5afb00r3ipnq7wnyvxyp4hnfcmbbf89qcpn4awhd355cv9k6"; })
+  (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; hash = "sha256-ZqbNShkNckXsZTght1ZlzkJyfd/e8oPtjSMDsJwqGuo="; })
-  (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; sha256 = "1nz05bh78d6ilz2g2vqp3jgxag5p3h1cnidwr9qxzgr89nj2fas6"; })
+  (fetchNuGet { pname = "xunit.assert"; version = "2.7.1"; hash = "sha256-RisnpE0ov99xyrxFywIctzzVnxwXb/HEp9E0dOAq4Ns="; })
-  (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; sha256 = "1lr7dm4f9i6xcjq1d8sj3a11y1kj50z43wmr84m8aj6lkwqkbv6z"; })
+  (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; hash = "sha256-3+w1MZ/USIUqQbnyQT4ocgYfghpSoxawZN3E5EhtJ9M="; })
-  (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; sha256 = "00pjk2i95kzjqm6j86i589vf265cmczk748xl4qcqalwrzhhc1g8"; })
+  (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; hash = "sha256-6AUG4c+cKswwoR2RMz+rrBjhdkIlGiRNxfLPkqKY8gI="; })
-  (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; sha256 = "1s90pc6fm3i5r3wjip9jkk2m5giyimik9f05b77yylknl9yipcfw"; })
+  (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; hash = "sha256-3LEbfaJ2Uu/PWQW4NGONPr5SxZwy3Sj5yCWO6gy7IOk="; })
-  (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.1"; sha256 = "0fln5pk18z98gp0zfshy1p9h6r9wc55nyqhap34k89yran646vhn"; })
+  (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.1"; hash = "sha256-Fm5DjFXZJzTJuApib0thPGUD0w0eavfBfSh9FOYtljo="; })
-  (fetchNuGet { pname = "YamlDotNet.Signed"; version = "5.3.0"; sha256 = "1gnp5aa2zzg7v61bbn2ra1npy0p07szp5w8vqk44fdj3fcvrdxib"; })
+  (fetchNuGet { pname = "YamlDotNet.Signed"; version = "5.3.0"; hash = "sha256-K/aWN3NDNkfIxBvxcr8+4AJ/bVBZ2LWC2ef9L5Qq174="; })
 ]

pkgs/development/tools/ginkgo/default.nix

@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.19.1";
+  version = "2.20.0";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-U8oSROthoqZsEEk3EUkojyHcpR3WJgDYDTAg+/ggqE8=";
+    sha256 = "sha256-18j9eBqFz2D3eK1uQPQgAUilJZmFbyS+0DqOjno9LTE=";
   };
-  vendorHash = "sha256-JQ1BayYPsp1VSEdGtRXI3NFZamHMLv/5C8G2gEY0qY0=";
+  vendorHash = "sha256-RfIkiASUEK1TBSBx/rx9UWVE8NuZssYmoTKggkj/kQE=";
 
   # integration tests expect more file changes
   # types tests are missing CodeLocation

pkgs/development/tools/ruff/Cargo.lock

@@ -133,6 +133,12 @@ version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
+[[package]]
+name = "append-only-vec"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74d9f7083455f1a474276ccd32374958d2cb591024aac45101c7623b10271347"
+
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
@@ -188,18 +194,6 @@ version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
-[[package]]
-name = "boomphf"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617e2d952880a00583ddb9237ac3965732e8df6a92a8e7bcc054100ec467ec3b"
-dependencies = [
- "crossbeam-utils",
- "log",
- "rayon",
- "wyhash",
-]
-
 [[package]]
 name = "bstr"
 version = "1.10.0"
@@ -326,9 +320,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
+checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -336,9 +330,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
+checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
 dependencies = [
  "anstream",
  "anstyle",
@@ -379,9 +373,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.11"
+version = "4.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1053,9 +1047,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1206,9 +1200,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -1488,11 +1482,11 @@ dependencies = [
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.0"
+version = "0.50.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd2800e1520bdc966782168a627aa5d1ad92e33b984bf7c7615d31280c83ff14"
+checksum = "d4a28e057d01f97e61255210fcff094d74ed0466038633e95017f5beb68e4399"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1530,87 +1524,13 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
 
 [[package]]
 name = "ordermap"
-version = "0.5.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5a8e22be64dfa1123429350872e7be33594dbf5ae5212c90c5890e71966d1d"
+checksum = "8c81974681ab4f0cc9fe49cad56f821d1cc67a08cd2caa9b5d58b0adaa5dd36d"
 dependencies = [
  "indexmap",
 ]
 
-[[package]]
-name = "orx-concurrent-ordered-bag"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa866e2be4aa03927eddb481e7c479d5109fe3121324fb7db6d97f91adf9876"
-dependencies = [
- "orx-fixed-vec",
- "orx-pinned-concurrent-col",
- "orx-pinned-vec",
- "orx-pseudo-default",
- "orx-split-vec",
-]
-
-[[package]]
-name = "orx-concurrent-vec"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5912426ffb660f8b61e8f0812a1d07400803cd5513969d2c7af4d69602ba8a1"
-dependencies = [
- "orx-concurrent-ordered-bag",
- "orx-fixed-vec",
- "orx-pinned-concurrent-col",
- "orx-pinned-vec",
- "orx-pseudo-default",
- "orx-split-vec",
-]
-
-[[package]]
-name = "orx-fixed-vec"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f69466c7c1fc2e1f00b58e39059b78c438b9fad144d1937ef177ecfc413e997"
-dependencies = [
- "orx-pinned-vec",
- "orx-pseudo-default",
-]
-
-[[package]]
-name = "orx-pinned-concurrent-col"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdbcb1fa05dc1676f1c9cf19f443b3d2d2ca5835911477d22fa77cad8b79208d"
-dependencies = [
- "orx-fixed-vec",
- "orx-pinned-vec",
- "orx-pseudo-default",
- "orx-split-vec",
-]
-
-[[package]]
-name = "orx-pinned-vec"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1071baf586de45722668234bddf56c52c1ece6a6153d16541bbb0505f0ac055"
-dependencies = [
- "orx-pseudo-default",
-]
-
-[[package]]
-name = "orx-pseudo-default"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f627c439e723fa78e410a0faba89047a8a47d0dc013da5c0e05806e8a6cddb"
-
-[[package]]
-name = "orx-split-vec"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52b9dbfa8c7069ae73a890870d3aa9097a897d616751d3d0278f2b42d5214730"
-dependencies = [
- "orx-pinned-vec",
- "orx-pseudo-default",
-]
-
 [[package]]
 name = "os_str_bytes"
 version = "7.0.0"
@@ -1726,9 +1646,9 @@ dependencies = [
 
 [[package]]
 name = "pep440_rs"
-version = "0.6.0"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca0a570e7ec9171250cac57614e901f62408094b54b3798bb920d3cf0d4a0e09"
+checksum = "466eada3179c2e069ca897b99006cbb33f816290eaeec62464eea907e22ae385"
 dependencies = [
  "once_cell",
  "serde",
@@ -1940,34 +1860,46 @@ name = "red_knot"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "chrono",
  "clap",
+ "colored",
  "countme",
  "crossbeam",
  "ctrlc",
  "filetime",
  "rayon",
- "red_knot_module_resolver",
+ "red_knot_python_semantic",
+ "red_knot_server",
  "red_knot_workspace",
  "ruff_db",
  "salsa",
  "tempfile",
  "tracing",
+ "tracing-flame",
  "tracing-subscriber",
  "tracing-tree",
 ]
 
 [[package]]
-name = "red_knot_module_resolver"
+name = "red_knot_python_semantic"
 version = "0.0.0"
 dependencies = [
  "anyhow",
+ "bitflags 2.6.0",
  "camino",
  "compact_str",
+ "countme",
+ "hashbrown",
  "insta",
  "once_cell",
+ "ordermap",
  "path-slash",
  "ruff_db",
+ "ruff_index",
+ "ruff_python_ast",
+ "ruff_python_parser",
  "ruff_python_stdlib",
+ "ruff_text_size",
  "rustc-hash 2.0.0",
  "salsa",
  "tempfile",
@@ -1977,23 +1909,43 @@ dependencies = [
 ]
 
 [[package]]
-name = "red_knot_python_semantic"
+name = "red_knot_server"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "bitflags 2.6.0",
+ "crossbeam",
- "countme",
+ "jod-thread",
- "hashbrown",
+ "libc",
- "ordermap",
+ "lsp-server",
- "red_knot_module_resolver",
+ "lsp-types",
+ "red_knot_workspace",
  "ruff_db",
- "ruff_index",
+ "ruff_linter",
+ "ruff_notebook",
  "ruff_python_ast",
- "ruff_python_parser",
+ "ruff_source_file",
  "ruff_text_size",
  "rustc-hash 2.0.0",
- "salsa",
+ "serde",
+ "serde_json",
+ "shellexpand",
  "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "red_knot_wasm"
+version = "0.0.0"
+dependencies = [
+ "console_error_panic_hook",
+ "console_log",
+ "js-sys",
+ "log",
+ "red_knot_workspace",
+ "ruff_db",
+ "ruff_notebook",
+ "wasm-bindgen",
+ "wasm-bindgen-test",
 ]
 
 [[package]]
@@ -2003,12 +1955,13 @@ dependencies = [
  "anyhow",
  "crossbeam",
  "notify",
- "red_knot_module_resolver",
  "red_knot_python_semantic",
+ "ruff_cache",
  "ruff_db",
  "ruff_python_ast",
  "rustc-hash 2.0.0",
  "salsa",
+ "thiserror",
  "tracing",
 ]
 
@@ -2034,9 +1987,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2093,7 +2046,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.5.6"
+version = "0.5.7"
 dependencies = [
  "anyhow",
  "argfile",
@@ -2148,6 +2101,7 @@ name = "ruff_benchmark"
 version = "0.0.0"
 dependencies = [
  "codspeed-criterion-compat",
+ "criterion",
  "mimalloc",
  "once_cell",
  "red_knot_workspace",
@@ -2200,6 +2154,7 @@ dependencies = [
  "salsa",
  "tempfile",
  "tracing",
+ "web-time",
  "zip",
 ]
 
@@ -2279,7 +2234,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.5.6"
+version = "0.5.7"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.2",
@@ -2303,7 +2258,7 @@ dependencies = [
  "once_cell",
  "path-absolutize",
  "pathdiff",
- "pep440_rs 0.6.0",
+ "pep440_rs 0.6.6",
  "pyproject-toml",
  "quick-junit",
  "regex",
@@ -2599,7 +2554,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.5.6"
+version = "0.5.7"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -2638,7 +2593,7 @@ dependencies = [
  "matchit",
  "path-absolutize",
  "path-slash",
- "pep440_rs 0.6.0",
+ "pep440_rs 0.6.6",
  "regex",
  "ruff_cache",
  "ruff_formatter",
@@ -2739,15 +2694,15 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 [[package]]
 name = "salsa"
 version = "0.18.0"
-source = "git+https://github.com/MichaReiser/salsa.git?rev=0cae5c52a3240172ef0be5c9d19e63448c53397c#0cae5c52a3240172ef0be5c9d19e63448c53397c"
+source = "git+https://github.com/MichaReiser/salsa.git?tag=red-knot-0.0.1#ece083e15b79f155f9e4368ec1318cec9a08d88b"
 dependencies = [
+ "append-only-vec",
  "arc-swap",
- "boomphf",
  "crossbeam",
  "dashmap 6.0.1",
  "hashlink",
  "indexmap",
- "orx-concurrent-vec",
+ "lazy_static",
  "parking_lot",
  "rustc-hash 2.0.0",
  "salsa-macro-rules",
@@ -2759,12 +2714,12 @@ dependencies = [
 [[package]]
 name = "salsa-macro-rules"
 version = "0.1.0"
-source = "git+https://github.com/MichaReiser/salsa.git?rev=0cae5c52a3240172ef0be5c9d19e63448c53397c#0cae5c52a3240172ef0be5c9d19e63448c53397c"
+source = "git+https://github.com/MichaReiser/salsa.git?tag=red-knot-0.0.1#ece083e15b79f155f9e4368ec1318cec9a08d88b"
 
 [[package]]
 name = "salsa-macros"
 version = "0.18.0"
-source = "git+https://github.com/MichaReiser/salsa.git?rev=0cae5c52a3240172ef0be5c9d19e63448c53397c#0cae5c52a3240172ef0be5c9d19e63448c53397c"
+source = "git+https://github.com/MichaReiser/salsa.git?tag=red-knot-0.0.1#ece083e15b79f155f9e4368ec1318cec9a08d88b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -2868,9 +2823,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.121"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609"
+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
 dependencies = [
  "itoa",
  "memchr",
@@ -3051,12 +3006,13 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53"
 dependencies = [
  "cfg-if",
  "fastrand",
+ "once_cell",
  "rustix",
  "windows-sys 0.52.0",
 ]
@@ -3194,9 +3150,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "toml"
-version = "0.8.16"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -3206,18 +3162,18 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.7"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.17"
+version = "0.22.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16"
+checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
 dependencies = [
  "indexmap",
  "serde",
@@ -3259,6 +3215,17 @@ dependencies = [
  "valuable",
 ]
 
+[[package]]
+name = "tracing-flame"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9"
+dependencies = [
+ "lazy_static",
+ "tracing",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "tracing-indicatif"
 version = "0.3.6"
@@ -3306,7 +3273,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c"
 dependencies = [
- "nu-ansi-term 0.50.0",
+ "nu-ansi-term 0.50.1",
  "tracing-core",
  "tracing-log",
  "tracing-subscriber",
@@ -3640,6 +3607,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "0.26.1"
@@ -3851,9 +3828,9 @@ checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
 
 [[package]]
 name = "winnow"
-version = "0.6.6"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0c976aaaa0e1f90dbb21e9587cdaf1d9679a1cde8875c0d6bd83ab96a208352"
+checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f"
 dependencies = [
  "memchr",
 ]
@@ -3864,15 +3841,6 @@ version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904"
 
-[[package]]
-name = "wyhash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf6e163c25e3fac820b4b453185ea2dea3b6a3e0a721d4d23d75bd33734c295"
-dependencies = [
- "rand_core",
-]
-
 [[package]]
 name = "yansi"
 version = "0.5.1"
@@ -3923,6 +3891,7 @@ dependencies = [
  "byteorder",
  "crc32fast",
  "crossbeam-utils",
+ "flate2",
  "zstd",
 ]
 

pkgs/development/tools/ruff/default.nix

@@ -13,20 +13,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     rev = "refs/tags/${version}";
-    hash = "sha256-70EEdr6gjdE8kjgMXYzHpqCzt4E73/Gr7ksNEbLlBoA=";
+    hash = "sha256-swnh2bfmwPP1BHlnKbOtRdskMMArZgP/ErtrnXKRiC8=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ=";
-      "salsa-0.18.0" = "sha256-y5PuGeQNUHLhU8YY9wPbGk71eNZ0aM0Xpvwfyf+UZwM=";
+      "salsa-0.18.0" = "sha256-Gu7YVqEDJUSzBqTeZH1xU0b3CWsWZrEvjIg7QpUaKBw=";
     };
   };
 

pkgs/servers/corosync/default.nix

@@ -7,8 +7,9 @@
 , nixosTests
 }:
 
-with lib;
+let
-
+  inherit (lib) optional;
+in
 stdenv.mkDerivation rec {
   pname = "corosync";
   version = "3.1.8";
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preConfigure = optionalString enableInfiniBandRdma ''
+  preConfigure = lib.optionalString enableInfiniBandRdma ''
     # configure looks for the pkg-config files
     # of librdmacm and libibverbs
     # Howver, rmda-core does not provide a pkg-config file
@@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
     inherit (nixosTests) pacemaker;
   };
 
-  meta = {
+  meta = with lib; {
     homepage = "http://corosync.org/";
     description = "Group Communication System with features for implementing high availability within applications";
     license = licenses.bsd3;

pkgs/servers/http/tengine/default.nix

@@ -7,8 +7,9 @@
 , ...
 }:
 
-with lib;
+let
-
+  inherit (lib) optional optionals optionalString;
+in
 stdenv.mkDerivation rec {
   version = "3.1.0";
   pname = "tengine";
@@ -22,9 +23,9 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ openssl zlib pcre libxcrypt libxml2 libxslt gd geoip gperftools jemalloc ]
-    ++ concatMap (mod: mod.inputs or []) modules;
+    ++ lib.concatMap (mod: mod.inputs or []) modules;
 
-  patches = singleton (substituteAll {
+  patches = lib.singleton (substituteAll {
     src = ../nginx/nix-etag-1.15.4.patch;
     preInstall = ''
       export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}"
@@ -101,7 +102,7 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2 -Wno-error=implicit-fallthrough"
     + optionalString stdenv.isDarwin " -Wno-error=deprecated-declarations";
 
-  preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
+  preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
 
   hardeningEnable = optional (!stdenv.isDarwin) "pie";
 
@@ -116,7 +117,7 @@ stdenv.mkDerivation rec {
     tests = nixosTests.nginx-variants.tengine;
   };
 
-  meta = {
+  meta = with lib; {
     description = "Web server based on Nginx and has many advanced features, originated by Taobao";
     mainProgram = "nginx";
     homepage    = "https://tengine.taobao.org";

pkgs/servers/http/unit/default.nix

@@ -12,8 +12,6 @@
 , withDebug ? false
 }:
 
-with lib;
-
 let
   phpConfig = {
     embedSupport = true;
@@ -27,6 +25,7 @@ let
   php81-unit = php81.override phpConfig;
   php82-unit = php82.override phpConfig;
 
+  inherit (lib) optional optionals optionalString;
 in stdenv.mkDerivation rec {
   version = "1.32.1";
   pname = "unit";
@@ -74,7 +73,7 @@ in stdenv.mkDerivation rec {
 
   passthru.tests.unit-php = nixosTests.unit-php;
 
-  meta = {
+  meta = with lib; {
     description = "Dynamic web and application server, designed to run applications in multiple languages";
     mainProgram = "unitd";
     homepage    = "https://unit.nginx.org/";

pkgs/servers/mail/mailman/package.nix

@@ -12,6 +12,8 @@ with python3.pkgs;
 buildPythonPackage rec {
   pname = "mailman";
   version = "3.3.9";
+  pyproject = true;
+
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
@@ -19,7 +21,11 @@ buildPythonPackage rec {
     hash = "sha256-GblXI6IwkLl+V1gEbMAe1baVyZOHMaYaYITXcTkp2Mo=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [
+    setuptools
+  ];
+
+  dependencies = with python3.pkgs; [
     aiosmtpd
     alembic
     authheaders

pkgs/servers/monitoring/mtail/default.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.0.7";
+  version = "3.0.8";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "mtail";
     rev = "v${version}";
-    hash = "sha256-Uo3Mq3NaQf/MlvvqfIfVlvQ+7YmrhKn/hb2HpEoc628=";
+    hash = "sha256-Rnpf0RgGltSrUPHra5LbvVmS9jftcimYM2Zc39xoxDk=";
   };
 
-  vendorHash = "sha256-FdvbwFrhvwJgqlssyqzZiBbh2HJEHAUi2s6IuBa6LC8=";
+  vendorHash = "sha256-30V+SS+fl1qmK/0i7eB4OGI6pv232kNIMPclRyTNWww=";
 
   ldflags = [
     "-X=main.Branch=main"

pkgs/servers/nats-streaming-server/default.nix

@@ -1,7 +1,5 @@
 { buildGoModule, fetchFromGitHub, lib  }:
 
-with lib;
-
 buildGoModule rec {
   pname   = "nats-streaming-server";
   version = "0.25.6";
@@ -18,7 +16,7 @@ buildGoModule rec {
   # tests fail and ask to `go install`
   doCheck = false;
 
-  meta = {
+  meta = with lib; {
     description = "NATS Streaming System Server";
     license = licenses.asl20;
     maintainers = [ maintainers.swdunlop ];

pkgs/servers/nosql/mongodb/mongodb.nix

@@ -25,8 +25,6 @@
 #   The command line administrative tools are part of other packages:
 #   see pkgs.mongodb-tools and pkgs.mongosh.
 
-with lib;
-
 { version, sha256, patches ? []
 , license ? lib.licenses.sspl
 , avxSupport ? stdenv.hostPlatform.avxSupport
@@ -39,7 +37,7 @@ let
     cheetah3
     psutil
     setuptools
-  ] ++ lib.optionals (versionAtLeast version "6.0") [
+  ] ++ lib.optionals (lib.versionAtLeast version "6.0") [
     packaging
     pymongo
   ]);
@@ -57,7 +55,7 @@ let
     #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
     #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
     #"wiredtiger"
-  ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
+  ] ++ lib.optionals stdenv.isLinux [ "tcmalloc" ];
   inherit (lib) systems subtractLists;
 
 in stdenv.mkDerivation rec {
@@ -108,7 +106,7 @@ in stdenv.mkDerivation rec {
     #include <string>'
     substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include <string>' '#include <optional>
     #include <string>'
-  '' + lib.optionalString (stdenv.isDarwin && versionOlder version "6.0") ''
+  '' + lib.optionalString (stdenv.isDarwin && lib.versionOlder version "6.0") ''
     substituteInPlace src/third_party/mozjs-${mozjsVersion}/extract/js/src/jsmath.cpp --replace '${mozjsReplace}' 0
   '' + lib.optionalString stdenv.isi686 ''
 
@@ -143,9 +141,9 @@ in stdenv.mkDerivation rec {
   preBuild = ''
     sconsFlags+=" CC=$CC"
     sconsFlags+=" CXX=$CXX"
-  '' + optionalString (!stdenv.isDarwin) ''
+  '' + lib.optionalString (!stdenv.isDarwin) ''
     sconsFlags+=" AR=$AR"
-  '' + optionalString stdenv.isAarch64 ''
+  '' + lib.optionalString stdenv.isAarch64 ''
     sconsFlags+=" CCFLAGS='-march=armv8-a+crc'"
   '';
 
@@ -165,7 +163,7 @@ in stdenv.mkDerivation rec {
   '';
 
   installTargets =
-    if (versionAtLeast version "6.0") then "install-devcore"
+    if (lib.versionAtLeast version "6.0") then "install-devcore"
     else "install-core";
 
   prefixKey = "DESTDIR=";
@@ -174,7 +172,7 @@ in stdenv.mkDerivation rec {
 
   hardeningEnable = [ "pie" ];
 
-  meta = {
+  meta = with lib; {
     description = "Scalable, high-performance, open source NoSQL database";
     homepage = "http://www.mongodb.org";
     inherit license;

pkgs/servers/rippled/data-api.nix

@@ -1,10 +1,8 @@
 { lib, fetchFromGitHub, nodePackages }:
 
-with lib;
-
 let
   np = nodePackages.override { generated = ./package.nix; self = np; };
-in nodePackages.buildNodePackage rec {
+in nodePackages.buildNodePackage {
   pname = "ripple-data-api";
   version = "unstable-2015-03-26";
 
@@ -15,11 +13,11 @@ in nodePackages.buildNodePackage rec {
     sha256 = "sha256-QEBdYdW55sAz6jshIAr2dSfXuqE/vqA2/kBeoxf75a8=";
   };
 
-  deps = (filter (v: nixType v == "derivation") (attrValues np));
+  deps = (lib.filter (v: lib.nixType v == "derivation") (lib.attrValues np));
 
   meta = {
     description = "Historical ripple data";
     homepage = "https://github.com/ripple/ripple-data-api";
-    maintainers = with maintainers; [ offline ];
+    maintainers = with lib.maintainers; [ offline ];
   };
 }

pkgs/servers/samba/4.x.nix

@@ -50,8 +50,6 @@
 , enablePam ? (!stdenv.isDarwin), pam
 }:
 
-with lib;
-
 let
   # samba-tool requires libxcrypt-legacy algorithms
   python = python3Packages.python.override {
@@ -61,6 +59,8 @@ let
   wrapPython = python3Packages.wrapPython.override {
     inherit python;
   };
+
+  inherit (lib) optional optionals;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "samba";
@@ -200,7 +200,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Save asn1_compile and compile_et so they are available to run on the build
   # platform when cross-compiling
-  postInstall = optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
+  postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) ''
     mkdir -p "$dev/bin"
     cp bin/asn1_compile bin/compile_et "$dev/bin"
   '';

pkgs/servers/search/elasticsearch/7.x.nix

@@ -11,11 +11,10 @@
 , zlib
 }:
 
-with lib;
 let
-  info = splitString "-" stdenv.hostPlatform.system;
+  info = lib.splitString "-" stdenv.hostPlatform.system;
-  arch = elemAt info 0;
+  arch = lib.elemAt info 0;
-  plat = elemAt info 1;
+  plat = lib.elemAt info 1;
   hashes =
     {
       x86_64-linux   = "sha512-OiWGRxaCdRxXuxE/W04v87ytzOeUEcHRjF5nyRkdqSbZSnLXUyKOYQ4fKmk4til0VBOaKZYId20XyPiu/XTXNw==";
@@ -62,7 +61,7 @@ stdenv.mkDerivation rec {
       --replace 'bin/elasticsearch-keystore' "$out/bin/elasticsearch-keystore"
 
     wrapProgram $out/bin/elasticsearch \
-      --prefix PATH : "${makeBinPath [ util-linux coreutils gnugrep ]}" \
+      --prefix PATH : "${lib.makeBinPath [ util-linux coreutils gnugrep ]}" \
       --set JAVA_HOME "${jre_headless}"
 
     wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"
@@ -70,9 +69,9 @@ stdenv.mkDerivation rec {
 
   passthru = { enableUnfree = true; };
 
-  meta = {
+  meta = with lib; {
     description = "Open Source, Distributed, RESTful Search Engine";
-    sourceProvenance = with lib.sourceTypes; [
+    sourceProvenance = with sourceTypes; [
       binaryBytecode
       binaryNativeCode
     ];

pkgs/servers/shishi/default.nix

@@ -11,8 +11,9 @@ let
   optPam = shouldUsePkg pam;
   optLibidn = shouldUsePkg libidn;
   optGnutls = shouldUsePkg gnutls;
+
+  inherit (lib) enableFeature withFeature optionalString;
 in
-with lib;
 stdenv.mkDerivation rec {
   pname = "shishi";
   version = "1.0.2";
@@ -66,7 +67,7 @@ stdenv.mkDerivation rec {
       -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
   '';
 
-  meta = {
+  meta = with lib; {
     homepage    = "https://www.gnu.org/software/shishi/";
     description = "Implementation of the Kerberos 5 network security system";
     license     = licenses.gpl3Plus;

pkgs/servers/sql/mariadb/connector-c/default.nix

@@ -4,10 +4,8 @@
 , version, hash, ...
 }:
 
-with lib;
-
 let
-  isVer33 = versionAtLeast version "3.3";
+  isVer33 = lib.versionAtLeast version "3.3";
 
 in stdenv.mkDerivation {
   pname = "mariadb-connector-c";
@@ -46,12 +44,12 @@ in stdenv.mkDerivation {
   '';
 
   # The cmake setup-hook uses $out/lib by default, this is not the case here.
-  preConfigure = optionalString stdenv.isDarwin ''
+  preConfigure = lib.optionalString stdenv.isDarwin ''
     cmakeFlagsArray+=("-DCMAKE_INSTALL_NAME_DIR=$out/lib/mariadb")
   '';
 
   nativeBuildInputs = [ cmake ];
-  propagatedBuildInputs = [ curl openssl zlib ] ++ optional isVer33 zstd;
+  propagatedBuildInputs = [ curl openssl zlib ] ++ lib.optional isVer33 zstd;
   buildInputs = [ libiconv ];
 
   postInstall = ''
@@ -67,7 +65,7 @@ in stdenv.mkDerivation {
     install -Dm644 include/ma_config.h $dev/include/mariadb/my_config.h
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Client library that can be used to connect to MySQL or MariaDB";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [ globin ];

pkgs/servers/xmpp/prosody/default.nix

@@ -9,8 +9,6 @@
 , withOnlyInstalledCommunityModules ? [ ]
 , withCommunityModules ? [ ] }:
 
-with lib;
-
 let
   luaEnv = lua.withPackages(p: with p; [
       luasocket luasec luaexpat luafilesystem luabitop luadbi-sqlite3 luaunbound
@@ -72,7 +70,7 @@ stdenv.mkDerivation rec {
 
   # the wrapping should go away once lua hook is fixed
   postInstall = ''
-      ${concatMapStringsSep "\n" (module: ''
+      ${lib.concatMapStringsSep "\n" (module: ''
         cp -r $communityModules/mod_${module} $out/lib/prosody/modules/
       '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))}
       make -C tools/migration install
@@ -83,7 +81,7 @@ stdenv.mkDerivation rec {
     tests = { inherit (nixosTests) prosody prosody-mysql; };
   };
 
-  meta = {
+  meta = with lib; {
     description = "Open-source XMPP application server written in Lua";
     license = licenses.mit;
     homepage = "https://prosody.im";

pkgs/tools/misc/flitter/flitter.patch

@@ -1,5 +1,38 @@
+diff --git a/src/big.ml b/src/big.ml
+index 7cd327f..f84bc10 100644
+--- a/src/big.ml
++++ b/src/big.ml
+@@ -11,7 +11,7 @@ let big_font_map =
+   ] in
+ 
+   let uchar_of_char = 
+-    let open Caml.Uchar in
++    let open Stdlib.Uchar in
+     function
+     | '[' -> of_int 0x258C
+     | ']' -> of_int 0x2590
+@@ -48,4 +48,4 @@ let image_of_string attr str =
+   List.map (String.to_list str) ~f:(fun ch ->
+       List.map (Map.find_exn big_font_map ch) ~f:(I.uchars attr)
+       |> I.vcat
+-    ) |> I.hcat
+\ No newline at end of file
++    ) |> I.hcat
+diff --git a/src/display.ml b/src/display.ml
+index bd6f7e4..44d7f6d 100644
+--- a/src/display.ml
++++ b/src/display.ml
+@@ -41,7 +41,7 @@ let splits_header timer width =
+   let joined = I.hcat cell_padded in
+   let padded = left_pad width joined in
+ 
+-  let br = I.uchar Colors.label (Caml.Uchar.of_int 0x2500) width 1 in
++  let br = I.uchar Colors.label (Stdlib.Uchar.of_int 0x2500) width 1 in
+   I.(padded <-> br)
+ 
+ type time_status = Ahead_gain | Ahead_loss | Behind_gain | Behind_loss | Gold
 diff --git a/src/dune b/src/dune
-index a50b09a..54cc770 100644
+index a50b09a..2b00ee2 100644
 --- a/src/dune
 +++ b/src/dune
 @@ -1,7 +1,7 @@

pkgs/tools/security/rbw/default.nix

@@ -25,14 +25,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rbw";
-  version = "1.11.1";
+  version = "1.12.1";
 
   src = fetchzip {
     url = "https://git.tozt.net/rbw/snapshot/rbw-${version}.tar.gz";
-    hash = "sha256-fk54jeAgOVF3KjkqkQL61aszhAAvLibZnI2w+irLK2s=";
+    hash = "sha256-+1kalFyhk2UL+iVzuFLDsSSTudrd4QpXw+3O4J+KsLc=";
   };
 
-  cargoHash = "sha256-MHNc8MjKbisgCRulO7xSiurHlp60rytPqxiGEV7TLMY=";
+  cargoHash = "sha256-cKbbsDb449WANGT+x8APhzs+hf5SR3RBsCBWDNceRMA=";
 
   nativeBuildInputs = [
     installShellFiles

pkgs/tools/text/ugrep/default.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ugrep";
-  version = "6.3.0";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "Genivia";
     repo = "ugrep";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-v9Bk+RfzoS1/rgnJMo0UQWJn23MPEAVH/phaMQSLjGg=";
+    hash = "sha256-oD55EEThyetByEaO2ZZxAadouZf/Z+p10lvnESep8gg=";
   };
 
   buildInputs = [

pkgs/tools/virtualization/jumppad/default.nix

@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "jumppad";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "jumppad-labs";
     repo = "jumppad";
     rev = version;
-    hash = "sha256-jG/XTMkedgDSncCW7YbII3g3ieB1i0Z9cOEVfZiczHI=";
+    hash = "sha256-RgUjefOWOIIRPtXOLBkXaJoSprmsMRzyUPjt/RLVFFc=";
   };
-  vendorHash = "sha256-FPM0q1ZVDfo00Z6QEXqtqfx77qkq5HhB+3vF9z9zrM0=";
+  vendorHash = "sha256-HyG6gPl3uyDR3GZqrFktnbKihIgIj/BZdntE4S0KD2M=";
 
   subPackages = [ "." ];
 

pkgs/top-level/all-packages.nix

@@ -12459,8 +12459,6 @@ with pkgs;
     inherit (darwin.apple_sdk.libs) utmp;
   };
 
-  scrcpy = callPackage ../misc/scrcpy { };
-
   screen-message = callPackage ../tools/X11/screen-message { };
 
   screenkey = callPackage ../applications/video/screenkey { };

pkgs/top-level/ocaml-packages.nix

@@ -751,7 +751,9 @@ let
 
     # Jane Street
     janePackage =
-      if lib.versionOlder "4.13.1" ocaml.version
+      if lib.versionOlder "5.1" ocaml.version
+      then callPackage ../development/ocaml-modules/janestreet/janePackage_0_17.nix {}
+      else if lib.versionOlder "4.13.1" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/janePackage_0_16.nix {}
       else if lib.versionOlder "4.10.2" ocaml.version
       then callPackage ../development/ocaml-modules/janestreet/janePackage_0_15.nix {}
@@ -762,7 +764,13 @@ let
       else null;
 
     janeStreet =
-      if lib.versionOlder "4.13.1" ocaml.version
+      if lib.versionOlder "5.1" ocaml.version
+      then import ../development/ocaml-modules/janestreet/0.17.nix
+         {
+           inherit self;
+           inherit (pkgs) bash fzf lib openssl zstd;
+         }
+      else if lib.versionOlder "4.13.1" ocaml.version
       then import ../development/ocaml-modules/janestreet/0.16.nix {
         inherit self;
         inherit (pkgs) bash fetchpatch fzf lib openssl zstd krb5;