Merge master into haskell-updates

ci/OWNERS

@@ -182,6 +182,7 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 # Rust
 /pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt @figsoda
 /pkgs/build-support/rust @zowoq @winterqt @figsoda
+/pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt
 /doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
 
 # Tcl

doc/languages-frameworks/go.section.md

@@ -7,32 +7,6 @@ The function `buildGoModule` builds Go programs managed with Go modules. It buil
 - An intermediate fetcher derivation called `goModules`. This derivation will be used to fetch all the dependencies of the Go module.
 - A final derivation will use the output of the intermediate derivation to build the binaries and produce the final output.
 
-### Attributes of `buildGoModule` {#buildgomodule-parameters}
-
-The `buildGoModule` function accepts the following parameters in addition to the [attributes accepted by both Go builders](#ssec-go-common-attributes):
-
-- `vendorHash`: is the hash of the output of the intermediate fetcher derivation (the dependencies of the Go modules).
-
-  `vendorHash` can be set to `null`.
-  In that case, rather than fetching the dependencies, the dependencies already vendored in the `vendor` directory of the source repo will be used.
-
-  To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;`.
-  You can read more about [vendoring in the Go documentation](https://go.dev/ref/mod#vendoring).
-
-  To obtain the actual hash, set `vendorHash = lib.fakeHash;` and run the build ([more details here](#sec-source-hashes)).
-- `proxyVendor`: If `true`, the intermediate fetcher downloads dependencies from the
-  [Go module proxy](https://go.dev/ref/mod#module-proxy) (using `go mod download`) instead of vendoring them. The resulting
-  [module cache](https://go.dev/ref/mod#module-cache) is then passed to the final derivation.
-
-  This is useful if your code depends on C code and `go mod tidy` does not include the needed sources to build or
-  if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums.
-
-  Defaults to `false`.
-- `modPostBuild`: Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`.
-  Note that if you change this attribute, you need to update `vendorHash` attribute.
-- `modRoot`: The root directory of the Go module that contains the `go.mod` file.
-  Defaults to `./`, which is the root of `src`.
-
 ### Example for `buildGoModule` {#ex-buildGoModule}
 
 The following is an example expression using `buildGoModule`:
@@ -62,17 +36,45 @@ The following is an example expression using `buildGoModule`:
 }
 ```
 
-### Obtaining and overriding `vendorHash` for `buildGoModule` {#buildGoModule-vendorHash}
+## Attributes of `buildGoModule` {#buildgomodule-parameters}
+
+Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by `buildGoModule`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` goModules fixed output derivation as well:
+
+- [`sourceRoot`](#var-stdenv-sourceRoot)
+- [`prePatch`](#var-stdenv-prePatch)
+- [`patches`](#var-stdenv-patches)
+- [`patchFlags`](#var-stdenv-patchFlags)
+- [`postPatch`](#var-stdenv-postPatch)
+- [`preBuild`](#var-stdenv-preBuild)
+- `env`: useful for passing down variables such as `GOWORK`.
+
+To control test execution of the build derivation, the following attributes are of interest:
+
+- [`checkInputs`](#var-stdenv-checkInputs)
+- [`preCheck`](#var-stdenv-preCheck)
+- [`checkFlags`](#var-stdenv-checkFlags)
+
+In addition to the above attributes, and the many more variables respected also by `stdenv.mkDerivation`, `buildGoModule` respects Go-specific attributes that tweak them to behave slightly differently:
+
+### `vendorHash` {#var-go-vendorHash}
+
+Hash of the output of the intermediate fetcher derivation (the dependencies of the Go modules).
+
+`vendorHash` can be set to `null`.
+In that case, rather than fetching the dependencies, the dependencies already vendored in the `vendor` directory of the source repo will be used.
+
+To avoid updating this field when dependencies change, run `go mod vendor` in your source repo and set `vendorHash = null;`.
+You can read more about [vendoring in the Go documentation](https://go.dev/ref/mod#vendoring).
+
+To obtain the hash, set `vendorHash = lib.fakeHash;` and run the build. ([more details here](#sec-source-hashes)).
+Another way is to use use `nix-prefetch` to obtain the hash. The following command gets the value of `vendorHash` for package `pet`:
 
-We can use `nix-prefetch` to obtain the actual hash. The following command gets the value of `vendorHash` for package `pet`:
 
 ```sh
 cd path/to/nixpkgs
 nix-prefetch -E "{ sha256 }: ((import ./. { }).my-package.overrideAttrs { vendorHash = sha256; }).goModules"
 ```
 
-To obtain the hash without external tools, set `vendorHash = lib.fakeHash;` and run the build. ([more details here](#sec-source-hashes)).
-
 `vendorHash` can be overridden with `overrideAttrs`. Override the above example like this:
 
 ```nix
@@ -91,144 +93,29 @@ To obtain the hash without external tools, set `vendorHash = lib.fakeHash;` and
 }
 ```
 
-### Overriding `goModules` {#buildGoModule-goModules-override}
+### `proxyVendor` {#var-go-proxyVendor}
 
-Overriding `<pkg>.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation. Alternatively, the primary derivation provides an overridable `passthru.overrideModAttrs` function to store the attribute overlay implicitly taken by `goModules.overrideAttrs`. Here's an example usage of `overrideModAttrs`:
+If `true`, the intermediate fetcher downloads dependencies from the
+[Go module proxy](https://go.dev/ref/mod#module-proxy) (using `go mod download`) instead of vendoring them. The resulting
+[module cache](https://go.dev/ref/mod#module-cache) is then passed to the final derivation.
 
-```nix
-{
-  pet-overridden = pet.overrideAttrs (
-    finalAttrs: previousAttrs: {
-      passthru = previousAttrs.passthru // {
-        # If the original package has an `overrideModAttrs` attribute set, you'd
-        # want to extend it, and not replace it. Hence we use
-        # `lib.composeExtensions`. If you are sure the `overrideModAttrs` of the
-        # original package trivially does nothing, you can safely replace it
-        # with your own by not using `lib.composeExtensions`.
-        overrideModAttrs = lib.composeExtensions previousAttrs.passthru.overrideModAttrs (
-          finalModAttrs: previousModAttrs: {
-            # goModules-specific overriding goes here
-            postBuild = ''
-              # Here you have access to the `vendor` directory.
-              substituteInPlace vendor/github.com/example/repo/file.go \
-                --replace-fail "panic(err)" ""
-            '';
-          }
-        );
-      };
-    }
-  );
-}
-```
+This is useful if your code depends on C code and `go mod tidy` does not include the needed sources to build or
+if any dependency has case-insensitive conflicts which will produce platform-dependent `vendorHash` checksums.
 
-## `buildGoPackage` (legacy) {#ssec-go-legacy}
+Defaults to `false`.
 
-The function `buildGoPackage` builds legacy Go programs, not supporting Go modules.
 
-::: {.warning}
-`buildGoPackage` is deprecated and will be removed for the 25.05 release.
-:::
+### `modPostBuild` {#var-go-modPostBuild}
 
-### Migrating from `buildGoPackage` to `buildGoModule` {#buildGoPackage-migration}
+Shell commands to run after the build of the goModules executes `go mod vendor`, and before calculating fixed output derivation's `vendorHash`.
+Note that if you change this attribute, you need to update `vendorHash` attribute.
 
-Go modules, released 6y ago, are now widely adopted in the ecosystem.
-Most upstream projects are using Go modules, and the tooling previously used for dependency management in Go is mostly deprecated, archived or at least unmaintained at this point.
 
-In case a project doesn't have external dependencies or dependencies are vendored in a way understood by `go mod init`, migration can be done with a few changes in the package.
+### `modRoot` {#var-go-modRoot}
 
-- Switch the builder from `buildGoPackage` to `buildGoModule`
-- Remove `goPackagePath` and other attributes specific to `buildGoPackage`
-- Set `vendorHash = null;`
-- Run `go mod init <module name>` in `postPatch`
+The root directory of the Go module that contains the `go.mod` file.
 
-In case the package has external dependencies that aren't vendored or the build setup is more complex the upstream source might need to be patched.
-Examples for the migration can be found in the [issue tracking migration withing nixpkgs](https://github.com/NixOS/nixpkgs/issues/318069).
-
-### Example for `buildGoPackage` {#example-for-buildgopackage}
-
-In the following is an example expression using `buildGoPackage`, the following arguments are of special significance to the function:
-
-- `goPackagePath` specifies the package's canonical Go import path.
-- `goDeps` is where the Go dependencies of a Go program are listed as a list of package source identified by Go import path. It could be imported as a separate `deps.nix` file for readability. The dependency data structure is described below.
-
-```nix
-{
-  deis = buildGoPackage rec {
-    pname = "deis";
-    version = "1.13.0";
-
-    goPackagePath = "github.com/deis/deis";
-
-    src = fetchFromGitHub {
-      owner = "deis";
-      repo = "deis";
-      rev = "v${version}";
-      hash = "sha256-XCPD4LNWtAd8uz7zyCLRfT8rzxycIUmTACjU03GnaeM=";
-    };
-
-    goDeps = ./deps.nix;
-  };
-}
-```
-
-The `goDeps` attribute can be imported from a separate `nix` file that defines which Go libraries are needed and should be included in `GOPATH` for `buildPhase`:
-
-```nix
-# deps.nix
-[ # goDeps is a list of Go dependencies.
-  {
-    # goPackagePath specifies Go package import path.
-    goPackagePath = "gopkg.in/yaml.v2";
-    fetch = {
-      # `fetch type` that needs to be used to get package source.
-      # If `git` is used there should be `url`, `rev` and `hash` defined next to it.
-      type = "git";
-      url = "https://gopkg.in/yaml.v2";
-      rev = "a83829b6f1293c91addabc89d0571c246397bbf4";
-      hash = "sha256-EMrdy0M0tNuOcITaTAmT5/dPSKPXwHDKCXFpkGbVjdQ=";
-    };
-  }
-  {
-    goPackagePath = "github.com/docopt/docopt-go";
-    fetch = {
-      type = "git";
-      url = "https://github.com/docopt/docopt-go";
-      rev = "784ddc588536785e7299f7272f39101f7faccc3f";
-      hash = "sha256-Uo89zjE+v3R7zzOq/gbQOHj3SMYt2W1nDHS7RCUin3M=";
-    };
-  }
-]
-```
-
-To extract dependency information from a Go package in automated way use [go2nix (deprecated)](https://github.com/kamilchm/go2nix). It can produce complete derivation and `goDeps` file for Go programs.
-
-You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc:
-
-```bash
-for p in $NIX_PROFILES; do
-    GOPATH="$p/share/go:$GOPATH"
-done
-```
-
-## Attributes used by both builders {#ssec-go-common-attributes}
-
-Many attributes [controlling the build phase](#variables-controlling-the-build-phase) are respected by both `buildGoModule` and `buildGoPackage`. Note that `buildGoModule` reads the following attributes also when building the `vendor/` goModules fixed output derivation as well:
-
-- [`sourceRoot`](#var-stdenv-sourceRoot)
-- [`prePatch`](#var-stdenv-prePatch)
-- [`patches`](#var-stdenv-patches)
-- [`patchFlags`](#var-stdenv-patchFlags)
-- [`postPatch`](#var-stdenv-postPatch)
-- [`preBuild`](#var-stdenv-preBuild)
-- `env`: useful for passing down variables such as `GOWORK`.
-
-To control test execution of the build derivation, the following attributes are of interest:
-
-- [`checkInputs`](#var-stdenv-checkInputs)
-- [`preCheck`](#var-stdenv-preCheck)
-- [`checkFlags`](#var-stdenv-checkFlags)
-
-In addition to the above attributes, and the many more variables respected also by `stdenv.mkDerivation`, both `buildGoModule` and `buildGoPackage` respect Go-specific attributes that tweak them to behave slightly differently:
+Defaults to `./`, which is the root of `src`.
 
 ### `ldflags` {#var-go-ldflags}
 
@@ -326,6 +213,38 @@ Whether the build result should be allowed to contain references to the Go tool
 
 Defaults to `false`
 
+## Overriding `goModules` {#buildGoModule-goModules-override}
+
+Overriding `<pkg>.goModules` by calling `goModules.overrideAttrs` is unsupported. Still, it is possible to override the `vendorHash` (`goModules`'s `outputHash`) and the `pre`/`post` hooks for both the build and patch phases of the primary and `goModules` derivation.
+
+Alternatively, the primary derivation provides an overridable `passthru.overrideModAttrs` function to store the attribute overlay implicitly taken by `goModules.overrideAttrs`. Here's an example usage of `overrideModAttrs`:
+
+```nix
+{
+  pet-overridden = pet.overrideAttrs (
+    finalAttrs: previousAttrs: {
+      passthru = previousAttrs.passthru // {
+        # If the original package has an `overrideModAttrs` attribute set, you'd
+        # want to extend it, and not replace it. Hence we use
+        # `lib.composeExtensions`. If you are sure the `overrideModAttrs` of the
+        # original package trivially does nothing, you can safely replace it
+        # with your own by not using `lib.composeExtensions`.
+        overrideModAttrs = lib.composeExtensions previousAttrs.passthru.overrideModAttrs (
+          finalModAttrs: previousModAttrs: {
+            # goModules-specific overriding goes here
+            postBuild = ''
+              # Here you have access to the `vendor` directory.
+              substituteInPlace vendor/github.com/example/repo/file.go \
+                --replace-fail "panic(err)" ""
+            '';
+          }
+        );
+      };
+    }
+  );
+}
+```
+
 ## Controlling the Go environment {#ssec-go-environment}
 
 The Go build can be further tweaked by setting environment variables. In most cases, this isn't needed. Possible values can be found in the [Go documentation of accepted environment variables](https://pkg.go.dev/cmd/go#hdr-Environment_variables). Notice that some of these flags are set by the builder itself and should not be set explicitly. If in doubt, grep the implementation of the builder.
@@ -364,4 +283,23 @@ If a larger amount of tests should be skipped, the following pattern can be used
 ```
 
 To disable tests altogether, set `doCheck = false;`.
-`buildGoPackage` does not execute tests by default.
+
+## Migrating from `buildGoPackage` to `buildGoModule` {#buildGoPackage-migration}
+
+::: {.warning}
+`buildGoPackage` was removed for the 25.05 release. It was used to build legacy Go programs
+that do not support Go modules.
+:::
+
+Go modules, released 6y ago, are now widely adopted in the ecosystem.
+Most upstream projects are using Go modules, and the tooling previously used for dependency management in Go is mostly deprecated, archived or at least unmaintained at this point.
+
+In case a project doesn't have external dependencies or dependencies are vendored in a way understood by `go mod init`, migration can be done with a few changes in the package.
+
+- Switch the builder from `buildGoPackage` to `buildGoModule`
+- Remove `goPackagePath` and other attributes specific to `buildGoPackage`
+- Set `vendorHash = null;`
+- Run `go mod init <module name>` in `postPatch`
+
+In case the package has external dependencies that aren't vendored or the build setup is more complex the upstream source might need to be patched.
+Examples for the migration can be found in the [issue tracking migration withing nixpkgs](https://github.com/NixOS/nixpkgs/issues/318069).

doc/redirects.json

@@ -2721,29 +2721,20 @@
     "index.html#ssec-language-go"
   ],
   "buildgomodule-parameters": [
-    "index.html#buildgomodule-parameters"
+    "index.html#buildgomodule-parameters",
+    "index.html#ssec-go-common-attributes"
   ],
   "ex-buildGoModule": [
     "index.html#ex-buildGoModule"
   ],
-  "buildGoModule-vendorHash": [
-    "index.html#buildGoModule-vendorHash"
-  ],
   "buildGoModule-goModules-override": [
     "index.html#buildGoModule-goModules-override"
   ],
-  "ssec-go-legacy": [
-    "index.html#ssec-go-legacy"
-  ],
   "buildGoPackage-migration": [
-    "index.html#buildGoPackage-migration"
-  ],
-  "example-for-buildgopackage": [
+    "index.html#buildGoPackage-migration",
+    "index.html#ssec-go-legacy",
     "index.html#example-for-buildgopackage"
   ],
-  "ssec-go-common-attributes": [
-    "index.html#ssec-go-common-attributes"
-  ],
   "var-go-ldflags": [
     "index.html#var-go-ldflags"
   ],
@@ -2759,6 +2750,9 @@
   "var-go-excludedPackages": [
     "index.html#var-go-excludedPackages"
   ],
+  "var-go-proxyVendor": [
+    "index.html#var-go-proxyVendor"
+  ],
   "var-go-CGO_ENABLED": [
     "index.html#var-go-CGO_ENABLED"
   ],
@@ -2768,6 +2762,16 @@
   "var-go-allowGoReference": [
     "index.html#var-go-allowGoReference"
   ],
+  "var-go-vendorHash": [
+    "index.html#var-go-vendorHash",
+    "index.html#buildGoModule-vendorHash"
+  ],
+  "var-go-modPostBuild": [
+    "index.html#var-go-modPostBuild"
+  ],
+  "var-go-modRoot": [
+    "index.html#var-go-modRoot"
+  ],
   "ssec-go-environment": [
     "index.html#ssec-go-environment"
   ],

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -4,11 +4,6 @@
 
 ## Highlights {#sec-release-24.11-highlights}
 
-- **This will be the last release of Nixpkgs to support macOS Sierra 10.12 to macOS Catalina 10.15.**
-  Starting with release 25.05, the minimum supported version will be macOS Big Sur 11, and we cannot guarantee that packages will continue to work on older versions of macOS.
-  Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS.
-  If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports versions back to Mac OS X Snow Leopard 10.6.
-
 - Nix was updated to 2.24, which brings a lot of improvements and fixes. See the release notes for
     [2.19](https://nix.dev/manual/nix/latest/release-notes/rl-2.19),
     [2.20](https://nix.dev/manual/nix/latest/release-notes/rl-2.20),
@@ -18,6 +13,16 @@
     [2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24).
   Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life additions.
 
+- There have been significant changes to macOS support.
+  - The build environment has been redesigned to be closer to a native Xcode toolchain, enabling us to provide all SDKs from macOS Sierra 10.12 to macOS Sequoia 15, simplify build definitions, and build more software without hacks or patching.
+    Although compatibility shims for the old SDK scheme are provided, some builds may break, and the old mechanisms will be removed by 25.11 at the latest.
+    See the [Darwin section](https://nixos.org/manual/nixpkgs/stable/#sec-darwin) of the Nixpkgs manual for details of the new scheme and how to use it, and [the announcement on Discourse](https://discourse.nixos.org/t/the-darwin-sdks-have-been-updated/55295) for more information on the changes and benefits.
+
+  - **This will be the last release of Nixpkgs to support macOS Sierra 10.12 to macOS Catalina 10.15.**
+    Starting with release 25.05, the minimum supported version will be macOS Big Sur 11, and we cannot guarantee that packages will continue to work on older versions of macOS.
+    Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS.
+    If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports versions back to Mac OS X Snow Leopard 10.6.
+
 - This will be the last release of Nixpkgs to support versions of CUDA prior to CUDA 12.0.
   These versions only work with old compiler versions that will be unsupported by the time of the Nixpkgs 25.05 release.
   In the future, users should expect CUDA versions to be dropped as the compiler versions they require leave upstream support windows.
@@ -893,6 +898,8 @@
 
 - `virtualisation.incus` module gained new `incus-user.service` and `incus-user.socket` systemd units. It is now possible to add a user to `incus` group instead of `incus-admin` for increased security.
 
+- `freecad` now supports addons and custom configuration in nix-way, which can be used by calling `freecad.customize`.
+
 ## Detailed Migration Information {#sec-release-24.11-migration}
 
 ### `sound` options removal {#sec-release-24.11-migration-sound}

nixos/doc/manual/release-notes/rl-2505.section.md

@@ -24,6 +24,8 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
+- `buildGoPackage` has been removed. Use `buildGoModule` instead. See the [Go section in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#sec-language-go) for details.
+
 - `kanata` was updated to v1.7.0, which introduces several breaking changes.
   See the release notes of
   [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)

nixos/modules/module-list.nix

@@ -264,6 +264,7 @@
   ./programs/openvpn3.nix
   ./programs/obs-studio.nix
   ./programs/partition-manager.nix
+  ./programs/pay-respects.nix
   ./programs/plotinus.nix
   ./programs/pqos-wrapper.nix
   ./programs/projecteur.nix

nixos/modules/programs/pay-respects.nix

@@ -11,6 +11,7 @@ let
     mkEnableOption
     mkIf
     mkOption
+    optionalString
     types
     ;
   inherit (types) str;
@@ -48,8 +49,8 @@ in
 
     programs = {
       bash.interactiveShellInit = initScript "bash";
-      fish.interactiveShellInit = mkIf config.programs.fish.enable initScript "fish";
-      zsh.interactiveShellInit = mkIf config.programs.zsh.enable initScript "zsh";
+      fish.interactiveShellInit = optionalString config.programs.fish.enable (initScript "fish");
+      zsh.interactiveShellInit = optionalString config.programs.zsh.enable (initScript "zsh");
     };
   };
   meta.maintainers = with maintainers; [ sigmasquadron ];

nixos/modules/services/audio/snapserver.nix

@@ -297,6 +297,7 @@ in {
         ProtectKernelTunables = true;
         ProtectControlGroups = true;
         ProtectKernelModules = true;
+        Restart = "on-failure";
         RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX AF_NETLINK";
         RestrictNamespaces = true;
         RuntimeDirectory = name;

nixos/modules/services/mail/opendkim.nix

@@ -1,35 +1,27 @@
 { config, lib, pkgs, ... }:
-let
 
+let
   cfg = config.services.opendkim;
 
   defaultSock = "local:/run/opendkim/opendkim.sock";
 
-  keyFile = "${cfg.keyPath}/${cfg.selector}.private";
-
   args = [ "-f" "-l"
            "-p" cfg.socket
            "-d" cfg.domains
-           "-k" keyFile
+           "-k" "${cfg.keyPath}/${cfg.selector}.private"
            "-s" cfg.selector
          ] ++ lib.optionals (cfg.configFile != null) [ "-x" cfg.configFile ];
 
+  configFile = pkgs.writeText "opendkim.conf"
+    (lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${value}") cfg.settings));
 in {
   imports = [
     (lib.mkRenamedOptionModule [ "services" "opendkim" "keyFile" ] [ "services" "opendkim" "keyPath" ])
   ];
 
-  ###### interface
-
   options = {
-
     services.opendkim = {
-
-      enable = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = "Whether to enable the OpenDKIM sender authentication system.";
-      };
+      enable = lib.mkEnableOption "OpenDKIM sender authentication system";
 
       socket = lib.mkOption {
         type = lib.types.str;
@@ -74,21 +66,24 @@ in {
         description = "Selector to use when signing.";
       };
 
+      # TODO: deprecate this?
       configFile = lib.mkOption {
         type = lib.types.nullOr lib.types.path;
         default = null;
-        description = "Additional opendkim configuration.";
+        description = "Additional opendkim configuration as a file.";
       };
 
+      settings = lib.mkOption {
+        type = with lib.types; submodule {
+          freeformType = attrsOf str;
+        };
+        default = { };
+        description = "Additional opendkim configuration";
+      };
     };
-
   };
 
-
-  ###### implementation
-
   config = lib.mkIf cfg.enable {
-
     users.users = lib.optionalAttrs (cfg.user == "opendkim") {
       opendkim = {
         group = cfg.group;
@@ -100,7 +95,14 @@ in {
       opendkim.gid = config.ids.gids.opendkim;
     };
 
-    environment.systemPackages = [ pkgs.opendkim ];
+    environment = {
+      etc = lib.mkIf (cfg.settings != { }) {
+        "opendkim/opendkim.conf".source = configFile;
+      };
+      systemPackages = [ pkgs.opendkim ];
+    };
+
+    services.opendkim.configFile = lib.mkIf (cfg.settings != { }) configFile;
 
     systemd.tmpfiles.rules = [
       "d '${cfg.keyPath}' - ${cfg.user} ${cfg.group} - -"
@@ -159,6 +161,5 @@ in {
         UMask = "0077";
       };
     };
-
   };
 }

nixos/modules/services/web-apps/wordpress.nix

@@ -154,8 +154,8 @@ let
             (l: warn "setting this option with a list is deprecated"
               listToAttrs (map (p: nameValuePair (p.name or (throw "${p} does not have a name")) p) l))
             (attrsOf path);
-          default = { inherit (pkgs.wordpressPackages.themes) twentytwentyfour; };
-          defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentyfour; }";
+          default = { inherit (pkgs.wordpressPackages.themes) twentytwentyfive; };
+          defaultText = literalExpression "{ inherit (pkgs.wordpressPackages.themes) twentytwentyfive; }";
           description = ''
             Path(s) to respective theme(s) which are copied from the 'theme' directory.
 

nixos/tests/wordpress.nix

@@ -67,7 +67,7 @@ rec {
       networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ];
     };
   }) {} [
-    "6_6"
+    "6_7"
   ];
 
   testScript = ''

pkgs/applications/blockchains/alfis/default.nix

@@ -24,14 +24,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "ecies-ed25519-ng-0.5.3" = "sha256-sJZ5JCaGNa3DdAaHw7/2qeLYv+HDKEMcY4uHbzfzQBM=";
-      "ureq-2.10.0" = "sha256-XNjY8qTgt2OzlfKu7ECIfgRLkSlprvjpgITsNVMi1uc=";
-      "web-view-0.7.3" = "sha256-eVMcpMRZHwOdWhfV6Z1uGUNOmhB41YZPaiz1tRQvhrI=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-xe0YQCKnDV6M6IKWgljsuJ5ZevkdpxZDnNHAHKJyUec=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/applications/editors/neovim/utils.nix

@@ -176,7 +176,11 @@ let
         (lib.replaceStrings [ "-" ] [ "_" ])
       ];
 
-      nvimGrammars = lib.mapAttrsToList (name: value: value.origGrammar) vimPlugins.nvim-treesitter.grammarPlugins;
+      nvimGrammars = lib.mapAttrsToList (
+        name: value:
+        value.origGrammar
+          or (builtins.throw "additions to `pkgs.vimPlugins.nvim-treesitter.grammarPlugins` set should be passed through `pkgs.neovimUtils.grammarToPlugin` first")
+      ) vimPlugins.nvim-treesitter.grammarPlugins;
       isNvimGrammar = x: builtins.elem x nvimGrammars;
 
       toNvimTreesitterGrammar = callPackage ({ }:

pkgs/applications/emulators/retroarch/hashes.json

@@ -155,10 +155,10 @@
         "src": {
             "owner": "libretro",
             "repo": "bluemsx-libretro",
-            "rev": "7a4a21d1e90a9135f678587cd8aea3f023798edd",
-            "hash": "sha256-emwyVbZHJU2ujHeiqD1mthKFvnP4bXdUDLAv+DFMMN4="
+            "rev": "01ce142ccb85c302420cb962d1b6e6a68a6ce076",
+            "hash": "sha256-h3Zpv+h6CbM1pdSOXsjN0pFUjXLn5T/R5W55VZXpMVM="
         },
-        "version": "unstable-2024-10-01"
+        "version": "unstable-2024-10-22"
     },
     "bsnes": {
         "fetcher": "fetchFromGitHub",
@@ -368,10 +368,10 @@
         "src": {
             "owner": "libretro",
             "repo": "gpsp",
-            "rev": "01ca530d0797021fb519a49c18f5df15c5093605",
-            "hash": "sha256-4ka3finPgtAJx3SWXG9L6+t+Dbn++pRQJJi9EG7jV3s="
+            "rev": "36061caf8cc5e15c3c92fb772b6b8560c7c59ec7",
+            "hash": "sha256-o36OUdgm7p+rAMN6R2e2Lqi4oBLTyxziw7Lr20ERBg0="
         },
-        "version": "unstable-2024-10-01"
+        "version": "unstable-2024-10-21"
     },
     "gw": {
         "fetcher": "fetchFromGitHub",
@@ -398,21 +398,21 @@
         "src": {
             "owner": "libretro",
             "repo": "hatari",
-            "rev": "153887d70df7c91e192192fa7ca34f90e000a7c5",
-            "hash": "sha256-s1VNAIuO0N4mrInb74sRcSTBMwwHwtYw9JnCKNVPNpU="
+            "rev": "7008194d3f951a157997f67a820578f56f7feee0",
+            "hash": "sha256-ZPzwUBaxs2ivE9n9cb5XB5mhixY9b6qIlq7OiVSLbqg="
         },
-        "version": "unstable-2024-10-01"
+        "version": "unstable-2024-10-21"
     },
     "mame": {
         "fetcher": "fetchFromGitHub",
         "src": {
             "owner": "libretro",
             "repo": "mame",
-            "rev": "6a3d1606e41aaedc94e6b00d68e682a95ac36bec",
-            "hash": "sha256-Fcd906E1I52fDnBWehrdtk6NfYA1yhmHIQ7xZCcbtEU=",
+            "rev": "a67797ad2f7516906ed7acef87569c6f35ca8739",
+            "hash": "sha256-MF6MWQftHBYL1Uv3ZYKFqCH24nd1+M73rhUzkdftMzk=",
             "fetchSubmodules": true
         },
-        "version": "unstable-2024-10-04"
+        "version": "unstable-2024-11-01"
     },
     "mame2000": {
         "fetcher": "fetchFromGitHub",
@@ -611,10 +611,10 @@
         "src": {
             "owner": "libretro",
             "repo": "parallel-n64",
-            "rev": "334998e6129debe50f7ef9c5cd1e995460ae2da8",
-            "hash": "sha256-ngENgmBQFHUYRp9DBnQLWapvfhnFra/B+jeegm8+rtE="
+            "rev": "e372c5e327dcd649e9d840ffc3d88480b6866eda",
+            "hash": "sha256-q4octB5XDdl4PtLYVZfBgydVBNaOwzu9dPBY+Y68lVo="
         },
-        "version": "unstable-2024-06-29"
+        "version": "unstable-2024-10-21"
     },
     "pcsx2": {
         "fetcher": "fetchFromGitHub",
@@ -694,20 +694,20 @@
         "src": {
             "owner": "libretro",
             "repo": "libretro-uae",
-            "rev": "527564f2748901068a5fef891c5073a4d6cd089b",
-            "hash": "sha256-tzZVG4B+rzHqhw28cmvjMFiyFfbrU3xOOEU+OCUaa+M="
+            "rev": "c60e42ef9ad474518d4be859b7c1da2c0c7e1d6f",
+            "hash": "sha256-WCkz7BUgYaI+yRhPmNuOKGJC/GxV+n2aeJVn8vhx0Ng="
         },
-        "version": "unstable-2024-09-25"
+        "version": "unstable-2024-10-19"
     },
     "quicknes": {
         "fetcher": "fetchFromGitHub",
         "src": {
             "owner": "libretro",
             "repo": "QuickNES_Core",
-            "rev": "89d649a544e7d37a5cdbc77c811e88753fa23131",
-            "hash": "sha256-OPZVYQVbtIfmmKmuLQ5eVqZf+41ovyoa17YHvjKgd6w="
+            "rev": "dbf19f73e3eb9701d1c7f5898f57c097e05c9fbd",
+            "hash": "sha256-oFQUMp1imc8JCsQYCy1BtIUmTC+u0VcoYHpWzUpKNb4="
         },
-        "version": "unstable-2024-06-28"
+        "version": "unstable-2024-10-21"
     },
     "same_cdi": {
         "fetcher": "fetchFromGitHub",
@@ -764,10 +764,10 @@
         "src": {
             "owner": "libretro",
             "repo": "snes9x2002",
-            "rev": "2790d03b2266c58444429b4f7d76ba298e0bde87",
-            "hash": "sha256-kTZrEeZcaFey7gmLbPEG82T6n3cxxZkKminRP543oZA="
+            "rev": "a0709ec7dcd6de2fbebb43106bd757b649e3b7cf",
+            "hash": "sha256-rrMPhXIsQ48fVvjgZgC3xeqm9k9kwe43oZNzs2d/h1Q="
         },
-        "version": "unstable-2024-06-28"
+        "version": "unstable-2024-10-21"
     },
     "snes9x2005": {
         "fetcher": "fetchFromGitHub",
@@ -784,10 +784,10 @@
         "src": {
             "owner": "libretro",
             "repo": "snes9x2010",
-            "rev": "84b963a2f627bbc41198e357430619f34bbebc8a",
-            "hash": "sha256-s358pyMH4vIQt1f0Mgw1U5gwUW0aSqVtwyeyoL/4Ok8="
+            "rev": "f9ae8fd28b13070a945a829ccf41cbf90a21d0f7",
+            "hash": "sha256-nsExAYnzDenPvXzeN60jGykRTrCGMi/mRPV+vgS8ZtE="
         },
-        "version": "unstable-2024-06-28"
+        "version": "unstable-2024-11-18"
     },
     "stella": {
         "fetcher": "fetchFromGitHub",
@@ -885,10 +885,10 @@
         "src": {
             "owner": "libretro",
             "repo": "virtualjaguar-libretro",
-            "rev": "8126e5c504ac7217a638f38e4cd9190822c8abdd",
-            "hash": "sha256-U/qdKApE0OU3jc6ekfgEZ7VCaIqCc2h+Y+IHe7PIRY0="
+            "rev": "48096c1f6f8b98cfff048a5cb4e6a86686631072",
+            "hash": "sha256-DLBQQARHqupGGQS8YznDSSMuxQliyt5apGA4Ku2jlYo="
         },
-        "version": "unstable-2023-06-01"
+        "version": "unstable-2024-10-21"
     },
     "yabause": {
         "fetcher": "fetchFromGitHub",

pkgs/applications/networking/cluster/k3s/1_28/chart-versions.nix

@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
-    sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
+    sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
-    sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
+    sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
   };
 }

pkgs/applications/networking/cluster/k3s/1_28/images-versions.json

@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0rydihys7r9sscl7bv2ixbs3b25jjxr9rsgzz5nwgz6ncsr6nn7v"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "0p14llji8m1pfi289w29smx6sbad6qhgxk9drwlyrfdywrhd04ly"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "036inn29k2c0wdbkxxh4fl6gs2g2wckv7856n7dhy791j33v8v0f"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "054apgl2al8822f399ir81jbid9mfs27d4by7xkkpdbqr3fywbr6"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "107s3imimc3gg8hmahihqc8930yzqcgxly7rhjia1z76vskswhpx"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "19hzamg68zc1k90a9m6p2jnpy2p7v437kvgqsw198bhy796f6asb"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.14%2Bk3s1/k3s-images.txt",
-    "sha256": "1l71xhcj2z9fz3mn89iyyxznrgk59qgng549iq3zc8w3l0hl0qry"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.28.15%2Bk3s1/k3s-images.txt",
+    "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8"
   }
 }

pkgs/applications/networking/cluster/k3s/1_28/versions.nix

@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.28.14+k3s1";
-  k3sCommit = "3ef2bdb1e5ba667b735a65cbfa43229fd49230ef";
-  k3sRepoSha256 = "146xxpldp7bffn8sigfp9xjj8hw793ybp1xrfyb9s0bd85yxiw4x";
-  k3sVendorHash = "sha256-Y5s5lPP2bVGPHQPma3DJYYP91I3HQQoi+KbjEZpTr6w=";
+  k3sVersion = "1.28.15+k3s1";
+  k3sCommit = "869dd4d62626f5ba4afe3a923d77b2047c565a43";
+  k3sRepoSha256 = "1nijdii01004v2cgpaw0xnzyrljd4iw00wca1lg6szhqmj28gcfv";
+  k3sVendorHash = "sha256-zWBMZrpRJzzc4yAIWAnWnmVE7qr7bscJjHrHdDD0Ilg=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.0";
   k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
   k3sCNIVersion = "1.5.1-k3s1";
   k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7";
-  containerdVersion = "1.7.21-k3s2.28";
-  containerdSha256 = "00gdmd617mxf246m3mfz8if8snaciib4zdb7fm12mdhf52w031a6";
+  containerdVersion = "1.7.22-k3s1.28";
+  containerdSha256 = "0jpq03n5q8aydw4y14w9fl4fqixpdcw42gwvmsp3z3qplbvwkfkl";
   criCtlVersion = "1.26.0-rc.0-k3s1";
 }

pkgs/applications/networking/cluster/k3s/1_29/chart-versions.nix

@@ -1,10 +1,10 @@
 {
   traefik-crd = {
-    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-25.0.3+up25.0.0.tgz";
-    sha256 = "1z693i4kd3jyf26ccnb0sxjyxadipl6k13n7jyg5v4y93fv1rpdw";
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-27.0.201+up27.0.2.tgz";
+    sha256 = "0vwprcb60y15sc4lmi58gl1zr3yhsq43jlbsfm7gs20ci90frv16";
   };
   traefik = {
-    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-25.0.3+up25.0.0.tgz";
-    sha256 = "1a24qlp7c6iri72ka1i37l1lzn13xibrd26dy295z2wzr55gg7if";
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-27.0.201+up27.0.2.tgz";
+    sha256 = "12dp1r82qfzqfzs4sfxc54rnw8kv42a3w4gpk5v3qkhqm6fkrnn1";
   };
 }

pkgs/applications/networking/cluster/k3s/1_29/images-versions.json

@@ -1,18 +1,18 @@
 {
   "airgap-images-amd64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
-    "sha256": "0z3k4pc5cg75krk391d9h74ankv20mfcswrhwhhfv208rcndd9w9"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "0vyanank5iaflhxjiz7wqq52swfdf5i0ca40bigq8ynjh39l9rh9"
   },
   "airgap-images-arm": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-airgap-images-arm.tar.zst",
-    "sha256": "0iy0xz8ypmgn48jh3b4hbnwl8iszdb35c2f6an115z86lnl7a9a3"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "1lsfnifh5krb7jc4jr7kfrj2a8snrv58c90qq72pkl4akdbg4l2r"
   },
   "airgap-images-arm64": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
-    "sha256": "1bjfd63jd7a1yhh796nmdh7jvw9mabsw5gajcx8ssqcxd4wwrdxb"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "03y6pnr3yxa60vnz1r3k51f9fr2vrb1jffkjla1p4j8w3bs5gaqq"
   },
   "images-list": {
-    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.9%2Bk3s1/k3s-images.txt",
-    "sha256": "1l71xhcj2z9fz3mn89iyyxznrgk59qgng549iq3zc8w3l0hl0qry"
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.29.10%2Bk3s1/k3s-images.txt",
+    "sha256": "05229bfg174pvy525dcy7rvmgv9i9v1nnz5ngq80n7zkxj9cp8m8"
   }
 }

pkgs/applications/networking/cluster/k3s/1_29/versions.nix

@@ -1,15 +1,15 @@
 {
-  k3sVersion = "1.29.9+k3s1";
-  k3sCommit = "e92d3b3ba7a4810e82e38a3d5c6091a3e18caad5";
-  k3sRepoSha256 = "1i4881nv41dpvxmh20qy121d45431xbhkzlywx1rfwqla8wq6bwh";
-  k3sVendorHash = "sha256-JeX9SJw6U1/FMbv9fVQeQvAZKq+Z99ZrLC2bAy1vUkA=";
+  k3sVersion = "1.29.10+k3s1";
+  k3sCommit = "ae4df3117e4860c986f81361a8e5825e6418f9ee";
+  k3sRepoSha256 = "17c5y00y7f3zadpqkjpbw9ylscs7m7bqcym7y3ddgsm4cg6bz5g7";
+  k3sVendorHash = "sha256-X2Js9DxEmjCQc/w6M5+6NS9y3znutFmH7j95fDETqDI=";
   chartVersions = import ./chart-versions.nix;
   imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
   k3sRootVersion = "0.14.0";
   k3sRootSha256 = "15cs9faw3jishsb5nhgmb5ldjc47hkwf7hz2126fp8ahf80m0fcl";
   k3sCNIVersion = "1.5.1-k3s1";
   k3sCNISha256 = "1bkz78p77aiw64hdvmlgc5zir9x8zha8qprfaab48jxbcsj3dfi7";
-  containerdVersion = "1.7.21-k3s2";
-  containerdSha256 = "0kp93fhmw2kiy46hw3ag05z8xwhw7kqp4wcbhsxshsdf0929g539";
+  containerdVersion = "1.7.22-k3s1";
+  containerdSha256 = "031rapiynpm7zlzn42l8z4m125lww2vyspw02irs4q3qb6mpx3px";
   criCtlVersion = "1.29.0-k3s1";
 }

pkgs/applications/networking/cluster/k3s/update-script.sh

@@ -10,6 +10,7 @@ trap "rm -rf ${WORKDIR}" EXIT
 
 NIXPKGS_ROOT="$(git rev-parse --show-toplevel)"/
 NIXPKGS_K3S_PATH=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)/
+OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s_1_${MINOR_VERSION}.version or (builtins.parseDrvName k3s_1_${MINOR_VERSION}.name).version" | tr -d '"')"
 cd ${NIXPKGS_K3S_PATH}
 
 cd 1_${MINOR_VERSION}
@@ -153,12 +154,11 @@ fi
 
 # Implement commit
 # See https://nixos.org/manual/nixpkgs/stable/#var-passthru-updateScript-commit
-OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_ROOT. {}; k3s.version or (builtins.parseDrvName k3s.name).version" | tr -d '"')"
 cat <<EOF
 [{
     "attrPath": "k3s_1_${MINOR_VERSION}",
     "oldVersion": "$OLD_VERSION",
     "newVersion": "$K3S_VERSION",
-    "files": ["$PWD/versions.nix","$PWD/chart-versions.nix"]
+    "files": ["$PWD/versions.nix","$PWD/chart-versions.nix","$PWD/images-versions.json"]
 }]
 EOF

pkgs/applications/networking/instant-messengers/gurk-rs/default.nix

@@ -11,29 +11,22 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gurk-rs";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "boxdot";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-g0V6FPkCpIEWx+/kDG9+0NtlCVj6jc1gbkkzOSl/lAo=";
+    repo = "gurk-rs";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ZVpI60pZZCLRnKdC80P8f63gE0+Vi1lelhyFPAhpHyU=";
   };
 
   postPatch = ''
     rm .cargo/config.toml
   '';
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "libsignal-protocol-0.1.0" = "sha256-4aHINlpVAqVTtm7npwXQRutZUmIxYgkhXhApg7jSM4M=";
-      "libsignal-service-0.1.0" = "sha256-AOGw76A9R2qH3hc7B+MBE3okzW8b5LTZdepzUDOv9lM=";
-      "curve25519-dalek-4.1.3" = "sha256-bPh7eEgcZnq9C3wmSnnYv0C4aAP+7pnwk9Io29GrI4A=";
-      "presage-0.6.2" = "sha256-t9t8ecPtefI/jYlk+Ul8WdgH26VJIkfMptbKxprekS0=";
-      "qr2term-0.3.1" = "sha256-U8YLouVZTtDwsvzZiO6YB4Pe75RXGkZXOxHCQcCOyT8=";
-    };
-  };
+  useFetchCargoVendor = true;
+
+  cargoHash = "sha256-jTZ2wJPXj3nU7GVTfne64eSra+JuKhNryCtRZMKOE44=";
 
   nativeBuildInputs = [ protobuf pkg-config ];
 

pkgs/applications/networking/mullvad/mullvad.nix

@@ -37,12 +37,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-me0e8Cb1dRrnAeiCmsXiclcDMruVLV3t0eGAM3RU1es=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "udp-over-tcp-0.3.0" = "sha256-5PeaM7/zhux1UdlaKpnQ2yIdmFy1n2weV/ux9lSRha4=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-HCW2brAQK20oJIFKrdqHqRmihnKnxGZfyt5T8Yrt1z8=";
 
   checkFlags = "--skip=version_check";
 

pkgs/applications/terminal-emulators/st/xst.nix

@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xst";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "gnotclub";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-V7WzletBFOOXBXClDJZIGT2comnC5WDApO1ZCoPKThY=";
+    sha256 = "sha256-2pXR9U2tTBd0lyeQ3BjnXW+Ne9aUQg/+rnpmYPPG06A=";
   };
 
   nativeBuildInputs = [

pkgs/applications/video/kodi/addons/jellyfin/default.nix

@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
   pname = "jellyfin";
   namespace = "plugin.video.jellyfin";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
     rev = "v${version}";
-    sha256 = "sha256-MPRyMeJuuiG62ahNKfXyb3Q4LDm0yXkNgCeYxfpT1io=";
+    sha256 = "sha256-bGdTMe45zHhTBHp4k1l4N4ksSL+MJdKh3hDBS6TDtPI=";
   };
 
   nativeBuildInputs = [ python ];

pkgs/applications/virtualization/docker/compose.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "docker-compose";
-  version = "2.30.0";
+  version = "2.30.3";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "compose";
     rev = "v${version}";
-    hash = "sha256-L31O/Hzn0jbu5VqVB18PZUSJPGfqU+73Jx3e1njxGiI=";
+    hash = "sha256-L+RDO31LnQbWA22bkCrnU2QDF6+eCPwbPpzZxHGrZ1Q=";
   };
 
   postPatch = ''
@@ -16,7 +16,7 @@ buildGoModule rec {
     rm -rf e2e/
   '';
 
-  vendorHash = "sha256-j9gV1PNTqVRctbhnYRydGwJvBpb9uQCxcdBrQCdbBrg=";
+  vendorHash = "sha256-IbDr2cTGmJZM8G2cj35CwfEX+DWVD0L4pUxHBvu9EfI=";
 
   ldflags = [ "-X github.com/docker/compose/v2/internal.Version=${version}" "-s" "-w" ];
 

pkgs/applications/window-managers/i3/workstyle.nix

@@ -9,17 +9,13 @@ rustPlatform.buildRustPackage rec {
 
   src = fetchFromGitHub {
     owner = "pierrechevalier83";
-    repo = pname;
+    repo = "workstyle";
     rev = "8bde72d9a9dd67e0fc7c0545faca53df23ed3753";
     sha256 = "sha256-yhnt7edhgVy/cZ6FpF6AZWPoeMeEKTXP+87no2KeIYU=";
   };
 
-  cargoLock = {
-    lockFile = ./workstyle-Cargo.lock;
-    outputHashes = {
-      "swayipc-3.0.1" = "sha256-3Jhz3+LhncSRvo3n7Dh5d+RWQSvEff9teuaDZLLLEHk=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-es8kS1w71TuQ1pKb4/wXtpukWEBqUJUA+GX3uXOYbtU=";
 
   doCheck = false; # No tests
 

pkgs/build-support/go/module.nix

@@ -46,9 +46,6 @@
   # Meta data for the final derivation.
 , meta ? { }
 
-  # Not needed with `buildGoModule`.
-, goPackagePath ? ""
-
   # Go linker flags.
 , ldflags ? [ ]
   # Go build flags.
@@ -57,8 +54,6 @@
 , ...
 }@args':
 
-assert goPackagePath != "" -> throw "`goPackagePath` is not needed with `buildGoModule`";
-
 let
   args = removeAttrs args' [ "overrideModAttrs" "vendorSha256" ];
 

pkgs/build-support/go/package.nix

@@ -1,295 +0,0 @@
-{ go, govers, lib, fetchgit, fetchhg, fetchbzr, rsync
-, fetchFromGitHub, stdenv }:
-
-{ buildInputs ? []
-, nativeBuildInputs ? []
-, passthru ? {}
-, preFixup ? ""
-, shellHook ? ""
-
-# We want parallel builds by default
-, enableParallelBuilding ? true
-
-# Go import path of the package
-, goPackagePath
-
-# Go package aliases
-, goPackageAliases ? [ ]
-
-# Extra sources to include in the gopath
-, extraSrcs ? [ ]
-
-# Extra gopaths containing src subfolder
-# with sources to include in the gopath
-, extraSrcPaths ? [ ]
-
-# go2nix dependency file
-, goDeps ? null
-
-# Whether to delete the vendor folder supplied with the source.
-, deleteVendor ? false
-
-, dontRenameImports ? false
-
-# Do not enable this without good reason
-# IE: programs coupled with the compiler
-, allowGoReference ? false
-
-, CGO_ENABLED ? go.CGO_ENABLED
-
-, ldflags ? [ ]
-
-, GOFLAGS ? [ ]
-
-# needed for buildFlags{,Array} warning
-, buildFlags ? ""
-, buildFlagsArray ? ""
-
-, meta ? {}, ... } @ args:
-
-let
-  dep2src = goDep:
-    {
-      inherit (goDep) goPackagePath;
-      src = if goDep.fetch.type == "git" then
-        fetchgit {
-          inherit (goDep.fetch) url rev sha256;
-        }
-      else if goDep.fetch.type == "hg" then
-        fetchhg {
-          inherit (goDep.fetch) url rev sha256;
-        }
-      else if goDep.fetch.type == "bzr" then
-        fetchbzr {
-          inherit (goDep.fetch) url rev sha256;
-        }
-      else if goDep.fetch.type == "FromGitHub" then
-        fetchFromGitHub {
-          inherit (goDep.fetch) owner repo rev sha256;
-        }
-      else abort "Unrecognized package fetch type: ${goDep.fetch.type}";
-    };
-
-  importGodeps = { depsFile }:
-    map dep2src (import depsFile);
-
-  goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs
-                             else extraSrcs;
-  package = stdenv.mkDerivation (
-    (builtins.removeAttrs args [ "goPackageAliases" "disabled" "extraSrcs"]) // {
-
-    nativeBuildInputs = [ go ]
-      ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs;
-    buildInputs = buildInputs;
-
-    inherit (go) GOOS GOARCH GO386;
-
-    GOHOSTARCH = go.GOHOSTARCH or null;
-    GOHOSTOS = go.GOHOSTOS or null;
-
-    inherit CGO_ENABLED enableParallelBuilding;
-
-    GO111MODULE = "off";
-    GOTOOLCHAIN = "local";
-    GOFLAGS = GOFLAGS ++ lib.optional (!allowGoReference)  "-trimpath" ;
-
-    GOARM = toString (lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]);
-
-    # If not set to an explicit value, set the buildid empty for reproducibility.
-    ldflags = ldflags ++ lib.optional (!lib.any (lib.hasPrefix "-buildid=") ldflags) "-buildid=";
-
-    configurePhase = args.configurePhase or (''
-      runHook preConfigure
-
-      # Extract the source
-      cd "$NIX_BUILD_TOP"
-      mkdir -p "go/src/$(dirname "$goPackagePath")"
-      mv "$sourceRoot" "go/src/$goPackagePath"
-
-    '' + lib.optionalString deleteVendor ''
-      if [ ! -d "go/src/$goPackagePath/vendor" ]; then
-        echo "vendor folder does not exist, 'deleteVendor' is not needed"
-        exit 10
-      else
-        rm -rf "go/src/$goPackagePath/vendor"
-      fi
-    '' + lib.optionalString (goDeps != null) ''
-      if [ -d "go/src/$goPackagePath/vendor" ]; then
-        echo "vendor folder exists, 'goDeps' is not needed"
-        exit 10
-      fi
-    '' + lib.flip lib.concatMapStrings goPath ({ src, goPackagePath }: ''
-      mkdir goPath
-      (cd goPath; unpackFile "${src}")
-      mkdir -p "go/src/$(dirname "${goPackagePath}")"
-      chmod -R u+w goPath/*
-      mv goPath/* "go/src/${goPackagePath}"
-      rmdir goPath
-
-    '') + (lib.optionalString (extraSrcPaths != []) ''
-      ${rsync}/bin/rsync -a ${lib.concatMapStringsSep " " (p: "${p}/src") extraSrcPaths} go
-
-    '') + ''
-      export GOPATH=$NIX_BUILD_TOP/go:$GOPATH
-      export GOCACHE=$TMPDIR/go-cache
-
-      # currently pie is only enabled by default in pkgsMusl
-      # this will respect the `hardening{Disable,Enable}` flags if set
-      if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then
-        export GOFLAGS="-buildmode=pie $GOFLAGS"
-      fi
-
-      runHook postConfigure
-    '');
-
-    renameImports = args.renameImports or (
-      let
-        inputsWithAliases = lib.filter (x: x ? goPackageAliases)
-          (buildInputs ++ (args.propagatedBuildInputs or [ ]));
-        rename = to: from: "echo Renaming '${from}' to '${to}'; govers -d -m ${from} ${to}";
-        renames = p: lib.concatMapStringsSep "\n" (rename p.goPackagePath) p.goPackageAliases;
-      in lib.concatMapStringsSep "\n" renames inputsWithAliases);
-
-    buildPhase = args.buildPhase or (''
-      runHook preBuild
-
-      runHook renameImports
-
-      exclude='\(/_\|examples\|Godeps\|testdata'
-      if [[ -n "$excludedPackages" ]]; then
-        IFS=' ' read -r -a excludedArr <<<$excludedPackages
-        printf -v excludedAlternates '%s\\|' "''${excludedArr[@]}"
-        excludedAlternates=''${excludedAlternates%\\|} # drop final \| added by printf
-        exclude+='\|'"$excludedAlternates"
-      fi
-      exclude+='\)'
-
-      buildGoDir() {
-        local cmd="$1" dir="$2"
-
-        . $TMPDIR/buildFlagsArray
-
-        declare -a flags
-        flags+=($buildFlags "''${buildFlagsArray[@]}")
-        flags+=(''${tags:+-tags=''${tags// /,}})
-        flags+=(''${ldflags:+-ldflags="$ldflags"})
-        flags+=("-p" "$NIX_BUILD_CORES")
-
-        if [ "$cmd" = "test" ]; then
-          flags+=(-vet=off)
-          flags+=($checkFlags)
-        fi
-
-        local OUT
-        if ! OUT="$(go $cmd "''${flags[@]}" $dir 2>&1)"; then
-          if ! echo "$OUT" | grep -qE '(no( buildable| non-test)?|build constraints exclude all) Go (source )?files'; then
-            echo "$OUT" >&2
-            return 1
-          fi
-        fi
-        if [ -n "$OUT" ]; then
-          echo "$OUT" >&2
-        fi
-        return 0
-      }
-
-      getGoDirs() {
-        local type;
-        type="$1"
-        if [ -n "$subPackages" ]; then
-          echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g"
-        else
-          pushd "$NIX_BUILD_TOP/go/src" >/dev/null
-          find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | grep -v "/vendor/" | sort | uniq | grep -v "$exclude"
-          popd >/dev/null
-        fi
-      }
-
-      if (( "''${NIX_DEBUG:-0}" >= 1 )); then
-        buildFlagsArray+=(-x)
-      fi
-
-      if [ ''${#buildFlagsArray[@]} -ne 0 ]; then
-        declare -p buildFlagsArray > $TMPDIR/buildFlagsArray
-      else
-        touch $TMPDIR/buildFlagsArray
-      fi
-      if [ -z "$enableParallelBuilding" ]; then
-          export NIX_BUILD_CORES=1
-      fi
-      for pkg in $(getGoDirs ""); do
-        echo "Building subPackage $pkg"
-        buildGoDir install "$pkg"
-      done
-    '' + lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
-      # normalize cross-compiled builds w.r.t. native builds
-      (
-        dir=$NIX_BUILD_TOP/go/bin/${go.GOOS}_${go.GOARCH}
-        if [[ -n "$(shopt -s nullglob; echo $dir/*)" ]]; then
-          mv $dir/* $dir/..
-        fi
-        if [[ -d $dir ]]; then
-          rmdir $dir
-        fi
-      )
-    '' + ''
-      runHook postBuild
-    '');
-
-    doCheck = args.doCheck or false;
-    checkPhase = args.checkPhase or ''
-      runHook preCheck
-      # We do not set trimpath for tests, in case they reference test assets
-      export GOFLAGS=''${GOFLAGS//-trimpath/}
-
-      for pkg in $(getGoDirs test); do
-        buildGoDir test "$pkg"
-      done
-
-      runHook postCheck
-    '';
-
-    installPhase = args.installPhase or ''
-      runHook preInstall
-
-      mkdir -p $out
-      dir="$NIX_BUILD_TOP/go/bin"
-      [ -e "$dir" ] && cp -r $dir $out
-
-      runHook postInstall
-    '';
-
-    strictDeps = true;
-
-    shellHook = ''
-      d=$(mktemp -d "--suffix=-$name")
-    '' + toString (map (dep: ''
-       mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")"
-       ln -s "${dep.src}" "$d/src/${dep.goPackagePath}"
-    ''
-    ) goPath) + ''
-      export GOPATH=${lib.concatStringsSep ":" ( ["$d"] ++ ["$GOPATH"] ++ ["$PWD"] ++ extraSrcPaths)}
-    '' + shellHook;
-
-    disallowedReferences = lib.optional (!allowGoReference) go
-      ++ lib.optional (!dontRenameImports) govers;
-
-    passthru = passthru //
-      { inherit go; } //
-      lib.optionalAttrs (goPackageAliases != []) { inherit goPackageAliases; };
-
-    meta = {
-      # Add default meta information
-      homepage = "https://${goPackagePath}";
-      platforms = go.meta.platforms or lib.platforms.all;
-    } // meta;
-  });
-in
-lib.warnIf (buildFlags != "" || buildFlagsArray != "")
-  "`buildFlags`/`buildFlagsArray` are deprecated and will be removed in the 24.11 release. Use the `ldflags` and/or `tags` attributes instead"
-lib.warnIf (builtins.elem "-buildid=" ldflags) "`-buildid=` is set by default as ldflag by buildGoModule"
-lib.warnIf (builtins.elem "-trimpath" GOFLAGS) "`-trimpath` is added by default to GOFLAGS by buildGoModule when allowGoReference isn't set to true"
-lib.warn ''
-  'buildGoPackage' is deprecated and will be removed for the 25.05 release.
-  Please use 'buildGoModule' instead. Tips for migration can be found in the Go section of the nixpkgs manual.''
-  package

pkgs/build-support/rust/fetch-cargo-vendor-util.py

@@ -11,6 +11,7 @@ from pathlib import Path
 from typing import Any, TypedDict, cast
 
 import requests
+from requests.adapters import HTTPAdapter, Retry
 
 eprint = functools.partial(print, file=sys.stderr)
 
@@ -21,8 +22,17 @@ def load_toml(path: Path) -> dict[str, Any]:
 
 
 def download_file_with_checksum(url: str, destination_path: Path) -> str:
+    retries = Retry(
+        total=5,
+        backoff_factor=0.5,
+        status_forcelist=[500, 502, 503, 504]
+    )
+    session = requests.Session()
+    session.mount('http://', HTTPAdapter(max_retries=retries))
+    session.mount('https://', HTTPAdapter(max_retries=retries))
+
     sha256_hash = hashlib.sha256()
-    with requests.get(url, stream=True) as response:
+    with session.get(url, stream=True) as response:
         if not response.ok:
             raise Exception(f"Failed to fetch file from {url}. Status code: {response.status_code}")
         with open(destination_path, "wb") as file:

pkgs/by-name/au/audiobookshelf/source.json

@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "e05cb0ef4de000eb20e46b6557a35fa12cc6b9a0",
-  "hash": "sha256-wbcXyHtlpCZ5lmFmYxMB5Z+ObVq0P8LFAQ1AoQpWbt8=",
-  "version": "2.16.2",
-  "depsHash": "sha256-/A+XyN2nfpj8bSJgfNey7DOKB7QeeuZGCy2yKi46HwQ=",
-  "clientDepsHash": "sha256-vpn455/DJopb2TIiIKXjuS3CxI1pXRH3TU3QfZtbMi8="
+  "rev": "22f85d3af9815f4946eeeb2218d532cf5f543da8",
+  "hash": "sha256-GAHl9QKs6O01wtt5ajSKwkIOc1VdM76cpw2MRdaC17M=",
+  "version": "2.17.1",
+  "depsHash": "sha256-ijFY/sp0P3Ya1076ZfIA8g+3tz0jvXBwKWGGr7Bw2+M=",
+  "clientDepsHash": "sha256-by2LpKAfyyteBywTWiWZFufKerb39Jqzz+zsjl3f/bk="
 }

pkgs/by-name/aw/aws-iam-authenticator/package.nix

@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "aws-iam-authenticator";
-  version = "0.6.27";
+  version = "0.6.28";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-8WLuz3+pn6BMnhZGUfRYj0IwOm6xuqd6zj+J2XbCPy4=";
+    hash = "sha256-+cMgB1FHNFtvDz6x3fPuzMkKLytlipX6CE5Xs2e9UCc=";
   };
 
-  vendorHash = "sha256-xCNuFO+J0NXq8CPZXB0R2RmLLH27Vh/GMrBKk+mGk04=";
+  vendorHash = "sha256-gFz1QrzLGMPyjB8yo+/FscZEpb2msshoUfBGmNRbvJM=";
 
   ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [
     "-s"

pkgs/by-name/bp/bpftune/package.nix

@@ -12,26 +12,22 @@
 
 stdenv.mkDerivation rec {
   pname = "bpftune";
-  version = "0-unstable-2024-06-07";
+  version = "0-unstable-2024-10-25";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "bpftune";
-    rev = "04bab5dd306b55b3e4e13e261af2480b7ccff9fc";
-    hash = "sha256-kVjvupZ6HxJocwXWOrxUNqEGl0welJRlZwvOmMKqeBA=";
+    rev = "6a50f5ff619caeea6f04d889e3a60de6c12feb76";
+    hash = "sha256-yol6VFelqQiPKLg1UUeP+r/+XO4fjYeDbIeI29gZ7j4=";
   };
 
   postPatch = ''
     # otherwise shrink rpath would drop $out/lib from rpath
     substituteInPlace src/Makefile \
-      --replace-fail /lib64   /lib \
       --replace-fail /sbin    /bin \
       --replace-fail ldconfig true
     substituteInPlace src/bpftune.service \
       --replace-fail /usr/sbin/bpftune "$out/bin/bpftune"
-    substituteInPlace include/bpftune/libbpftune.h \
-      --replace-fail /usr/lib64/bpftune/       "$out/lib/bpftune/" \
-      --replace-fail /usr/local/lib64/bpftune/ "$out/lib/bpftune/"
     substituteInPlace src/libbpftune.c \
       --replace-fail /lib/modules /run/booted-system/kernel-modules/lib/modules
   '';
@@ -51,6 +47,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "prefix=${placeholder "out"}"
     "confprefix=${placeholder "out"}/etc"
+    "libdir=lib"
     "BPFTUNE_VERSION=${version}"
     "NL_INCLUDE=${lib.getDev libnl}/include/libnl3"
     "BPF_INCLUDE=${lib.getDev libbpf}/include"

pkgs/by-name/br/brave/package.nix

@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.71.123";
+  version = "1.73.89";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-u3fme771Q5F00fYiLez9mhGQR2mORYdSabXovr0+OYE=";
+      hash = "sha256-qpWKu0hmFs8LXkSrrcSOpS9BsgkO1WPOItpPc/InBLY=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ=";
+      hash = "sha256-9e0zMS5kcTMdxkvvq248kZDQpBz/Hf4OMUdZ4lgmDV8=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-kDiZ6NKQ+v1jBEUexItKTCKFsbnOtSzPmGEVWI5JoXI=";
+      hash = "sha256-LOSm4IbdmrpxzDf9yzbKhkBlp8452R9tInYOP4dMfzo=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-/yl4k/XvmL7oBW1XU4wVNHfa07Z+XMHYTkkufhDCXUc=";
+      hash = "sha256-VWobettpSvMCCENg/b9VkH+cwNOrYF/n6d3Ebdq00Lc=";
     };
   };
 

pkgs/by-name/br/brave/update.sh

@@ -48,7 +48,6 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) (
   archive
   // {
     inherit pname version;
-    platform = stdenv.system;
   }
 )
 EOF

pkgs/by-name/bu/buildkite-agent/package.nix

@@ -13,13 +13,13 @@
 }:
 buildGoModule rec {
   pname = "buildkite-agent";
-  version = "3.86.0";
+  version = "3.87.0";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "agent";
     rev = "v${version}";
-    hash = "sha256-qvwJ8NFFJbD9btTAs8x7V4tbDDo4L7O679XYp2t9MpE=";
+    hash = "sha256-yCbK6qS7A8K4B3qTZnA6Hl5kOdQ8UCDGmHsVh6LFpbM=";
   };
 
   vendorHash = "sha256-Ovi1xK+TtWli6ZG0s5Pu0JGAjtbyUWBgiKCBybVbcXk=";

pkgs/by-name/ca/cardinal/package.nix

@@ -22,6 +22,7 @@
 , python3
 , speexdsp
 , libglvnd
+, headless ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -68,7 +69,7 @@ stdenv.mkDerivation rec {
   ];
 
   hardeningDisable = [ "format" ];
-  makeFlags = [ "SYSDEPS=true" "PREFIX=$(out)" ];
+  makeFlags = lib.optional headless "HEADLESS=true" ++ [ "SYSDEPS=true" "PREFIX=$(out)" ];
 
   postInstall = ''
     wrapProgram $out/bin/Cardinal \

pkgs/by-name/ca/cargo-about/package.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-about";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
     rev = version;
-    sha256 = "sha256-KFTG4FmmEji+0yNTwrunqOQuaU+qUcu1Vg7ZqoeUy4c=";
+    sha256 = "sha256-HkhwSL3t++En9+cMnOjNWpBSedbnXFl8DCt9Fva69+s=";
   };
 
-  cargoHash = "sha256-bCw30ooQdSMRD3oM9BeUt9sJe5v+ketO73FjEypNy9s=";
+  cargoHash = "sha256-GdSgess8u/UG3BSCqDx8okVj5AiTKT3O28jDR+pXwvw=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/cc/ccze/package.nix

@@ -1,19 +1,38 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, ncurses, pcre }:
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  autoconf,
+  ncurses,
+  pcre2,
+  quilt,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ccze";
-  version = "0.2.1-2";
+  version = "0.2.1-8";
 
-  src = fetchFromGitHub {
-    owner = "madhouse";
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian";
     repo = "ccze";
-    rev = "ccze-${version}";
-    hash = "sha256-LVwmbrq78mZcAEuAqjXTqLE5we83H9mcMPtxQx2Tn/c=";
+    rev = "debian/${finalAttrs.version}";
+    hash = "sha256-sESbs+HTDRX9w7c+LYnzQoemPIxAtqk27IVSTtiAGEk=";
   };
 
-  nativeBuildInputs = [ autoconf ];
+  postPatch = ''
+    QUILT_PATCHES=debian/patches quilt push -a
+  '';
 
-  buildInputs = [ ncurses pcre ];
+  nativeBuildInputs = [
+    autoconf
+    quilt
+  ];
+
+  buildInputs = [
+    ncurses
+    pcre2
+  ];
 
   preConfigure = ''
     autoheader
@@ -21,14 +40,19 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    mainProgram = "ccze";
     description = "Fast, modular log colorizer";
+    homepage = "https://salsa.debian.org/debian/ccze";
+    changelog = "https://salsa.debian.org/debian/ccze/-/raw/master/debian/changelog?ref_type=heads";
     longDescription = ''
-      Fast log colorizer written in C, intended to be a drop-in replacement
-      for the Perl colorize tool.  Includes plugins for a variety of log
-      formats (Apache, Postfix, Procmail, etc.).
+      Fast log colorizer written in C, intended to be a drop-in replacement for the Perl colorize tool.
+      Includes plugins for a variety of log formats (Apache, Postfix, Procmail, etc.).
     '';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ malyn ];
+    maintainers = with maintainers; [
+      malyn
+      philiptaron
+    ];
     platforms = platforms.linux;
   };
-}
+})

pkgs/by-name/ch/chiptrack/package.nix

@@ -64,13 +64,8 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec {
   ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [ alsa-lib ];
 
   # Has git dependencies
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "rboy-0.1.0" = "sha256-2Acgg5phDAVTJht3XIXO7/TV5FxEXyLQJtC5n7cd9Ek=";
-      "wamr-sys-1.2.0" = "sha256-lNpJjHqdaYi/cyoAb8RlsKuLQ9WhuGwlzcSpDM68Kco=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-K1Fio9xu0fxVYZZmZ4IpI5n5gBCogwTEWwUaJPBi35Y=";
 
   env = {
     SKIA_SOURCE_DIR =

pkgs/by-name/ci/circleci-cli/package.nix

@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "circleci-cli";
-  version = "0.1.30995";
+  version = "0.1.31151";
 
   src = fetchFromGitHub {
     owner = "CircleCI-Public";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-DSgpyQ9luC7RSFq/TbJplQzEKJEDdGIPHsFX3LuzqaQ=";
+    sha256 = "sha256-tmoDo/DvFiP6SfnQU5iNF2By5HxIuK//hj1n5+Q+cps=";
   };
 
   vendorHash = "sha256-60edYYhbSPiJWmuQXXEt+xCnSxsHf8Q38RgyWwdP6vQ=";

pkgs/by-name/ci/cirrus-cli/package.nix

@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.131.2";
+  version = "0.132.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "cirrus-cli";
     rev = "v${version}";
-    hash = "sha256-PxJYKn97gsqozofeU2IzOk0sMupt+fNpggQ00tZ12pk=";
+    hash = "sha256-juDe/Dw8tdVoz5F1bGGQMwZYz9HbQaQ0xZo8LqD03RA=";
   };
 
-  vendorHash = "sha256-rYg0cmW63IolYQ79R9pFiFXD6UfESv4jq9kn1EGJmgw=";
+  vendorHash = "sha256-+OMhaAGA+pmiDUyXDo9UfQ0SFEAN9zuNZjnLkgr7a+0=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

pkgs/by-name/cl/cloud-hypervisor/package.nix

@@ -13,17 +13,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-AuKUwYxAXY/rNQk5Jx4WxGj+wChRrDkw8fp3uO3KBv0=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "acpi_tables-0.1.0" = "sha256-ReIibUCFiLVq6AFqFupue/3BEQUJoImCLKaUBSVpdl4=";
-      "micro_http-0.1.0" = "sha256-yIgcoEfc7eeS1+bijzkifaBxVNHa71Y+Vn79owMaKvM=";
-      "mshv-bindings-0.3.0" = "sha256-IqmFB4nyENsfEPqiSYv52sL4LDiv+rCabTiIxE1MWZ0=";
-      "vfio-bindings-0.4.0" = "sha256-ie/RcYbojLCGJkc6Yl97iUhOxnYk8/DO7JKlhMtT/6w=";
-      "vfio_user-0.1.0" = "sha256-jScCwZEqoWYGBBKjoxB6xXOltX1/5h4Jgpcy5RzzTtg=";
-      "vm-fdt-0.3.0" = "sha256-9PywgSnSL+8gT6lcl9t6w7X4fEINa+db+H1vWS+gDOI=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-xqMUB9aqkUIpnX0U30CfiWmjDI7IS5SuJIKF5byXIxk=";
 
   separateDebugInfo = true;
 

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

@@ -40,16 +40,8 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-ut3IWEueNR/hT7NyGfuK5IYtppC6ArSoJdEfFuD/0vE=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "ruma-0.10.1" = "sha256-u4C2VwRBmw8iVaPrkSmF/EKi5U3nWJWVktUDFmQcI1E=";
-      "rust-librocksdb-sys-0.25.0+9.5.2" = "sha256-wz6QDLoXtY8+EU2DlPf4MbWC67KJK0hZnRswCeomkLQ=";
-      "rustyline-async-0.4.3" = "sha256-7yYOGZ14SODD4+e9fTGgggUKqTi31479S0lEVKTKLPI=";
-      "tikv-jemalloc-ctl-0.6.0" = "sha256-guiH6Gw/Oeb6A8Ri1SFcB6CW6mt+9XeA6vfwdS72yDQ=";
-      "tracing-0.1.40" = "sha256-J6+8hBC/755SU8n1fTiJwBh17Unluv1SXfd5+dDAEhk=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-L0UvJ5ZyEk/hZobkB21u6cfPCeRwhDl+07aWcQEOgYw=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/do/dooit/package.nix

@@ -12,14 +12,14 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "dooit";
-  version = "3.0.3";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dooit-org";
     repo = "dooit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-o9Spe6OejCsN+pWaEVED1DlHMayOZuZv7bi/HmiogKg=";
+    hash = "sha256-gWpmjpgAn37hfNv4aCCb+7pW/39Ngo8/Za9AdU4YCKA=";
   };
 
   build-system = with python3.pkgs; [ poetry-core ];

pkgs/by-name/do/doppler/package.nix

@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "doppler";
-  version = "3.69.1";
+  version = "3.69.2";
 
   src = fetchFromGitHub {
     owner = "dopplerhq";
     repo = "cli";
     rev = version;
-    hash = "sha256-KiSRMF4S+gz8cnRxkO2SVwO3Rl6ImflK/4MEgkQh2UE=";
+    hash = "sha256-65DKCmAzGEKbB/R9NlkTa2lBEcfX0iBXJQWH8OXfemc=";
   };
 
   vendorHash = "sha256-NUHWKPszQH/pvnA+j65+bJ6t+C0FDRRbTviqkYztpE4=";

pkgs/by-name/dx/dxvk_2/package.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   pkgsBuildHost,
   glslang,
   meson,
@@ -38,29 +37,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dxvk";
-  version = "2.5";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "doitsujin";
     repo = "dxvk";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JwEKmzYnoDhad0VKadQYEqraMogXn7BFI9kmT9F+Ts0=";
+    hash = "sha256-wmn3ErYl3hhInrDQeY3OZK76yzwW2OJc1f+unMBzJQE=";
     fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
   };
 
-  patches = [
-    # Fixes `ERROR: Index 2 out of bounds of array of size 2` error on native builds.
-    (fetchpatch2 {
-      url = "https://github.com/doitsujin/dxvk/commit/e6209d28cd9c51ad371605db4c0de27547c0d28c.patch?full_index=1";
-      hash = "sha256-zKO6YXOUKBnwcijzCldDzmDqXSkf+wWe9KmUlhsaTyM=";
-    })
-    # Fixes missing symbol error when building with GLFW support enabled.
-    (fetchpatch2 {
-      url = "https://github.com/doitsujin/dxvk/commit/62ef4854a6accf2b042f25f44db667abadc0b3fd.patch?full_index=1";
-      hash = "sha256-oXybFqoD68gTLHO1kDHll4XCfpU+s9E+PmaXQFqEy/g=";
-    })
-  ];
-
   postPatch =
     ''
       substituteInPlace meson.build \

pkgs/by-name/ea/easyeffects/0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch

@@ -0,0 +1,229 @@
+From a2f524ffe163e1a15dc8a4b6f21964092ec8e0a7 Mon Sep 17 00:00:00 2001
+From: Sofi <sofi+git@mailbox.org>
+Date: Sat, 28 Sep 2024 00:31:11 +0200
+Subject: [PATCH] Revert "Merge pull request #3340 from
+ violetmage/violetmage-spectrum-avsync"
+
+This reverts commit d40ff638e2f0db00579e1f30a9880b7d35f137fd, reversing
+changes made to ee0fe4a8da57ef84a39600ad02280ddc98d9de31.
+---
+ ...thub.wwmm.easyeffects.spectrum.gschema.xml |  5 --
+ data/ui/preferences_spectrum.ui               | 21 -----
+ include/spectrum.hpp                          |  5 --
+ src/preferences_spectrum.cpp                  |  7 +-
+ src/spectrum.cpp                              | 86 +++----------------
+ 5 files changed, 14 insertions(+), 110 deletions(-)
+
+diff --git a/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml b/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml
+index 340da382e..1260810f3 100644
+--- a/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml
++++ b/data/schemas/com.github.wwmm.easyeffects.spectrum.gschema.xml
+@@ -49,10 +49,5 @@
+             <range min="120" max="22000" />
+             <default>20000</default>
+         </key>
+-
+-        <key name="avsync-delay" type="i">
+-            <range min="0" max="1000" />
+-            <default>0</default>
+-        </key>
+     </schema>
+ </schemalist>
+\ No newline at end of file
+diff --git a/data/ui/preferences_spectrum.ui b/data/ui/preferences_spectrum.ui
+index 2eae7b8ab..97535d518 100644
+--- a/data/ui/preferences_spectrum.ui
++++ b/data/ui/preferences_spectrum.ui
+@@ -18,27 +18,6 @@
+                         </child>
+                     </object>
+                 </child>
+-
+-                <child>
+-                    <object class="AdwActionRow">
+-                        <property name="title" translatable="yes">Compensating Delay (ms)</property>
+-
+-                        <child>
+-                            <object class="GtkSpinButton" id="avsync_delay">
+-                                <property name="valign">center</property>
+-                                <property name="digits">0</property>
+-                                <property name="adjustment">
+-                                    <object class="GtkAdjustment">
+-                                        <property name="lower">0</property>
+-                                        <property name="upper">1000</property>
+-                                        <property name="step-increment">1</property>
+-                                        <property name="page-increment">10</property>
+-                                    </object>
+-                                </property>
+-                            </object>
+-                        </child>
+-                    </object>
+-                </child>
+             </object>
+         </child>
+ 
+diff --git a/include/spectrum.hpp b/include/spectrum.hpp
+index 546ceec59..af49dd9e5 100644
+--- a/include/spectrum.hpp
++++ b/include/spectrum.hpp
+@@ -65,11 +65,6 @@ class Spectrum : public PluginBase {
+ 
+   std::array<float, n_bands> real_input;
+   std::array<double, n_bands / 2U + 1U> output;
+-  
+-  std::vector<float> left_delayed_vector;
+-  std::vector<float> right_delayed_vector;
+-  std::span<float> left_delayed;
+-  std::span<float> right_delayed;
+ 
+   std::array<float, n_bands> latest_samples_mono;
+ 
+diff --git a/src/preferences_spectrum.cpp b/src/preferences_spectrum.cpp
+index 2902a8ee4..151960bef 100644
+--- a/src/preferences_spectrum.cpp
++++ b/src/preferences_spectrum.cpp
+@@ -49,7 +49,7 @@ struct _PreferencesSpectrum {
+ 
+   GtkDropDown* type;
+ 
+-  GtkSpinButton *n_points, *height, *line_width, *minimum_frequency, *maximum_frequency, *avsync_delay;
++  GtkSpinButton *n_points, *height, *line_width, *minimum_frequency, *maximum_frequency;
+ 
+   GSettings* settings;
+ 
+@@ -119,7 +119,6 @@ void preferences_spectrum_class_init(PreferencesSpectrumClass* klass) {
+   gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, axis_color_button);
+   gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, minimum_frequency);
+   gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, maximum_frequency);
+-  gtk_widget_class_bind_template_child(widget_class, PreferencesSpectrum, avsync_delay);
+ 
+   gtk_widget_class_bind_template_callback(widget_class, on_spectrum_color_set);
+   gtk_widget_class_bind_template_callback(widget_class, on_spectrum_axis_color_set);
+@@ -193,9 +192,9 @@ void preferences_spectrum_init(PreferencesSpectrum* self) {
+   // spectrum section gsettings bindings
+ 
+   gsettings_bind_widgets<"show", "fill", "rounded-corners", "show-bar-border", "dynamic-y-scale", "n-points", "height",
+-                         "line-width", "minimum-frequency", "maximum-frequency", "avsync-delay">(
++                         "line-width", "minimum-frequency", "maximum-frequency">(
+       self->settings, self->show, self->fill, self->rounded_corners, self->show_bar_border, self->dynamic_y_scale,
+-      self->n_points, self->height, self->line_width, self->minimum_frequency, self->maximum_frequency, self->avsync_delay);
++      self->n_points, self->height, self->line_width, self->minimum_frequency, self->maximum_frequency);
+ 
+   ui::gsettings_bind_enum_to_combo_widget(self->settings, "type", self->type);
+ 
+diff --git a/src/spectrum.cpp b/src/spectrum.cpp
+index 28f7ff4da..1075a358f 100644
+--- a/src/spectrum.cpp
++++ b/src/spectrum.cpp
+@@ -55,30 +55,6 @@ Spectrum::Spectrum(const std::string& tag,
+ 
+   plan = fftwf_plan_dft_r2c_1d(static_cast<int>(n_bands), real_input.data(), complex_output, FFTW_ESTIMATE);
+ 
+-
+-
+-  lv2_wrapper = std::make_unique<lv2::Lv2Wrapper>("http://lsp-plug.in/plugins/lv2/comp_delay_x2_stereo");
+-
+-  package_installed = lv2_wrapper->found_plugin;
+-
+-  if (!package_installed) {
+-    util::debug(log_tag + "http://lsp-plug.in/plugins/lv2/comp_delay_x2_stereo is not installed, spectrum will not have A/V sync compensation");
+-  }
+-
+-  lv2_wrapper->set_control_port_value("mode_l", 2);
+-  lv2_wrapper->set_control_port_value("mode_r", 2);
+-
+-  lv2_wrapper->set_control_port_value("dry_l", 0.0F);
+-  lv2_wrapper->set_control_port_value("dry_r", 0.0F);
+-
+-  lv2_wrapper->set_control_port_value("wet_l", static_cast<float>(util::db_to_linear(0.0F)));
+-  lv2_wrapper->set_control_port_value("wet_r", static_cast<float>(util::db_to_linear(0.0F)));
+-
+-  lv2_wrapper->bind_key_int<"time_l", "avsync-delay">(settings);
+-  lv2_wrapper->bind_key_int<"time_r", "avsync-delay">(settings);
+-
+-
+-
+   g_signal_connect(settings, "changed::show", G_CALLBACK(+[](GSettings* settings, char* key, gpointer user_data) {
+                      auto* self = static_cast<Spectrum*>(user_data);
+ 
+@@ -106,19 +82,6 @@ Spectrum::~Spectrum() {
+ void Spectrum::setup() {
+   std::ranges::fill(real_input, 0.0F);
+   std::ranges::fill(latest_samples_mono, 0.0F);
+-
+-  left_delayed_vector.resize(n_samples, 0.0F);
+-  right_delayed_vector.resize(n_samples, 0.0F);
+-
+-  left_delayed = std::span<float>(left_delayed_vector);
+-  right_delayed = std::span<float>(right_delayed_vector);
+-
+-  lv2_wrapper->set_n_samples(n_samples);
+-
+-  if (lv2_wrapper->get_rate() != rate) {
+-    util::debug(log_tag + " creating instance of comp delay x2 stereo for spectrum A/V sync");
+-    lv2_wrapper->create_instance(rate);
+-  }
+ }
+ 
+ void Spectrum::process(std::span<float>& left_in,
+@@ -132,46 +95,19 @@ void Spectrum::process(std::span<float>& left_in,
+     return;
+   }
+ 
+-  // delay the visualization of the spectrum by the reported latency
+-  // of the output device, so that the spectrum is visually in sync
+-  // with the audio as experienced by the user. (A/V sync)
+-  if ( lv2_wrapper->found_plugin && lv2_wrapper->has_instance() ) {
+-    lv2_wrapper->connect_data_ports(left_in, right_in, left_delayed, right_delayed);
+-    lv2_wrapper->run();
++  if (n_samples < n_bands) {
++    // Drop the oldest quantum.
++    std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples],
++        (n_bands - n_samples) * sizeof(float));
+ 
+-    // Downmix the latest n_bands samples from the delayed signal.
+-    if (n_samples < n_bands) {
+-      // Drop the oldest quantum.
+-      std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples],
+-          (n_bands - n_samples) * sizeof(float));
+-
+-      // Copy the new quantum.
+-      for (size_t n = 0; n < n_samples; n++) {
+-        latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_delayed[n] + right_delayed[n]);
+-      }
+-    } else {
+-      // Copy the latest n_bands samples.
+-      for (size_t n = 0; n < n_bands; n++)
+-        latest_samples_mono[n] = 0.5F * (left_delayed[n_samples - n_bands + n] +
+-                                        right_delayed[n_samples - n_bands + n]);
+-    }
++    // Copy the new quantum.
++    for (size_t n = 0; n < n_samples; n++)
++      latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_in[n] + right_in[n]);
+   } else {
+-    // Downmix the latest n_bands samples from the non-delayed signal.
+-    if (n_samples < n_bands) {
+-      // Drop the oldest quantum.
+-      std::memmove(&latest_samples_mono[0], &latest_samples_mono[n_samples],
+-          (n_bands - n_samples) * sizeof(float));
+-
+-      // Copy the new quantum.
+-      for (size_t n = 0; n < n_samples; n++) {
+-        latest_samples_mono[n_bands - n_samples + n] = 0.5F * (left_in[n] + right_in[n]);
+-      }
+-    } else {
+-      // Copy the latest n_bands samples.
+-      for (size_t n = 0; n < n_bands; n++)
+-        latest_samples_mono[n] = 0.5F * (left_in[n_samples - n_bands + n] +
+-                                        right_in[n_samples - n_bands + n]);
+-    }
++    // Copy the latest n_bands samples.
++    for (size_t n = 0; n < n_bands; n++)
++      latest_samples_mono[n] = 0.5F * (left_in[n_samples - n_bands + n] +
++                                       right_in[n_samples - n_bands + n]);
+   }
+ 
+   /*
+-- 
+2.46.0
+

pkgs/by-name/ea/easyeffects/package.nix

@@ -114,6 +114,11 @@ stdenv.mkDerivation rec {
       )
     '';
 
+  patches = [
+    # Remove when lsp-plugins is >= 1.2.17. (https://github.com/wwmm/easyeffects/issues/3394)
+    ./0001-Revert-Merge-pull-request-3340-from-violetmage-viole.patch
+  ];
+
   separateDebugInfo = true;
 
   passthru = {

pkgs/by-name/fl/flyctl/package.nix

@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.3.29";
+  version = "0.3.37";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-gaDmgMJ87d8SosmXuO2arLS7w+3NBS8teKhdIRIXRnM=";
+    hash = "sha256-Ilj5nmRzHH3TeTV8HS1xvwnQGsPrOsbthezp64TS/64=";
   };
 
-  vendorHash = "sha256-0GfbHCKzBE8dlf2ZtUZN5L6ZJK2/Jhd9HNnkCNTAgtk=";
+  vendorHash = "sha256-xYDiMOr3KxMjSGh9GkV905kaREW3oPQBQGs0h3TOn9c=";
 
   subPackages = [ "." ];
 

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

@@ -149,7 +149,13 @@ buildGoModule rec {
     '';
 
     tests = if lts then nixosTests.forgejo-lts else nixosTests.forgejo;
-    updateScript = nix-update-script { extraArgs = nixUpdateExtraArgs; };
+
+    updateScript = nix-update-script {
+      extraArgs = nixUpdateExtraArgs ++ [
+        "--version-regex"
+        "v(${lib.versions.major version}\.[0-9.]+)"
+      ];
+    };
   };
 
   meta = {

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

@@ -5,8 +5,6 @@ import ./generic.nix {
   vendorHash = "sha256-hfbNyCQMQzDzJxFc2MPAR4+v/qNcnORiQNbwbbIA4Nw=";
   lts = true;
   nixUpdateExtraArgs = [
-    "--version-regex"
-    "v(7\.[0-9.]+)"
     "--override-filename"
     "pkgs/by-name/fo/forgejo/lts.nix"
   ];

pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch

@@ -0,0 +1,149 @@
+From 23ddb6ff148ec5c27da050ba0eb7a2e449b8450b Mon Sep 17 00:00:00 2001
+From: Yury Shvedov <yury.shvedov@kaspersky.com>
+Date: Mon, 4 Nov 2024 14:22:22 +0300
+Subject: [PATCH] Gui: take in account module-path argument
+
+Use paths passed with `--module-path` argument to search for preference
+packs
+
+Change-Id: If168dbd99a826757290ee6b918f5b712305fe2bb
+---
+ src/Gui/DlgPreferencePackManagementImp.cpp | 16 +++++----
+ src/Gui/PreferencePackManager.cpp          | 39 +++++++++++++++++-----
+ src/Gui/PreferencePackManager.h            |  5 +++
+ 3 files changed, 44 insertions(+), 16 deletions(-)
+
+diff --git a/src/Gui/DlgPreferencePackManagementImp.cpp b/src/Gui/DlgPreferencePackManagementImp.cpp
+index a1a0dad41a..50f3982f21 100644
+--- a/src/Gui/DlgPreferencePackManagementImp.cpp
++++ b/src/Gui/DlgPreferencePackManagementImp.cpp
+@@ -54,7 +54,7 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)
+     // but can only disable individual installed packs (though we can completely uninstall the pack's
+     // containing Addon by redirecting to the Addon Manager).
+     auto savedPreferencePacksDirectory = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
+-    auto modDirectory = fs::path(App::Application::getUserAppDataDir()) / "Mod";
++    auto modDirectories = Application::Instance->prefPackManager()->modPaths();
+     auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";
+ 
+     // The displayed tree has two levels: at the toplevel is either "User-Saved Packs" or the name
+@@ -66,12 +66,14 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)
+     auto builtinPacks = getPacksFromDirectory(resourcePath);
+ 
+     std::map<std::string, std::vector<std::string>> installedPacks;
+-    if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {
+-        for (const auto& mod : fs::directory_iterator(modDirectory)) {
+-            auto packs = getPacksFromDirectory(mod);
+-            if (!packs.empty()) {
+-                auto modName = mod.path().filename().string();
+-                installedPacks.emplace(modName, packs);
++    for (const auto& modDirectory : modDirectories) {
++        if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {
++            for (const auto& mod : fs::directory_iterator(modDirectory)) {
++                auto packs = getPacksFromDirectory(mod);
++                if (!packs.empty()) {
++                    auto modName = mod.path().filename().string();
++                    installedPacks.emplace(modName, packs);
++                }
+             }
+         }
+     }
+diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
+index dfc54240c0..83e32fa05e 100644
+--- a/src/Gui/PreferencePackManager.cpp
++++ b/src/Gui/PreferencePackManager.cpp
+@@ -30,6 +30,7 @@
+ #endif
+ 
+ #include <boost/filesystem.hpp>
++#include <boost/algorithm/string.hpp>
+ #include <QDir>
+ 
+ #include "PreferencePackManager.h"
+@@ -134,12 +135,11 @@ void PreferencePack::applyConfigChanges() const
+ }
+ 
+ PreferencePackManager::PreferencePackManager()
++    : _preferencePackPaths(modPaths())
+ {
+-    auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
+     auto savedPath = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
+     auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";
+-    _preferencePackPaths.push_back(resourcePath);
+-    _preferencePackPaths.push_back(modPath);
++    _preferencePackPaths.insert(_preferencePackPaths.begin(), resourcePath);
+     _preferencePackPaths.push_back(savedPath);
+     rescan();
+ 
+@@ -232,6 +232,26 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,
+     rescan();
+ }
+ 
++// TODO(Shvedov): Is this suitable place for this method? It is more generic,
++// and maybe more suitable place at Application?
++std::vector<boost::filesystem::path> Gui::PreferencePackManager::modPaths() const
++{
++    auto userModPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
++
++    auto& config = App::Application::Config();
++    auto additionalModules = config.find("AdditionalModulePaths");
++    std::vector<boost::filesystem::path> result;
++
++    if (additionalModules != config.end()) {
++        boost::split(result,
++                     additionalModules->second,
++                     boost::is_any_of(";"),
++                     boost::token_compress_on);
++    }
++    result.emplace_back(userModPath);
++    return result;
++}
++
+ void Gui::PreferencePackManager::FindPreferencePacksInPackage(const fs::path &mod)
+ {
+     try {
+@@ -528,7 +548,6 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template
+     // (alternate spellings are provided for packages using CamelCase and snake_case, and both major English dialects)
+ 
+     auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui";
+-    auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
+ 
+     std::string group = "Built-In";
+     if (fs::exists(resourcePath) && fs::is_directory(resourcePath)) {
+@@ -536,11 +555,13 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template
+         std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
+     }
+ 
+-    if (fs::exists(modPath) && fs::is_directory(modPath)) {
+-        for (const auto& mod : fs::directory_iterator(modPath)) {
+-            group = mod.path().filename().string();
+-            const auto localFiles = scanForTemplateFiles(group, mod);
+-            std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
++    for (const auto& modPath : modPaths()) {
++        if (fs::exists(modPath) && fs::is_directory(modPath)) {
++            for (const auto& mod : fs::directory_iterator(modPath)) {
++                group = mod.path().filename().string();
++                const auto localFiles = scanForTemplateFiles(group, mod);
++                std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
++            }
+         }
+     }
+ 
+diff --git a/src/Gui/PreferencePackManager.h b/src/Gui/PreferencePackManager.h
+index 301e160df2..e5776e47a0 100644
+--- a/src/Gui/PreferencePackManager.h
++++ b/src/Gui/PreferencePackManager.h
+@@ -191,6 +191,11 @@ namespace Gui {
+          */
+         void importConfig(const std::string &packName, const boost::filesystem::path &path);
+ 
++        /**
++         * Get a list of all mod directories.
++         */
++        std::vector<boost::filesystem::path> modPaths() const;
++
+     private:
+ 
+         void FindPreferencePacksInPackage(const boost::filesystem::path& mod);
+-- 
+2.44.1
+

pkgs/by-name/fr/freecad/freecad-utils.nix

@@ -0,0 +1,98 @@
+{
+  runCommand,
+  buildEnv,
+  makeWrapper,
+  lib,
+  python311,
+  writeShellScript,
+}:
+let
+  wrapPathsStr =
+    flag: values:
+    builtins.concatStringsSep " " (
+      builtins.concatMap (p: [
+        "--add-flags"
+        flag
+        "--add-flags"
+        p
+      ]) values
+    );
+
+  wrapCfgStr =
+    typ: val:
+    let
+      installer = writeShellScript "insteller-${typ}" ''
+        dst="$HOME/.config/FreeCAD/${typ}.cfg"
+        if [ ! -f "$dst" ]; then
+          mkdir -p "$(dirname "$dst")"
+          cp --no-preserve=mode,ownership '${val}' "$dst"
+        fi
+      '';
+    in
+    lib.optionalString (val != null) "--run ${installer}";
+
+  pythonsProcessed = builtins.map (
+    pyt:
+    if builtins.isString pyt then
+      pyt
+    else if builtins.isFunction pyt then
+      "${(python311.withPackages pyt)}/lib/python3.11/site-packages"
+    else
+      throw "Expected string or function as python paths for freecad"
+  );
+
+  makeCustomizable =
+    freecad:
+    freecad
+    // {
+      customize =
+        {
+          name ? freecad.name,
+          modules ? [ ],
+          pythons ? [ ],
+          makeWrapperFlags ? [ ],
+          userCfg ? null,
+          systemCfg ? null,
+        }:
+        let
+          modulesStr = wrapPathsStr "--module-path" modules;
+          pythonsStr = wrapPathsStr "--python-path" (pythonsProcessed pythons);
+          makeWrapperFlagsStr = builtins.concatStringsSep " " (builtins.map (f: "'${f}'") makeWrapperFlags);
+
+          userCfgStr = wrapCfgStr "user" userCfg;
+          systemCfgStr = wrapCfgStr "system" systemCfg;
+
+          bin = runCommand "${name}-bin" { nativeBuildInputs = [ makeWrapper ]; } ''
+            mkdir -p "$out/bin"
+            for exe in FreeCAD{,Cmd}; do
+              if [[ ! -e ${freecad}/bin/$exe ]]; then
+                echo "No binary $exe in freecad package"
+                false
+              fi
+              dest="$out/bin/$exe";
+              makeWrapper "${freecad}/bin/$exe" "$dest" \
+                --inherit-argv0                         \
+                ${modulesStr}                           \
+                ${pythonsStr}                           \
+                ${userCfgStr}                           \
+                ${systemCfgStr}                         \
+                ${makeWrapperFlagsStr}
+            done
+            ln -s FreeCAD $out/bin/freecad
+            ln -s FreeCADCmd $out/bin/freecadcmd
+          '';
+        in
+        makeCustomizable (buildEnv {
+          inherit name;
+          paths = [
+            (lib.lowPrio freecad)
+            bin
+          ];
+        });
+      override = f: makeCustomizable (freecad.override f);
+      overrideAttrs = f: makeCustomizable (freecad.overrideAttrs f);
+    };
+in
+{
+  inherit makeCustomizable;
+}

pkgs/by-name/fr/freecad/package.nix

@@ -1,11 +1,11 @@
 { lib
+, callPackage
 , cmake
 , coin3d
 , doxygen
 , eigen
 , fetchFromGitHub
 , fmt
-, freecad
 , gfortran
 , gts
 , hdf5
@@ -22,7 +22,6 @@
 , opencascade-occt_7_6
 , pkg-config
 , python311Packages
-, runCommand  # for passthru.tests
 , spaceNavSupport ? stdenv.hostPlatform.isLinux
 , stdenv
 , swig
@@ -60,8 +59,9 @@ let
     scipy
     shiboken2
     ;
+  freecad-utils = callPackage ./freecad-utils.nix { };
 in
-stdenv.mkDerivation (finalAttrs: {
+freecad-utils.makeCustomizable (stdenv.mkDerivation (finalAttrs: {
   pname = "freecad";
   version = "1.0rc4";
 
@@ -131,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
     ./0002-FreeCad-OndselSolver-pkgconfig.patch
+    ./0003-Gui-take-in-account-module-path-argument.patch
   ];
 
   cmakeFlags = [
@@ -174,22 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
   '';
 
-  passthru.tests = {
-    # Check that things such as argument parsing still work correctly with
-    # the above PYTHONPATH patch. Previously the patch used above changed
-    # the `PyConfig_InitIsolatedConfig` to `PyConfig_InitPythonConfig`,
-    # which caused the built-in interpreter to attempt (and fail) to doubly
-    # parse argv. This should catch if that ever regresses and also ensures
-    # that PYTHONPATH is still respected enough for the FreeCAD console to
-    # successfully run and check that it was included in `sys.path`.
-    python-path =
-      runCommand "freecad-test-console"
-        {
-          nativeBuildInputs = [ freecad ];
-        } ''
-        HOME="$(mktemp -d)" PYTHONPATH="$(pwd)/test" FreeCADCmd --log-file $out -c "if not '$(pwd)/test' in sys.path: sys.exit(1)" </dev/null
-      '';
-  };
+  passthru.tests = callPackage ./tests {};
 
   meta = {
     homepage = "https://www.freecad.org";
@@ -214,4 +200,4 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ gebner srounce ];
     platforms = lib.platforms.linux;
   };
-})
+}))

pkgs/by-name/fr/freecad/tests/default.nix

@@ -0,0 +1,7 @@
+{
+  callPackage,
+}:
+{
+  python-path = callPackage ./python-path.nix { };
+  modules = callPackage ./modules.nix { };
+}

pkgs/by-name/fr/freecad/tests/modules.nix

@@ -0,0 +1,42 @@
+{
+  freecad,
+  runCommand,
+  writeTextFile,
+}:
+let
+  mkModule =
+    n:
+    writeTextFile {
+      name = "module-${n}";
+      destination = "/Init.py";
+      text = ''
+        import sys
+        import os
+
+        out = os.environ['out']
+        f = open(out + "/module-${n}.touch", "w")
+        f.write("module-${n}");
+        f.close()
+      '';
+    };
+  module-1 = mkModule "1";
+  module-2 = mkModule "2";
+  freecad-customized = freecad.customize {
+    modules = [
+      module-1
+      module-2
+    ];
+  };
+in
+runCommand "freecad-test-modules"
+  {
+    nativeBuildInputs = [ freecad-customized ];
+  }
+  ''
+    mkdir $out
+    HOME="$(mktemp -d)" FreeCADCmd --log-file $out/freecad.log -c "sys.exit(0)" </dev/null
+    test -f $out/module-1.touch
+    test -f $out/module-2.touch
+    grep -q 'Initializing ${module-1}... done' $out/freecad.log
+    grep -q 'Initializing ${module-2}... done' $out/freecad.log
+  ''

pkgs/by-name/fr/freecad/tests/python-path.nix

@@ -0,0 +1,18 @@
+{
+  freecad,
+  runCommand,
+}:
+# Check that things such as argument parsing still work correctly with
+# the above PYTHONPATH patch. Previously the patch used above changed
+# the `PyConfig_InitIsolatedConfig` to `PyConfig_InitPythonConfig`,
+# which caused the built-in interpreter to attempt (and fail) to doubly
+# parse argv. This should catch if that ever regresses and also ensures
+# that PYTHONPATH is still respected enough for the FreeCAD console to
+# successfully run and check that it was included in `sys.path`.
+runCommand "freecad-test-console"
+  {
+    nativeBuildInputs = [ freecad ];
+  }
+  ''
+    HOME="$(mktemp -d)" PYTHONPATH="$(pwd)/test" FreeCADCmd --log-file $out -c "if not '$(pwd)/test' in sys.path: sys.exit(1)" </dev/null
+  ''

pkgs/by-name/fr/freefilesync/package.nix

@@ -1,24 +1,25 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, fetchDebianPatch
-, copyDesktopItems
-, pkg-config
-, wrapGAppsHook3
-, unzip
-, curl
-, glib
-, gtk3
-, libssh2
-, openssl
-, wxGTK32
-, makeDesktopItem
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  fetchDebianPatch,
+  copyDesktopItems,
+  pkg-config,
+  wrapGAppsHook3,
+  unzip,
+  curl,
+  glib,
+  gtk3,
+  libssh2,
+  openssl,
+  wxGTK32,
+  makeDesktopItem,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freefilesync";
-  version = "13.7";
+  version = "13.8";
 
   src = fetchurl {
     url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip";
@@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
       rm -f $out
       tryDownload "$url"
     '';
-    hash = "sha256-bS3J0uevtZH/yjoOtqSMYVHRaNegW6NMOZv7ctW5oRc=";
+    hash = "sha256-nciunM5qDY8bxR09mv98CO5TU1BWmeFnByKHo7qqRc4=";
   };
 
   sourceRoot = ".";
@@ -116,7 +117,10 @@ stdenv.mkDerivation (finalAttrs: {
       genericName = "Folder Comparison and Synchronization";
       icon = name;
       exec = name;
-      categories = [ "Utility" "FileTools" ];
+      categories = [
+        "Utility"
+        "FileTools"
+      ];
     })
     (makeDesktopItem rec {
       name = "RealTimeSync";
@@ -124,14 +128,22 @@ stdenv.mkDerivation (finalAttrs: {
       genericName = "Automated Synchronization";
       icon = name;
       exec = name;
-      categories = [ "Utility" "FileTools" ];
+      categories = [
+        "Utility"
+        "FileTools"
+      ];
     })
   ];
 
   meta = with lib; {
     description = "Open Source File Synchronization & Backup Software";
     homepage = "https://freefilesync.org";
-    license = [ licenses.gpl3Only licenses.openssl licenses.curl licenses.bsd3 ];
+    license = [
+      licenses.gpl3Only
+      licenses.openssl
+      licenses.curl
+      licenses.bsd3
+    ];
     maintainers = with maintainers; [ wegank ];
     platforms = platforms.linux;
   };

pkgs/by-name/ge/geoipupdate/package.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "geoipupdate";
-  version = "7.0.1";
+  version = "7.1.0";
 
   src = fetchFromGitHub {
     owner = "maxmind";
     repo = "geoipupdate";
     rev = "v${version}";
-    sha256 = "sha256-OWo8puUjzMZXZ80HMpCrvRGUVdclnSxk7rHR5egOU1Y=";
+    sha256 = "sha256-XfQ5W2JbPBIAh5iF4jj9UJ4eLhhRHRwFPs0VWrBQVNA=";
   };
 
-  vendorHash = "sha256-MApZUtI9JewMBbImuV3vsNG89UvCfxcBg3TZiuk/nvg=";
+  vendorHash = "sha256-XQTZITuG9HjHnpYsSdwNLbdeDhH48+1kLCK32DMkppo=";
 
   ldflags = [ "-X main.version=${version}" ];
 

pkgs/by-name/gh/gh-dash/package.nix

@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gh-dash";
-  version = "4.7.1";
+  version = "4.7.3";
 
   src = fetchFromGitHub {
     owner = "dlvhdr";
     repo = "gh-dash";
     rev = "v${version}";
-    hash = "sha256-q/p7WDbJU27+m/4HVQJ7zRo0r1A0FkV21gJqHJYHHBE=";
+    hash = "sha256-QDqGsVgY3Je1VgQVobDhNkVjrCyvMNEdghXc0ny+yyo=";
   };
 
   vendorHash = "sha256-lqmz+6Cr9U5IBoJ5OeSN6HKY/nKSAmszfvifzbxG7NE=";

pkgs/by-name/gi/github-runner/deps.nix

@@ -2,43 +2,41 @@
 # Please dont edit it manually, your changes might get overwritten!
 
 { fetchNuGet }: [
-  (fetchNuGet { pname = "Azure.Core"; version = "1.36.0"; hash = "sha256-lokfjW2wvgFu6bALLzNmDhXIz3HXoPuGX0WfGb9hmpI="; })
-  (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.19.1"; hash = "sha256-E7QHJrhQjQjGhFq4GoQpyVGR6uKfA91NGcyziRfdr2U="; })
-  (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.18.1"; hash = "sha256-M10Ov1bBV1/U8R3Sp05apS3qFHONQRmAQakQsd17X8I="; })
-  (fetchNuGet { pname = "Castle.Core"; version = "4.4.0"; hash = "sha256-7hLBAHnB+drr2yU4w3o05eMX2ADy/rXN3XRPBn1d7GY="; })
-  (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"; hash = "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="; })
-  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.2.0"; hash = "sha256-ckbeFz5ArvZUE7w3EYiciBIGlmbmjwpxqWeAOEKgHgU="; })
-  (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; hash = "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "5.2.1"; hash = "sha256-b1wK8yssiKQxsFO7FFNQAffEu9r8c3YPcIY+UWVS874="; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "5.2.1"; hash = "sha256-APBQ+v+2RvfE98sHXzEIjujGYvMzut4RtpGHvAsJZg8="; })
-  (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"; hash = "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="; })
+  (fetchNuGet { pname = "Azure.Core"; version = "1.44.1"; hash = "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk="; })
+  (fetchNuGet { pname = "Azure.Storage.Blobs"; version = "12.23.0"; hash = "sha256-SMSelOQaPwRTv4qrgM1oIW0122KaMt4nBhHW1EzQg7Q="; })
+  (fetchNuGet { pname = "Azure.Storage.Common"; version = "12.22.0"; hash = "sha256-mgE5u4uqEN/qxSE2K6d/nr3uIW9ZBXFkBKBUKWJwzwM="; })
+  (fetchNuGet { pname = "Castle.Core"; version = "5.1.1"; hash = "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="; })
+  (fetchNuGet { pname = "Microsoft.AspNet.WebApi.Client"; version = "6.0.0"; hash = "sha256-lNL5C4W7/p8homWooO/3ZKDZQ2M0FUTDixJwqWBPVbo="; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; })
+  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.8.0"; hash = "sha256-cv/wAXfTNS+RWEsHWNKqRDHC7LOQSSdFJ1a9cZuSfJw="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "7.5.1"; hash = "sha256-q4Q9HtdGbjfih1QegppYaJh1ZrzCzQ56NXM7lQ9ZvU0="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.5.1"; hash = "sha256-/Xuu3mzeicfMP4elmXkJvBLsoAye7c57sX+fRmE9yds="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.5.1"; hash = "sha256-Tro3KKW/WjAnVoaMcOwvLybp+/Mm8GCObS7DPbrNCv4="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.5.1"; hash = "sha256-gf0QQMx+/n8AMoH5Yrq17ndbAeFkN95qGVRxmI7J0pE="; })
+  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.8.0"; hash = "sha256-uz7QvW+NsVRsp8FR1wjnGEOkUaPX4JyieywvCN6g2+s="; })
   (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"; hash = "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="; })
   (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; hash = "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; hash = "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
   (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"; hash = "sha256-vZCfpwHH4vrzj9WPVJt4FeTjsjJf81op0D9Rt82XwBc="; })
   (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"; hash = "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="; })
   (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1-rc2-24027"; hash = "sha256-sv12e7PuIV06abQV2ms4fotpQCyuufMsIOWoqSUqJMg="; })
   (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; hash = "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="; })
   (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.3"; hash = "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="; })
   (fetchNuGet { pname = "Microsoft.NETCore.Windows.ApiSets"; version = "1.0.1-rc2-24027"; hash = "sha256-HezmYiv8wL03Ok3FFBtAULe2yOUjjXfj9wPHE8hNlQw="; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.2.0"; hash = "sha256-OwtuyH4rBS2S2mp1rlUQcVxFPS04OWBcUa59+VjVBVA="; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.2.0"; hash = "sha256-ty2fxo3mQESh+cpsGfhSpMCEqmvPdzZE0EK8BkeHaIg="; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.8.0"; hash = "sha256-9TwGrjVvbtyetw67Udp3EMK5MX8j0RFRjduxPCs9ESw="; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.8.0"; hash = "sha256-+CTYFu631uovLCO47RKe86YaAqfoLA4r73vKORJUsjg="; })
   (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"; hash = "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.4.0"; hash = "sha256-ZumsykAAIYKmVtP4QI5kZ0J10n2zcOZZ69PmAK0SEiE="; })
+  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
   (fetchNuGet { pname = "Minimatch"; version = "2.0.0"; hash = "sha256-oG/s4O/iBEtWsTTe4wvUPfJiYt3oRlsGtALj8FfABM0="; })
-  (fetchNuGet { pname = "Moq"; version = "4.11.0"; hash = "sha256-/JzL3LDxMGV/hKaU85PcWfCMWX6oKrnatFhKpgGadiE="; })
+  (fetchNuGet { pname = "Moq"; version = "4.20.70"; hash = "sha256-O+Ed1Hv8fK8MKaRh7qFGbsSPaTAj4O+yaLQ/W/ju7ks="; })
   (fetchNuGet { pname = "NETStandard.Library"; version = "1.5.0-rc2-24027"; hash = "sha256-lddIyqj8Y3IexOm5I1hsE5w1/dOoOaNDHoUPI1vkX80="; })
-  (fetchNuGet { pname = "NETStandard.Library"; version = "1.6.1"; hash = "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; })
   (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; })
-  (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.1"; hash = "sha256-qofIFqViDsdBOE/X0IvzfGUklSrULaH8MoZQ+YrcMOQ="; })
-  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; })
+  (fetchNuGet { pname = "Newtonsoft.Json.Bson"; version = "1.0.2"; hash = "sha256-ZUj6YFSMZp5CZtXiamw49eZmbp1iYBuNsIKNnjxcRzA="; })
+  (fetchNuGet { pname = "NuGet.Frameworks"; version = "6.5.0"; hash = "sha256-ElqfN4CcKxT3hP2qvxxObb4mnBlYG89IMxO0Sm5oZ2g="; })
   (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"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; })
   (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; })
@@ -64,7 +62,6 @@
   (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"; hash = "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="; })
   (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"; hash = "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="; })
   (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"; hash = "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="; })
   (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; hash = "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="; })
@@ -93,171 +90,112 @@
   (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"; hash = "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="; })
   (fetchNuGet { pname = "System.AppContext"; version = "4.1.0-rc2-24027"; hash = "sha256-Tym1nDr/5+VQUa1041eqtfIGF2FJ911V5L8oEZ4eHTA="; })
-  (fetchNuGet { pname = "System.AppContext"; version = "4.3.0"; hash = "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="; })
   (fetchNuGet { pname = "System.Buffers"; version = "4.0.0-rc2-24027"; hash = "sha256-V2pNSn3VniEXZmQzgqU3FTQSqitOEpTGgbHPe5BXFtc="; })
   (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; hash = "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="; })
   (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; hash = "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="; })
-  (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; hash = "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="; })
+  (fetchNuGet { pname = "System.ClientModel"; version = "1.1.0"; hash = "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM="; })
   (fetchNuGet { pname = "System.Collections"; version = "4.0.11-rc2-24027"; hash = "sha256-GCoP5iuHXa1T8fJjqfK1X1OwdFeZHTFS3qwOH497V0Y="; })
   (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; hash = "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="; })
   (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12-rc2-24027"; hash = "sha256-BCPzxT4h6f9tV0sqxE5uwlDsGrkpZ19ZWjutTQ4uDHo="; })
   (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; hash = "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="; })
-  (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; hash = "sha256-8/yZmD4jjvq7m68SPkJZLBQ79jOTOyT5lyzX4SCYAx8="; })
-  (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; hash = "sha256-QNg0JJNx+zXMQ26MJRPzH7THdtqjrNtGLUgaR1SdvOk="; })
-  (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; hash = "sha256-i00uujMO4JEDIEPKLmdLY3QJ6vdSpw6Gh9oOzkFYBiU="; })
-  (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; hash = "sha256-IOMJleuIBppmP4ECB3uftbdcgL7CCd56+oAD/Sqrbus="; })
-  (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; hash = "sha256-PSDiPYt8PgTdTUBz+GH6lHCaM1YgfObneHnZsc8Fz54="; })
   (fetchNuGet { pname = "System.Console"; version = "4.0.0-rc2-24027"; hash = "sha256-AYG01PY+ZNvGfvHZADPxbQR27gH4ZpGvY0WDrUYYVRw="; })
-  (fetchNuGet { pname = "System.Console"; version = "4.3.0"; hash = "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="; })
-  (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"; hash = "sha256-CiEy6bAdvVz9/rgpOoPRK8SjaJ+6yoKYT3yR+dsEP4c="; })
   (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; hash = "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="; })
   (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; hash = "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="; })
   (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "6.0.1"; hash = "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4="; })
-  (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; hash = "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="; })
+  (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "6.0.0"; hash = "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="; })
+  (fetchNuGet { pname = "System.Diagnostics.EventLog"; version = "8.0.0"; hash = "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="; })
   (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"; hash = "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="; })
-  (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"; hash = "sha256-pkKcVfskyL57QvM2VyqsS2jYz6bE1NL2gsB6VCkRDCg="; })
   (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="; })
-  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; hash = "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="; })
-  (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; hash = "sha256-k75gjOYimIQtLBD5NDzwwi3ZMUBPRW3jmc3evDMMJbU="; })
-  (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; hash = "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="; })
+  (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; hash = "sha256-9nL3dN4w/dZ49W1pCkTjRqZm6Dh0mMVExNungcBHrKs="; })
+  (fetchNuGet { pname = "System.Formats.Asn1"; version = "8.0.0"; hash = "sha256-AVMl6N3SG2AqAcQHFruf2QDQeQIC3CICxID+Sh0vBxI="; })
   (fetchNuGet { pname = "System.Globalization"; version = "4.0.11-rc2-24027"; hash = "sha256-9sLqNlbC6lG30dwyGI62ZeLsKJjLnfVd+1UXlGkwgXo="; })
   (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; hash = "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="; })
   (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1-rc2-24027"; hash = "sha256-s3z6l6fJhYcUijzFKOcBxsQONAZBnxGYj8eUliMWGXI="; })
   (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; hash = "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="; })
   (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; hash = "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="; })
-  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "5.2.1"; hash = "sha256-XWOX7wuuQyUoMZG5Fnk64g7KoVP9y8shxUZE/Wz6wSI="; })
-  (fetchNuGet { pname = "System.IO"; version = "4.1.0"; hash = "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="; })
+  (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "7.5.1"; hash = "sha256-1pBDkT0aL2xiPg55728rA0FHIqyCNnrv1TYLjuLnMV8="; })
   (fetchNuGet { pname = "System.IO"; version = "4.1.0-rc2-24027"; hash = "sha256-RMvF7LpD7bgXYXUIew2ipUHNVJuY57FsD4K+QY6tmGc="; })
   (fetchNuGet { pname = "System.IO"; version = "4.3.0"; hash = "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="; })
   (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"; hash = "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="; })
   (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"; hash = "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="; })
-  (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; hash = "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="; })
   (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"; hash = "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="; })
-  (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "4.4.0"; hash = "sha256-e77Nud0sKDdkAFSrCbQAV3rwzn3iHZ131CSqspdQVoc="; })
-  (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; hash = "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="; })
+  (fetchNuGet { pname = "System.IO.FileSystem.AccessControl"; version = "5.0.0"; hash = "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="; })
   (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"; hash = "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="; })
   (fetchNuGet { pname = "System.IO.Hashing"; version = "6.0.0"; hash = "sha256-gSxLJ/ujWthLknylguRv40mwMl/qNcqnFI9SNjQY6lE="; })
-  (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; hash = "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="; })
   (fetchNuGet { pname = "System.Linq"; version = "4.1.0-rc2-24027"; hash = "sha256-RFhAtAGpWDdUfsdIqal/E7LmrN1SjE8ZZOoAvIHXi0U="; })
   (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; hash = "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="; })
