Merge master into haskell-updates

2023-08-13 00:11:49 +00:00 · 2023-08-13 00:11:49 +00:00 · 163a5a5675
commit 163a5a5675
parent f4d5aa6125 ead1dc9913
148 changed files with 1845 additions and 893 deletions
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -37,7 +37,7 @@ Below is a short excerpt of some points in there:

    The old config generation system used impure shell scripts and could break in specific circumstances (see #1234).

-* `meta.description` should:
+* `meta.description` must:
  * Be short, just one sentence.
  * Be capitalized.
  * Not start with the package name.
@ -47,7 +47,8 @@ Below is a short excerpt of some points in there:
 * `meta.license` must be set and fit the upstream license.
  * If there is no upstream license, `meta.license` should default to `lib.licenses.unfree`.
  * If in doubt, try to contact the upstream developers for clarification.
-* `meta.maintainers` must be set.
+* `meta.mainProgram` must be set when appropriate.
+* `meta.maintainers` should be set.

 See the nixpkgs manual for more details on [standard meta-attributes](https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes).

--- a/lib/path/default.nix
+++ b/lib/path/default.nix
@ -121,17 +121,18 @@ let

 in /* No rec! Add dependencies on this file at the top. */ {

-  /* Append a subpath string to a path.
+  /*
+    Append a subpath string to a path.

    Like `path + ("/" + string)` but safer, because it errors instead of returning potentially surprising results.
    More specifically, it checks that the first argument is a [path value type](https://nixos.org/manual/nix/stable/language/values.html#type-path"),
-    and that the second argument is a valid subpath string (see `lib.path.subpath.isValid`).
+    and that the second argument is a [valid subpath string](#function-library-lib.path.subpath.isValid).

    Laws:

-    - Not influenced by subpath normalisation
+    - Not influenced by subpath [normalisation](#function-library-lib.path.subpath.normalise):

-        append p s == append p (subpath.normalise s)
+          append p s == append p (subpath.normalise s)

    Type:
      append :: Path -> String -> Path
@ -175,26 +176,26 @@ in /* No rec! Add dependencies on this file at the top. */ {
    path + ("/" + subpath);

  /*
-  Whether the first path is a component-wise prefix of the second path.
+    Whether the first path is a component-wise prefix of the second path.

-  Laws:
+    Laws:

-  - `hasPrefix p q` is only true if `q == append p s` for some subpath `s`.
+    - `hasPrefix p q` is only true if [`q == append p s`](#function-library-lib.path.append) for some [subpath](#function-library-lib.path.subpath.isValid) `s`.

-  - `hasPrefix` is a [non-strict partial order](https://en.wikipedia.org/wiki/Partially_ordered_set#Non-strict_partial_order) over the set of all path values
+    - `hasPrefix` is a [non-strict partial order](https://en.wikipedia.org/wiki/Partially_ordered_set#Non-strict_partial_order) over the set of all path values.

-  Type:
-    hasPrefix :: Path -> Path -> Bool
+    Type:
+      hasPrefix :: Path -> Path -> Bool

-  Example:
-    hasPrefix /foo /foo/bar
-    => true
-    hasPrefix /foo /foo
-    => true
-    hasPrefix /foo/bar /foo
-    => false
-    hasPrefix /. /foo
-    => true
+    Example:
+      hasPrefix /foo /foo/bar
+      => true
+      hasPrefix /foo /foo
+      => true
+      hasPrefix /foo/bar /foo
+      => false
+      hasPrefix /. /foo
+      => true
  */
  hasPrefix =
    path1:
@ -219,27 +220,27 @@ in /* No rec! Add dependencies on this file at the top. */ {
        take (length path1Deconstructed.components) path2Deconstructed.components == path1Deconstructed.components;

  /*
-  Remove the first path as a component-wise prefix from the second path.
-  The result is a normalised subpath string, see `lib.path.subpath.normalise`.
+    Remove the first path as a component-wise prefix from the second path.
+    The result is a [normalised subpath string](#function-library-lib.path.subpath.normalise).

-  Laws:
+    Laws:

-  - Inverts `append` for normalised subpaths:
+    - Inverts [`append`](#function-library-lib.path.append) for [normalised subpath string](#function-library-lib.path.subpath.normalise):

-        removePrefix p (append p s) == subpath.normalise s
+          removePrefix p (append p s) == subpath.normalise s

-  Type:
-    removePrefix :: Path -> Path -> String
+    Type:
+      removePrefix :: Path -> Path -> String

-  Example:
-    removePrefix /foo /foo/bar/baz
-    => "./bar/baz"
-    removePrefix /foo /foo
-    => "./."
-    removePrefix /foo/bar /foo
-    => <error>
-    removePrefix /. /foo
-    => "./foo"
+    Example:
+      removePrefix /foo /foo/bar/baz
+      => "./bar/baz"
+      removePrefix /foo /foo
+      => "./."
+      removePrefix /foo/bar /foo
+      => <error>
+      removePrefix /. /foo
+      => "./foo"
  */
  removePrefix =
    path1:
@ -272,41 +273,43 @@ in /* No rec! Add dependencies on this file at the top. */ {
        joinRelPath components;

  /*
-  Split the filesystem root from a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path).
-  The result is an attribute set with these attributes:
-  - `root`: The filesystem root of the path, meaning that this directory has no parent directory.
-  - `subpath`: The [normalised subpath string](#function-library-lib.path.subpath.normalise) that when [appended](#function-library-lib.path.append) to `root` returns the original path.
+    Split the filesystem root from a [path](https://nixos.org/manual/nix/stable/language/values.html#type-path).
+    The result is an attribute set with these attributes:
+    - `root`: The filesystem root of the path, meaning that this directory has no parent directory.
+    - `subpath`: The [normalised subpath string](#function-library-lib.path.subpath.normalise) that when [appended](#function-library-lib.path.append) to `root` returns the original path.

-  Laws:
-  - [Appending](#function-library-lib.path.append) the `root` and `subpath` gives the original path:
+    Laws:
+    - [Appending](#function-library-lib.path.append) the `root` and `subpath` gives the original path:

-        p ==
-          append
-            (splitRoot p).root
-            (splitRoot p).subpath
+          p ==
+            append
+              (splitRoot p).root
+              (splitRoot p).subpath

-  - Trying to get the parent directory of `root` using [`readDir`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readDir) returns `root` itself:
+    - Trying to get the parent directory of `root` using [`readDir`](https://nixos.org/manual/nix/stable/language/builtins.html#builtins-readDir) returns `root` itself:

-        dirOf (splitRoot p).root == (splitRoot p).root
+          dirOf (splitRoot p).root == (splitRoot p).root

-  Type:
-    splitRoot :: Path -> { root :: Path, subpath :: String }
+    Type:
+      splitRoot :: Path -> { root :: Path, subpath :: String }

-  Example:
-    splitRoot /foo/bar
-    => { root = /.; subpath = "./foo/bar"; }
+    Example:
+      splitRoot /foo/bar
+      => { root = /.; subpath = "./foo/bar"; }

-    splitRoot /.
-    => { root = /.; subpath = "./."; }
+      splitRoot /.
+      => { root = /.; subpath = "./."; }

-    # Nix neutralises `..` path components for all path values automatically
-    splitRoot /foo/../bar
-    => { root = /.; subpath = "./bar"; }
+      # Nix neutralises `..` path components for all path values automatically
+      splitRoot /foo/../bar
+      => { root = /.; subpath = "./bar"; }

-    splitRoot "/foo/bar"
-    => <error>
+      splitRoot "/foo/bar"
+      => <error>
  */
-  splitRoot = path:
+  splitRoot =
+    # The path to split the root off of
+    path:
    assert assertMsg
      (isPath path)
      "lib.path.splitRoot: Argument is of type ${typeOf path}, but a path was expected";
@ -317,46 +320,47 @@ in /* No rec! Add dependencies on this file at the top. */ {
      subpath = joinRelPath deconstructed.components;
    };

-  /* Whether a value is a valid subpath string.
+  /*
+    Whether a value is a valid subpath string.

-  A subpath string points to a specific file or directory within an absolute base directory.
-  It is a stricter form of a relative path that excludes `..` components, since those could escape the base directory.
+    A subpath string points to a specific file or directory within an absolute base directory.
+    It is a stricter form of a relative path that excludes `..` components, since those could escape the base directory.

-  - The value is a string
+    - The value is a string.

-  - The string is not empty
+    - The string is not empty.

-  - The string doesn't start with a `/`
+    - The string doesn't start with a `/`.

-  - The string doesn't contain any `..` path components
+    - The string doesn't contain any `..` path components.

-  Type:
-    subpath.isValid :: String -> Bool
+    Type:
+      subpath.isValid :: String -> Bool

-  Example:
-    # Not a string
-    subpath.isValid null
-    => false
+    Example:
+      # Not a string
+      subpath.isValid null
+      => false

-    # Empty string
-    subpath.isValid ""
-    => false
+      # Empty string
+      subpath.isValid ""
+      => false

-    # Absolute path
-    subpath.isValid "/foo"
-    => false
+      # Absolute path
+      subpath.isValid "/foo"
+      => false

-    # Contains a `..` path component
-    subpath.isValid "../foo"
-    => false
+      # Contains a `..` path component
+      subpath.isValid "../foo"
+      => false

-    # Valid subpath
-    subpath.isValid "foo/bar"
-    => true
+      # Valid subpath
+      subpath.isValid "foo/bar"
+      => true

-    # Doesn't need to be normalised
-    subpath.isValid "./foo//bar/"
-    => true
+      # Doesn't need to be normalised
+      subpath.isValid "./foo//bar/"
+      => true
  */
  subpath.isValid =
    # The value to check
@ -364,15 +368,16 @@ in /* No rec! Add dependencies on this file at the top. */ {
    subpathInvalidReason value == null;


-  /* Join subpath strings together using `/`, returning a normalised subpath string.
+  /*
+    Join subpath strings together using `/`, returning a normalised subpath string.

    Like `concatStringsSep "/"` but safer, specifically:

-    - All elements must be valid subpath strings, see `lib.path.subpath.isValid`
+    - All elements must be [valid subpath strings](#function-library-lib.path.subpath.isValid).

-    - The result gets normalised, see `lib.path.subpath.normalise`
+    - The result gets [normalised](#function-library-lib.path.subpath.normalise).

-    - The edge case of an empty list gets properly handled by returning the neutral subpath `"./."`
+    - The edge case of an empty list gets properly handled by returning the neutral subpath `"./."`.

    Laws:

@ -386,12 +391,12 @@ in /* No rec! Add dependencies on this file at the top. */ {
          subpath.join [ (subpath.normalise p) "./." ] == subpath.normalise p
          subpath.join [ "./." (subpath.normalise p) ] == subpath.normalise p

-    - Normalisation - the result is normalised according to `lib.path.subpath.normalise`:
+    - Normalisation - the result is [normalised](#function-library-lib.path.subpath.normalise):

          subpath.join ps == subpath.normalise (subpath.join ps)

-    - For non-empty lists, the implementation is equivalent to normalising the result of `concatStringsSep "/"`.
-      Note that the above laws can be derived from this one.
+    - For non-empty lists, the implementation is equivalent to [normalising](#function-library-lib.path.subpath.normalise) the result of `concatStringsSep "/"`.
+      Note that the above laws can be derived from this one:

          ps != [] -> subpath.join ps == subpath.normalise (concatStringsSep "/" ps)

@ -439,108 +444,109 @@ in /* No rec! Add dependencies on this file at the top. */ {
      ) 0 subpaths;

  /*
-  Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings.
-  Throw an error if the subpath isn't valid.
-  Note that the returned path components are also valid subpath strings, though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise).
+    Split [a subpath](#function-library-lib.path.subpath.isValid) into its path component strings.
+    Throw an error if the subpath isn't valid.
+    Note that the returned path components are also [valid subpath strings](#function-library-lib.path.subpath.isValid), though they are intentionally not [normalised](#function-library-lib.path.subpath.normalise).

-  Laws:
+    Laws:

-  - Splitting a subpath into components and [joining](#function-library-lib.path.subpath.join) the components gives the same subpath but [normalised](#function-library-lib.path.subpath.normalise):
+    - Splitting a subpath into components and [joining](#function-library-lib.path.subpath.join) the components gives the same subpath but [normalised](#function-library-lib.path.subpath.normalise):

-        subpath.join (subpath.components s) == subpath.normalise s
+          subpath.join (subpath.components s) == subpath.normalise s

-  Type:
-    subpath.components :: String -> [ String ]
+    Type:
+      subpath.components :: String -> [ String ]

-  Example:
-    subpath.components "."
-    => [ ]
+    Example:
+      subpath.components "."
+      => [ ]

-    subpath.components "./foo//bar/./baz/"
-    => [ "foo" "bar" "baz" ]
+      subpath.components "./foo//bar/./baz/"
+      => [ "foo" "bar" "baz" ]

-    subpath.components "/foo"
-    => <error>
+      subpath.components "/foo"
+      => <error>
  */
  subpath.components =
+    # The subpath string to split into components
    subpath:
    assert assertMsg (isValid subpath) ''
      lib.path.subpath.components: Argument is not a valid subpath string:
          ${subpathInvalidReason subpath}'';
    splitRelPath subpath;

-  /* Normalise a subpath. Throw an error if the subpath isn't valid, see
-  `lib.path.subpath.isValid`
+  /*
+    Normalise a subpath. Throw an error if the subpath isn't [valid](#function-library-lib.path.subpath.isValid).

-  - Limit repeating `/` to a single one
+    - Limit repeating `/` to a single one.

-  - Remove redundant `.` components
+    - Remove redundant `.` components.

-  - Remove trailing `/` and `/.`
+    - Remove trailing `/` and `/.`.

-  - Add leading `./`
+    - Add leading `./`.

-  Laws:
+    Laws:

-  - Idempotency - normalising multiple times gives the same result:
+    - Idempotency - normalising multiple times gives the same result:

-        subpath.normalise (subpath.normalise p) == subpath.normalise p
+          subpath.normalise (subpath.normalise p) == subpath.normalise p

-  - Uniqueness - there's only a single normalisation for the paths that lead to the same file system node:
+    - Uniqueness - there's only a single normalisation for the paths that lead to the same file system node:

-        subpath.normalise p != subpath.normalise q -> $(realpath ${p}) != $(realpath ${q})
+          subpath.normalise p != subpath.normalise q -> $(realpath ${p}) != $(realpath ${q})

-  - Don't change the result when appended to a Nix path value:
+    - Don't change the result when [appended](#function-library-lib.path.append) to a Nix path value:

-        base + ("/" + p) == base + ("/" + subpath.normalise p)
+          append base p == append base (subpath.normalise p)

-  - Don't change the path according to `realpath`:
+    - Don't change the path according to `realpath`:

-        $(realpath ${p}) == $(realpath ${subpath.normalise p})
+          $(realpath ${p}) == $(realpath ${subpath.normalise p})

-  - Only error on invalid subpaths:
+    - Only error on [invalid subpaths](#function-library-lib.path.subpath.isValid):

-        builtins.tryEval (subpath.normalise p)).success == subpath.isValid p
+          builtins.tryEval (subpath.normalise p)).success == subpath.isValid p

-  Type:
-    subpath.normalise :: String -> String
+    Type:
+      subpath.normalise :: String -> String

-  Example:
-    # limit repeating `/` to a single one
-    subpath.normalise "foo//bar"
-    => "./foo/bar"
+    Example:
+      # limit repeating `/` to a single one
+      subpath.normalise "foo//bar"
+      => "./foo/bar"

-    # remove redundant `.` components
-    subpath.normalise "foo/./bar"
-    => "./foo/bar"
+      # remove redundant `.` components
+      subpath.normalise "foo/./bar"
+      => "./foo/bar"

-    # add leading `./`
-    subpath.normalise "foo/bar"
-    => "./foo/bar"
+      # add leading `./`
+      subpath.normalise "foo/bar"
+      => "./foo/bar"

-    # remove trailing `/`
-    subpath.normalise "foo/bar/"
-    => "./foo/bar"
+      # remove trailing `/`
+      subpath.normalise "foo/bar/"
+      => "./foo/bar"

-    # remove trailing `/.`
-    subpath.normalise "foo/bar/."
-    => "./foo/bar"
+      # remove trailing `/.`
+      subpath.normalise "foo/bar/."
+      => "./foo/bar"

-    # Return the current directory as `./.`
-    subpath.normalise "."
-    => "./."
+      # Return the current directory as `./.`
+      subpath.normalise "."
+      => "./."

-    # error on `..` path components
-    subpath.normalise "foo/../bar"
-    => <error>
+      # error on `..` path components
+      subpath.normalise "foo/../bar"
+      => <error>

-    # error on empty string
-    subpath.normalise ""
-    => <error>
+      # error on empty string
+      subpath.normalise ""
+      => <error>

-    # error on absolute path
-    subpath.normalise "/foo"
-    => <error>
+      # error on absolute path
+      subpath.normalise "/foo"
+      => <error>
  */
  subpath.normalise =
    # The subpath string to normalise
--- a/lib/path/tests/default.nix
+++ b/lib/path/tests/default.nix
@ -18,7 +18,14 @@ pkgs.runCommand "lib-path-tests" {
  ];
 } ''
  # Needed to make Nix evaluation work
-  export NIX_STATE_DIR=$(mktemp -d)
+  export TEST_ROOT=$(pwd)/test-tmp
+  export NIX_BUILD_HOOK=
+  export NIX_CONF_DIR=$TEST_ROOT/etc
+  export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
+  export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
+  export NIX_STATE_DIR=$TEST_ROOT/var/nix
+  export NIX_STORE_DIR=$TEST_ROOT/store
+  export PAGER=cat

  cp -r ${libpath} lib
  export TEST_LIB=$PWD/lib
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -1203,6 +1203,12 @@
    githubId = 20933385;
    name = "Anton Latukha";
  };
+  antonmosich = {
+    email = "anton@mosich.at";
+    github = "antonmosich";
+    githubId = 27223336;
+    name = "Anton Mosich";
+  };
  antono = {
    email = "self@antono.info";
    github = "antono";
@ -1282,6 +1288,12 @@
    githubId = 56009;
    name = "Arcadio Rubio García";
  };
+  arcayr = {
+    email = "nix@arcayr.online";
+    github = "arcayr";
+    githubId = 11192354;
+    name = "Elliot Speck";
+  };
  archer-65 = {
    email = "mario.liguori.056@gmail.com";
    github = "archer-65";
@ -3287,6 +3299,15 @@
    email = "jupiter@m.rdis.dev";
    name = "Scott Little";
  };
+  codifryed = {
+    email = "gb@guyboldon.com";
+    name = "Guy Boldon";
+    github = "codifryed";
+    githubId = 27779510;
+    keys = [{
+      fingerprint = "FDF5 EF67 8CC1 FE22 1845  6A22 CF7B BB5B C756 1BD3";
+    }];
+  };
  codsl = {
    email = "codsl@riseup.net";
    github = "codsl";
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@ -140,6 +140,16 @@

 - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration.

+- GNOME module no longer forces Qt applications to use Adwaita style since it was buggy and is no longer maintained upstream. If you still want it, you can add the following options to your configuration but it will probably be eventually removed:
+
+  ```nix
+  qt = {
+    enable = true;
+    platformTheme = "gnome";
+    style = "adwaita";
+  };
+  ```
+
 - `fontconfig` now defaults to using greyscale antialiasing instead of subpixel antialiasing because of a [recommendation from one of the downstreams](https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/337). You can change this value by configuring [](#opt-fonts.fontconfig.subpixel.rgba) accordingly.

 - The latest available version of Nextcloud is v27 (available as `pkgs.nextcloud27`). The installation logic is as follows:
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
@ -30,12 +30,6 @@
    enable = true;
  };

-  # Theme calamares with GNOME theme
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-  };
-
  # Fix scaling for calamares on wayland
  environment.variables = {
    QT_QPA_PLATFORM = "$([[ $XDG_SESSION_TYPE = \"wayland\" ]] && echo \"wayland\")";
--- a/nixos/modules/programs/captive-browser.nix
+++ b/nixos/modules/programs/captive-browser.nix
@ -7,6 +7,8 @@ let
    concatStringsSep escapeShellArgs optionalString
    literalExpression mkEnableOption mkIf mkOption mkOptionDefault types;

+  requiresSetcapWrapper = config.boot.kernelPackages.kernelOlder "5.7" && cfg.bindInterface;
+
  browserDefault = chromium: concatStringsSep " " [
    ''env XDG_CONFIG_HOME="$PREV_CONFIG_HOME"''
    ''${chromium}/bin/chromium''
@ -23,11 +25,23 @@ let
  desktopItem = pkgs.makeDesktopItem {
    name = "captive-browser";
    desktopName = "Captive Portal Browser";
-    exec = "/run/wrappers/bin/captive-browser";
+    exec = "captive-browser";
    icon = "nix-snowflake";
    categories = [ "Network" ];
  };

+  captive-browser-configured = pkgs.writeShellScriptBin "captive-browser" ''
+    export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
+    export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
+      browser = """${cfg.browser}"""
+      dhcp-dns = """${cfg.dhcp-dns}"""
+      socks5-addr = """${cfg.socks5-addr}"""
+      ${optionalString cfg.bindInterface ''
+        bind-device = """${cfg.interface}"""
+      ''}
+    ''}
+    exec ${cfg.package}/bin/captive-browser
+  '';
 in
 {
  ###### interface
@ -101,6 +115,7 @@ in
      (pkgs.runCommand "captive-browser-desktop-item" { } ''
        install -Dm444 -t $out/share/applications ${desktopItem}/share/applications/*.desktop
      '')
+      captive-browser-configured
    ];

    programs.captive-browser.dhcp-dns =
@ -131,22 +146,11 @@ in
      source = "${pkgs.busybox}/bin/udhcpc";
    };

-    security.wrappers.captive-browser = {
+    security.wrappers.captive-browser = mkIf requiresSetcapWrapper {
      owner = "root";
      group = "root";
      capabilities = "cap_net_raw+p";
-      source = pkgs.writeShellScript "captive-browser" ''
-        export PREV_CONFIG_HOME="$XDG_CONFIG_HOME"
-        export XDG_CONFIG_HOME=${pkgs.writeTextDir "captive-browser.toml" ''
-                                  browser = """${cfg.browser}"""
-                                  dhcp-dns = """${cfg.dhcp-dns}"""
-                                  socks5-addr = """${cfg.socks5-addr}"""
-                                  ${optionalString cfg.bindInterface ''
-                                    bind-device = """${cfg.interface}"""
-                                  ''}
-                                ''}
-        exec ${cfg.package}/bin/captive-browser
-      '';
+      source = "${captive-browser-configured}/bin/captive-browser";
    };
  };
 }
--- a/nixos/modules/programs/hyprland.nix
+++ b/nixos/modules/programs/hyprland.nix
@ -32,11 +32,10 @@ in
      readOnly = true;
      default = cfg.package.override {
        enableXWayland = cfg.xwayland.enable;
-        hidpiXWayland = cfg.xwayland.hidpi;
-        nvidiaPatches = cfg.nvidiaPatches;
+        enableNvidiaPatches = cfg.enableNvidiaPatches;
      };
      defaultText = literalExpression
-        "`wayland.windowManager.hyprland.package` with applied configuration";
+        "`programs.hyprland.package` with applied configuration";
      description = mdDoc ''
        The Hyprland package after applying configuration.
      '';
@ -44,17 +43,9 @@ in

    portalPackage = mkPackageOptionMD pkgs "xdg-desktop-portal-hyprland" { };

-    xwayland = {
-      enable = mkEnableOption (mdDoc "XWayland") // { default = true; };
-      hidpi = mkEnableOption null // {
-        description = mdDoc ''
-          Enable HiDPI XWayland, based on [XWayland MR 733](https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/733).
-          See <https://wiki.hyprland.org/Nix/Options-Overrides/#xwayland-hidpi> for more info.
-        '';
-      };
-    };
+    xwayland.enable = mkEnableOption (mdDoc "XWayland") // { default = true; };

-    nvidiaPatches = mkEnableOption (mdDoc "patching wlroots for better Nvidia support");
+    enableNvidiaPatches = mkEnableOption (mdDoc "patching wlroots for better Nvidia support");
  };

  config = mkIf cfg.enable {
@ -77,4 +68,15 @@ in
      extraPortals = [ finalPortalPackage ];
    };
  };
+
+  imports = with lib; [
+    (mkRemovedOptionModule
+      [ "programs" "hyprland" "xwayland" "hidpi" ]
+      "XWayland patches are deprecated. Refer to https://wiki.hyprland.org/Configuring/XWayland"
+    )
+    (mkRenamedOptionModule
+      [ "programs" "hyprland" "nvidiaPatches" ]
+      [ "programs" "hyprland" "enableNvidiaPatches" ]
+    )
+  ];
 }
--- a/nixos/modules/services/audio/liquidsoap.nix
+++ b/nixos/modules/services/audio/liquidsoap.nix
@ -18,6 +18,7 @@ let
          ExecStart = "${pkgs.liquidsoap}/bin/liquidsoap ${stream}";
          User = "liquidsoap";
          LogsDirectory = "liquidsoap";
+          Restart = "always";
        };
      };
    };
--- a/nixos/modules/services/networking/hostapd.nix
+++ b/nixos/modules/services/networking/hostapd.nix
@ -987,7 +987,7 @@ in {
                  } // optionalAttrs (bssCfg.authentication.wpaPassword != null) {
                    wpa_passphrase = bssCfg.authentication.wpaPassword;
                  } // optionalAttrs (bssCfg.authentication.wpaPskFile != null) {
-                    wpa_psk_file = bssCfg.authentication.wpaPskFile;
+                    wpa_psk_file = toString bssCfg.authentication.wpaPskFile;
                  };

                  dynamicConfigScripts = let
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@ -352,13 +352,6 @@ in
        })
      ];

-      # Harmonize Qt application style and also make them use the portal for file chooser dialog.
-      qt = {
-        enable = mkDefault true;
-        platformTheme = mkDefault "gnome";
-        style = mkDefault "adwaita";
-      };
-
      networking.networkmanager.enable = mkDefault true;

      services.xserver.updateDbusEnvironment = true;
--- a/pkgs/applications/audio/tidal-hifi/default.nix
+++ b/pkgs/applications/audio/tidal-hifi/default.nix
@ -34,13 +34,13 @@
 , xorg
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "tidal-hifi";
-  version = "5.3.0";
+  version = "5.5.0";

  src = fetchurl {
-    url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${version}/tidal-hifi_${version}_amd64.deb";
-    sha256 = "sha256-YGSHEvanWek6qiWvKs6g+HneGbuuqJn/DBfhawjQi5M=";
+    url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
+    sha256 = "sha256-pUQgTz7KZt4icD4lDAs4Wg095HxYEAifTM8a4cDejQM=";
  };

  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
@ -104,18 +104,18 @@ stdenv.mkDerivation rec {

  postFixup = ''
    makeWrapper $out/opt/tidal-hifi/tidal-hifi $out/bin/tidal-hifi \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath buildInputs}" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \
      "''${gappsWrapperArgs[@]}"
    substituteInPlace $out/share/applications/tidal-hifi.desktop \
      --replace "/opt/tidal-hifi/tidal-hifi" "tidal-hifi"
  '';

-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${finalAttrs.version}";
    description = "The web version of Tidal running in electron with hifi support thanks to widevine";
    homepage = "https://github.com/Mastermindzh/tidal-hifi";
-    changelog = "https://github.com/Mastermindzh/tidal-hifi/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ qbit ];
-    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ qbit ];
+    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/applications/blockchains/stellar-core/default.nix
+++ b/pkgs/applications/blockchains/stellar-core/default.nix
@ -1,30 +1,55 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, libtool, automake, pkg-config, git
-, bison, flex, postgresql, ripgrep, libunwind }:
+{ autoconf
+, automake
+, bison
+, fetchFromGitHub
+, flex
+, git
+, lib
+, libtool
+, libunwind
+, pkg-config
+, postgresql
+, ripgrep
+, stdenv
+}:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "stellar-core";
-  version = "19.12.0";
+  version = "19.13.0";

  src = fetchFromGitHub {
    owner = "stellar";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-WpzUEn3BuC2OxrsqYete595m6YWv27QXnTfW1F6CX9k=";
+    repo = "stellar-core";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-C775tL+x1IX4kfCM/7gOg/V8xunq/rkhIfdkwkhLENk=";
    fetchSubmodules = true;
  };

-  nativeBuildInputs = [ automake autoconf git libtool pkg-config ripgrep ];
+  nativeBuildInputs = [
+    automake
+    autoconf
+    git
+    libtool
+    pkg-config
+    ripgrep
+  ];

-  buildInputs = [ libunwind ];
+  buildInputs = [
+    libunwind
+  ];

-  propagatedBuildInputs = [ bison flex postgresql ];
+  propagatedBuildInputs = [
+    bison
+    flex
+    postgresql
+  ];

  enableParallelBuilding = true;

  preConfigure = ''
    # Due to https://github.com/NixOS/nixpkgs/issues/8567 we cannot rely on
    # having the .git directory present, so directly provide the version
-    substituteInPlace src/Makefile.am --replace '$$vers' '${pname} ${version}';
+    substituteInPlace src/Makefile.am --replace '$$vers' 'stellar-core ${finalAttrs.version}';

    # Everything needs to be staged in git because the build uses
    # `git ls-files` to search for source files to compile.
@ -34,17 +59,17 @@ stdenv.mkDerivation rec {
    ./autogen.sh
  '';

-  meta = with lib; {
+  meta = {
    description = "Implements the Stellar Consensus Protocol, a federated consensus protocol";
+    homepage = "https://www.stellar.org/";
+    license = lib.licenses.asl20;
    longDescription = ''
      Stellar-core is the backbone of the Stellar network. It maintains a
      local copy of the ledger, communicating and staying in sync with other
      instances of stellar-core on the network. Optionally, stellar-core can
      store historical records of the ledger and participate in consensus.
    '';
-    homepage = "https://www.stellar.org/";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ];
-    license = licenses.asl20;
+    maintainers = [ ];
+    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -29,12 +29,12 @@ final: prev:

  ChatGPT-nvim = buildVimPluginFrom2Nix {
    pname = "ChatGPT.nvim";
-    version = "2023-08-06";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "jackMort";
      repo = "ChatGPT.nvim";
-      rev = "2107f7037c775bf0b9bff9015eed68929fcf493e";
-      sha256 = "0djhynyrnrwvfhzr35vbp4gd17aaw0g2n4zsw0s7yazjyic3xsl3";
+      rev = "346ebaba1c537f030505c9e5d92f48c88ee235b4";
+      sha256 = "03v7ibqyfbsn6p7sdqjsi79aq2n87q92cx665g849a8s349dglai";
    };
    meta.homepage = "https://github.com/jackMort/ChatGPT.nvim/";
  };
@ -305,12 +305,12 @@ final: prev:

  SchemaStore-nvim = buildVimPluginFrom2Nix {
    pname = "SchemaStore.nvim";
-    version = "2023-08-09";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "129914a81535b2c7296c05587c07ac8876fbd3e6";
-      sha256 = "1hgvhdzjcknapixh960giy8hjwsz47fsmv21k29dg8gaab5k75ja";
+      rev = "6a36e79d9d1c2649063128e407c33e257cf85baf";
+      sha256 = "0kz3p1cjk55iqxyns2znqjpdw97qsz6rbrvwn40nyypdca23zm8h";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -502,8 +502,8 @@ final: prev:
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "aerial.nvim";
-      rev = "bd31dd0ebe8fb46c452cc7dcd514687112d4d02e";
-      sha256 = "0hpkz1kkv02y4c3bb45bs3jap7smsiprrm4vybwh00yhs82dpwfg";
+      rev = "bb2cc2fbf0f5be6ff6cd7e467c7c6b02860f3c7b";
+      sha256 = "0igkkyw8wyh3qi18is83szpay0088xfawk4050cww8kp3rxv1fld";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -1147,12 +1147,12 @@ final: prev:

  bufferline-nvim = buildVimPluginFrom2Nix {
    pname = "bufferline.nvim";
-    version = "2023-07-24";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "akinsho";
      repo = "bufferline.nvim";
-      rev = "99f0932365b34e22549ff58e1bea388465d15e99";
-      sha256 = "17cs0kbgavjsnwjp7n3xbznba0zfpz5g6wgxa6d30070w9hjq91j";
+      rev = "417b303328118b6d836ae330142e88771c48a8a3";
+      sha256 = "0cylncv3z34z76178whji62nsvrs55n8xrmz8bymdc0nlvkx7j4f";
    };
    meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
  };
@ -1231,12 +1231,12 @@ final: prev:

  chadtree = buildVimPluginFrom2Nix {
    pname = "chadtree";
-    version = "2023-08-08";
+    version = "2023-08-12";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "chadtree";
-      rev = "0805b8630b24f028f28151c04c1d8291adf4bdb0";
-      sha256 = "16jzq1rh86cd6cwkgxvfj500msmlmld0zkxkiq5pmbmcawbkhmz6";
+      rev = "7dbc8b17c6d22a7511a8818636a8f7a428cf56f8";
+      sha256 = "1vqw7g4kqjrcjfqzq4r995lh0yc466pa88d24ii38vwzmzp27z10";
    };
    meta.homepage = "https://github.com/ms-jpq/chadtree/";
  };
@ -2251,12 +2251,12 @@ final: prev:

  conjure = buildVimPluginFrom2Nix {
    pname = "conjure";
-    version = "2023-07-11";
+    version = "2023-08-04";
    src = fetchFromGitHub {
      owner = "Olical";
      repo = "conjure";
-      rev = "2482871cbe0d1b85d331465cf7f065d5d2a7e2ac";
-      sha256 = "1jmlpf0k9zf6djblpphxlwsg6l0nhfxni67z8gzmawxg8a300kgg";
+      rev = "0d9b823db06cc11e6115b54297f690dff10c0299";
+      sha256 = "0s7pf2jq1rfyxwina555702ln52h4x9gjnfk2sjpdgk7515bk9s5";
    };
    meta.homepage = "https://github.com/Olical/conjure/";
  };
@ -2299,12 +2299,12 @@ final: prev:

  copilot-lua = buildVimPluginFrom2Nix {
    pname = "copilot.lua";
-    version = "2023-08-04";
+    version = "2023-08-10";
    src = fetchFromGitHub {
      owner = "zbirenbaum";
      repo = "copilot.lua";
-      rev = "f306957de0f9730de4298bb1ea85c3735ef7cc43";
-      sha256 = "1v76k17wk4wri7gnf9fhaail2wjgsgipmjcqab5kkiavllngn24l";
+      rev = "50ca36fd766db4d444094de81f5e131b6628f48f";
+      sha256 = "1hmrz9vgnsjc27w58pk9ar06f7wzsc0f325rdj2sxhrg8v3kc1gl";
    };
    meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
  };
@ -2359,12 +2359,12 @@ final: prev:

  coq_nvim = buildVimPluginFrom2Nix {
    pname = "coq_nvim";
-    version = "2023-08-06";
+    version = "2023-08-12";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "3d202065fd34701618e049a6bdcf8634121877c6";
-      sha256 = "112kwh4cyics8srgi2n4axwxb12278acish3v5dyfp97b0wcv7ar";
+      rev = "64f4d9346b48566ecb910d2299a6fe9e156346f9";
+      sha256 = "02yy75arzd0skhr69vvlwpawr2wznk729g5pznn6k2iymh4g2kkj";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -4150,12 +4150,12 @@ final: prev:

  hotpot-nvim = buildVimPluginFrom2Nix {
    pname = "hotpot.nvim";
-    version = "2023-08-10";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "rktjmp";
      repo = "hotpot.nvim";
-      rev = "34050bff81bea0d8f90a6389b31d1399603c4ae4";
-      sha256 = "0bvk9pk594xpm3gmq57dv7i9ms872smd4bm7hj6m3s31b65dqjdq";
+      rev = "42cb3f364a7ac6c2dfca08c8b86f950b00097657";
+      sha256 = "0y1049gmg6ia594ms00hx485d06cjmj9g65wgqnmziyjkssvbjan";
    };
    meta.homepage = "https://github.com/rktjmp/hotpot.nvim/";
  };
@ -4244,6 +4244,18 @@ final: prev:
    meta.homepage = "https://github.com/edwinb/idris2-vim/";
  };

+  image-nvim = buildVimPluginFrom2Nix {
+    pname = "image.nvim";
+    version = "2023-07-17";
+    src = fetchFromGitHub {
+      owner = "3rd";
+      repo = "image.nvim";
+      rev = "24c312191ca6bc04e45610a7bcb984d3bf208820";
+      sha256 = "1fy024nd01wryrasibc4b8divcfzx3a7xxfzx968l4a4l1q3l6vc";
+    };
+    meta.homepage = "https://github.com/3rd/image.nvim/";
+  };
+
  impatient-nvim = buildVimPluginFrom2Nix {
    pname = "impatient.nvim";
    version = "2023-05-05";
@ -4631,12 +4643,12 @@ final: prev:

  lazy-lsp-nvim = buildVimPluginFrom2Nix {
    pname = "lazy-lsp.nvim";
-    version = "2023-07-10";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "dundalek";
      repo = "lazy-lsp.nvim";
-      rev = "c35cb31854f87aece550404103d6ca921b2689aa";
-      sha256 = "0ilcg7z7f02y8a319ajsdi8vyvm3aby6hihxzaa06r2aqn1g4dwj";
+      rev = "4b10237a7f9e5ab678eb384a4266e2e28e8472f7";
+      sha256 = "1rblszvg8g7bvqlx8f6dhr3hrs7azki2sbh60r5kk3p8884sjfyd";
    };
    meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
  };
@ -4667,12 +4679,12 @@ final: prev:

  lean-nvim = buildVimPluginFrom2Nix {
    pname = "lean.nvim";
-    version = "2023-08-04";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "Julian";
      repo = "lean.nvim";
-      rev = "9dd3f51eed8c6d309f56c6d7c1c9e2953eb52b4b";
-      sha256 = "0xc3gz5kg95aani2wkk61s4a1v5vp32g447ypd3239y9zv7c36ai";
+      rev = "67580fab5bed73920fa3fdd712fc8e805c389c3d";
+      sha256 = "1wpklaiyk0hcipmrc1ampqn6x4qhag2srrb7cz22smh74bhw66cd";
    };
    meta.homepage = "https://github.com/Julian/lean.nvim/";
  };
@ -5122,12 +5134,12 @@ final: prev:

  lspsaga-nvim = buildVimPluginFrom2Nix {
    pname = "lspsaga.nvim";
-    version = "2023-08-10";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "e552e9d2ffc7ba99e1a2f51764b48ad4c668ada4";
-      sha256 = "0cb5hdskwpysmpd7iz99dc7xm0p2ywar4igllczx1l9nkcx85191";
+      rev = "5890d58e8cf174ea5c69e9ea8c41558b01f18897";
+      sha256 = "1zrzcm3jkv4s5rp012p9ymrralcafibiqnyraczx0p2rh9q16zhd";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
@ -5363,12 +5375,12 @@ final: prev:

  melange-nvim = buildVimPluginFrom2Nix {
    pname = "melange-nvim";
-    version = "2023-08-08";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "savq";
      repo = "melange-nvim";
-      rev = "11f35df3e091f35e966a335ed90b0d8a03851ffd";
-      sha256 = "0s0pb1cgx40zcxjy7axx06ix4zl5f8i3gi86rqy2qsagzp1adbf6";
+      rev = "517518347e41301bb2d1189d257f3918551a2ea5";
+      sha256 = "0rh6bm12wkkwbhb1xfp3n57xjy9i99zc92wbzvalp8ylps9dvcpb";
    };
    meta.homepage = "https://github.com/savq/melange-nvim/";
  };
@ -5819,12 +5831,12 @@ final: prev:

  neogit = buildVimPluginFrom2Nix {
    pname = "neogit";
-    version = "2023-08-10";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "NeogitOrg";
      repo = "neogit";
-      rev = "34f5e78891a1543cb3a223052d4421e3256e8dd5";
-      sha256 = "1ar82rwfwgwg4scf2y4wmlj14lhsmnnzkxa6xcnpnqjvy4p8dbz2";
+      rev = "e80cd6424a8a85d93bac25b8cd8d1758105f2b0f";
+      sha256 = "1x5cp250qim36l63qgikqpygmsdcciq7i69gcs3qfx9jxfgih4fh";
    };
    meta.homepage = "https://github.com/NeogitOrg/neogit/";
  };
@ -6803,12 +6815,12 @@ final: prev:

  nvim-gdb = buildVimPluginFrom2Nix {
    pname = "nvim-gdb";
-    version = "2023-08-07";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "sakhnik";
      repo = "nvim-gdb";
-      rev = "ca161dadc7699ca1d5fbbdc40ecf8ad54814d38f";
-      sha256 = "1cv20k3cmxzbx0fbclqkkkg75hk6myhfr9n2mg1vcnrrkmvmh6vv";
+      rev = "a15b1a6a060d77e5a0047ac2962b90c0d47c9903";
+      sha256 = "088n6ix7hz0k49ykwmpyxphw7mqs1dxdkl43ba0b9nnwbfr6ii1z";
    };
    meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
  };
@ -6971,12 +6983,12 @@ final: prev:

  nvim-lspconfig = buildVimPluginFrom2Nix {
    pname = "nvim-lspconfig";
-    version = "2023-08-09";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "7c73a4dc44c3d62ee79ab9f03ba313251c0388d4";
-      sha256 = "0k7cly9xmjgpq55izxk3kcrc6289fra3pcpkisslr9jj6qzq3bfq";
+      rev = "a981d4447b92c54a4d464eb1a76b799bc3f9a771";
+      sha256 = "0bcfrz5r1d5v5iizjirfg3hfzlb415557zhvkdig3ciphbly3ccj";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -7187,12 +7199,12 @@ final: prev:

  nvim-scrollview = buildVimPluginFrom2Nix {
    pname = "nvim-scrollview";
-    version = "2023-08-07";
+    version = "2023-08-12";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "7fa516c1bd73c0be3e4a8e6693a249fc6e85cb83";
-      sha256 = "1q47w5ksz9zfjczcffkg4iqq3v5cbjplqp7g6z4cxssr9wy3pwfr";
+      rev = "f3991f78682fd24ad65d936d55715f4c7363016e";
+      sha256 = "0csf3z48zl3zbj255sd0h823ggi4y2lg6gxy8qr4j0gwrphq1qsc";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -7307,12 +7319,12 @@ final: prev:

  nvim-treesitter = buildVimPluginFrom2Nix {
    pname = "nvim-treesitter";
-    version = "2023-08-10";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "477a5d76a241ea5d79974072ee133dada223420d";
-      sha256 = "19k47cb9ra6xpwxn0yc13cxa2cfk262m73kld9rhz38f6kvy2qbi";
+      rev = "fa414da96f4a2e60c2ac8082f0c1802b8f3c8f6c";
+      sha256 = "027702lqkkn1pmwnypmwx1s8bz6lg6ix882g1rcwyrpn3lb85489";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };
@ -7486,12 +7498,12 @@ final: prev:

  nvimdev-nvim = buildVimPluginFrom2Nix {
    pname = "nvimdev.nvim";
-    version = "2023-07-20";
+    version = "2023-08-12";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvimdev.nvim";
-      rev = "07f161a0252f7ad1cf22a1ba4a567b41d9aece97";
-      sha256 = "086qy6zqjjnjml8msxi34zx79cvqfmnv4lgg8gz32m3gpllazvkp";
+      rev = "3b873456a439e572b590636a0c6ea7ccfec14776";
+      sha256 = "16cz6lha7zb34qdsv1xg5hz4dk9pzaqnqvwgjmnfqcmpb5jw71x1";
    };
    meta.homepage = "https://github.com/neovim/nvimdev.nvim/";
  };
@ -8546,12 +8558,12 @@ final: prev:

  sg-nvim = buildVimPluginFrom2Nix {
    pname = "sg.nvim";
-    version = "2023-08-08";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "sourcegraph";
      repo = "sg.nvim";
-      rev = "6138d659f6a98ebf08d1a9206b456b792b17d52c";
-      sha256 = "0gf533dgin5s6rn7d0wxzz87223vlb9kd8zz6mbwya8bh7gw9966";
+      rev = "49f28eef7a78fb8c5fddf6fbf1c07c78035f2e03";
+      sha256 = "17s2r6rmzz5fkiyhnkvpvyi8w3ffp0avnp4c7s6p3pi1lqwkz9nw";
    };
    meta.homepage = "https://github.com/sourcegraph/sg.nvim/";
  };
@ -8823,12 +8835,12 @@ final: prev:

  splitjoin-vim = buildVimPluginFrom2Nix {
    pname = "splitjoin.vim";
-    version = "2023-08-10";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "AndrewRadev";
      repo = "splitjoin.vim";
-      rev = "30a1d7cc3b061d37ee5cac866dae4b0604b5f20a";
-      sha256 = "0c14d1dyijws9xwjnhqk33fkmhsq0vgfdjh7w2p0k20jvpl60inz";
+      rev = "0e208e01e7981d59914f045144f5dee709abf891";
+      sha256 = "09pp75byrqscp21sv9bvkbcfilqiqrfg7zrb8c0af6k9s7hsbz30";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@ -8872,12 +8884,12 @@ final: prev:

  ssr-nvim = buildVimPluginFrom2Nix {
    pname = "ssr.nvim";
-    version = "2023-08-09";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "cshuaimin";
      repo = "ssr.nvim";
-      rev = "bc9c0d2dd765dafc1b8fecb28d0a317e7913b81f";
-      sha256 = "18hhbq1fbsab3g3n4mj09jwapzra7754hp23w6dsv4nvf8rq27qc";
+      rev = "027a89f84283a9051427d4f319720336535c2e82";
+      sha256 = "1b8nllqvi12kg1ixzipwdxnc68qr034s9r4wqnydwccdi1cw6pdd";
    };
    meta.homepage = "https://github.com/cshuaimin/ssr.nvim/";
  };
@ -9306,12 +9318,12 @@ final: prev:

  telescope-frecency-nvim = buildVimPluginFrom2Nix {
    pname = "telescope-frecency.nvim";
-    version = "2023-08-10";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "nvim-telescope";
      repo = "telescope-frecency.nvim";
-      rev = "509288ef3de6419bf72c43781a1fe921420cf8ac";
-      sha256 = "0maj0v7bvjg3ai2bv6xk5hxichvv6y0mjs2kkwpi3p309qssv435";
+      rev = "9b17c177447915f066cf78952892fe771c3e43c5";
+      sha256 = "0c9f7ahlhvky1n9wkc4vfkbiqnwf5d6b4mphcj7grrpm1imxfj8d";
    };
    meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
  };
@ -10005,12 +10017,12 @@ final: prev:

  unison = buildVimPluginFrom2Nix {
    pname = "unison";
-    version = "2023-08-09";
+    version = "2023-08-10";
    src = fetchFromGitHub {
      owner = "unisonweb";
      repo = "unison";
-      rev = "388d0b9051fc8bf2d5f96285ac2800835b0d696a";
-      sha256 = "1cai2vzi456djxbnq0yi1inn5n4jzwwr2qffcr21v4jl823i603k";
+      rev = "5966a2a591fc2b56cffbe98acec8fb67ade9c479";
+      sha256 = "1r8agg2v15k7q28fmpxlag5nr6spxjja2jzmpa54ksw14y58cj00";
    };
    meta.homepage = "https://github.com/unisonweb/unison/";
  };
@ -10089,12 +10101,12 @@ final: prev:

  verilog_systemverilog-vim = buildVimPluginFrom2Nix {
    pname = "verilog_systemverilog.vim";
-    version = "2023-02-20";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "vhda";
      repo = "verilog_systemverilog.vim";
-      rev = "b47a3c0e5ace979f67326b82702b9da5acd7efb9";
-      sha256 = "1ig8m86pbvjqvykgi0xm45c0q3h5ibwqjmr3scpqkz2ah6wahpvb";
+      rev = "74e533b5f8f169af86af27d7206814103b35efcb";
+      sha256 = "0f9fylwhmya8rzg605bjyn8qldhyk59d6r98fhd6s4nn3n939rvw";
    };
    meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/";
  };
@ -11853,12 +11865,12 @@ final: prev:

  vim-go = buildVimPluginFrom2Nix {
    pname = "vim-go";
-    version = "2023-06-22";
+    version = "2023-08-10";
    src = fetchFromGitHub {
      owner = "fatih";
      repo = "vim-go";
-      rev = "12de6c0bc0efce3cedc5e28d4fe0ecc3a4aaeb77";
-      sha256 = "0y576h385h9m7d8wic2b2743v8l4vvpcly6fk5siwziqbq2j082h";
+      rev = "ca29cf84515431ba74dcf9abe6d403809b513e3b";
+      sha256 = "13nsq9ch0jn79xnmhah3hi4v2dyaaypqgkw1x95az20apr19sv0f";
    };
    meta.homepage = "https://github.com/fatih/vim-go/";
  };
@ -13358,12 +13370,12 @@ final: prev:
    pname = "vim-pasta";
    version = "2018-09-08";
    src = fetchFromGitHub {
-      owner = "sickill";
+      owner = "ku1ik";
      repo = "vim-pasta";
      rev = "cb4501a123d74fc7d66ac9f10b80c9d393746c66";
      sha256 = "14rswwx24i75xzgkbx1hywan1msn2ki26353ly2pyvznnqss1pwq";
    };
-    meta.homepage = "https://github.com/sickill/vim-pasta/";
+    meta.homepage = "https://github.com/ku1ik/vim-pasta/";
  };

  vim-pathogen = buildVimPluginFrom2Nix {
@ -13450,6 +13462,18 @@ final: prev:
    meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/";
  };

+  vim-pluto = buildVimPluginFrom2Nix {
+    pname = "vim-pluto";
+    version = "2022-02-01";
+    src = fetchFromGitHub {
+      owner = "hasundue";
+      repo = "vim-pluto";
+      rev = "a20df8c2e228f3db8a5cd004d1b7f275a591d4bd";
+      sha256 = "1ds0hwhmsc0d67xcyk9sdmp2hckkr1nlb57dnxmfgsswirpxzbbq";
+    };
+    meta.homepage = "https://github.com/hasundue/vim-pluto/";
+  };
+
  vim-polyglot = buildVimPluginFrom2Nix {
    pname = "vim-polyglot";
    version = "2022-10-14";
@ -14377,12 +14401,12 @@ final: prev:

  vim-test = buildVimPluginFrom2Nix {
    pname = "vim-test";
-    version = "2023-08-09";
+    version = "2023-08-11";
    src = fetchFromGitHub {
      owner = "vim-test";
      repo = "vim-test";
-      rev = "7cb4ae5212451266a1f643642d47474063a99de4";
-      sha256 = "1xqlp1b54ssvfw7p212bmd10ccsjz77rm3vnvhs955f0blg80ji5";
+      rev = "837640f1cb74067aa326d533a8b4609800a55a8d";
+      sha256 = "16605786h5dy5w667i2zfcl96ardr1nq37hlymyd0linffqbai42";
    };
    meta.homepage = "https://github.com/vim-test/vim-test/";
  };
@ -15579,12 +15603,12 @@ final: prev:

  catppuccin-nvim = buildVimPluginFrom2Nix {
    pname = "catppuccin-nvim";
-    version = "2023-08-06";
+    version = "2023-08-10";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "371430f32f2637d2dd5796399b3982d4cada61d8";
-      sha256 = "1fk1zjr9w2s41vm35d25rgb06kq5gx6j9qhq5rr1qs8kdwb9a2gs";
+      rev = "490078b1593c6609e6a50ad5001e7902ea601824";
+      sha256 = "03nwnc8q65nqjvrxj5fg8c95ywqb94xyim2hxald95agiickv6rd";
    };
    meta.homepage = "https://github.com/catppuccin/nvim/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -27,12 +27,12 @@
  };
  arduino = buildGrammar {
    language = "arduino";
-    version = "0.0.0+rev=11d4fd1";
+    version = "0.0.0+rev=d988e6a";
    src = fetchFromGitHub {
      owner = "ObserverOfTime";
      repo = "tree-sitter-arduino";
-      rev = "11d4fd1b0320514272cfbe3aa911a3cd8705b7a9";
-      hash = "sha256-lbMmgY3Nriw2KxuOT3iI8h/nrVzMPG+E/NuNDLe9X9Y=";
+      rev = "d988e6a803203cc2bbfd2a8a84edffc73d2922b4";
+      hash = "sha256-Q8LmoBIKqU/DCf387ew/LgvYbyT8KsxvmD+WFMXOMGI=";
    };
    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";
  };
@ -258,12 +258,12 @@
  };
  cpp = buildGrammar {
    language = "cpp";
-    version = "0.0.0+rev=869f1be";
+    version = "0.0.0+rev=77cecd8";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-cpp";
-      rev = "869f1be6ab4a384f649f4c6b374d0e4d7f0abab6";
-      hash = "sha256-iNUu7hO3PCiSAg2jEP5wm5MAzHDv5BT++CTJeo5lzSI=";
+      rev = "77cecd88d28032bf4f54fd4ee68efb53a6c8c9a5";
+      hash = "sha256-/w77s0qcJcLH6MX3BVuM37UQ1Xm/6t2oJ2KTq+hnIJI=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
  };
@ -280,12 +280,12 @@
  };
  cuda = buildGrammar {
    language = "cuda";
-    version = "0.0.0+rev=ff8425f";
+    version = "0.0.0+rev=d4285d0";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-cuda";
-      rev = "ff8425f44c1c273dd3b831913dff5cdb3fe94e25";
-      hash = "sha256-stfyBvEK/fQ8yFSbYnFIx1cbn0IS3Lrc5jWswRXlbVg=";
+      rev = "d4285d0396a409c91bcd5a7fd362cf13cc6f8600";
+      hash = "sha256-M4jx6pEj6kb0XIaWq7dzEvd+p6qadlowEyMYzJoeiRU=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
  };
@ -645,12 +645,12 @@
  };
  glsl = buildGrammar {
    language = "glsl";
-    version = "0.0.0+rev=e9c49d0";
+    version = "0.0.0+rev=00ffe20";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-glsl";
-      rev = "e9c49d0752d968bc6dcd35d0c3a88397c5d51757";
-      hash = "sha256-O/RNeoUZEPF8dxQDy41mQvmIyQ29V6MFr7Rgi7g4kDw=";
+      rev = "00ffe2099374613d2f313ace4a9dda44370b458b";
+      hash = "sha256-K0JSRytbV5qMP6X3rT/cmEjxdTPgT63hQpahFrUjTOU=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
  };
@ -810,12 +810,12 @@
  };
  hlsl = buildGrammar {
    language = "hlsl";
-    version = "0.0.0+rev=d3dc3e3";
+    version = "0.0.0+rev=95361dd";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-hlsl";
-      rev = "d3dc3e3cd010d200573eee26421dbdecfd6a6b59";
-      hash = "sha256-mdESPOOxwJ1WEuO5No26wfvxsaiIFtQcLsE4m5OkzIQ=";
+      rev = "95361dde7ad4025fbec5dc4e5cdde0ea8ed64172";
+      hash = "sha256-zOWkB0ii0awy/P2nHd3vGEoiLpo/fswhHVvYJOwfgzg=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-hlsl";
  };
@ -898,12 +898,12 @@
  };
  ispc = buildGrammar {
    language = "ispc";
-    version = "0.0.0+rev=0bdbb03";
+    version = "0.0.0+rev=cc57a93";
    src = fetchFromGitHub {
      owner = "fab4100";
      repo = "tree-sitter-ispc";
-      rev = "0bdbb03d9abde78d8be2f2199e57119b2c7f8fd7";
-      hash = "sha256-udsVK0FCbq6hFl0iLgWdTNbZdKps2avHk0SfJ/DIUxY=";
+      rev = "cc57a931eb782474324910e19ca253aa0d5fe38a";
+      hash = "sha256-fWBKSLzegpf5duDEqIbz5hvEFlOZFjQdLpVxLhimSAY=";
    };
    meta.homepage = "https://github.com/fab4100/tree-sitter-ispc";
  };
@ -1275,12 +1275,12 @@
  };
  objc = buildGrammar {
    language = "objc";
-    version = "0.0.0+rev=77e28ae";
+    version = "0.0.0+rev=97e022e";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-objc";
-      rev = "77e28aeaede824a5f4aa501fb5f3138ab1019b9f";
-      hash = "sha256-lK0wy6cEf9RSD9G96ywkUFZrRTk1WYtkdNbI7OBGRtg=";
+      rev = "97e022ec4a908108283bad23d42eee39ad204db6";
+      hash = "sha256-3sp93zxliIrjp6Z1SUlFdp2rkcsFLba4SEIVdaQ4H+4=";
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-objc";
  };
@ -1628,6 +1628,17 @@
    };
    meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego";
  };
+  requirements = buildGrammar {
+    language = "requirements";
+    version = "0.0.0+rev=56ddb4d";
+    src = fetchFromGitHub {
+      owner = "ObserverOfTime";
+      repo = "tree-sitter-requirements";
+      rev = "56ddb4dad2ea0761d20c0995a0de2990caa350b5";
+      hash = "sha256-0q7cyv/a9gZG00tyBcF2i9TUcj3TqAi89CWjbzszD7U=";
+    };
+    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
+  };
  rnoweb = buildGrammar {
    language = "rnoweb";
    version = "0.0.0+rev=502c112";
@ -2121,12 +2132,12 @@
  };
  vim = buildGrammar {
    language = "vim";
-    version = "0.0.0+rev=26b1aea";
+    version = "0.0.0+rev=77e9e96";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "tree-sitter-vim";
-      rev = "26b1aea3b3a5dae31f784a1204205fd57f2b82b5";
-      hash = "sha256-NS6Ao2eK+7/NW7QufXiX2oBBLgGDLZX3PuPKezC+Quc=";
+      rev = "77e9e96c2ae5cff7343ce3dced263483acf95793";
+      hash = "sha256-YGE/up7TE1+a6FrN8iEeHbAJr6kEMcWLMPaeyQRRVLs=";
    };
    meta.homepage = "https://github.com/neovim/tree-sitter-vim";
  };
@ -2176,12 +2187,12 @@
  };
  wing = buildGrammar {
    language = "wing";
-    version = "0.0.0+rev=46d47ba";
+    version = "0.0.0+rev=f416d4b";
    src = fetchFromGitHub {
      owner = "winglang";
      repo = "wing";
-      rev = "46d47bade5f6ee149c9f1449f64bace22a288a2e";
-      hash = "sha256-wzOeJz3LM/t6e1WzNpAjeD0MNSO803YNQ3eFrHizyII=";
+      rev = "f416d4b76141d803ea2ebadf0629fca164133723";
+      hash = "sha256-xSt6C64PmNJOqZxon4TWbAIlMzSaRClPc47wi9Sxdpk=";
    };
    location = "libs/tree-sitter-wing";
    generate = true;
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -125,6 +125,7 @@

  # must be lua51Packages
 , luaPackages
+, luajitPackages
 }:

 self: super: {
@ -600,6 +601,24 @@ self: super: {

  };

+  image-nvim = super.image-nvim.overrideAttrs {
+    dependencies = with self; [
+      nvim-treesitter
+      nvim-treesitter-parsers.markdown_inline
+      nvim-treesitter-parsers.norg
+    ];
+
+    # Add magick to package.path
+    patches = [ ./patches/image-nvim/magick.patch ];
+
+    postPatch = ''
+      substituteInPlace lua/image/magick.lua \
+        --replace @nix_magick@ ${luajitPackages.magick}
+    '';
+
+    nvimRequireCheck = "image";
+  };
+
  jedi-vim = super.jedi-vim.overrideAttrs {
    # checking for python3 support in vim would be neat, too, but nobody else seems to care
    buildInputs = [ python3.pkgs.jedi ];
@ -947,7 +966,7 @@ self: super: {
        pname = "sg-nvim-rust";
        inherit (old) version src;

-        cargoHash = "sha256-cDlqJBx9p/rA+OAHZW2GcOiQmroU66urZ+qv2lXhg/4=";
+        cargoHash = "sha256-cMMNur6QKp87Q28JyCH2IMLE3xDVd7Irg9HvJ2AsnZc=";

        nativeBuildInputs = [ pkg-config ];

@ -1440,6 +1459,10 @@ self: super: {
    preInstall = "cd vim";
  };

+  vim-pluto = super.vim-pluto.overrideAttrs {
+    dependencies = with self; [ denops-vim ];
+  };
+
  vim-snipmate = super.vim-snipmate.overrideAttrs {
    dependencies = with self; [ vim-addon-mw-utils tlib_vim ];
  };
--- a/pkgs/applications/editors/vim/plugins/patches/image-nvim/magick.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/image-nvim/magick.patch
@ -0,0 +1,11 @@
+diff --git a/lua/image/magick.lua b/lua/image/magick.lua
+index a0c5a64..e3b57d4 100644
+--- a/lua/image/magick.lua
+++ b/lua/image/magick.lua
+@@ -1,3 +1,6 @@
+package.path = package.path .. ";@nix_magick@/share/lua/5.1/?/init.lua;"
+package.path = package.path .. ";@nix_magick@/share/lua/5.1/?.lua;"
+
+ local has_magick, magick = pcall(require, "magick")
+ 
+ ---@return MagickImage
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -355,6 +355,7 @@ https://github.com/mboughaba/i3config.vim/,,
 https://github.com/cocopon/iceberg.vim/,,
 https://github.com/idris-hackers/idris-vim/,,
 https://github.com/edwinb/idris2-vim/,,
+https://github.com/3rd/image.nvim/,HEAD,
 https://github.com/lewis6991/impatient.nvim/,,
 https://github.com/smjonas/inc-rename.nvim/,HEAD,
 https://github.com/nishigori/increment-activator/,,
@ -1133,6 +1134,7 @@ https://github.com/jparise/vim-phabricator/,,
 https://github.com/justinj/vim-pico8-syntax/,,
 https://github.com/junegunn/vim-plug/,,
 https://github.com/powerman/vim-plugin-AnsiEsc/,,
+https://github.com/hasundue/vim-pluto/,HEAD,
 https://github.com/sheerun/vim-polyglot/,,
 https://github.com/jakwings/vim-pony/,,
 https://github.com/haya14busa/vim-poweryank/,,
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@ -30,21 +30,21 @@ let
  archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";

  sha256 = {
-    x86_64-linux = "0hc1pfrhmdydwgyz3mjp45nmzs101iffam7ciximqmnhf1s1x4qf";
-    x86_64-darwin = "1snrr4lsa5qdpdl80wx8ymxp8h1bhd5ablhcgkhzvmj5dh7jrywk";
-    aarch64-linux = "0pm5znbjm79ziwdx37cc75qnbf0jv3yrm2xg7cykavn43gz97abw";
-    aarch64-darwin = "0bq5hvgv228x7vby4475cc65g24kpv9kvj06p6c0y6a2a79j45by";
-    armv7l-linux = "11gxpqflakp4cwzkpqrwsd6m5fls1vnaigppc4bq9flfknwkjfrx";
+    x86_64-linux = "0j3lmyj77qalhn8hrgfg3zgw6jqv8rscfy16vhkl0ir2xnmb19jf";
+    x86_64-darwin = "06dx8lhw1cqignv06pcjjv8v743kr8bck1iqgl1881jmqyhggi4f";
+    aarch64-linux = "0nyd452wcp5qw2cx1zj89v4fgk3jvbk3hhiix9a0gv150q48vyfa";
+    aarch64-darwin = "1yfbsfnkjbf99yl1dcflpyxppa9mhnxigyyplz0jaqgpwmhs2s0b";
+    armv7l-linux = "1miz95rz2fdw7xplflnydzq57hnz894xg29mhpywwiib8kypfrm7";
  }.${system} or throwSystem;
 in
  callPackage ./generic.nix rec {
    # Please backport all compatible updates to the stable release.
    # This is important for the extension ecosystem.
-    version = "1.81.0";
+    version = "1.81.1";
    pname = "vscode" + lib.optionalString isInsiders "-insiders";

    # This is used for VS Code - Remote SSH test
-    rev = "6445d93c81ebe42c4cbd7a60712e0b17d9463e97";
+    rev = "6c3e3dba23e8fadc360aed75ce363ba185c49794";

    executableName = "code" + lib.optionalString isInsiders "-insiders";
    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@ -68,7 +68,7 @@ in
      src = fetchurl {
        name = "vscode-server-${rev}.tar.gz";
        url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "07x9lmkyhra4hplsgdhh97dixsx92i7lab5z5ihs2wqvvzl69ah2";
+        sha256 = "1xfyl81d5l2bl7k4vz4rnj84j1ijwv90sqgv9lnqzza2dfckfd6m";
      };
    };

--- a/pkgs/applications/emulators/citra/default.nix
+++ b/pkgs/applications/emulators/citra/default.nix
@ -10,7 +10,7 @@ let
  compat-list = fetchurl {
    name = "citra-compat-list";
    url = "https://web.archive.org/web/20230807103651/https://api.citra-emu.org/gamedb/";
-    hash = "sha256-Ma1SXgzhyMHa/MeoYuf8b+QYPjhoQEeKklLbGbkHwEk=";
+    hash = "sha256-J+zqtWde5NgK2QROvGewtXGRAWUTNSKHNMG6iu9m1fU=";
  };
 in {
  nightly = qt6Packages.callPackage ./generic.nix rec {
--- a/pkgs/applications/emulators/nuked-md/default.nix
+++ b/pkgs/applications/emulators/nuked-md/default.nix
@ -0,0 +1,72 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+, gitUpdater
+, cmake
+, SDL2
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nuked-md";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "nukeykt";
+    repo = "Nuked-MD";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-Pe+TSu9FBUhxtACq+6jMbrUxiwKLOJgQbEcmUrcrjMs=";
+  };
+
+  # Interesting detail about our SDL2 packaging:
+  # Because we build it with the configure script instead of CMake, we ship sdl2-config.cmake instead of SDL2Config.cmake
+  # The former doesn't set SDL2_FOUND while the latter does (like CMake config scripts should), which causes this issue:
+  #
+  # CMake Error at CMakeLists.txt:5 (find_package):
+  #   Found package configuration file:
+  #
+  #     <SDL2.dev>/lib/cmake/SDL2/sdl2-config.cmake
+  #
+  #   but it set SDL2_FOUND to FALSE so package "SDL2" is considered to be NOT
+  #   FOUND.
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace 'SDL2 REQUIRED' 'SDL2'
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    SDL2
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 Nuked-MD $out/bin/Nuked-MD
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+    };
+  };
+
+  meta = with lib; {
+    description = "Cycle accurate Mega Drive emulator";
+    longDescription = ''
+      Cycle accurate Mega Drive core. The goal of this project is to emulate Sega Mega Drive chipset as accurately as
+      possible using decapped chips photos.
+    '';
+    homepage = "https://github.com/nukeykt/Nuked-MD";
+    license = licenses.gpl2Plus;
+    mainProgram = "Nuked-MD";
+    maintainers = with maintainers; [ OPNA2608 ];
+    platforms = platforms.all;
+  };
+})
--- a/pkgs/applications/graphics/conjure/default.nix
+++ b/pkgs/applications/graphics/conjure/default.nix
@ -0,0 +1,71 @@
+{ fetchFromGitHub
+, gobject-introspection
+, lib
+, libadwaita
+, python3Packages
+, wrapGAppsHook
+, meson
+, ninja
+, desktop-file-utils
+, pkg-config
+, appstream-glib
+, gtk4
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "conjure";
+  version = "0.1.2";
+
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "nate-xyz";
+    repo = "conjure";
+    rev = "v${version}";
+    hash = "sha256-qWeqUQxTTnmJt40Jm1qDTGGuSQikkurzOux8sZsmDQk=";
+  };
+
+  nativeBuildInputs = [
+    gobject-introspection
+    wrapGAppsHook
+    desktop-file-utils
+    appstream-glib
+    meson
+    ninja
+    pkg-config
+    gtk4
+  ];
+
+  buildInputs = [
+    libadwaita
+  ];
+
+  propagatedBuildInputs = with python3Packages; [
+    pygobject3
+    loguru
+    wand
+  ];
+
+  nativeCheckInputs = with python3Packages; [
+    pytest
+  ];
+
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
+  meta = with lib; {
+    description = "Magically transform your images";
+    longDescription = ''
+      Resize, crop, rotate, flip images, apply various filters and effects,
+      adjust levels and brightness, and much more. An intuitive tool for designers,
+      artists, or just someone who wants to enhance their images.
+      Built on top of the popular image processing library, ImageMagick with python
+      bindings from Wand.
+    '';
+    homepage = "https://github.com/nate-xyz/conjure";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ sund3RRR ];
+  };
+}
--- a/pkgs/applications/graphics/krop/default.nix
+++ b/pkgs/applications/graphics/krop/default.nix
@ -19,6 +19,7 @@ python3Packages.buildPythonApplication rec {
  ];
  buildInputs = [
    libsForQt5.poppler
+    libsForQt5.qtwayland
  ];

  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
--- a/pkgs/applications/misc/ablog/default.nix
+++ b/pkgs/applications/misc/ablog/default.nix
@ -3,30 +3,39 @@
 , fetchPypi
 }:

-with python3.pkgs;
-
-buildPythonApplication rec {
+python3.pkgs.buildPythonApplication rec {
  pname = "ablog";
-  version = "0.10.33.post1";
+  version = "0.11.4.post1";
+  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "sha256-+vrVQ4sItCXrSCzNXyKk6/6oDBOyfyD7iNWzmcbE/BQ=";
+    hash = "sha256-Zyvx7lVUQtjoGsSpFmH8pFrgTGgsFd4GMsL3fXKtUpU=";
  };

-  propagatedBuildInputs = [
-    feedgen
-    sphinx
-    invoke
-    watchdog
-    python-dateutil
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools
+    setuptools-scm
+    wheel
  ];

-  nativeCheckInputs = [
+  propagatedBuildInputs = with python3.pkgs; [
+    docutils
+    feedgen
+    invoke
+    packaging
+    python-dateutil
+    sphinx
+    watchdog
+  ];
+
+  nativeCheckInputs = with python3.pkgs; [
    pytestCheckHook
  ];

-  nativeBuildInputs = [ setuptools-scm ];
+  pytestFlagsArray = [
+    "--rootdir" "src/ablog"
+  ];

  meta = with lib; {
    description = "ABlog for blogging with Sphinx";
--- a/pkgs/applications/misc/base16-universal-manager/default.nix
+++ b/pkgs/applications/misc/base16-universal-manager/default.nix
@ -8,10 +8,10 @@ buildGoModule rec {
    owner = "pinpox";
    repo = "base16-universal-manager";
    rev = "v${version}";
-    sha256 = "11kal7x0lajzydbc2cvbsix9ympinsiqzfib7dg4b3xprqkyb9zl";
+    hash = "sha256-9KflJ863j0VeOyu6j6O28VafetRrM8FW818qCvqhaoY=";
  };

-  vendorSha256 = "19rba689319w3wf0b10yafydyz01kqg8b051vnijcyjyk0khwvsk";
+  vendorHash = "sha256-U28OJ5heeiaj3aGAhR6eAXzfvFMehAUcHzyFkZBRK6c=";

  meta = with lib; {
    description = "A universal manager to set base16 themes for any supported application";
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@ -1,14 +1,15 @@
 { lib, stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff
 , libwebp, pkg-config, librsvg, glib, gtk2, libXext, libXxf86vm, poppler, vlc
-, ghostscript, makeWrapper, tzdata, makeDesktopItem, copyDesktopItems }:
+, ghostscript, makeWrapper, tzdata, makeDesktopItem, copyDesktopItems
+, directoryListingUpdater }:

 stdenv.mkDerivation rec {
  pname = "eaglemode";
-  version = "0.96.0";
+  version = "0.96.1";

  src = fetchurl {
    url = "mirror://sourceforge/eaglemode/${pname}-${version}.tar.bz2";
-    hash = "sha256-aMVXJpfws9rh2Eaa/EzSLwtwvn0pVJlEbhxzvXME1hs=";
+    hash = "sha256-FIhCcMghzLg7Odcsou9hBw7kIaqLVUFEAKUk9uwRNNw=";
  };

  # Fixes "Error: No time zones found." on the clock
@ -55,6 +56,11 @@ stdenv.mkDerivation rec {
    })
  ];

+  passthru.updateScript = directoryListingUpdater {
+    url = "https://eaglemode.sourceforge.net/download.html";
+    extraRegex = "(?!.*(x86_64|setup64|livecd)).*";
+  };
+
  meta = with lib; {
    homepage = "https://eaglemode.sourceforge.net";
    description = "Zoomable User Interface";
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
    homepage = "http://goldendict.org/";
    description = "A feature-rich dictionary lookup program";
    platforms = with platforms; linux ++ darwin;
+    mainProgram = "goldendict";
    maintainers = with maintainers; [ gebner astsmtl sikmir ];
    license = licenses.gpl3Plus;
  };
--- a/pkgs/applications/misc/hcl2json/default.nix
+++ b/pkgs/applications/misc/hcl2json/default.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "hcl2json";
-  version = "0.5.0";
+  version = "0.6.0";

  src = fetchFromGitHub {
    owner = "tmccombs";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-kmg483HidFL9mP6jXisLN5VR0dd0xzPXSwqTR8tOCrM=";
+    sha256 = "sha256-XdPRata9B8cK58eyAKxEBBwKAum+z0yoGgUGSkmhXfw=";
  };

-  vendorHash = "sha256-ejbCY5S/aeY5Sp+5A20y5kUDY0yxgnMUxtr3UPvtic0=";
+  vendorHash = "sha256-F7G8K0tfXyLHQgqd2PE9eRXlhkFgijAO9LKKj9mvvwc=";

  subPackages = [ "." ];

--- a/pkgs/applications/misc/kbt/default.nix
+++ b/pkgs/applications/misc/kbt/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "kbt";
-  version = "1.2.2";
+  version = "1.2.3";

  src = fetchFromGitHub {
    owner = "bloznelis";
    repo = "kbt";
    rev = version;
-    hash = "sha256-v0xbW1xlOhaLf19a6gFpd16RjYfXIK6FDBSWVWPlK3c=";
+    hash = "sha256-AhMl8UuSVKLiIj+EnnmJX8iURjytLByDRLqDkgHGBr0=";
  };

-  cargoHash = "sha256-rBThJqaemtPAHqiWDILJZ7j+NL5+6+4tsXrFPcEiFL0=";
+  cargoHash = "sha256-pgdI+BoYrdSdQpVN0pH4QMcNAKbjbnrUbAmMpmtfd2s=";

  nativeBuildInputs = lib.optionals stdenv.isLinux [
    pkg-config
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@ -14,13 +14,13 @@

 mkDerivation rec {
  pname = "librecad";
-  version = "2.2.0.1";
+  version = "2.2.0.2";

  src = fetchFromGitHub {
    owner = "LibreCAD";
    repo = "LibreCAD";
    rev = version;
-    sha256 = "sha256-5tezXhkInOG+TBjEixXL/qUOHUXD9dR8vu06zl3p4Ek=";
+    sha256 = "sha256-Vj6nvOfmhzou2hhmujm47a7aKBzmgchDb/BbwCb3/hI=";
  };

  buildInputs = [
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@ -23,33 +23,21 @@ let
      matplotlib = super.matplotlib.override {
        enableGtk3 = true;
      };
-      sqlalchemy = super.sqlalchemy.overridePythonAttrs (old: rec {
-        version = "1.4.46";
-        src = fetchPypi {
-          pname = "SQLAlchemy";
-          inherit version;
-          hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA=";
-        };
-        disabledTestPaths = [
-           "test/aaa_profiling"
-           "test/ext/mypy"
-        ];
-      });
    });
  };
 in python.pkgs.buildPythonApplication rec {
  pname = "pytrainer";
-  version = "2.1.0";
+  version = "2.2.1";

  src = fetchFromGitHub {
    owner = "pytrainer";
    repo = "pytrainer";
    rev = "v${version}";
-    sha256 = "sha256-U2SVQKkr5HF7LB0WuCZ1xc7TljISjCNO26QUDGR+W/4=";
+    hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
  };

  propagatedBuildInputs = with python.pkgs; [
-    sqlalchemy-migrate
+    sqlalchemy
    python-dateutil
    matplotlib
    lxml
@ -85,10 +73,17 @@ in python.pkgs.buildPythonApplication rec {
    psycopg2
  ]);

+  postPatch = ''
+    substituteInPlace pytrainer/platform.py \
+        --replace 'sys.prefix' "\"$out\""
+  '';
+
  checkPhase = ''
-    env HOME=$TEMPDIR TZDIR=${tzdata}/share/zoneinfo \
+    env \
+      HOME=$TEMPDIR \
+      TZDIR=${tzdata}/share/zoneinfo \
      TZ=Europe/Kaliningrad \
-      LC_ALL=en_US.UTF-8 \
+      LC_TIME=C \
      xvfb-run -s '-screen 0 800x600x24' \
      ${python.interpreter} setup.py test
  '';
--- a/pkgs/applications/misc/ulauncher/default.nix
+++ b/pkgs/applications/misc/ulauncher/default.nix
@ -21,11 +21,11 @@

 python3Packages.buildPythonApplication rec {
  pname = "ulauncher";
-  version = "5.15.0";
+  version = "5.15.3";

  src = fetchurl {
    url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz";
-    sha256 = "sha256-1Qo6ffMtVRtZDPCHvHEl7T0dPdDUxP4TP2hkSVSdQpo";
+    sha256 = "sha256-unAic6GTgvZFFJwPERh164vfDiFE0zLEUjgADR94w5w=";
  };

  nativeBuildInputs = with python3Packages; [
@ -120,6 +120,6 @@ python3Packages.buildPythonApplication rec {
    homepage = "https://ulauncher.io/";
    license = licenses.gpl3;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ aaronjanse ];
+    maintainers = with maintainers; [ aaronjanse sebtm ];
  };
 }
--- a/pkgs/applications/networking/browsers/lagrange/default.nix
+++ b/pkgs/applications/networking/browsers/lagrange/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lagrange";
-  version = "1.16.6";
+  version = "1.16.7";

  src = fetchFromGitHub {
    owner = "skyjake";
    repo = "lagrange";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-avBZnQi1xuyrJX7YG+8O3+122Of11innCCr5sPYyySg=";
+    hash = "sha256-d9QmFXDDeYDR1KFtOyQKfaYvex8TFDiYJUrKEp7H5K8=";
  };

  nativeBuildInputs = [ cmake pkg-config zip ];
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@ -1,11 +1,11 @@
 {
-  "packageVersion": "116.0-1",
+  "packageVersion": "116.0.2-1",
  "source": {
-    "rev": "116.0-1",
-    "sha256": "1nah5a5l5ajyvy8aw4xdpdfs2s3ybfs5jw9c4qj9qczxdp541a66"
+    "rev": "116.0.2-1",
+    "sha256": "08q50yjb8q168zb2y4iajjqd9ygbpywwr9i4vfn67wchqlsc1mrp"
  },
  "firefox": {
-    "version": "116.0",
-    "sha512": "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d"
+    "version": "116.0.2",
+    "sha512": "2c0ae18672fe22c75002744831130e13da764f83726951e5b58cfe74f7f473e22634ce08ebc11a98bac5baec0a4ac099a3a350a8b756af9c5bea6d5f4432da6d"
  }
 }
--- a/pkgs/applications/networking/browsers/vieb/default.nix
+++ b/pkgs/applications/networking/browsers/vieb/default.nix
@ -2,20 +2,20 @@

 buildNpmPackage rec {
  pname = "vieb";
-  version = "10.1.1";
+  version = "10.2.0";

  src = fetchFromGitHub {
    owner = "Jelmerro";
    repo = pname;
    rev = version;
-    hash = "sha256-fEnBsxhRl8SmyTV82SPza5jv5GkCyVpfymeq5k48oxk=";
+    hash = "sha256-eI+doYI5kssuVLNLlAj67CRvBuWQ+TRm0RKXPcW+S8c=";
  };

  postPatch = ''
    sed -i '/"electron"/d' package.json
  '';

-  npmDepsHash = "sha256-iCuRPC5p7XzKpVjkGYLoZfOySYvO+uL71/qW9rDxI2M=";
+  npmDepsHash = "sha256-Emiw5ZlHh4+YqtW+T3iQW/ldr1Exx/66vsQteCijObQ=";
  dontNpmBuild = true;

  nativeBuildInputs = [ makeWrapper ] ++ lib.optional stdenv.isAarch64 python3;
--- a/pkgs/applications/networking/cluster/linkerd/default.nix
+++ b/pkgs/applications/networking/cluster/linkerd/default.nix
@ -2,7 +2,7 @@

 (callPackage ./generic.nix { }) {
  channel = "stable";
-  version = "2.13.5";
-  sha256 = "0mjb0wcwyd51ap0kvkfmykh6zqijg4z2g5yxvp9aq67l984wh7sb";
+  version = "2.13.6";
+  sha256 = "1z5gcz1liyxydy227vb350k0hsq31x80kvxamx7l1xkd2p0mcmbj";
  vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0=";
 }
--- a/pkgs/applications/networking/cluster/odo/default.nix
+++ b/pkgs/applications/networking/cluster/odo/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "odo";
-  version = "3.12.0";
+  version = "3.13.0";

  src = fetchFromGitHub {
    owner = "redhat-developer";
    repo = "odo";
    rev = "v${version}";
-    sha256 = "sha256-UieMY+YoMjOYUGwkSWxuC+91YfGHhMdhSJFwA+kG4PU=";
+    sha256 = "sha256-l5WW6Wos/FLxJsyrWnLhb1vAztGT1QYl8tKhiBgNGbw=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/cluster/tanka/default.nix
+++ b/pkgs/applications/networking/cluster/tanka/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "tanka";
-  version = "0.25.0";
+  version = "0.26.0";

  src = fetchFromGitHub {
    owner = "grafana";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-LAOcDgosSGE7sLiQYSimz//oZ3FHcx3PTjtG0WdDNmg=";
+    sha256 = "sha256-xKB/SKiw3cKqdpl869Bs/NO1Jbrla8Un0hH4kIGqAPs=";
  };

-  vendorHash = "sha256-//uxNK8u7zIVeIUN401DXtkJsX/1iVfDcoFwcs8Y3cg=";
+  vendorHash = "sha256-+BCUQ+czqWkxbDoSvCaAxewTN0SuI+hCHEQpLOvNGj4=";

  doCheck = false;

--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@ -363,11 +363,11 @@
    "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
  },
  "equinix": {
-    "hash": "sha256-nqKswIq7cOEvGuoRA9Fv5j84Ob/z2C+Ux5ecdhTW0RY=",
+    "hash": "sha256-lo3DxEXa0nSm+KXBmWwulyNNsctrFvZJLHVJ087BsoU=",
    "homepage": "https://registry.terraform.io/providers/equinix/equinix",
    "owner": "equinix",
    "repo": "terraform-provider-equinix",
-    "rev": "v1.14.5",
+    "rev": "v1.14.6",
    "spdx": "MIT",
    "vendorHash": "sha256-7a90fzAU76QRXkSa+G/N3kMPP8jy68i72i2JSlUrvfc="
  },
@ -436,11 +436,11 @@
    "vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
  },
  "github": {
-    "hash": "sha256-Y70HJEUArUCT1XM3F02bUNPwB1bW4N/Gg/M6aW7XcMM=",
+    "hash": "sha256-9U3vF8xunpTKbOTytUEscMeS3ya6u+PVkNVJjufhpZ0=",
    "homepage": "https://registry.terraform.io/providers/integrations/github",
    "owner": "integrations",
    "repo": "terraform-provider-github",
-    "rev": "v5.32.0",
+    "rev": "v5.33.0",
    "spdx": "MIT",
    "vendorHash": null
  },
@ -664,11 +664,11 @@
    "vendorHash": "sha256-9AmfvoEf7E6lAblPIWizElng5GQJG/hQ5o6Mo3AN+EA="
  },
  "launchdarkly": {
-    "hash": "sha256-gXpnYX4G+KYEPr4385VgbVfbfkNRc0z2txaaH16nJqI=",
+    "hash": "sha256-gXT/rBlucBjg+8cjpSXdlClFGNuWmq6tZuuMfsBhR2E=",
    "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
    "owner": "launchdarkly",
    "repo": "terraform-provider-launchdarkly",
-    "rev": "v2.14.0",
+    "rev": "v2.15.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-I+9hfKWBbclXXpthQc9LAHhZ7MYr/8I89mLeIVeae+Q="
  },
@ -1061,11 +1061,11 @@
    "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
  },
  "spotinst": {
-    "hash": "sha256-eZiWhMtsrys64NjN12BDaxL2b2GynIJMhWe+D33wgsw=",
+    "hash": "sha256-g0qkUzLcMZZQrYtRbpyNWkpYLzJskP7Be+tGs3SGyVo=",
    "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
    "owner": "spotinst",
    "repo": "terraform-provider-spotinst",
-    "rev": "v1.132.0",
+    "rev": "v1.133.0",
    "spdx": "MPL-2.0",
    "vendorHash": "sha256-5F8A8v8YQXrYAgWGYjO5G+sY3SY+O2oiYo3zVLZ9LUc="
  },
@ -1115,11 +1115,11 @@
    "vendorHash": "sha256-32ENfzBep97Wn0FvMIEuqxIAmxjTtw2UvDvYJTmJJNc="
  },
  "tencentcloud": {
-    "hash": "sha256-RipntxK8i/uyTolf6Z8DJDkNYMsEYcdDpDQfNnGORxQ=",
+    "hash": "sha256-T98RZ775nXIjqanqWhZfz+IKJIXvDEkVnqHhznilYe0=",
    "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
    "owner": "tencentcloudstack",
    "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.81.19",
+    "rev": "v1.81.20",
    "spdx": "MPL-2.0",
    "vendorHash": null
  },
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@ -10,16 +10,16 @@

 buildGoModule rec {
  pname = "werf";
-  version = "1.2.248";
+  version = "1.2.249";

  src = fetchFromGitHub {
    owner = "werf";
    repo = "werf";
    rev = "v${version}";
-    hash = "sha256-z8XuMByI6B49XCgsZWVjErzcmthCCnpE6LdIfHEpxyA=";
+    hash = "sha256-zDQIdWB50Ehme4JwD1mr3T48SzIH9PTCFhBJAND9FeY=";
  };

-  vendorHash = "sha256-mt/2Pc1xF6seMZiSxQFQ6bfUxpQCgG3WkjZd0utWbiw=";
+  vendorHash = "sha256-V+/xwqNdX+Wa/bI/VZUUYpGPV0l17tAjEtkulZWk3cA=";

  proxyVendor = true;

--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@ -6,7 +6,7 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "flexget";
-  version = "3.8.3";
+  version = "3.8.5";
  format = "pyproject";

  # Fetch from GitHub in order to use `requirements.in`
@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
    owner = "Flexget";
    repo = "Flexget";
    rev = "refs/tags/v${version}";
-    hash = "sha256-qGc5L9hL4KbcHGZvhvzqBg1ATFHWGKM72O/aDhrCV4Q=";
+    hash = "sha256-lvZVezg5MORsNkWGo7iqtyRlo68JcVLiG+2hhiSdRZ8=";
  };

  postPatch = ''
--- a/pkgs/applications/networking/nextcloud-client/default.nix
+++ b/pkgs/applications/networking/nextcloud-client/default.nix
@ -25,7 +25,7 @@

 mkDerivation rec {
  pname = "nextcloud-client";
-  version = "3.9.1";
+  version = "3.9.2";

  outputs = [ "out" "dev" ];

@ -33,7 +33,7 @@ mkDerivation rec {
    owner = "nextcloud";
    repo = "desktop";
    rev = "v${version}";
-    sha256 = "sha256-DQM7n7rTk1q+F8H8OpiEgg1pvIzQw2UwBObbj20O5MQ=";
+    sha256 = "sha256-QtZy5ccr55u8bQVBCFRNu/HJiYtNJX9BgtSV700QX0g=";
  };

  patches = [
--- a/pkgs/applications/networking/owamp/default.nix
+++ b/pkgs/applications/networking/owamp/default.nix
@ -3,17 +3,19 @@

 stdenv.mkDerivation rec {
  pname = "owamp";
-  version = "3.5.6";
-  nativeBuildInputs = [ autoconf automake ];
-  buildInputs = [ mandoc ];
+  version = "4.4.6";
+
  src = fetchFromGitHub {
    owner = "perfsonar";
    repo = "owamp";
-    rev = version;
-    sha256="019rcshmrqk8pfp510j5jvazdcnz0igfkwv44mfxb5wirzj9p6s7";
+    rev = "v${version}";
+    sha256= "5o85XSn84nOvNjIzlaZ2R6/TSHpKbWLXTO0FmqWsNMU=";
    fetchSubmodules = true;
  };

+  nativeBuildInputs = [ autoconf automake ];
+  buildInputs = [ mandoc ];
+
  preConfigure = ''
    I2util/bootstrap.sh
    ./bootstrap
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@ -13,16 +13,16 @@ let
  common = { stname, target, postInstall ? "" }:
    buildGoModule rec {
      pname = stname;
-      version = "1.23.6";
+      version = "1.23.7";

      src = fetchFromGitHub {
        owner = "syncthing";
        repo = "syncthing";
        rev = "v${version}";
-        hash = "sha256-1NULZ3i3gR5RRegHJHH3OmxXU0d293GSTcky9+B4mJ4=";
+        hash = "sha256-LwjqMEfCdMvNoxn88H3+VyX31G5IlRohpfp++oNCfEc=";
      };

-      vendorHash = "sha256-sj0XXEkcTfv24OuUeOoOLKHjaYMEuoh1Vg8k8T1Fp1o=";
+      vendorHash = "sha256-nk80Y5RBoUCp+xYNYYnVWVBkCLCgvgKZFpV5CfS2p/s=";

      nativeBuildInputs = lib.optionals stdenv.isDarwin [
        # Recent versions of macOS seem to require binaries to be signed when
--- a/pkgs/applications/office/qownnotes/default.nix
+++ b/pkgs/applications/office/qownnotes/default.nix
@ -19,14 +19,14 @@
 let
  pname = "qownnotes";
  appname = "QOwnNotes";
-  version = "23.7.3";
+  version = "23.8.0";
 in
 stdenv.mkDerivation {
  inherit pname appname version;

  src = fetchurl {
    url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz";
-    hash = "sha256-Jk0KPYYB+CW60ggVn58JKJ1UX5VXWbSUC+osHG4wjR0=";
+    hash = "sha256-ZvZOUcKtY+V0zhqsOYNi3W8yxRPUdYsp2kSHETRCTLs=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "treesheets";
-  version = "unstable-2023-08-08";
+  version = "unstable-2023-08-10";

  src = fetchFromGitHub {
    owner = "aardappel";
    repo = "treesheets";
-    rev = "e7ebdbc21e69c0cda99ab1c8bdf873495b6ab9a0";
-    sha256 = "P/ln7JghEP8MdTzPMmPH+0k+aRuOL/m6VkjYrtynUPE=";
+    rev = "18847fc16e05078ff5a8d0106a38ce2059ec497f";
+    sha256 = "bz2dX4CSPOFEg+6LnqcG46jOFCmjgnrhPyaljyVlDY4=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/version-management/git-stack/default.nix
+++ b/pkgs/applications/version-management/git-stack/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "git-stack";
-  version = "0.10.16";
+  version = "0.10.17";

  src = fetchFromGitHub {
    owner = "gitext-rs";
    repo = "git-stack";
    rev = "v${version}";
-    hash = "sha256-QpRgAcbaZP5pgqMCoYAUybp8NkSkfGqNsZYXZp3Zdtc=";
+    hash = "sha256-foItJSZ6jsLuWkO/c1Ejb45dSdzZ/ripieyVIYsEyy0=";
  };

-  cargoHash = "sha256-L+GtqbPQCgw0n1aW/2rU8ba+acC5n0sdEl9C6lveb1I=";
+  cargoHash = "sha256-MEhUmy4ijR/zHm/qMt4PqNGYnCfIgjNaL9SlMmXCMmc=";

  buildInputs = lib.optionals stdenv.isDarwin [
    Security
--- a/pkgs/applications/video/dmlive/default.nix
+++ b/pkgs/applications/video/dmlive/default.nix
@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec {
    description = "A tool to play and record videos or live streams with danmaku";
    homepage = "https://github.com/THMonster/dmlive";
    license = licenses.mit;
+    mainProgram = "dmlive";
    maintainers = with maintainers; [ nickcao ];
  };
 }
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@ -1,4 +1,5 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper
+, fetchpatch
 , pkg-config, cmake, yasm, python3Packages
 , libxcrypt, libgcrypt, libgpg-error, libunistring
 , boost, avahi, lame
@ -110,7 +111,15 @@ in stdenv.mkDerivation {
    version = kodiVersion;

    src = kodi_src;
-
+    patches = [
+      # Fix compatiblity with fmt 10.0 (from spdlog).
+      # Remove with the next release: https://github.com/xbmc/xbmc/pull/23453
+      (fetchpatch {
+        name = "Fix fmt10 compat";
+        url = "https://github.com/xbmc/xbmc/pull/23453.patch";
+        hash = "sha256-zMUparbQ8gfgeXj8W3MDmPi5OgLNz/zGCJINU7H6Rx0=";
+      })
+    ];
    buildInputs = [
      gnutls libidn2 libtasn1 nasm p11-kit
      libxml2 python3Packages.python
--- a/pkgs/applications/video/media-downloader/default.nix
+++ b/pkgs/applications/video/media-downloader/default.nix
@ -1,24 +1,24 @@
-{ lib
-, stdenv
-, fetchFromGitHub
+{ aria2
 , cmake
-, wrapQtAppsHook
-, qtbase
-, aria2
+, fetchFromGitHub
 , ffmpeg
+, lib
 , python3
+, qtbase
+, stdenv
+, wrapQtAppsHook
 , yt-dlp
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "media-downloader";
-  version = "3.2.1";
+  version = "3.3.0";

  src = fetchFromGitHub {
    owner = "mhogomchungu";
-    repo = pname;
-    rev = version;
-    hash = "sha256-+wLVF0UKspVll+dYZGSk5dUbPBc/2Y0cqTuaeepxw+k=";
+    repo = "media-downloader";
+    rev = finalAttrs.version;
+    hash = "sha256-UmNaosunkNUTm4rsf4q29H+0cJAccUDx+ulcS2octIo=";
  };

  nativeBuildInputs = [
@ -39,11 +39,11 @@ stdenv.mkDerivation rec {
      ]}"
  ];

-  meta = with lib; {
+  meta = {
    description = "A Qt/C++ GUI front end to youtube-dl";
    homepage = "https://github.com/mhogomchungu/media-downloader";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ zendo ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ zendo ];
+    platforms = lib.platforms.linux;
  };
-}
+})
--- a/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/default.nix
@ -2,8 +2,10 @@
 , stdenv
 , fetchFromGitHub
 , pkg-config
+, makeWrapper
 , meson
 , ninja
+, binutils
 , cairo
 , git
 , hyprland-protocols
@ -24,34 +26,35 @@
 , xcbutilwm
 , xwayland
 , debug ? false
+, enableNvidiaPatches ? false
 , enableXWayland ? true
-, hidpiXWayland ? false
 , legacyRenderer ? false
-, nvidiaPatches ? false
 , withSystemd ? true
+, wrapRuntimeDeps ? true
+  # deprecated flags
+, nvidiaPatches ? false
+, hidpiXWayland ? false
 }:
-let
-  assertXWayland = lib.assertMsg (hidpiXWayland -> enableXWayland) ''
-    Hyprland: cannot have hidpiXWayland when enableXWayland is false.
-  '';
-in
-assert assertXWayland;
+assert lib.assertMsg (!nvidiaPatches) "The option `nvidiaPatches` has been renamed `enableNvidiaPatches`";
+assert lib.assertMsg (!hidpiXWayland) "The option `hidpiXWayland` has been removed. Please refer https://wiki.hyprland.org/Configuring/XWayland";
 stdenv.mkDerivation (finalAttrs: {
  pname = "hyprland" + lib.optionalString debug "-debug";
-  version = "0.27.0";
+  version = "unstable-2023-08-08";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = finalAttrs.pname;
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-mEKF6Wcx+wSF/eos/91A7LxhFLDYhSnQnLpwZF13ntg=";
+    rev = "8e04a80e60983f5def26bdcaea701040fea9a7ae";
+    hash = "sha256-5/vEdU3SzAdeIyPykjks/Zxkvh9luPTIei6oa77OY2Q=";
  };

  patches = [
    # make meson use the provided dependencies instead of the git submodules
-    "${finalAttrs.src}/nix/meson-build.patch"
+    "${finalAttrs.src}/nix/patches/meson-build.patch"
    # look into $XDG_DESKTOP_PORTAL_DIR instead of /usr; runtime checks for conflicting portals
-    "${finalAttrs.src}/nix/portals.patch"
+    # NOTE: revert back to the patch inside SRC on the next version bump
+    # "${finalAttrs.src}/nix/patches/portals.patch"
+    ./portals.patch
  ];

  postPatch = ''
@ -64,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {

  nativeBuildInputs = [
    jq
+    makeWrapper
    meson
    ninja
    pkg-config
@ -90,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
      wayland-protocols
      pango
      pciutils
-      (wlroots.override { inherit enableXWayland hidpiXWayland nvidiaPatches; })
+      (wlroots.override { inherit enableNvidiaPatches; })
    ]
    ++ lib.optionals enableXWayland [ libxcb xcbutilwm xwayland ]
    ++ lib.optionals withSystemd [ systemd ];
@ -106,6 +110,14 @@ stdenv.mkDerivation (finalAttrs: {
    (lib.optional withSystemd "-Dsystemd=enabled")
  ];

+  postInstall = ''
+    ln -s ${wlroots}/include/wlr $dev/include/hyprland/wlroots
+    ${lib.optionalString wrapRuntimeDeps ''
+      wrapProgram $out/bin/Hyprland \
+        --suffix PATH : ${lib.makeBinPath [binutils pciutils]}
+    ''}
+  '';
+
  passthru.providedSessions = [ "hyprland" ];

  meta = with lib; {
--- a/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/portals.patch
@ -0,0 +1,28 @@
+diff --git a/src/Compositor.cpp b/src/Compositor.cpp
+index 1d978aed..56665389 100644
+--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
+@@ -2365,17 +2365,16 @@ void CCompositor::performUserChecks() {
+ 
+     static auto* const    PSUPPRESSPORTAL = &g_pConfigManager->getConfigValuePtr("misc:suppress_portal_warnings")->intValue;
+ 
+-    if (!*PSUPPRESSPORTAL) {
+-        if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/" + portal + ".portal"); })) {
+    static auto* const    PORTALDIRENV = getenv("XDG_DESKTOP_PORTAL_DIR");
+
+    static auto const     PORTALDIR = PORTALDIRENV != NULL ? std::string(PORTALDIRENV) : "";
+
+    if (!*PSUPPRESSPORTAL && PORTALDIR != "") {
+        if (std::ranges::any_of(BAD_PORTALS, [&](const std::string& portal) { return std::filesystem::exists(PORTALDIR + "/" + portal + ".portal"); })) {
+             // bad portal detected
+             g_pHyprNotificationOverlay->addNotification("You have one or more incompatible xdg-desktop-portal impls installed. Please remove incompatible ones to avoid issues.",
+                                                         CColor(0), 15000, ICON_ERROR);
+         }
+-
+-        if (std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/hyprland.portal") && std::filesystem::exists("/usr/share/xdg-desktop-portal/portals/wlr.portal")) {
+-            g_pHyprNotificationOverlay->addNotification("You have xdg-desktop-portal-hyprland and -wlr installed simultaneously. Please uninstall one to avoid issues.", CColor(0),
+-                                                        15000, ICON_ERROR);
+-        }
+     }
+ }
+ 
--- a/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland/wlroots.nix
@ -1,15 +1,11 @@
 { fetchFromGitLab
 , hyprland
 , wlroots
-, xwayland
-, fetchpatch
 , lib
 , libdisplay-info
 , libliftoff
 , hwdata
-, hidpiXWayland ? true
-, enableXWayland ? true
-, nvidiaPatches ? false
+, enableNvidiaPatches ? false
 }:
 let
  libdisplay-info-new = libdisplay-info.overrideAttrs (old: {
@ -38,10 +34,7 @@ let
    ];
  });
 in
-assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
-  wlroots-hyprland: cannot have hidpiXWayland when enableXWayland is false.
-'');
-(wlroots.overrideAttrs
+wlroots.overrideAttrs
  (old: {
    version = "0.17.0-dev";

@ -49,65 +42,31 @@ assert (lib.assertMsg (hidpiXWayland -> enableXWayland) ''
      domain = "gitlab.freedesktop.org";
      owner = "wlroots";
      repo = "wlroots";
-      rev = "7e7633abf09b362d0bad9e3fc650fd692369291d";
-      hash = "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=";
+      rev = "e8d545a9770a2473db32e0a0bfa757b05d2af4f3";
+      hash = "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=";
    };

    pname =
      old.pname
      + "-hyprland"
-      + (
-        if hidpiXWayland
-        then "-hidpi"
-        else ""
-      )
-      + (
-        if nvidiaPatches
-        then "-nvidia"
-        else ""
-      );
+      + lib.optionalString enableNvidiaPatches "-nvidia";

    patches =
      (old.patches or [ ])
-      ++ (lib.optionals (enableXWayland && hidpiXWayland) [
-        "${hyprland.src}/nix/wlroots-hidpi.patch"
-        (fetchpatch {
-          url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/18595000f3a21502fd60bf213122859cc348f9af.diff";
-          sha256 = "sha256-jvfkAMh3gzkfuoRhB4E9T5X1Hu62wgUjj4tZkJm0mrI=";
-          revert = true;
-        })
-      ])
-      ++ (lib.optionals nvidiaPatches [
-        (fetchpatch {
-          url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-nvidia-format-workaround.patch?h=hyprland-nvidia-screenshare-git&id=2830d3017d7cdd240379b4cc7e5dd6a49cf3399a";
-          sha256 = "A9f1p5EW++mGCaNq8w7ZJfeWmvTfUm4iO+1KDcnqYX8=";
-        })
+      ++ (lib.optionals enableNvidiaPatches [
+        "${hyprland.src}/nix/patches/wlroots-nvidia.patch"
      ]);

    postPatch =
      (old.postPatch or "")
      + (
-        if nvidiaPatches
-        then ''
-          substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"
-        ''
-        else ""
+        lib.optionalString enableNvidiaPatches
+          ''substituteInPlace render/gles2/renderer.c --replace "glFlush();" "glFinish();"''
      );

-    buildInputs =
-      old.buildInputs
-      ++ [
-        hwdata
-        libdisplay-info-new
-        libliftoff-new
-      ];
-  })).override {
-  xwayland = xwayland.overrideAttrs (old: {
-    patches =
-      (old.patches or [ ])
-      ++ (lib.optionals hidpiXWayland [
-        "${hyprland.src}/nix/xwayland-vsync.patch"
-        "${hyprland.src}/nix/xwayland-hidpi.patch"
-      ]);
-  });
-}
+    buildInputs = old.buildInputs ++ [
+      hwdata
+      libdisplay-info-new
+      libliftoff-new
+    ];
+  })
--- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, file
 , libjpeg
 , mesa
 , pango
@ -13,13 +14,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hyprpaper";
-  version = "0.3.0";
+  version = "0.4.0";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = finalAttrs.pname;
    rev = "v${finalAttrs.version}";
-    hash = "sha256-/ehJbAtSJS86NlqHVOeR2ViBKlImKH4guFVPacTmCr8=";
+    hash = "sha256-V5ulB9CkGh1ghiC4BKvRdoYKZzpaiOKzAOUmJIFkgM0=";
  };

  nativeBuildInputs = [
@ -29,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
  ];

  buildInputs = [
+    file
    libjpeg
    mesa
    pango
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/source.nix
@ -3,7 +3,7 @@
 , wayland
 }:
 let
-  version = "0.4.0";
+  version = "0.5.0";
 in
 {
  inherit version;
@ -12,7 +12,7 @@ in
    owner = "hyprwm";
    repo = "xdg-desktop-portal-hyprland";
    rev = "v${version}";
-    hash = "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=";
+    hash = "sha256-C5AO0KnyAFJaCkOn+5nJfWm0kyiPn/Awh0lKTjhgr7Y=";
  };

  meta = with lib; {
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@ -41,13 +41,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "icewm";
-  version = "3.4.0";
+  version = "3.4.1";

  src = fetchFromGitHub {
    owner = "ice-wm";
    repo = "icewm";
    rev = finalAttrs.version;
-    hash = "sha256-5RIjvmoqxMLnSW2P122rEa8MghWfwLHFtYgXwcFPF38=";
+    hash = "sha256-KgdCgKR3KqDf9GONCBRkLpNLoOycE0y4UXxHxBqNudk=";
  };

  nativeBuildInputs = [
--- a/pkgs/data/themes/adwaita-qt/default.nix
+++ b/pkgs/data/themes/adwaita-qt/default.nix
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
    description = "A style to bend Qt applications to look like they belong into GNOME Shell";
    homepage = "https://github.com/FedoraQt/adwaita-qt";
    license = licenses.gpl2Plus;
-    maintainers = teams.gnome.members ++ (with maintainers; [ ]);
+    maintainers = with maintainers; [ ];
    platforms = platforms.all;
  };
 }
--- a/pkgs/development/compilers/mercury/default.nix
+++ b/pkgs/development/compilers/mercury/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  pname = "mercury";
-  version = "22.01.6";
+  version = "22.01.7";

  src = fetchurl {
    url    = "https://dl.mercurylang.org/release/mercury-srcdist-${version}.tar.gz";
-    sha256 = "sha256-dpRW+DRGJZPIvUv6/y1TLAFjrPOldKBtpwn87nOgIt8=";
+    sha256 = "sha256-PctyVKlV2cnHoBSAXjMTSPvWY7op9D6kIMypYDRgvGw=";
  };

  nativeBuildInputs = [ makeWrapper ];
@ -54,9 +54,10 @@ stdenv.mkDerivation rec {
      allowing modularity, separate compilation, and numerous optimization/time
      trade-offs.
    '';
-    homepage    = "http://mercurylang.org";
-    license     = lib.licenses.gpl2;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    homepage    = "https://mercurylang.org/";
+    changelog   = "https://dl.mercurylang.org/release/release-notes-${version}.html";
+    license     = lib.licenses.gpl2Only;
+    platforms   = lib.platforms.all;
    maintainers = [ ];
  };
 }
--- a/pkgs/development/interpreters/gpython/default.nix
+++ b/pkgs/development/interpreters/gpython/default.nix
@ -0,0 +1,47 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, testers
+, gpython
+}:
+
+buildGoModule rec {
+  pname = "gpython";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "go-python";
+    repo = "gpython";
+    rev = "v${version}";
+    hash = "sha256-xqwq27u41Jgoh7t9UDyatuBQswr+h3xio5AV/npncHc=";
+  };
+
+  vendorHash = "sha256-NXPllEhootdB8m5Wvfy8MW899oQnjWAQj7yCC2oDvqE=";
+
+  subPackages = [
+    "."
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.version=${version}"
+    "-X=main.commit=${src.rev}"
+    "-X=main.date=1970-01-01"
+  ];
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = gpython;
+      command = "gpython < /dev/null";
+    };
+  };
+
+  meta = with lib; {
+    description = "A Python interpreter written in Go";
+    homepage = "https://github.com/go-python/gpython";
+    changelog = "https://github.com/go-python/gpython/releases/tag/${src.rev}";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
--- a/pkgs/development/interpreters/luau/default.nix
+++ b/pkgs/development/interpreters/luau/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "luau";
-  version = "0.589";
+  version = "0.590";

  src = fetchFromGitHub {
    owner = "Roblox";
    repo = "luau";
    rev = version;
-    hash = "sha256-q36mWkZgzms+dYZ++S9MwnRYxUXBtRxiECOxX886eVw=";
+    hash = "sha256-ZVe4SCx6/IC039CL+ngNIQShNi9V6XQh62gpbcoK/tM=";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/cminpack/default.nix
+++ b/pkgs/development/libraries/cminpack/default.nix
@ -1,31 +1,48 @@
-{lib, stdenv, fetchurl}:
+{ lib
+, stdenv
+, cmake
+, darwin
+, fetchFromGitHub
+, fetchurl
+, withBlas ? true, blas
+}:

 stdenv.mkDerivation rec {
  pname = "cminpack";
-  version = "1.3.6";
+  version = "1.3.8";

-  src = fetchurl {
-    url = "http://devernay.free.fr/hacks/cminpack/cminpack-${version}.tar.gz";
-    sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw";
+  src = fetchFromGitHub {
+    owner = "devernay";
+    repo = "cminpack";
+    rev = "v${version}";
+    hash = "sha256-eFJ43cHbSbWld+gPpMaNiBy1X5TIcN9aVxjh8PxvVDU=";
  };

-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace '/usr/local' '${placeholder "out"}' \
-      --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \
-      --replace 'ranlib -t' '${stdenv.cc.targetPrefix}ranlib' \
-      --replace 'ranlib' '${stdenv.cc.targetPrefix}ranlib'
-  '';
+  strictDeps = true;

-  preInstall = ''
-    mkdir -p $out/lib $out/include
-  '';
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = lib.optionals withBlas [
+    blas
+  ] ++ lib.optionals (withBlas && stdenv.isDarwin) [
+    darwin.apple_sdk.frameworks.Accelerate
+    darwin.apple_sdk.frameworks.CoreGraphics
+    darwin.apple_sdk.frameworks.CoreVideo
+  ];
+
+  cmakeFlags = [
+    "-DUSE_BLAS=${if withBlas then "ON" else "OFF"}"
+    "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+  ];

  meta = {
-    homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html";
-    license = lib.licenses.bsd3;
    description = "Software for solving nonlinear equations and nonlinear least squares problems";
+    homepage = "http://devernay.free.fr/hacks/cminpack/";
+    changelog = "https://github.com/devernay/cminpack/blob/v${version}/README.md#history";
+    license = lib.licenses.bsd3;
    platforms = lib.platforms.all;
+    maintainers = [ ];
  };
-
 }
--- a/pkgs/development/libraries/ctre/default.nix
+++ b/pkgs/development/libraries/ctre/default.nix
@ -6,13 +6,13 @@

 stdenv.mkDerivation rec {
  pname = "ctre";
-  version = "3.7.2";
+  version = "3.8";

  src = fetchFromGitHub {
    owner = "hanickadot";
    repo = "compile-time-regular-expressions";
    rev = "v${version}";
-    hash = "sha256-pO6PW4oZsCA2xaMCsaJz2Bu203zyMUkbjO3OOBEbSiw=";
+    hash = "sha256-oGJHSyvcgvBJh5fquK6dU70czVg4txcGTuicvrTK2hc=";
  };

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

 stdenv.mkDerivation rec {
  pname = "faudio";
-  version = "23.07";
+  version = "23.08";

  src = fetchFromGitHub {
    owner = "FNA-XNA";
    repo = "FAudio";
    rev = version;
-    sha256 = "sha256-HGW28mM/rg8VALRoo4iFNHogBkPaVpU80eJh3NmxBqw=";
+    sha256 = "sha256-ceFnk0JQtolx7Q1FnADCO0z6fCxu1RzmN3sHohy4hzU=";
  };

  nativeBuildInputs = [cmake];
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "XAudio reimplementation focusing to develop a fully accurate DirectX audio library";
    homepage = "https://github.com/FNA-XNA/FAudio";
+    changelog = "https://github.com/FNA-XNA/FAudio/releases/tag/${version}";
    license = licenses.zlib;
    platforms = platforms.linux;
    maintainers = [ maintainers.marius851000 ];
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@ -114,13 +114,13 @@ stdenv.mkDerivation rec {
  # NOTE: You must also bump:
  # <nixpkgs/pkgs/development/python-modules/libvirt/default.nix>
  # SysVirt in <nixpkgs/pkgs/top-level/perl-packages.nix>
-  version = "9.4.0";
+  version = "9.5.0";

  src = fetchFromGitLab {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-aYLXiZtbNXwJ8qmTHXv2OnyrYWK7KbwQWulTeuTbe0k=";
+    sha256 = "sha256-u+J1ejv7JH6Lcwk8zDVUS8Vk806WvG59rLAZr0UOqj0=";
    fetchSubmodules = true;
  };

--- a/pkgs/development/libraries/llhttp/default.nix
+++ b/pkgs/development/libraries/llhttp/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "llhttp";
-  version = "8.1.1";
+  version = "9.0.0";

  src = fetchFromGitHub {
    owner = "nodejs";
    repo = "llhttp";
    rev = "release/v${version}";
-    hash = "sha256-srAHKyYvdEGtjV7BwcKQArwAChRoZqTCfa/RefI/8wQ=";
+    hash = "sha256-mk9tNZJONh1xdZ8lqquMfFDEvEdYRucNlSrR64U8eaA=";
  };

  nativeBuildInputs = [
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Port of http_parser to llparse";
    homepage = "https://llhttp.org/";
+    changelog = "https://github.com/nodejs/llhttp/releases/tag/${src.rev}";
    license = licenses.mit;
    maintainers = [ maintainers.marsam ];
    platforms = platforms.all;
--- a/pkgs/development/libraries/openvr/default.nix
+++ b/pkgs/development/libraries/openvr/default.nix
@ -1,23 +1,23 @@
-{ lib
-, stdenv
+{ AppKit
 , cmake
-, libGL
-, jsoncpp
 , fetchFromGitHub
 , fetchpatch2
 , Foundation
-, AppKit
+, jsoncpp
+, lib
+, libGL
+, stdenv
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "openvr";
-  version = "1.23.8";
+  version = "1.26.7";

  src = fetchFromGitHub {
    owner = "ValveSoftware";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-ZdL1HDRSpPykbV3M0CjCZkOt7XlF7Z7OAhOey2ALeHg=";
+    repo = "openvr";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-verVIRyDdpF8lIjjjG8GllDJG7nhqByIfs/8O5TMOyc=";
  };

  patches = [
@ -25,13 +25,13 @@ stdenv.mkDerivation rec {
    (fetchpatch2 {
      name = "use-correct-CPP11-definition-for-vsprintf_s.patch";
      url = "https://github.com/ValveSoftware/openvr/commit/0fa21ba17748efcca1816536e27bdca70141b074.patch";
-      sha256 = "sha256-0sPNDx5qKqCzN35FfArbgJ0cTztQp+SMLsXICxneLx4=";
+      hash = "sha256-0sPNDx5qKqCzN35FfArbgJ0cTztQp+SMLsXICxneLx4=";
    })
    # https://github.com/ValveSoftware/openvr/pull/1716
    (fetchpatch2 {
      name = "add-ability-to-build-with-system-installed-jsoncpp.patch";
      url = "https://github.com/ValveSoftware/openvr/commit/54a58e479f4d63e62e9118637cd92a2013a4fb95.patch";
-      sha256 = "sha256-aMojjbNjLvsGev0JaBx5sWuMv01sy2tG/S++I1NUi7U=";
+      hash = "sha256-aMojjbNjLvsGev0JaBx5sWuMv01sy2tG/S++I1NUi7U=";
    })
  ];

@ -42,17 +42,26 @@ stdenv.mkDerivation rec {
    mv source/src/json source/thirdparty/jsoncpp
  '';

-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ jsoncpp libGL ] ++ lib.optionals stdenv.isDarwin [ Foundation AppKit ];
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    jsoncpp
+    libGL
+  ] ++ lib.optionals stdenv.isDarwin [
+    AppKit
+    Foundation
+  ];

  cmakeFlags = [ "-DUSE_SYSTEM_JSONCPP=ON" "-DBUILD_SHARED=1" ];

-  meta = with lib; {
+  meta = {
    broken = stdenv.isDarwin;
-    homepage = "https://github.com/ValveSoftware/openvr";
    description = "An API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ pedrohlc Scrumplex ];
-    platforms = platforms.unix;
+    homepage = "https://github.com/ValveSoftware/openvr";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pedrohlc Scrumplex ];
+    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
    description = "QPlatformTheme for a better Qt application inclusion in GNOME";
    homepage = "https://github.com/FedoraQt/QGnomePlatform";
    license = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members ++ (with maintainers; [ ]);
+    maintainers = with maintainers; [ ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/development/misc/cppreference-doc/default.nix
+++ b/pkgs/development/misc/cppreference-doc/default.nix
@ -2,11 +2,11 @@

 stdenvNoCC.mkDerivation rec {
  pname = "cppreference-doc";
-  version = "20220730";
+  version = "20230810";

  src = fetchurl {
    url = "https://github.com/PeterFeicht/${pname}/releases/download/v${version}/html-book-${version}.tar.xz";
-    hash = "sha256-cfFQA8FouNxaAMuvGbZICps+h6t+Riqjnttj11EcAos=";
+    hash = "sha256-McCOTZnobH9j8yTT/1ME7/IDATHEoKwNHjwZxiyO1oQ=";
  };

  sourceRoot = ".";
--- a/pkgs/development/python-modules/amazon-kclpy/default.nix
+++ b/pkgs/development/python-modules/amazon-kclpy/default.nix
@ -1,7 +1,7 @@
 { lib, buildPythonPackage, fetchFromGitHub, python, mock, boto, pytest }:

 buildPythonPackage rec {
-  pname = "amazon_kclpy";
+  pname = "amazon-kclpy";
  version = "2.1.1";

  src = fetchFromGitHub {
--- a/pkgs/development/python-modules/angrcli/default.nix
+++ b/pkgs/development/python-modules/angrcli/default.nix
@ -24,6 +24,11 @@ buildPythonPackage rec {
    hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
  };

+  postPatch = ''
+    substituteInPlace tests/test_derefs.py \
+      --replace "/bin/ls" "${coreutils}/bin/ls"
+  '';
+
  propagatedBuildInputs = [
    angr
    cmd2
@ -35,17 +40,18 @@ buildPythonPackage rec {
    pytestCheckHook
  ];

-  postPatch = ''
-    substituteInPlace tests/test_derefs.py \
-      --replace "/bin/ls" "${coreutils}/bin/ls"
-  '';
+  disabledTests = lib.optionals (!stdenv.hostPlatform.isx86) [
+    # expects the x86 register "rax" to exist
+    "test_cc"
+    "test_loop"
+    "test_max_depth"
+  ];

  pythonImportsCheck = [
    "angrcli"
  ];

  meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64);
    description = "Python modules to allow easier interactive use of angr";
    homepage = "https://github.com/fmagin/angr-cli";
    license = with licenses; [ mit ];
--- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix
+++ b/pkgs/development/python-modules/astropy-extension-helpers/default.nix
@ -4,7 +4,9 @@
 , findutils
 , pytestCheckHook
 , pythonOlder
+, pip
 , setuptools-scm
+, wheel
 }:

 buildPythonPackage rec {
@ -21,12 +23,14 @@ buildPythonPackage rec {

  nativeBuildInputs = [
    setuptools-scm
+    wheel
  ];

  patches = [ ./permissions.patch ];

  nativeCheckInputs = [
    findutils
+    pip
    pytestCheckHook
  ];

--- a/pkgs/development/python-modules/dataclass-wizard/default.nix
+++ b/pkgs/development/python-modules/dataclass-wizard/default.nix
@ -0,0 +1,65 @@
+{ lib
+, fetchFromGitHub
+, buildPythonPackage
+, pythonOlder
+, pythonAtLeast
+, pytimeparse
+, pyyaml
+, pytestCheckHook
+, pytest-mock
+, typing-extensions
+}:
+
+buildPythonPackage rec {
+  pname = "dataclass-wizard";
+  version = "0.22.2";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "rnag";
+    repo = "dataclass-wizard";
+    rev = "v${version}";
+    hash = "sha256-Ufi4lZc+UkM6NZr4bS2OibpOmMjyiBEoVKxmrqauW50=";
+  };
+
+  propagatedBuildInputs = [
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    typing-extensions
+  ];
+
+  passthru.optional-dependencies = {
+    timedelta = [
+      pytimeparse
+    ];
+    yaml = [
+      pyyaml
+    ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-mock
+  ] ++ passthru.optional-dependencies.timedelta
+  ++ passthru.optional-dependencies.yaml;
+
+  disabledTests = [
+  ] ++ lib.optionals (pythonAtLeast "3.11") [
+    # Any/None internal changes, tests need adjusting upstream
+    "without_type_hinting"
+    "default_dict"
+    "test_frozenset"
+    "test_set"
+    "date_times_with_custom_pattern"
+    "from_dict_handles_identical_cased_json_keys"
+  ];
+
+  pythonImportsCheck = [ "dataclass_wizard" ];
+
+  meta = with lib; {
+    description = "A set of simple, yet elegant wizarding tools for interacting with the Python dataclasses module";
+    homepage = "https://github.com/rnag/dataclass-wizard";
+    changelog = "https://github.com/rnag/dataclass-wizard/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ codifryed ];
+  };
+}
--- a/pkgs/development/python-modules/diofant/default.nix
+++ b/pkgs/development/python-modules/diofant/default.nix
@ -1,39 +1,57 @@
 { lib
 , buildPythonPackage
+, cython
+, fetchpatch
 , fetchPypi
 , gmpy2
-, isort
 , mpmath
 , numpy
 , pythonOlder
 , scipy
 , setuptools-scm
+, wheel
 }:

 buildPythonPackage rec {
  pname = "diofant";
-  version = "0.13.0";
-  disabled = pythonOlder "3.9";
+  version = "0.14.0";
  format = "pyproject";
+  disabled = pythonOlder "3.10";

  src = fetchPypi {
    inherit version;
    pname = "Diofant";
-    sha256 = "bac9e086a7156b20f18e3291d6db34e305338039a3c782c585302d377b74dd3c";
+    hash = "sha256-c886y37xR+4TxZw9+3tb7nkTGxWcS+Ag/ruUUdpf7S4=";
  };

+  patches = [
+    (fetchpatch {
+      name = "remove-pip-from-build-dependencies.patch";
+      url = "https://github.com/diofant/diofant/commit/117e441808faa7c785ccb81bf211772d60ebdec3.patch";
+      hash = "sha256-MYk1Ku4F3hAv7+jJQLWhXd8qyKRX+QYuBzPfYWT0VbU=";
+    })
+  ];
+
  nativeBuildInputs = [
-    isort
    setuptools-scm
+    wheel
  ];

  propagatedBuildInputs = [
-    gmpy2
    mpmath
-    numpy
-    scipy
  ];

+  passthru.optional-dependencies = {
+    exports = [
+      cython
+      numpy
+      scipy
+    ];
+    gmpy = [
+      gmpy2
+    ];
+  };
+
  # tests take ~1h
  doCheck = false;

--- a/pkgs/development/python-modules/dremel3dpy/default.nix
+++ b/pkgs/development/python-modules/dremel3dpy/default.nix
@ -1,6 +1,7 @@
 { lib
 , async-timeout
 , buildPythonPackage
+, decorator
 , fetchPypi
 , imageio
 , imutils
@ -26,6 +27,7 @@ buildPythonPackage rec {

  propagatedBuildInputs = [
    async-timeout
+    decorator
    imageio
    imutils
    requests
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "dvc-data";
-  version = "2.12.2";
+  version = "2.13.1";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-DNFnh+ajfKgsZEj5Vyfk+jqSs9nv/PHIIpkkarxugww=";
+    hash = "sha256-RmUwo7NcbDjRf+sVgthno+ZvxXhMDwmoTfiN7cJM/5s=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "govee-ble";
-  version = "0.23.0";
+  version = "0.24.0";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "Bluetooth-Devices";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-/uv4P7wB/5QQW2IA+PT6VMPWd91Aoyxsez+8ptrIa5M=";
+    hash = "sha256-uuC7CVf/KKr36mvd0TqNJd2OtK/xshCGYJXEtllE9is=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/idasen/default.nix
+++ b/pkgs/development/python-modules/idasen/default.nix
@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, fetchpatch
 , bleak
 , pyyaml
 , voluptuous
@ -24,6 +25,14 @@ buildPythonPackage rec {
    hash = "sha256-t8w4USDzyS0k5yk0XtQF8fVffzdf+udKSkdveMlseHk=";
  };

+  patches = [
+    (fetchpatch {
+      name = "replace-poetry-with-poetry-core.patch";
+      url = "https://github.com/newAM/idasen/commit/b9351d5c9def0687e4ae4cb65f38d14ed9ff2df5.patch";
+      hash = "sha256-Qi3psPZExJ5tBJ4IIvDC3JnWf4Gym6Z7akGCV8GZUNY=";
+    })
+  ];
+
  nativeBuildInputs = [
    poetry-core
  ];
--- a/pkgs/development/python-modules/jupyter-packaging/default.nix
+++ b/pkgs/development/python-modules/jupyter-packaging/default.nix
@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , deprecation
 , hatchling
 , pythonOlder
@ -23,6 +24,14 @@ buildPythonPackage rec {
    hash = "sha256-nZsrY7l//WeovFORwypCG8QVsmSjLJnk2NjdMdqunPQ=";
  };

+  patches = [
+    (fetchpatch {
+      name = "setuptools-68-test-compatibility.patch";
+      url = "https://github.com/jupyter/jupyter-packaging/commit/e963fb27aa3b58cd70c5ca61ebe68c222d803b7e.patch";
+      hash = "sha256-NlO07wBCutAJ1DgoT+rQFkuC9Y+DyF1YFlTwWpwsJzo=";
+    })
+  ];
+
  nativeBuildInputs = [
    hatchling
  ];
--- a/pkgs/development/python-modules/libvirt/default.nix
+++ b/pkgs/development/python-modules/libvirt/default.nix
@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "libvirt";
-  version = "9.4.0";
+  version = "9.5.0";

  src = fetchFromGitLab {
    owner = "libvirt";
    repo = "libvirt-python";
    rev = "v${version}";
-    hash = "sha256-P5IfH93qCEIJScDRkSOAnA5D82PV1T1eUlPCQYbK0d8=";
+    hash = "sha256-DhScwkbyCluLc/V26Y6wbZfzo1WBcLswBVzLCGs0PPs=";
  };

  nativeBuildInputs = [ pkg-config ];
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@ -29,7 +29,7 @@ let
 in buildPythonPackage rec {
  # Using an untagged version, with numpy 1.25 support, when it's released
  # also drop the versioneer patch in postPatch
-  version = "unstable-2023-08-02";
+  version = "unstable-2023-08-11";
  pname = "numba";
  format = "setuptools";
  disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
@ -37,7 +37,7 @@ in buildPythonPackage rec {
  src = fetchFromGitHub {
    owner = "numba";
    repo = "numba";
-    rev = "fcf94205335dcc6135d2e19c07bbef968d13610d";
+    rev = "6f0c5060a69656319ab0bae1d8bb89484cd5631f";
    # Upstream uses .gitattributes to inject information about the revision
    # hash and the refname into `numba/_version.py`, see:
    #
@ -50,7 +50,7 @@ in buildPythonPackage rec {
    # use `forceFetchGit = true;`.` If in the future we'll observe the hash
    # changes too often, we can always use forceFetchGit, and inject the
    # relevant strings ourselves, using `sed` commands, in extraPostFetch.
-    hash = "sha256-Wm1sV4uS/Xkz1BkT2xNmwgBZS0X8YziC6jlbfolXGB8=";
+    hash = "sha256-34qEn/i2X6Xu1cjuiRrmrm/HryNoN+Am4A4pJ90srAE=";
  };
  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";

@ -131,6 +131,7 @@ in buildPythonPackage rec {
    description = "Compiling Python code using LLVM";
    homepage = "https://numba.pydata.org/";
    license = licenses.bsd2;
+    mainProgram = "numba";
    maintainers = with maintainers; [ fridh ];
  };
 }
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@ -3,6 +3,7 @@
 , arrow
 , buildPythonPackage
 , fetchFromGitHub
+, pyotp
 , pytestCheckHook
 , pythonOlder
 , pythonRelaxDepsHook
@ -11,7 +12,7 @@

 buildPythonPackage rec {
  pname = "opower";
-  version = "0.0.20";
+  version = "0.0.26";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@ -20,7 +21,7 @@ buildPythonPackage rec {
    owner = "tronikos";
    repo = "opower";
    rev = "refs/tags/v${version}";
-    hash = "sha256-hb+TVnCAAnsoKPk9N1bDXj463CErp7nn2cteOumKhLs=";
+    hash = "sha256-W2lzMyu9N1ZLLaxoI8JLthtF7Zj3si1/mEVn5NrAlfU=";
  };

  pythonRemoveDeps = [
@ -36,6 +37,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    aiohttp
    arrow
+    pyotp
  ];

  nativeCheckInputs = [
--- a/pkgs/development/python-modules/pyairvisual/default.nix
+++ b/pkgs/development/python-modules/pyairvisual/default.nix
@ -2,9 +2,11 @@
 , aiohttp
 , aresponses
 , buildPythonPackage
+, certifi
 , fetchFromGitHub
 , numpy
 , poetry-core
+, pygments
 , pysmb
 , pytest-aiohttp
 , pytest-asyncio
@ -14,7 +16,7 @@

 buildPythonPackage rec {
  pname = "pyairvisual";
-  version = "2022.12.1";
+  version = "2023.08.1";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -23,16 +25,24 @@ buildPythonPackage rec {
    owner = "bachya";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-xzTho4HsIU2YLURz9DfFfaRL3tsrtVi8n5IA2bRkyzw=";
+    hash = "sha256-+yqN3q+uA/v01uCguzUSoeCJK9lRmiiYn8d272+Dd2M=";
  };

+  postPatch = ''
+    substituteInPlace pyproject.toml --replace \
+      'certifi = ">=2023.07.22"' \
+      'certifi = "*"'
+  '';
+
  nativeBuildInputs = [
    poetry-core
  ];

  propagatedBuildInputs = [
    aiohttp
+    certifi
    numpy
+    pygments
    pysmb
  ];

--- a/pkgs/development/python-modules/pyrainbird/default.nix
+++ b/pkgs/development/python-modules/pyrainbird/default.nix
@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "pyrainbird";
-  version = "3.0.1";
+  version = "4.0.0";
  format = "setuptools";

  disabled = pythonOlder "3.10";
@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "allenporter";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-Qi0NfLayypi/wKJZB9IOzoeaZsb3oq2JahXWdkwSjeo=";
+    hash = "sha256-VwcYyD9JtLDU2Bgp2hlptDz3vPoX4revTRKTA8OkWEw=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "python-roborock";
-  version = "0.32.0";
+  version = "0.32.2";
  format = "pyproject";

  disabled = pythonOlder "3.10";
@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "humbertogontijo";
    repo = "python-roborock";
    rev = "refs/tags/v${version}";
-    hash = "sha256-DojIfAmYW/asvpAkcBj/pN1rdCPFD4nwkEqpGVBkMoE=";
+    hash = "sha256-QMKdStv8WNGUjRrtU6ZKXsJPsYWMXbDMqWUO1nkD1Cc=";
  };

  pythonRelaxDeps = [
--- a/pkgs/development/python-modules/seaborn/default.nix
+++ b/pkgs/development/python-modules/seaborn/default.nix
@ -1,6 +1,7 @@
 { lib
 , stdenv
 , buildPythonPackage
+, fetchpatch
 , fetchPypi
 , flit-core
 , matplotlib
@ -24,6 +25,24 @@ buildPythonPackage rec {
    hash = "sha256-N0ZF82UJ0NyriVy6W0fa8Fhvd7/js2yXxgfbfaW+ATk=";
  };

+  patches = [
+    (fetchpatch {
+      name = "fix-test-using-matplotlib-3.7.patch";
+      url = "https://github.com/mwaskom/seaborn/commit/db7ae11750fc2dfb695457239708448d54e9b8cd.patch";
+      hash = "sha256-LbieI0GeC/0NpFVxV/NRQweFjP/lj/TR2D/SLMPYqJg=";
+    })
+    (fetchpatch {
+      name = "fix-pandas-deprecation.patch";
+      url = "https://github.com/mwaskom/seaborn/commit/a48601d6bbf8381f9435be48624f1a77d6fbfced.patch";
+      hash = "sha256-LuN8jn6Jo9Fvdl5iGZ2LgINYujSDvvs+hSclnadV1F4=";
+    })
+    (fetchpatch {
+      name = "fix-tests-using-numpy-1.25.patch";
+      url = "https://github.com/mwaskom/seaborn/commit/b6737d5aec9a91bb8840cdda896a7970e1830d56.patch";
+      hash = "sha256-Xj82yyB5Vy2xKRl0ideDmJ5Zr4Xc+8cEHU/liVwMSvE=";
+    })
+  ];
+
  nativeBuildInputs = [
    flit-core
  ];
@ -41,12 +60,12 @@ buildPythonPackage rec {
  ];

  disabledTests = [
-    # incompatible with matplotlib 3.7
-    # https://github.com/mwaskom/seaborn/issues/3288
-    "test_subplot_kws"
-
    # requires internet connection
    "test_load_dataset_string_error"
+
+    # per https://github.com/mwaskom/seaborn/issues/3431, we can enable this
+    # once matplotlib releases version > 3.7.2
+    "test_share_xy"
  ] ++ lib.optionals (!stdenv.hostPlatform.isx86) [
    # overly strict float tolerances
    "TestDendrogram"
@ -54,7 +73,7 @@ buildPythonPackage rec {

  # All platforms should use Agg. Let's set it explicitly to avoid probing GUI
  # backends (leads to crashes on macOS).
-  MPLBACKEND="Agg";
+  env.MPLBACKEND="Agg";

  pythonImportsCheck = [
    "seaborn"
--- a/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch
+++ b/pkgs/development/python-modules/single-version/0001-set-poetry-core.patch
@ -1,21 +0,0 @@
-From d949b37151cd538d4c6a15e1ba6c1343f8bff76d Mon Sep 17 00:00:00 2001
-From: "P. R. d. O" <d.ol.rod@protonmail.com>
-Date: Mon, 6 Dec 2021 15:26:19 -0600
-Subject: [PATCH] set poetry-core
-
---
- pyproject.toml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pyproject.toml b/pyproject.toml
-index d3fdc52..bd7ddc2 100644
--- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -27,4 +27,4 @@ black = "^19.10b0"
-
- [build-system]
- requires = ["poetry>=0.12"]
-build-backend = "poetry.masonry.api"
-+build-backend = "poetry.core.masonry.api"
--
-2.33.1
--- a/pkgs/development/python-modules/single-version/default.nix
+++ b/pkgs/development/python-modules/single-version/default.nix
@ -1,4 +1,10 @@
-{ lib, buildPythonPackage, fetchFromGitHub, poetry-core, pytestCheckHook }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, poetry-core
+, pytestCheckHook
+}:

 buildPythonPackage rec {
  pname = "single-version";
@ -13,7 +19,12 @@ buildPythonPackage rec {
  };

  patches = [
-    ./0001-set-poetry-core.patch
+    # https://github.com/hongquan/single-version/pull/4
+    (fetchpatch {
+      name = "use-poetry-core.patch";
+      url = "https://github.com/hongquan/single-version/commit/0cdf9795cb0522e90a8dc00306f1ff7bb85621ad.patch";
+      hash = "sha256-eT9G1XvkNF0+NKgx+yN7ei53xIEMvnc7V/KtPLqlWik=";
+    })
  ];

  nativeBuildInputs = [ poetry-core ];
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@ -1,30 +1,43 @@
-{ lib
-, stdenv
+{ docbook_xsl
+, docbook_xml_dtd_45
 , fetchFromGitHub
 , installShellFiles
-, pcre
-, python3
+, lib
 , libxslt
-, docbook_xsl
-, docbook_xml_dtd_45
-, which
+, pcre
 , pkg-config
+, python3
+, stdenv
+, which
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "cppcheck";
-  version = "2.11";
+  version = "2.11.1";

  src = fetchFromGitHub {
    owner = "danmar";
    repo = "cppcheck";
-    rev = version;
-    hash = "sha256-Zu1Ly5KsgmjtsVQlBzgB/h+varfkyB73t8bxzqB3a3M=";
+    rev = finalAttrs.version;
+    hash = "sha256-ZQ1EgnC2JBc0AvSW8PtgMzJoWSPt04Xfh8dqOU+KMfw=";
  };

  strictDeps = true;
-  nativeBuildInputs = [ pkg-config installShellFiles libxslt docbook_xsl docbook_xml_dtd_45 which python3 ];
-  buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ];
+
+  nativeBuildInputs = [
+    docbook_xsl
+    docbook_xml_dtd_45
+    installShellFiles
+    libxslt
+    pkg-config
+    python3
+    which
+  ];
+
+  buildInputs = [
+    pcre
+    (python3.withPackages (ps: [ ps.pygments ]))
+  ];

  makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ];

@ -58,15 +71,15 @@ stdenv.mkDerivation rec {
    runHook postInstallCheck
  '';

-  meta = with lib; {
+  meta = {
    description = "A static analysis tool for C/C++ code";
+    homepage = "http://cppcheck.sourceforge.net/";
+    license = lib.licenses.gpl3Plus;
    longDescription = ''
      Check C/C++ code for memory leaks, mismatching allocation-deallocation,
      buffer overruns and more.
    '';
-    homepage = "http://cppcheck.sourceforge.net/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ joachifm ];
+    maintainers = with lib.maintainers; [ joachifm ];
+    platforms = lib.platforms.unix;
  };
-}
+})
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/pkgs/development/tools/database/clickhouse-backup/default.nix
@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "clickhouse-backup";
-  version = "2.3.1";
+  version = "2.3.2";

  src = fetchFromGitHub {
    owner = "AlexAkulov";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-93dSeZL3W/6S46JYSbj/7ccHFBI3VKBD8TNKRO9fIZc=";
+    sha256 = "sha256-B6MImom0BSvbZVjeMWvF+oDEfoALl4xhXXitaOOU/ZI=";
  };

  vendorHash = "sha256-YSr3fKqJJtNRbUW1TjwDM96cA6CoYz1LUit/pC8V3Fs=";
--- a/pkgs/development/tools/datree/default.nix
+++ b/pkgs/development/tools/datree/default.nix
@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "datree";
-  version = "1.9.17";
+  version = "1.9.19";

  src = fetchFromGitHub {
    owner = "datreeio";
    repo = "datree";
    rev = "refs/tags/${version}";
-    hash = "sha256-vGlvujN9/1e9X/c2WgVSuc+yuqECUF55NLPmBecwvT0=";
+    hash = "sha256-W1eX7eUMdPGbHA/f08xkG2EUeZmaunEAQn7/LRBe2nk=";
  };

-  vendorHash = "sha256-ECVKofvmLuFAFvncq63hYUaYW8/2+F4gZr8wIGQyrdU=";
+  vendorHash = "sha256-+PQhuIO4KjXtW/ZcS0OamuOHzK7ZL+nwOBxeCRoXuKE=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/development/tools/doc2go/default.nix
+++ b/pkgs/development/tools/doc2go/default.nix
@ -5,15 +5,15 @@

 buildGoModule rec {
  pname = "doc2go";
-  version = "0.4.1";
+  version = "0.5.0";

  src = fetchFromGitHub {
    owner = "abhinav";
    repo = "doc2go";
    rev = "v${version}";
-    hash = "sha256-iypcjj6FFsus9mrafLBX0u7bHnzs718aEWC5dO3q0es=";
+    hash = "sha256-CFqr1laPxKNhaluGmwW7apxLQqkAFKVznDKezH8gjx0=";
  };
-  vendorHash = "sha256-IMqYCVGsspYigTmYNHD1b6Sgzxl47cdiCs+rq4C3Y08=";
+  vendorHash = "sha256-2WvlH69iYqIA3d9aFVec8TZL+pMJItoNKSoDBL/NNyg=";

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

--- a/pkgs/development/tools/esbuild/default.nix
+++ b/pkgs/development/tools/esbuild/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "esbuild";
-  version = "0.19.0";
+  version = "0.19.1";

  src = fetchFromGitHub {
    owner = "evanw";
    repo = "esbuild";
    rev = "v${version}";
-    hash = "sha256-DSuBON5EXQlAEqiCitAtDxOcdGNu0ubisIbuWmAfElw=";
+    hash = "sha256-HoCCgPny6XHz1uUTto6xJ56I6D3HhzLH2rBh9iKI1a8=";
  };

  vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@ -18,13 +18,13 @@

 stdenv.mkDerivation rec {
  pname = "nixd";
-  version = "1.2.1";
+  version = "1.2.2";

  src = fetchFromGitHub {
    owner = "nix-community";
    repo = "nixd";
    rev = version;
-    hash = "sha256-NqRYFaxa6Y4j7IMAxxVKo7o15Xmx0CiyeG71Uf1SLCI=";
+    hash = "sha256-W44orkPZQ9gDUTogb8YVIaw4WHzUA+ExOXhTnZlJ6yY=";
  };

  mesonBuildType = "release";
@ -81,8 +81,9 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Nix language server";
    homepage = "https://github.com/nix-community/nixd";
+    changelog = "https://github.com/nix-community/nixd/releases/tag/${version}";
    license = lib.licenses.lgpl3Plus;
-    maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth ];
+    maintainers = with lib.maintainers; [ inclyc Ruixi-rebirth marsam ];
    platforms = lib.platforms.unix;
  };
 }
--- a/pkgs/development/tools/language-servers/pylyzer/default.nix
+++ b/pkgs/development/tools/language-servers/pylyzer/default.nix
@ -12,16 +12,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "pylyzer";
-  version = "0.0.39";
+  version = "0.0.40";

  src = fetchFromGitHub {
    owner = "mtshiba";
    repo = "pylyzer";
    rev = "v${version}";
-    hash = "sha256-GHrB4FmZWmnkcfr3y4Ulk3TBmVn1Xsixqeni8h9PykY=";
+    hash = "sha256-HMu5DrzlHbNynjKdDxmN7Uzb+grsPQLv2ycOjT7vid0=";
  };

-  cargoHash = "sha256-Fe/bD8pIXElYfxYHF6JPVlpHhRrgJMDjEFfnequ00Bo=";
+  cargoHash = "sha256-3q7vNjcrKGE4y+w/9iezJWWHdewWKjRgeP2/Pza8CqM=";

  nativeBuildInputs = [
    git
--- a/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock
+++ b/pkgs/development/tools/language-servers/typst-lsp/Cargo.lock
@ -188,6 +188,12 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"

+[[package]]
+name = "bit_field"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@ -365,6 +371,30 @@ dependencies = [
 "crossbeam-utils",
 ]

+[[package]]
+name = "crossbeam-deque"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+dependencies = [
+ "cfg-if",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "crossbeam-utils",
+ "memoffset",
+ "scopeguard",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.16"
@ -374,6 +404,12 @@ dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
 [[package]]
 name = "csv"
 version = "1.2.2"
@ -561,6 +597,22 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"

+[[package]]
+name = "exr"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1e481eb11a482815d3e9d618db8c42a93207134662873809335a92327440c18"
+dependencies = [
+ "bit_field",
+ "flume",
+ "half",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
 [[package]]
 name = "fancy-regex"
 version = "0.11.0"
@ -623,6 +675,19 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"

+[[package]]
+name = "flume"
+version = "0.10.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "nanorand",
+ "pin-project",
+ "spin 0.9.8",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@ -776,8 +841,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
 dependencies = [
 "cfg-if",
+ "js-sys",
 "libc",
 "wasi",
+ "wasm-bindgen",
 ]

 [[package]]
@ -815,6 +882,15 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "half"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
+dependencies = [
+ "crunchy",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@ -1114,11 +1190,14 @@ dependencies = [
 "bytemuck",
 "byteorder",
 "color_quant",
+ "exr",
 "gif",
 "jpeg-decoder",
 "num-rational",
 "num-traits",
 "png",
+ "qoi",
+ "tiff",
 ]

 [[package]]
@ -1135,6 +1214,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
 "autocfg",
 "hashbrown 0.12.3",
+ "serde",
 ]

 [[package]]
@ -1249,6 +1329,9 @@ name = "jpeg-decoder"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
+dependencies = [
+ "rayon",
+]

 [[package]]
 name = "js-sys"
@ -1274,6 +1357,12 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
 [[package]]
 name = "libc"
 version = "0.2.147"
@ -1298,6 +1387,15 @@ dependencies = [
 "vcpkg",
 ]

+[[package]]
+name = "line-wrap"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9"
+dependencies = [
+ "safemem",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@ -1379,6 +1477,15 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "memoffset"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "mime"
 version = "0.3.17"
@ -1406,6 +1513,15 @@ dependencies = [
 "windows-sys",
 ]

+[[package]]
+name = "nanorand"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "native-tls"
 version = "0.2.11"
@ -1491,6 +1607,15 @@ dependencies = [
 "memchr",
 ]

+[[package]]
+name = "oklab"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "467e40ada50d13bab19019e3707862b5076ca15841f31ee1474c40397c1b9f11"
+dependencies = [
+ "rgb",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.18.0"
@ -1696,9 +1821,9 @@ checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"

 [[package]]
 name = "pdf-writer"
-version = "0.7.1"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30900f178ea696fc5d9637171f98aaa93d5aae54f0726726df68fc3e32810db6"
+checksum = "86af2eb3faa4614bc7fda8bd578c25e76a17ff3b1577be034b81e0c20527e204"
 dependencies = [
 "bitflags 1.3.2",
 "itoa",
@ -1782,6 +1907,20 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"

+[[package]]
+name = "plist"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdc0001cfea3db57a2e24bc0d818e9e20e554b5f97fabb9bc231dc240269ae06"
+dependencies = [
+ "base64",
+ "indexmap 1.9.3",
+ "line-wrap",
+ "quick-xml",
+ "serde",
+ "time",
+]
+
 [[package]]
 name = "png"
 version = "0.17.9"
@ -1869,6 +2008,24 @@ dependencies = [
 "cc",
 ]

+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81b9228215d82c7b61490fec1de287136b5de6f5700f6e58ea9ad61a7964ca51"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.32"
@ -1908,6 +2065,28 @@ dependencies = [
 "getrandom",
 ]

+[[package]]
+name = "rayon"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-utils",
+ "num_cpus",
+]
+
 [[package]]
 name = "rctree"
 version = "0.5.0"
@ -2022,8 +2201,11 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "142e83d8ae8c8c639f304698a5567b229ba65caba867bf4387bbc0ae158827cf"
 dependencies = [
+ "gif",
+ "jpeg-decoder",
 "log",
 "pico-args",
+ "png",
 "rgb",
 "svgtypes",
 "tiny-skia",
@ -2048,7 +2230,7 @@ dependencies = [
 "cc",
 "libc",
 "once_cell",
- "spin",
+ "spin 0.5.2",
 "untrusted",
 "web-sys",
 "winapi",
@ -2154,6 +2336,12 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"

+[[package]]
+name = "safemem"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@ -2377,6 +2565,15 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"

+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@ -2467,8 +2664,9 @@ dependencies = [

 [[package]]
 name = "svg2pdf"
-version = "0.5.0"
-source = "git+https://github.com/typst/svg2pdf.git#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c966e59fd4afd959edcc226687f751a7d05c94d0477cca1a4c2b15a7220f2b24"
 dependencies = [
 "image",
 "miniz_oxide",
@ -2532,11 +2730,13 @@ dependencies = [
 "flate2",
 "fnv",
 "once_cell",
+ "plist",
 "regex-syntax",
 "serde",
 "serde_json",
 "thiserror",
 "walkdir",
+ "yaml-rust",
 ]

 [[package]]
@ -2610,6 +2810,17 @@ dependencies = [
 "threadpool",
 ]

+[[package]]
+name = "tiff"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+dependencies = [
+ "flate2",
+ "jpeg-decoder",
+ "weezl",
+]
+
 [[package]]
 name = "time"
 version = "0.3.25"
@ -2972,8 +3183,8 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"

 [[package]]
 name = "typst"
-version = "0.6.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30"
+version = "0.7.0"
+source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9"
 dependencies = [
 "bitflags 2.3.3",
 "bytemuck",
@ -2986,6 +3197,7 @@ dependencies = [
 "indexmap 1.9.3",
 "log",
 "miniz_oxide",
+ "oklab",
 "once_cell",
 "pdf-writer",
 "pixglyph",
@ -3004,6 +3216,7 @@ dependencies = [
 "tracing",
 "ttf-parser",
 "typst-macros",
+ "typst-syntax",
 "unicode-general-category",
 "unicode-ident",
 "unicode-math-class",
@ -3015,8 +3228,8 @@ dependencies = [

 [[package]]
 name = "typst-library"
-version = "0.6.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30"
+version = "0.7.0"
+source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9"
 dependencies = [
 "az",
 "chinese-number",
@ -3054,7 +3267,7 @@ dependencies = [

 [[package]]
 name = "typst-lsp"
-version = "0.8.1"
+version = "0.9.0"
 dependencies = [
 "anyhow",
 "async-compression",
@ -3097,8 +3310,8 @@ dependencies = [

 [[package]]
 name = "typst-macros"
-version = "0.6.0"
-source = "git+https://github.com/typst/typst.git?tag=v0.6.0#2dfd44fedd99ab9414c17f358179e1c37e953f30"
+version = "0.7.0"
+source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9"
 dependencies = [
 "heck",
 "proc-macro2",
@ -3106,6 +3319,22 @@ dependencies = [
 "syn 2.0.28",
 ]

+[[package]]
+name = "typst-syntax"
+version = "0.7.0"
+source = "git+https://github.com/typst/typst.git?tag=v0.7.0#da8367e189b02918a8fe1a98fd3059fd11a82cd9"
+dependencies = [
+ "comemo",
+ "ecow",
+ "once_cell",
+ "serde",
+ "tracing",
+ "unicode-ident",
+ "unicode-math-class",
+ "unicode-segmentation",
+ "unscanny",
+]
+
 [[package]]
 name = "unic-langid"
 version = "0.9.1"
@ -3686,3 +3915,12 @@ dependencies = [
 "syn 1.0.109",
 "synstructure",
 ]
+
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
--- a/pkgs/development/tools/language-servers/typst-lsp/default.nix
+++ b/pkgs/development/tools/language-servers/typst-lsp/default.nix
@ -9,20 +9,19 @@

 rustPlatform.buildRustPackage rec {
  pname = "typst-lsp";
-  version = "0.8.1";
+  version = "0.9.0";

  src = fetchFromGitHub {
    owner = "nvarner";
    repo = "typst-lsp";
    rev = "v${version}";
-    hash = "sha256-Aq9KP9L9s42NmX45YVnGUMpP0MXKB1Pjd4W0f0U8T7o=";
+    hash = "sha256-XV/LlibO+2ORle0lVcqqHrDdH75kodk9yOU3OsHFA+A=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "svg2pdf-0.5.0" = "sha256-yBQpvDAnJ7C0PWIM/o0PzOg9JlDZCEiVdCTDDPSwrmE=";
-      "typst-0.6.0" = "sha256-8e6BNffKgAUNwic4uEfDh77y2nIyYt9BwZr+ypv+d5A=";
+      "typst-0.7.0" = "sha256-yrtOmlFAKOqAmhCP7n0HQCOQpU3DWyms5foCdUb9QTg=";
    };
  };

@ -36,11 +35,6 @@ rustPlatform.buildRustPackage rec {
    darwin.apple_sdk.frameworks.Security
  ];

-  patches = [
-    # `rustPlatform.importCargoLock` has trouble parsing the `??` in the url
-    ./remove-svg2pdf-patch.patch
-  ];
-
  checkFlags = [
    # requires internet access
    "--skip=workspace::package::external::repo::test::full_download"
--- a/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch
+++ b/pkgs/development/tools/language-servers/typst-lsp/remove-svg2pdf-patch.patch
@ -1,27 +0,0 @@
--- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2468,7 +2468,7 @@ dependencies = [
- [[package]]
- name = "svg2pdf"
- version = "0.5.0"
-source = "git+https://github.com/typst/svg2pdf.git??tag=v0.5.0#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b"
-+source = "git+https://github.com/typst/svg2pdf.git#39daf9fc2ee84b62b0e3b174ff8c9017f655af6b"
- dependencies = [
-  "image",
-  "miniz_oxide",
--- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -84,13 +84,5 @@ reqwest = { version = "0.11.18", default-features = false, features = [
-     "rustls-tls",
- ] }
- 
-
-# Typst 0.6.0 does not specify a tag or ref for svg2pdf, so provide one...
-# ...but Cargo doesn't want to make our lives too easy, and we can't replace the
-# dependency with another at the same URL. Use a workaroud inspired by
-# StackOverflow: https://stackoverflow.com/a/72261235
-[patch."https://github.com/typst/svg2pdf"]
-svg2pdf = { git = "https://github.com/typst/svg2pdf.git?", tag = "v0.5.0" }
-
- [dev-dependencies]
- temp-dir = "0.1.11"
--- a/pkgs/development/tools/misc/runme/default.nix
+++ b/pkgs/development/tools/misc/runme/default.nix
@ -11,16 +11,16 @@

 buildGoModule rec {
  pname = "runme";
-  version = "1.7.1";
+  version = "1.7.2";

  src = fetchFromGitHub {
    owner = "stateful";
    repo = "runme";
    rev = "v${version}";
-    hash = "sha256-WsYaOaXaNGztVqHMURn/96lWA9grccoKw6AJOhqUdfQ=";
+    hash = "sha256-BoPNIaYxK4VyafNWAVDonwTfpqF1N3Ggq5GF6A7DhF0=";
  };

-  vendorHash = "sha256-5FMrz4I/i/uJDI4vK9hiet4zMRf0CSbc/YJAFi8hlEM=";
+  vendorHash = "sha256-sGk2K0I9onGFpDwboRugNHjFictisY4Q0NTNnOT3BW4=";

  nativeBuildInputs = [
    installShellFiles
--- a/pkgs/development/tools/oh-my-posh/default.nix
+++ b/pkgs/development/tools/oh-my-posh/default.nix
@ -6,16 +6,16 @@

 buildGoModule rec {
  pname = "oh-my-posh";
-  version = "18.1.0";
+  version = "18.3.3";

  src = fetchFromGitHub {
    owner = "jandedobbeleer";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-qK9hjsWhVTzxFo4SSvKb5IgZteVabWlCtoetu9v9xIE=";
+    hash = "sha256-AJw+NNTbksYSW2VqUzxLwxwd3OjM9uK/ou2CVS2zNvw=";
  };

-  vendorHash = "sha256-cATGMi/nL8dvlsR+cuvKH6Y9eR3UqcVjvZAj35Ydn2c=";
+  vendorHash = "sha256-xkguBWk2Nh8w7C7tKbvaP0tRgZO4z08AEsdjNlJYC6Q=";

  sourceRoot = "${src.name}/src";

--- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
+++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
@ -6,13 +6,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-llvm-cov";
-  version = "0.5.25";
+  version = "0.5.26";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-4ctwvDLluJsLWJPInoFGqxmEzlEuBtEJb3/x+q/5pDA=";
+    sha256 = "sha256-CDf0O8xp4mEkpyQ90IhPAFoL7/fvOsKnrta0gEisl+Y=";
  };
-  cargoSha256 = "sha256-QghbQYfoCd+ppNz/g5NlCnrFYpsjesQlcgMCEKUgN2k=";
+  cargoSha256 = "sha256-Uh/k8TaoVz9ZjX1x1DWTLIzIoFyOuMrBrjA20U5+Tbk=";

  # skip tests which require llvm-tools-preview
  checkFlags = [
--- a/Show More
+++ b/Show More