-  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; hash = "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="; })
-  (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; hash = "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="; })
-  (fetchNuGet { pname = "System.Memory.Data"; version = "1.0.2"; hash = "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="; })
-  (fetchNuGet { pname = "System.Net.Http"; version = "4.3.0"; hash = "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="; })
+  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; })
+  (fetchNuGet { pname = "System.Memory.Data"; version = "6.0.0"; hash = "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo="; })
   (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; hash = "sha256-FMoU0K7nlPLxoDju0NL21Wjlga9GpnAoQjsFhFYYt00="; })
   (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; hash = "sha256-eGZwCBExWsnirWBHyp2sSSSXp6g7I6v53qNmwPgtJ5c="; })
   (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"; hash = "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="; })
   (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0-rc2-24027"; hash = "sha256-GgOSOyyZzXQw6ubXl5iZeQ8Rx3ZTWdlZ5dCeUPdaUxg="; })
-  (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"; hash = "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="; })
-  (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; hash = "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="; })
   (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12-rc2-24027"; hash = "sha256-clMUSdm6joAqjATtOdNPbfrrJj8aQwLGmulHx1VCtxg="; })
-  (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; hash = "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="; })
-  (fetchNuGet { pname = "System.Private.DataContractSerialization"; version = "4.3.0"; hash = "sha256-vNlHUKkaFvhiVnTY0JNsNT5E6TW9CFRzTqVcufGN0hk="; })
   (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; hash = "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="; })
-  (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; hash = "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="; })
   (fetchNuGet { pname = "System.Reflection"; version = "4.1.0-rc2-24027"; hash = "sha256-IkIon2wBRzj7FKhdVQtW10K5qZoQaDa/eClwhiPyJxw="; })
   (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; hash = "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; hash = "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="; })
-  (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; hash = "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="; })
-  (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"; hash = "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; hash = "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="; })
-  (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; hash = "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="; })
-  (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"; hash = "sha256-Z1vlqmgENByTMp4/hJdmNWArg5vtwRPUVVuA1Tg//1E="; })
-  (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; hash = "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="; })
   (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; })
-  (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; hash = "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="; })
   (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"; hash = "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="; })
-  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; hash = "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="; })
-  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.4.0"; hash = "sha256-sGgfV4pG9Kr+PLAR/DyRGiTP09Tkvol9U/WLSwkPOVk="; })
-  (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; hash = "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="; })
+  (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.7.0"; hash = "sha256-GEtCGXwtOnkYejSV+Tfl+DqyGq5jTUaVyL9eMupMHBM="; })
   (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"; hash = "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="; })
-  (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; hash = "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="; })
   (fetchNuGet { pname = "System.Runtime"; version = "4.1.0-rc2-24027"; hash = "sha256-z1c95ZkPupGWen++eWisSr2+5I9cszS++9Ki5XyEr7w="; })
   (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; hash = "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="; })
   (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; hash = "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0="; })
   (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; hash = "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="; })
-  (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; hash = "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="; })
   (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0-rc2-24027"; hash = "sha256-14jHFNeSD1ldMvMqmwlaoClRSwGJnPU4Y7eFoaNhZCY="; })
   (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; hash = "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="; })
-  (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; hash = "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="; })
   (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"; hash = "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="; })
-  (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"; hash = "sha256-dCm1Ff2hQlzgpJB080eiCU0xGoRmbTcCDs1kf3yDt2w="; })
   (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"; hash = "sha256-mYxrkfrMRtcDNQ4T1rvjdWl9Mr3lErPoonTfa/LmT2M="; })
   (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"; hash = "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="; })
   (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"; hash = "sha256-8BUhfRa4wI+l/nqHEy7MTQooekJYlNSaCKtWL+1hc74="; })
   (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; hash = "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="; })
-  (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; hash = "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="; })
-  (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.3.0"; hash = "sha256-zu5m1M9usend+i9sbuD6Xbizdo8Z6N5PEF9DAtEVewc="; })
-  (fetchNuGet { pname = "System.Runtime.Serialization.Xml"; version = "4.3.0"; hash = "sha256-0bp8xtv2cP/IuxaBF8xkyYYD8N6w1wVX8wzpAwXtTKw="; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.4.0"; hash = "sha256-J3T2ECVdL0JiBA999CUz77az545CVOYB11/NPA/huEc="; })
+  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
   (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; hash = "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks="; })
   (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; hash = "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; hash = "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="; })
-  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.4.0"; hash = "sha256-FpDJap32xOUDZTRLxL0QoeYFYSaY+JIzQ2VUgFpML78="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; hash = "sha256-nOJP3vdmQaYA07TI373OvZX6uWshETipvi5KpL7oExo="; })
   (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"; hash = "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="; })
   (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"; hash = "sha256-8I/RIdEP3BFCrgs2IUvpZLNwz86NwNs+Jimx+5lox64="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "8.0.0"; hash = "sha256-yqfIIeZchsII2KdcxJyApZNzxM/VKknjs25gDWlweBI="; })
   (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"; hash = "sha256-Ri53QmFX8I8UH0x4PikQ1ZA07ZSnBUXStd5rBfGWFOE="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; })
   (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; hash = "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="; })
   (fetchNuGet { pname = "System.Security.Principal"; version = "4.3.0"; hash = "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk="; })
   (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.3.0"; hash = "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE="; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.4.0"; hash = "sha256-lwNBM33EW45j6o8bM4hKWirEUZCvep0VYFchc50JOYc="; })
-  (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "4.4.0"; hash = "sha256-hkItmfxIVKNAfR3T4k2T0xIAeXpSvbUqEFCypf2W0UM="; })
-  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; hash = "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="; })
+  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; })
+  (fetchNuGet { pname = "System.ServiceProcess.ServiceController"; version = "8.0.0"; hash = "sha256-mq/Qm8JeMUvitHf32/F8uvw1YJGx4prGnEI/VzdaFAI="; })
   (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"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.4.0"; hash = "sha256-zD24blG8xhAcL9gC4UTGKetd8c3LO0nv22nKTp2Vfx0="; })
-  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; })
   (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"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; hash = "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; hash = "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="; })
-  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
-  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "6.0.10"; hash = "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc="; })
   (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.1"; hash = "sha256-DxsEZ0nnPozyC1W164yrMUXwnAdHShS9En7ImD/GJMM="; })
-  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
   (fetchNuGet { pname = "System.Threading"; version = "4.0.11-rc2-24027"; hash = "sha256-OJJ4f+gNzCZruuOvhnZG9uOU3whSVEKafMoTVbH6RCk="; })
   (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; hash = "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="; })
-  (fetchNuGet { pname = "System.Threading.Channels"; version = "4.5.0"; hash = "sha256-34I/eRNA/R8tazesCaE0yzYf80n3iEN3UQIeFSUf31g="; })
-  (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; hash = "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="; })
+  (fetchNuGet { pname = "System.Threading.Channels"; version = "8.0.0"; hash = "sha256-c5TYoLNXDLroLIPnlfyMHk7nZ70QAckc/c7V199YChg="; })
   (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"; hash = "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="; })
-  (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"; hash = "sha256-z9+gWBZBjNoG7P5F0RHMVA4VxAw8Farnf0a94S9uGoE="; })
-  (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"; hash = "sha256-3NeBC+r7eTVz3f+cEm1NkVhxSr7LrYGX/NdUwje9ecY="; })
   (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; hash = "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="; })
   (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; hash = "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg="; })
   (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"; hash = "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="; })
-  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; hash = "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="; })
   (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11-rc2-24027"; hash = "sha256-jYxZjqyHIpC4g3QngWbA3joMg0DQBRWeyWviauJ73G8="; })
-  (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; hash = "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="; })
-  (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"; hash = "sha256-P9yCIlkbOAhF03mTF/T+iLKEXSIcncoVDbgbplykb+c="; })
-  (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.3.0"; hash = "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="; })
-  (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; hash = "sha256-kbuV4Y7rVJkfMp2Kgoi8Zvdatm9CZNmlKB3GZgANvy4="; })
-  (fetchNuGet { pname = "System.Xml.XmlSerializer"; version = "4.3.0"; hash = "sha256-IqTGPENWYoI06x2NHFPVtHlLEq9tazbom32bFLom6h4="; })
   (fetchNuGet { pname = "xunit"; version = "2.7.1"; hash = "sha256-cf9vLYPIOvBGiUoUept+1NJfuhpSSdCFQSr6+XFde6E="; })
   (fetchNuGet { pname = "xunit.abstractions"; version = "2.0.3"; hash = "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="; })
   (fetchNuGet { pname = "xunit.analyzers"; version = "1.12.0"; hash = "sha256-ZqbNShkNckXsZTght1ZlzkJyfd/e8oPtjSMDsJwqGuo="; })
@@ -265,6 +203,6 @@
   (fetchNuGet { pname = "xunit.core"; version = "2.7.1"; hash = "sha256-3+w1MZ/USIUqQbnyQT4ocgYfghpSoxawZN3E5EhtJ9M="; })
   (fetchNuGet { pname = "xunit.extensibility.core"; version = "2.7.1"; hash = "sha256-6AUG4c+cKswwoR2RMz+rrBjhdkIlGiRNxfLPkqKY8gI="; })
   (fetchNuGet { pname = "xunit.extensibility.execution"; version = "2.7.1"; hash = "sha256-3LEbfaJ2Uu/PWQW4NGONPr5SxZwy3Sj5yCWO6gy7IOk="; })
-  (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.4.1"; hash = "sha256-Fm5DjFXZJzTJuApib0thPGUD0w0eavfBfSh9FOYtljo="; })
+  (fetchNuGet { pname = "xunit.runner.visualstudio"; version = "2.5.8"; hash = "sha256-71EXxeR3yiZTAWCVnjIx9o4Lme6MVY04KXch9qZETQU="; })
   (fetchNuGet { pname = "YamlDotNet.Signed"; version = "5.3.0"; hash = "sha256-K/aWN3NDNkfIxBvxcr8+4AJ/bVBZ2LWC2ef9L5Qq174="; })
 ]

pkgs/by-name/gi/github-runner/package.nix

@@ -23,13 +23,13 @@ assert builtins.all (x: builtins.elem x [ "node20" ]) nodeRuntimes;
 
 buildDotnetModule rec {
   pname = "github-runner";
-  version = "2.320.0";
+  version = "2.321.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-mVi/Z89R2nbxQAyEkpbcaU3Pc3wK6989QojHew9ad4g=";
+    hash = "sha256-KZ072v5kYlD78RGQl13Aj05DGzj2+r2akzyZ1aJn93A=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision
@@ -80,19 +80,16 @@ buildDotnetModule rec {
       url = "https://github.com/actions/runner/commit/5ff0ce1.patch";
       hash = "sha256-2Vg3cKZK3cE/OcPDZkdN2Ro2WgvduYTTwvNGxwCfXas=";
     })
+    # Fix source path discovery in tests
+    ./patches/test-getsrcpath.patch
   ];
 
-  postPatch =
-    ''
-      # Ignore changes to src/Runner.Sdk/BuildConstants.cs
-      substituteInPlace src/dir.proj \
-        --replace 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
-                  'true'
-    ''
-    + lib.optionalString (nodeRuntimes == [ "node20" ]) ''
-      substituteInPlace src/Runner.Common/Util/NodeUtil.cs \
-        --replace-fail '_defaultNodeVersion = "node16"' '_defaultNodeVersion = "node20"'
-    '';
+  postPatch = ''
+    # Ignore changes to src/Runner.Sdk/BuildConstants.cs
+    substituteInPlace src/dir.proj \
+      --replace-fail 'git update-index --assume-unchanged ./Runner.Sdk/BuildConstants.cs' \
+                     'true'
+  '';
 
   DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = isNull glibcLocales;
   LOCALE_ARCHIVE = lib.optionalString (
@@ -121,8 +118,8 @@ buildDotnetModule rec {
 
   buildInputs = [ (lib.getLib stdenv.cc.cc) ];
 
-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
-  dotnet-runtime = dotnetCorePackages.runtime_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
   dotnetFlags = [
     "-p:PackageRuntime=${dotnetCorePackages.systemToDotnetRid stdenv.hostPlatform.system}"
@@ -206,8 +203,6 @@ buildDotnetModule rec {
       "GitHub.Runner.Common.Tests.Worker.VariablesL0.Constructor_SetsOrdinalIgnoreCaseComparer"
       "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation"
       "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob"
-    ]
-    ++ lib.optionals (!lib.elem "node16" nodeRuntimes) [
       "GitHub.Runner.Common.Tests.ProcessExtensionL0.SuccessReadProcessEnv"
     ];
 

pkgs/by-name/gi/github-runner/patches/test-getsrcpath.patch

@@ -0,0 +1,11 @@
+--- a/src/Test/L0/TestUtil.cs
++++ b/src/Test/L0/TestUtil.cs
+@@ -29,7 +29,7 @@
+         {
+             string L0dir = Path.GetDirectoryName(GetTestFilePath());
+             string testDir = Path.GetDirectoryName(L0dir);
+-            string srcDir = Path.GetDirectoryName(testDir);
++            string srcDir = "/build/src" + Path.GetDirectoryName(testDir).Substring(2);
+             ArgUtil.Directory(srcDir, nameof(srcDir));
+             Assert.Equal(Src, Path.GetFileName(srcDir));
+             return srcDir;

pkgs/by-name/gn/gnumeric/package.nix

@@ -38,7 +38,6 @@ in stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     homepage = "http://projects.gnome.org/gnumeric/";
     platforms = platforms.unix;
-    broken = with stdenv; isDarwin && isAarch64;
     maintainers = [ maintainers.vcunat ];
   };
 }

pkgs/by-name/go/gotemplate/package.nix

@@ -1,17 +1,21 @@
-{ lib, buildGo123Module, fetchFromGitHub }:
-
+{
+  lib,
+  buildGo123Module,
+  fetchFromGitHub,
+}:
 buildGo123Module rec {
+
   pname = "gotemplate";
-  version = "3.9.2";
+  version = "3.10.1";
 
   src = fetchFromGitHub {
     owner = "coveooss";
-    repo = pname;
+    repo = "gotemplate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7FJejArGpnmkAzbN+2BOcewLdlcsh8QblOOZjFu+uSA=";
+    hash = "sha256-Q/Bqb0wgKzR0WPUHge/hqIvib/TbGxv6s+eEpDLxqPY=";
   };
 
-  vendorHash = "sha256-378oodyQG50l7qkTO5Ryt1NjFBbYW2n9by+ALNfTggI=";
+  vendorHash = "sha256-buRCG9I5zltIMTu5SLE98/pQAs3Vlfw4oz2BZXQxUAc=";
 
   # This is the value reported when running `gotemplate --version`,
   # see https://github.com/coveooss/gotemplate/issues/262
@@ -24,4 +28,5 @@ buildGo123Module rec {
     license = licenses.mit;
     maintainers = with maintainers; [ giorgiga ];
   };
+
 }

pkgs/by-name/gr/graphite-cli/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@withgraphite/graphite-cli",
-  "version": "1.4.6",
+  "version": "1.4.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@withgraphite/graphite-cli",
-      "version": "1.4.6",
+      "version": "1.4.8",
       "hasInstallScript": true,
       "license": "None",
       "dependencies": {

pkgs/by-name/gr/graphite-cli/package.nix

@@ -7,14 +7,14 @@
 
 buildNpmPackage rec {
   pname = "graphite-cli";
-  version = "1.4.6";
+  version = "1.4.8";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-RXVGy46DL+fxXIErCssspLeSh/iySLTzUCqQY2YNEVc=";
+    hash = "sha256-PzoMDBoWAXVbK3itcpybpjZ+lWd8tS7UOFtWWMwTh5U=";
   };
 
-  npmDepsHash = "sha256-I5WXcdDWBbfc+y7Tdh6UCi/WfHvHx75OAqtQsXujzSM=";
+  npmDepsHash = "sha256-mybKtbguxxHkPUm9oSYPjxGZxf6tEy4OKqyI5dNQFnE=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

pkgs/by-name/ic/icloudpd/package.nix

@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "icloudpd";
-  version = "1.24.3";
+  version = "1.24.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "icloud-photos-downloader";
     repo = "icloud_photos_downloader";
     rev = "v${version}";
-    hash = "sha256-IP5bjRmHlVKYmcsR1g9B/p4KzVpCyBomwznPwjay4wA=";
+    hash = "sha256-/axw1RSfQX9RIoICs2Zcn9ScWTcqU9mHAhotaMduAp8=";
   };
 
   pythonRelaxDeps = true;

pkgs/by-name/ja/jankyborders/package.nix

@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "JankyBorders";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "FelixKratz";
     repo = "JankyBorders";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-DX1d228UCOI+JU+RxenhiGyn3AiqpsGe0aCtr091szs=";
+    hash = "sha256-PUyq3m244QyY7e8+/YeAMOxMcAz3gsyM1Mg/kgjGVgU=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/jf/jfrog-cli/package.nix

@@ -1,23 +1,23 @@
 { lib
-, buildGo123Module
+, buildGoModule
 , fetchFromGitHub
 , nodejs
 , nix-update-script
 }:
 
-buildGo123Module rec {
+buildGoModule rec {
   pname = "jfrog-cli";
-  version = "2.71.0";
+  version = "2.71.4";
 
   src = fetchFromGitHub {
     owner = "jfrog";
     repo = "jfrog-cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hblOe6YMlfWBVvWD5MKEKvAB55jUx98OMeqFDdgVrmM=";
+    hash = "sha256-pC56OlSo05nMH+Adkg1v0Lba7Vd+bXeHRP4+Phvhlu8=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-px+eXSIOe3v4iNBibXAtcFMROrHq6YYJIHbCC7nhNS4=";
+  vendorHash = "sha256-d1VloSjvXAt10MsZwVJ0Fkg9pN+tcOE5vURy7hatg30=";
 
   postPatch = ''
     # Patch out broken test cleanup.

pkgs/by-name/ko/komikku/package.nix

@@ -23,7 +23,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "komikku";
-  version = "1.62.0";
+  version = "1.63.0";
 
   format = "other";
 
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "valos";
     repo = "Komikku";
     rev = "v${version}";
-    hash = "sha256-lU+AyslvuWr0BmhLvfqenOiWpBeC7q3Gtvek/q3o0ok=";
+    hash = "sha256-+p5iTB98jpCqodvSEZ9Y8SM9W3M57Lpoh9jAzN3OmRs=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/li/libpqxx/package.nix

@@ -1,31 +1,54 @@
-{ lib, stdenv, fetchFromGitHub, postgresql, python3 }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  postgresql,
+  python3,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libpqxx";
-  version = "7.7.5";
+  version = "7.9.2";
 
   src = fetchFromGitHub {
     owner = "jtv";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-mvGPMbk4b8NmPvzy5hS+Au69NtDGha8ONTEQf6I3VZE=";
+    repo = "libpqxx";
+    rev = finalAttrs.version;
+    hash = "sha256-I5e0iqXlZqDOMa1PlnrxpcKt1c2mbnSbVQrpi1Gh25o=";
   };
 
-  nativeBuildInputs = [ python3 ];
-  buildInputs = [ postgresql ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
-  preConfigure = ''
-    patchShebangs ./tools/splitconfig
+  nativeBuildInputs = [
+    postgresql.dev
+    python3
+  ];
+
+  buildInputs = [
+    postgresql.lib
+  ];
+
+  postPatch = ''
+    patchShebangs ./tools/splitconfig.py
   '';
 
-  configureFlags = [ "--enable-shared --disable-documentation" ];
-  CXXFLAGS = [ "-std=c++17" ];
+  configureFlags = [
+    "--disable-documentation"
+    "--enable-shared"
+  ];
+
+  strictDeps = true;
 
   meta = {
+    changelog = "https://github.com/jtv/libpqxx/releases/tag/${finalAttrs.version}";
     description = "C++ library to access PostgreSQL databases";
+    downloadPage = "https://github.com/jtv/libpqxx";
     homepage = "https://pqxx.org/development/libpqxx/";
     license = lib.licenses.bsd3;
-    platforms = lib.platforms.unix;
     maintainers = [ ];
+    platforms = lib.platforms.unix;
   };
-}
+})

pkgs/by-name/li/libvibrant/package.nix

@@ -1,32 +1,40 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, makeWrapper
-, libX11
-, libXrandr
-, linuxPackages
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  libX11,
+  libXrandr,
+  linuxPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libvibrant";
-  version = "2100c09";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "libvibrant";
     repo = "libvibrant";
-    rev = version;
-    hash = "sha256-nVODwP/PQgYBTHnSplgrkdNOLsF7N+vZ8iPL7gArVNY=";
+    rev = finalAttrs.version;
+    hash = "sha256-APja211+U0WVuCRz8f3VIAQLF4oPhh0CJ3Y5EgSJnh0=";
   };
 
-  buildInputs = [ libX11 libXrandr linuxPackages.nvidia_x11.settings.libXNVCtrl ];
-  nativeBuildInputs = [ cmake makeWrapper ];
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    libX11
+    libXrandr
+    linuxPackages.nvidia_x11.settings.libXNVCtrl
+  ];
 
   meta = with lib; {
     description = "Simple library to adjust color saturation of X11 outputs";
     homepage = "https://github.com/libvibrant/libvibrant";
-    license = licenses.mit;
+    license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    maintainers = with maintainers; [ Scrumplex ];
     mainProgram = "vibrant-cli";
   };
-}
+})

pkgs/by-name/nf/nfpm/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "2.40.0";
+  version = "2.41.1";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-hBA15pHCYgBKTeHBVBZkhPqoMnDkd13wx9afygTDPWk=";
+    hash = "sha256-/me2qMOaZ0QQ1wUrMs8T/CZ5t3tL25eVYlpoWSzCJhM=";
   };
 
-  vendorHash = "sha256-d4MuoKc7LF5KCXhLxIwuqS2Xu7ClLhyJZH4/+/LYm3w=";
+  vendorHash = "sha256-dGVfWKnlZxVdqgZSIRrEWmqSf360J/LKkyiMkKJ88ro=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 

pkgs/by-name/ob/obsidian/package.nix

@@ -12,7 +12,7 @@
 }:
 let
   pname = "obsidian";
-  version = "1.7.6";
+  version = "1.7.7";
   appname = "Obsidian";
   meta = with lib; {
     description = "Powerful knowledge base that works on top of a local folder of plain text Markdown files";
@@ -26,7 +26,7 @@ let
   filename = if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz";
   src = fetchurl {
     url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}";
-    hash = if stdenv.hostPlatform.isDarwin then "sha256-K7NLFbsTVNNH2VEXLiBM1KaG3fEWwaUkvxYh3vtKGvc=" else "sha256-5xkhm87eN36NmwG+t7SYnn20zT+ZELC7g2x+6/UGrHE=";
+    hash = if stdenv.hostPlatform.isDarwin then "sha256-vzYMTH1yaKxw1AwJOXVdzvKyQTkCMmx7NPPP/99xgMQ=" else "sha256-6IHqBvZx2yxQAvADi3Ok5Le3ip2/c6qafQ3FSpPT0po=";
   };
 
   icon = fetchurl {

pkgs/by-name/pa/pagsuite/package.nix

@@ -1,10 +1,12 @@
-{ lib
-, stdenv
-, fetchurl
-, cmake
-, unzip
-, gmp
-, scalp
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  cmake,
+  unzip,
+  gmp,
+  scalp,
 }:
 
 stdenv.mkDerivation rec {
@@ -12,11 +14,21 @@ stdenv.mkDerivation rec {
   version = "1.80";
 
   src = fetchurl {
-    url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${lib.replaceStrings ["."] ["_"] version}.zip";
+    url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${
+      lib.replaceStrings [ "." ] [ "_" ] version
+    }.zip";
     hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ=";
   };
 
-  sourceRoot = "pagsuite_${lib.replaceStrings ["."] ["_"] version}";
+  patches = [
+    # Fix issue with latest ScaLP update
+    (fetchpatch {
+      url = "https://gitlab.com/kumm/pagsuite/-/commit/cae9f78bec93a7f197461358f2f796f6b5778781.patch";
+      hash = "sha256-12IisS6oGYLRicORTemHB7bw9EB9cuQjxG8f6X0WMrU=";
+    })
+  ];
+
+  sourceRoot = "pagsuite_${lib.replaceStrings [ "." ] [ "_" ] version}";
 
   nativeBuildInputs = [
     cmake

pkgs/by-name/pl/plantuml-server/package.nix

@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "plantuml-server";
-  version = "1.2024.7";
+  version = "1.2024.8";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
-    hash = "sha256-9YTclV+FoiNbcpeNtlbbozqjB1BN9EJn03CzyHDbC+8=";
+    hash = "sha256-etarM3ByPHjGKfy+L1akYyz3J2hnDCcMKgjLviEW0yc=";
   };
 
   dontUnpack = true;

pkgs/by-name/pr/prismlauncher-unwrapped/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   cmark,
-  darwin,
+  apple-sdk_11,
   extra-cmake-modules,
   gamemode,
   ghc_filesystem,
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
       tomlplusplus
       zlib
     ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
     ++ lib.optional gamemodeSupport gamemode;
 
   hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];

pkgs/by-name/qs/qsv/package.nix

@@ -1,5 +1,4 @@
 {
-  darwin,
   fetchFromGitHub,
   file,
   lib,
@@ -12,7 +11,7 @@
 
 let
   pname = "qsv";
-  version = "0.131.1";
+  version = "0.138.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -21,37 +20,17 @@ rustPlatform.buildRustPackage {
     owner = "jqnatividad";
     repo = "qsv";
     rev = version;
-    hash = "sha256-erXMDZBkOPnZdhhjnUTiS0eCuFo1v5sNhLn8o7QN/5g=";
+    hash = "sha256-27oSk8fnTvl1zJ8xYkZHkWVTq+AVDn4Zi1s56T49T1Q=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "calamine-0.25.0" = "sha256-LFQahQ+SfGWhp5Kfs7AJCj4zyxWiz099pwVuQucCF00=";
-      "dynfmt-0.1.5" = "sha256-/SrNOOQJW3XFZOPL/mzdOBppVCaJNNyGBuJumQGx6sA=";
-      "grex-1.4.5" = "sha256-4Tr5L87HuiUW8tJdqr4oT1yQXviU7XtDrKY7iYNcwbo=";
-      "local-encoding-0.2.0" = "sha256-ThXYKr3u/n2kvINcyobB2Ayex2sNbJEOyyjZH993Z4U=";
-      "polars-0.41.3" = "sha256-8xkcJgfKo7BzeBnR6XVdbcH9ZY9Kh4dcGFMmyA5LuQg=";
-    };
-  };
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-tu9HCFAxmmYVgmJyHunBtGSqKGzwbX2vi6ju4cv33wc=";
 
-  buildInputs =
-    [
-      file
-      sqlite
-      zstd
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin (
-      with darwin.apple_sdk.frameworks;
-      [
-        AppKit
-        CoreFoundation
-        CoreGraphics
-        IOKit
-        Security
-        SystemConfiguration
-      ]
-    );
+  buildInputs = [
+    file
+    sqlite
+    zstd
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -75,27 +54,40 @@ rustPlatform.buildRustPackage {
     "geocode"
   ];
 
-  checkFlags = [
-    # Skip tests that require network access.
-    "--skip test_fetch"
-    "--skip test_geocode"
-    "--skip cmd::validate::test_load_json_via_url"
-    "--skip test_describegpt::describegpt_invalid_api_key"
-    "--skip test_sample::sample_seed_url"
-    "--skip test_snappy::snappy_decompress_url"
-    "--skip test_sniff::sniff_justmime_remote"
-    "--skip test_sniff::sniff_url_notcsv"
-    "--skip test_sniff::sniff_url_snappy"
-    "--skip test_sniff::sniff_url_snappy_noinfer"
-    "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema_url"
-    # Skip test that uses sh.
-    "--skip test_foreach::foreach_multiple_commands_with_shell_script"
-    # Skip features that aren't enabled.
-    "--skip test_luau"
-    # Skip tests that return the wrong datetime in CI.
-    "--skip test_stats::stats_cache_negative_threshold"
-    "--skip test_stats::stats_cache_negative_threshold_five"
-  ];
+  checkFlags =
+    [
+      # Skip tests that require network access.
+      "--skip test_fetch"
+      "--skip test_geocode"
+      "--skip cmd::validate::test_load_json_via_url"
+      "--skip cmd::validate::test_dyn_enum_validator"
+      "--skip cmd::validate::test_validate_currency_email_dynamicenum_validator"
+      "--skip test_describegpt::describegpt_invalid_api_key"
+      "--skip test_sample::sample_seed_url"
+      "--skip test_snappy::snappy_decompress_url"
+      "--skip test_sniff::sniff_justmime_remote"
+      "--skip test_sniff::sniff_url_notcsv"
+      "--skip test_sniff::sniff_url_snappy"
+      "--skip test_sniff::sniff_url_snappy_noinfer"
+      "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema_url"
+      "--skip test_schema::generate_schema_with_const_and_enum_constraints"
+      "--skip test_schema::generate_schema_with_defaults_and_validate_trim_with_no_errors"
+      "--skip test_schema::generate_schema_with_optional_flags_notrim_and_validate_with_errors"
+      "--skip test_schema::generate_schema_with_optional_flags_trim_and_validate_with_errors"
+      "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema"
+      "--skip test_validate::validate_adur_public_toilets_dataset_with_json_schema_valid_output"
+      # Skip test that uses sh.
+      "--skip test_foreach::foreach_multiple_commands_with_shell_script"
+      # Skip features that aren't enabled.
+      "--skip test_luau"
+      # Skip tests that return the wrong datetime in CI.
+      "--skip test_stats::stats_cache_negative_threshold"
+      "--skip test_stats::stats_cache_negative_threshold_five"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # uses X11 based clipboard library
+      "--skip test_clipboard::clipboard_success"
+    ];
 
   env = {
     ZSTD_SYS_USE_PKG_CONFIG = true;

pkgs/by-name/re/remind/package.nix

@@ -15,11 +15,11 @@
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.00.07";
+  version = "05.01.01";
 
   src = fetchurl {
     url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
-    hash = "sha256-id3yVyKHRSJWhm8r4Zmc/k61AZUt1wa3lArQktDbt9w=";
+    hash = "sha256-906V9QdFHKJ1+uXv9zrFz9swfeVr/kxgkgKkGsscUY0=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [

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

@@ -1,59 +1,80 @@
-{ lib
-, stdenv
-, fetchgit
-, cmake
-, withGurobi ? false
-, gurobi
-, withCplex ? false
-, cplex
-, withLpsolve ? true
-, lp_solve
+{
+  lib,
+  stdenv,
+  fetchgit,
+  cmake,
+  withGurobi ? false,
+  gurobi,
+  withCplex ? false,
+  cplex,
+  withLpsolve ? true,
+  lp_solve,
+  unstableGitUpdater,
 }:
 
 stdenv.mkDerivation rec {
   pname = "scalp";
-  version = "unstable-2022-03-15";
+  version = "0-unstable-2024-08-28";
 
   src = fetchgit {
     url = "https://digidev.digi.e-technik.uni-kassel.de/git/scalp.git";
     # mirrored at https://git.sr.ht/~weijia/scalp
-    rev = "185b84e4ff967f42cf2de5db4db4e6fa0cc18fb8";
-    hash = "sha256-NyMZdJwdD3FR6uweYCclJjfcf3Y24Bns1ViwsmJ5izg=";
+    rev = "4a8e8b850a57328d9377ea7955c27c437394ebd3";
+    hash = "sha256-6OEf3yWFBmTKgeTMojRMRf/t9Ec1i851Lx3mQjCeOuw=";
   };
 
+  postPatch =
+    ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
+        --replace-fail "-m64" ""
+      substituteInPlace src/tests/CMakeLists.txt \
+        --replace-fail "src/tests/" ""
+    ''
+    + lib.optionalString withGurobi ''
+      substituteInPlace CMakeExtensions/FindGurobi.cmake \
+        --replace-fail "\''${GUROBI_VERSION}" '"${lib.versions.major gurobi.version}${lib.versions.minor gurobi.version}"'
+    '';
+
   nativeBuildInputs = [
     cmake
   ];
 
-  buildInputs = lib.optionals withGurobi [
-    gurobi
-  ] ++ lib.optionals withCplex [
-    cplex
-  ] ++ lib.optionals withLpsolve [
-    lp_solve
-  ];
+  buildInputs =
+    lib.optionals withGurobi [
+      gurobi
+    ]
+    ++ lib.optionals withCplex [
+      cplex
+    ]
+    ++ lib.optionals withLpsolve [
+      lp_solve
+    ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace CMakeLists.txt \
-      --replace "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib"
-  '';
-
-  cmakeFlags = [
-    "-DBUILD_TESTS=${lib.boolToString doCheck}"
-  ] ++ lib.optionals withGurobi [
-    "-DGUROBI_DIR=${gurobi}"
-  ] ++ lib.optionals withCplex [
-    "-DCPLEX_DIR=${cplex}"
-  ];
+  cmakeFlags =
+    [
+      (lib.cmakeBool "BUILD_TESTS" doCheck)
+    ]
+    ++ lib.optionals withGurobi [
+      (lib.cmakeFeature "GUROBI_ROOT_DIR" "${gurobi}")
+    ]
+    ++ lib.optionals withCplex [
+      (lib.cmakeFeature "CPLEX_ROOT_DIR" "${cplex}")
+    ]
+    ++ lib.optionals withLpsolve [
+      (lib.cmakeFeature "LPSOLVE_ROOT_DIR" "${lp_solve}")
+    ];
 
   doCheck = true;
 
-  meta = with lib; {
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
     description = "Scalable Linear Programming Library";
     mainProgram = "scalp";
     homepage = "https://digidev.digi.e-technik.uni-kassel.de/scalp/";
-    license = licenses.lgpl3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ wegank ];
+    license = lib.licenses.lgpl3Only;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ wegank ];
   };
 }

pkgs/by-name/sh/showtime/package.nix

@@ -1,40 +1,45 @@
 {
   lib,
-  python3Packages,
-  fetchFromGitLab,
   appstream,
   blueprint-compiler,
   desktop-file-utils,
+  fetchFromGitLab,
   glib,
   gobject-introspection,
   gst_all_1,
+  gtk4,
   libadwaita,
   meson,
   ninja,
+  nix-update-script,
   pkg-config,
+  python3Packages,
   wrapGAppsHook4,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "showtime";
-  version = "46.3";
+  version = "47.0";
   pyproject = false;
 
   src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
     group = "GNOME";
     owner = "Incubator";
     repo = "showtime";
     rev = "refs/tags/${version}";
-    hash = "sha256-0qT62VoodRcrxYNTtZk+KqxzhflxFU/HPtj2u0wRSH0=";
-    domain = "gitlab.gnome.org";
+    hash = "sha256-Bnz+LFyvwSjkrbePmoVZZqy2pNLqiyJTsZsSuUyDy+E=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     appstream
     blueprint-compiler
     desktop-file-utils
-    glib # for `glib-compile-schemas`
+    glib # For `glib-compile-schemas`
     gobject-introspection
+    gtk4 # For `gtk-update-icon-cache`
     meson
     ninja
     pkg-config
@@ -42,12 +47,12 @@ python3Packages.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    gst_all_1.gstreamer
     gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-rs
     gst_all_1.gst-plugins-ugly
+    gst_all_1.gstreamer
     libadwaita
   ];
 
@@ -58,6 +63,10 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "showtime" ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Watch without distraction";
     homepage = "https://apps.gnome.org/Showtime";

pkgs/by-name/sk/sketchybar/package.nix

@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sketchybar";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "FelixKratz";
     repo = "SketchyBar";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-hTfQQjx6ai83zYFfccsz/KaoZUIj5Dfz4ENe59gS02E=";
+    hash = "sha256-0082rRSfIKJFTAzmJ65ItEdLSwjFks5ZkTlVZqaWKEw=";
   };
 
   buildInputs = [

pkgs/by-name/sp/spotifyd/package.nix

@@ -17,6 +17,7 @@
   withMpris ? stdenv.hostPlatform.isLinux,
   withKeyring ? true,
   dbus,
+  withPipe ? true,
   nix-update-script,
   testers,
   spotifyd,
@@ -24,16 +25,16 @@
 
 rustPackages.rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.3.5-unstable-2024-09-05";
+  version = "0.3.5-unstable-2024-10-21";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
-    rev = "e280d84124d854af3c2f9509ba496b1c2ba6a1ae";
-    hash = "sha256-RFfM/5DY7IG0E79zc8IuXpSNAIjloMWI3ZVbyLxh4O8=";
+    rev = "b25538f5c4dfc5b376927e7edf71c7c988492ace";
+    hash = "sha256-50eUVax3yqwncQUWgCPc0PHVUuUERQ9iORSSajPHB9c=";
   };
 
-  cargoHash = "sha256-z3zcQD2v71FZg6nEvKfaMiQU/aRAPFNt69b9Rm+jpuY=";
+  cargoHash = "sha256-3aEBLPyf72o9gF58j9OANpcqD/IClb2alfAEKRFzatU=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -54,6 +55,7 @@ rustPackages.rustPlatform.buildRustPackage rec {
     ++ lib.optional withPulseAudio "pulseaudio_backend"
     ++ lib.optional withPortAudio "portaudio_backend"
     ++ lib.optional withMpris "dbus_mpris"
+    ++ lib.optional withPipe "pipe_backend"
     ++ lib.optional withKeyring "dbus_keyring";
 
   doCheck = false;

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

@@ -11,23 +11,25 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "0.24.2";
+  version = "1.0.0";
+
+  CGO_ENABLED=0;
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FBWKXj1BfB9jbFMAmeBOHmv0QXmiZ3y7u1n1L8anUEg=";
+    hash = "sha256-BGV5x828WRaBTCddmKl6quMR/FGxXtJEezt8J3H6gPQ=";
   };
 
-  vendorHash = "sha256-m4cgYDCugI7mCLCpRbVlNe0SeWZf1aVpeggufxw64oI=";
+  vendorHash = "sha256-+y9OX/ywS/0AXCnVHf4VisTegFamt3sT/m43yVhbCNc=";
   proxyVendor = true;
 
   postPatch = ''
     # Patch test that relies on looking up homedir in user struct to prefer ~
     substituteInPlace pkg/steampipeconfig/shared_test.go \
       --replace-fail 'filehelpers "github.com/turbot/go-kit/files"' "" \
-      --replace-fail 'filepaths.SteampipeDir, _ = filehelpers.Tildefy("~/.steampipe")' 'filepaths.SteampipeDir = "~/.steampipe"';
+      --replace-fail 'app_specific.InstallDir, _ = filehelpers.Tildefy("~/.steampipe")' 'app_specific.InstallDir = "~/.steampipe"';
   '';
 
   nativeBuildInputs = [
@@ -47,8 +49,6 @@ buildGoModule rec {
       skippedTests = [
         # panic: could not create backups directory: mkdir /var/empty/.steampipe: operation not permitted
         "TestTrimBackups"
-        # Skip tests that require network access
-        "TestIsPortBindable"
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

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

@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "6.11";
+  version = "6.12";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-gyYlg6NSnwLDUBqouKx3K0y8A9yTTpi6tuSINibig6U=";
+    hash = "sha256-xH2pO+RbYFX03HQdfyDvr1DKEBYKWxAMEJspT9nAvf4=";
   };
 
   separateDebugInfo = true;

pkgs/by-name/su/surelog/package.nix

@@ -16,13 +16,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "surelog";
-  version = "1.83";
+  version = "1.84-unstable-2024-11-09";
 
   src = fetchFromGitHub {
     owner = "chipsalliance";
     repo = "surelog";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-V4LmW4ca6KfugOu0XnGwutRqWR/9K6ESokHOB2yAVag=";
+    # Once we're back on a stable tag, use "v$(finalAttrs.version}" below.
+    rev = "da88163a02dbc16f1af3514f281b93941d371ad9";
+    hash = "sha256-TIwXIMcDImZjCIiXwvT2MhukArgrWCgOf2AOvkG/55g=";
     fetchSubmodules = false;  # we use all dependencies from nix
   };
 
@@ -69,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/chipsalliance/Surelog";
     license = lib.licenses.asl20;
     mainProgram = "surelog";
-    maintainers = with lib.maintainers; [ matthuszagh ];
+    maintainers = with lib.maintainers; [ matthuszagh hzeller ];
     platforms = lib.platforms.all;
   };
 })

pkgs/by-name/ta/tart/package.nix

@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tart";
-  version = "2.19.3";
+  version = "2.20.2";
 
   src = fetchurl {
       url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz";
-      hash = "sha256-WigjqOu36bkNsTk6WpLwpyaauk4RtwShw1wWBHdxTFI=";
+      hash = "sha256-caHuBTRpbmFbmTlDRnxZyGM6F95iKjMhKbPTez5Hecc=";
   };
   sourceRoot = ".";
 

pkgs/by-name/to/tootik/package.nix

@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "tootik";
-  version = "0.12.6";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "tootik";
     rev = version;
-    hash = "sha256-v7+WDxGUWCrZMhm0TXMIZTQZTzHYNauX2LIOV3zz+9A=";
+    hash = "sha256-YVfxyfPYaGbfGdWtcoJhrMBV+1FI0x7m5OA1oOdPFDo=";
   };
 
-  vendorHash = "sha256-wmyaTZX181w4Kiiw1sZ4NeIDY63PwW+ayvtwrLSiF24=";
+  vendorHash = "sha256-8GHyMF/WfoQOnoF0qHHC3aMTuNeB8eVynmXJf6CD+Es=";
 
   nativeBuildInputs = [ openssl ];
 

pkgs/by-name/tr/trivy/package.nix

@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "trivy";
-  version = "0.57.0";
+  version = "0.57.1";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = "trivy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-al8hxVNyDoGQaoqa0fmA7Bn7M1twwlS4I5+XZnETXyc=";
+    hash = "sha256-ivxMH/oyLBGIDNraSAPFcD78S1AJ5O8OvLb2UYwZnAc=";
   };
 
   # Hash mismatch on across Linux and Darwin

pkgs/by-name/tt/ttdl/package.nix

@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ttdl";
-  version = "4.4.1";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "VladimirMarkelov";
     repo = "ttdl";
     rev = "v${version}";
-    sha256 = "sha256-pcZ/8eM8JN+DKJKdVKJEl775QUXC4CFeMAaiBN0j+zo=";
+    sha256 = "sha256-ahAqKf4ZFpyR2ZnrdJ2FWR4ZBd0Q+ZnqYfhc6Z7rM8Q=";
   };
 
-  cargoHash = "sha256-+caVo53gf7ZUMr0w/yoXfBaZ5MPe73s7vwoOdZVUcNY=";
+  cargoHash = "sha256-MHWPeqCZ/EpDEkKg2M819C6jbjpFa0oheiiPkW8x/3Q=";
 
   meta = with lib; {
     description = "CLI tool to manage todo lists in todo.txt format";