Merge staging-next into staging

2023-08-21 18:01:26 +00:00 · 2023-08-21 18:01:26 +00:00 · 7946d3b039
commit 7946d3b039
parent 5e8bdfad07 aa0bf7b570
47 changed files with 1889 additions and 1030 deletions
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@ -505,7 +505,9 @@ Shortcut to setup environments with C headers/libraries and Python packages:
 nix-shell -p pythonPackages.pyramid zlib libjpeg git
 ```

-Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
+::: {.note}
+There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
+:::

 ## User Guide {#user-guide}

@ -1123,16 +1125,20 @@ command provided by the setup.py (i.e. `python setup.py test`). However,
 this is currently deprecated https://github.com/pypa/setuptools/pull/1878
 and your package should provide its own checkPhase.

-*NOTE:* The `checkPhase` for python maps to the `installCheckPhase` on a
+::: {.note}
+The `checkPhase` for python maps to the `installCheckPhase` on a
 normal derivation. This is due to many python packages not behaving well
 to the pre-installed version of the package. Version info, and natively
 compiled extensions generally only exist in the install directory, and
 thus can cause issues when a test suite asserts on that behavior.
+:::

-*NOTE:* Tests should only be disabled if they don't agree with nix
+::: {.note}
+Tests should only be disabled if they don't agree with nix
 (e.g. external dependencies, network access, flakey tests), however,
 as many tests should be enabled as possible. Failing tests can still be
 a good indication that the package is not in a valid state.
+:::

 #### Using pytest {#using-pytest}

@ -1177,8 +1183,10 @@ filtering out tests which contain `download` or `update` in their test case name
 Only one `-k` argument is allowed, and thus a long predicate should be concatenated
 with “\\” and wrapped to the next line.

-*NOTE:* In pytest==6.0.1, the use of “\\” to continue a line (e.g. `-k 'not download \'`) has
+::: {.note}
+In pytest==6.0.1, the use of “\\” to continue a line (e.g. `-k 'not download \'`) has
 been removed, in this case, it's recommended to use `pytestCheckHook`.
+:::

 #### Using pytestCheckHook {#using-pytestcheckhook}

--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@ -425,6 +425,16 @@ A script to be run by `maintainers/scripts/update.nix` when the package is match
  };
  ```

+::: {.tip}
+A common pattern is to use the [`nix-update-script`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/common-updater/nix-update.nix) attribute provided in Nixpkgs, which runs [`nix-update`](https://github.com/Mic92/nix-update):
+
+```nix
+passthru.updateScript = nix-update-script { };
+```
+
+For simple packages, this is often enough, and will ensure that the package is updated automatically by [`nixpkgs-update`](https://ryantm.github.io/nixpkgs-update) when a new version is released. The [update bot](https://nix-community.org/update-bot) runs periodically to attempt to automatically update packages, and will run `passthru.updateScript` if set. While not strictly necessary if the project is listed on [Repology](https://repology.org), using `nix-update-script` allows the package to update via many more sources (e.g. GitHub releases).
+:::
+
 ##### How update scripts are executed? {#var-passthru-updateScript-execution}

 Update scripts are to be invoked by `maintainers/scripts/update.nix` script. You can run `nix-shell maintainers/scripts/update.nix` in the root of Nixpkgs repository for information on how to use it. `update.nix` offers several modes for selecting packages to update (e.g. select by attribute path, traverse Nixpkgs and filter by maintainer, etc.), and it will execute update scripts for all matched packages that have an `updateScript` attribute.
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -8135,6 +8135,12 @@
    githubId = 2308444;
    name = "Joshua Gilman";
  };
+  jmillerpdt = {
+    email = "jcmiller@pdtpartners.com";
+    github = "jmillerpdt";
+    githubId = 54179289;
+    name = "Jason Miller";
+  };
  jnsgruk = {
    email = "jon@sgrs.uk";
    github = "jnsgruk";
--- a/pkgs/applications/misc/nwg-displays/default.nix
+++ b/pkgs/applications/misc/nwg-displays/default.nix
@ -8,6 +8,8 @@
 , pango
 , python310Packages
 , wrapGAppsHook
+, hyprlandSupport ? false
+, wlr-randr
 }:

 python310Packages.buildPythonApplication rec {
@ -38,6 +40,8 @@ python310Packages.buildPythonApplication rec {
    python310Packages.gst-python
    python310Packages.i3ipc
    python310Packages.pygobject3
+  ] ++ lib.optionals hyprlandSupport [
+    wlr-randr
  ];

  dontWrapGApps = true;
--- a/pkgs/applications/networking/n8n/node-packages.nix
+++ b/pkgs/applications/networking/n8n/node-packages.nix
--- a/pkgs/applications/video/anilibria-winmaclinux/0001-fix-instalation-paths.patch
+++ b/pkgs/applications/video/anilibria-winmaclinux/0001-fix-instalation-paths.patch
@ -0,0 +1,24 @@
+diff --git a/AniLibria.pro b/AniLibria.pro
+index 3eb7213..ea571ff 100644
+--- a/AniLibria.pro
+++ b/AniLibria.pro
+@@ -271,17 +271,8 @@ QML_IMPORT_PATH =
+ # Additional import path used to resolve QML modules just for Qt Quick Designer
+ QML_DESIGNER_IMPORT_PATH =
+ 
+-# Default rules for deployment.
+-!flatpak{
+-    qnx: target.path = /tmp/$${TARGET}/bin
+-    else: unix:!android: target.path = /opt/$${TARGET}/bin
+-}else{
+-    target.path = $$PREFIX/bin
+-}
+-!isEmpty(target.path) {
+-    unix: INSTALLS += target desktop $${UNIX_ICONS}
+-    else:macx: INSTALLS += target
+-}
+target.path = $$PREFIX/bin
+INSTALLS += target $${UNIX_ICONS}
+ 
+ flatpak {
+     metadata.path = $$PREFIX/share/metainfo
--- a/pkgs/applications/video/anilibria-winmaclinux/0002-disable-version-check.patch
+++ b/pkgs/applications/video/anilibria-winmaclinux/0002-disable-version-check.patch
@ -0,0 +1,12 @@
+diff --git a/AniLibria.pro b/AniLibria.pro
+index 3eb7213..3d39ec9 100644
+--- a/AniLibria.pro
+++ b/AniLibria.pro
+@@ -174,7 +174,6 @@ unix {
+ DEFINES += QT_DEPRECATED_WARNINGS
+ 
+ # If you need not check version remove or comment this line
+-DEFINES += USE_VERSION_CHECK
+ 
+ # You can also make your code fail to compile if it uses deprecated APIs.
+ # In order to do so, uncomment the following line.
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@ -0,0 +1,91 @@
+{ mkDerivation
+, lib
+, fetchFromGitHub
+, qmake
+, qtbase
+, qtquickcontrols2
+, qtwebsockets
+, qtmultimedia
+, gst_all_1
+, wrapQtAppsHook
+, makeDesktopItem
+, copyDesktopItems
+}:
+
+mkDerivation rec {
+  pname = "anilibria-winmaclinux";
+  version = "1.2.9";
+
+  src = fetchFromGitHub {
+    owner = "anilibria";
+    repo = "anilibria-winmaclinux";
+    rev = version;
+    sha256 = "sha256-Fdj7i4jpKIDwaIBAch7SjIV/WnqMDnCfNYSiZLsamx8=";
+  };
+
+  sourceRoot = "source/src";
+
+  qmakeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  patches = [
+    ./0001-fix-instalation-paths.patch
+    ./0002-disable-version-check.patch
+  ];
+
+  preConfigure = ''
+    substituteInPlace AniLibria.pro \
+      --replace "\$\$PREFIX" '${placeholder "out"}'
+  '';
+
+  qtWrapperArgs = [
+    "--prefix GST_PLUGIN_PATH : ${(with gst_all_1; lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
+      gst-plugins-bad
+      gst-plugins-good
+      gst-plugins-base
+      gst-libav
+      gstreamer
+    ])}"
+  ];
+
+  nativeBuildInputs = [
+    qmake
+    wrapQtAppsHook
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    qtbase
+    qtquickcontrols2
+    qtwebsockets
+    qtmultimedia
+  ] ++ (with gst_all_1; [
+    gst-plugins-bad
+    gst-plugins-good
+    gst-plugins-base
+    gst-libav
+    gstreamer
+  ]);
+
+  desktopItems = [
+    (makeDesktopItem (rec {
+      name = "AniLibria";
+      desktopName = name;
+      icon = "anilibria";
+      comment = meta.description;
+      genericName = "AniLibria desktop client";
+      categories = [ "Qt" "AudioVideo" "Player" ];
+      keywords = [ "anime" ];
+      exec = name;
+      terminal = false;
+    }))
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/anilibria/anilibria-winmaclinux";
+    description = "AniLibria cross platform desktop client";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ _3JlOy-PYCCKUi ];
+    inherit (qtbase.meta) platforms;
+    mainProgram = "AniLibria";
+  };
+}
--- a/pkgs/desktops/budgie/budgie-desktop/default.nix
+++ b/pkgs/desktops/budgie/budgie-desktop/default.nix
@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , accountsservice
 , alsa-lib
 , budgie-screensaver
@ -38,31 +37,17 @@

 stdenv.mkDerivation rec {
  pname = "budgie-desktop";
-  version = "10.7.2";
+  version = "10.8";

  src = fetchFromGitHub {
    owner = "BuddiesOfBudgie";
    repo = pname;
    rev = "v${version}";
    fetchSubmodules = true;
-    hash = "sha256-fd3B2DMZxCI4Gb9mwdACjIPydKghXx8IkhFpMS/Clps=";
+    hash = "sha256-fOsTBnKtwBGQSPkBBrzwHEB3+OcJYtPIdvZsV31oi6g=";
  };

  patches = [
-    # Drop all Vapi files that are already included with Vala
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/commit/5f641489a00cc244e50aa1ceae04f952d58389d2
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/5f641489a00cc244e50aa1ceae04f952d58389d2.patch";
-      hash = "sha256-Cyj/+G1dx0DKCTtzVESzFZ+I5o7INopGvw7bq5o/abo=";
-    })
-
-    # Add support for Magpie
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/387
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/84ccb505160322536043717c3b8f970ab91b0103.patch";
-      hash = "sha256-4nd7Tk4ajyVy8cGDNIINpW9jlyRNywPYMrhBCtJVHZk=";
-    })
-
    ./plugins.patch
  ];

@ -117,6 +102,6 @@ stdenv.mkDerivation rec {
    homepage = "https://github.com/BuddiesOfBudgie/budgie-desktop";
    platforms = platforms.linux;
    maintainers = [ maintainers.federicoschonborn ];
-    license = with licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30];
+    license = with licenses; [ gpl2Plus lgpl21Plus cc-by-sa-30 ];
  };
 }
--- a/pkgs/desktops/budgie/budgie-desktop/plugins.patch
+++ b/pkgs/desktops/budgie/budgie-desktop/plugins.patch
@ -1,21 +1,153 @@
+diff --git a/meson.build b/meson.build
+index 48aeeb38..31e4c24b 100644
+--- a/meson.build
+++ b/meson.build
+@@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir'))
+ localedir = join_paths(prefix, get_option('localedir'))
+ podir = join_paths(meson.source_root(), 'po')
+ 
+-cdata.set_quoted('DATADIR', datadir)
+-cdata.set_quoted('SYSCONFDIR', confdir)
+-cdata.set_quoted('LOCALEDIR', localedir)
+-cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
+-
+ # Handle i18n on the .desktop file
+ # Originally stolem from TingPing:
+ # https://github.com/vinszent/gnome-twitch/blob/master/data/meson.build
+@@ -111,23 +106,10 @@ cdata.set_quoted('MODULEDIR', plugin_libdir)
+ cdata.set_quoted('MODULE_DATA_DIR', plugin_datadir)
+ cdata.set_quoted('RAVEN_PLUGIN_LIBDIR', raven_plugin_libdir)
+ cdata.set_quoted('RAVEN_PLUGIN_DATADIR', raven_plugin_datadir)
+-
+-if prefix == '/usr' or prefix == '/usr/local'
+-    cdata.set('HAS_SECONDARY_PLUGIN_DIRS', true)
+-
+-    if prefix == '/usr'
+-        secondary_libdir_root = join_paths(prefix, 'local', get_option('libdir'), meson.project_name())
+-        secondary_datadir_root = join_paths(prefix, 'local', get_option('datadir'), meson.project_name())
+-    else
+-        secondary_libdir_root = join_paths('/usr', get_option('libdir'), meson.project_name())
+-        secondary_datadir_root = join_paths('/usr', get_option('datadir'), meson.project_name())
+-    endif
+-
+-    cdata.set_quoted('MODULEDIR_SECONDARY', join_paths(secondary_libdir_root, 'plugins'))
+-    cdata.set_quoted('MODULE_DATA_DIR_SECONDARY', join_paths(secondary_datadir_root, 'plugins'))
+-    cdata.set_quoted('RAVEN_PLUGIN_LIBDIR_SECONDARY', join_paths(secondary_libdir_root, 'raven-plugins'))
+-    cdata.set_quoted('RAVEN_PLUGIN_DATADIR_SECONDARY', join_paths(secondary_datadir_root, 'raven-plugins'))
+-endif
+cdata.set_quoted('DATADIR', datadir)
+cdata.set_quoted('SYSCONFDIR', confdir)
+cdata.set_quoted('LOCALEDIR', localedir)
+cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
+ 
+ with_bluetooth = get_option('with-bluetooth')
+ if with_bluetooth == true
+diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c
+index fc531f59..0a21b690 100644
+--- a/src/config/budgie-config.c
+++ b/src/config/budgie-config.c
+@@ -11,7 +11,6 @@
+ 
+ #ifndef CONFIG_H_INCLUDED
+ #include "config.h"
+-#include <stdbool.h>
+ 
+ /**
+  * All this is to keep Vala happy & configured..
+@@ -20,21 +19,6 @@ const char* BUDGIE_MODULE_DIRECTORY = MODULEDIR;
+ const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR;
+ const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR;
+ const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR;
+-
+-#ifdef HAS_SECONDARY_PLUGIN_DIRS
+-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true;
+-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY;
+-const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = MODULE_DATA_DIR_SECONDARY;
+-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = RAVEN_PLUGIN_LIBDIR_SECONDARY;
+-const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = RAVEN_PLUGIN_DATADIR_SECONDARY;
+-#else
+-const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false;
+-const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL;
+-const char* BUDGIE_MODULE_DATA_DIRECTORY = NULL;
+-const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = NULL;
+-const char* BUDGIE_RAVEN_PLUGIN_DATADIR = NULL;
+-#endif
+-
+ const char* BUDGIE_DATADIR = DATADIR;
+ const char* BUDGIE_VERSION = PACKAGE_VERSION;
+ const char* BUDGIE_WEBSITE = PACKAGE_URL;
+diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h
+index 720379a5..c5774820 100644
+--- a/src/config/budgie-config.h
+++ b/src/config/budgie-config.h
+@@ -12,8 +12,6 @@
+ #ifndef _BUDGIE_CONFIG_H_
+ #define _BUDGIE_CONFIG_H_
+ 
+-#include <stdbool.h>
+-
+ /* i.e. /usr/lib/budgie-desktop */
+ extern const char* BUDGIE_MODULE_DIRECTORY;
+ 
+@@ -26,12 +24,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR;
+ /* i.e. /usr/share/budgie-desktop/raven-plugins */
+ extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR;
+ 
+-extern const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS;
+-extern const char* BUDGIE_MODULE_DIRECTORY_SECONDARY;
+-extern const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY;
+-extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY;
+-extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY;
+-
+ /* i.e. /usr/share/ */
+ extern const char* BUDGIE_DATADIR;
+ 
+diff --git a/src/config/budgie-config.vapi b/src/config/budgie-config.vapi
+index 5eb445d1..7d27e348 100644
+--- a/src/config/budgie-config.vapi
+++ b/src/config/budgie-config.vapi
+@@ -22,21 +22,6 @@ namespace Budgie {
+ 	[CCode (cheader_filename="budgie-config.h")]
+ 	public extern const string RAVEN_PLUGIN_DATADIR;
+ 
+-	[CCode (cheader_filename="budgie-config.h")]
+-	public extern const bool HAS_SECONDARY_PLUGIN_DIRS;
+-
+-	[CCode (cheader_filename="budgie-config.h")]
+-	public extern const string? MODULE_DIRECTORY_SECONDARY;
+-
+-	[CCode (cheader_filename="budgie-config.h")]
+-    public extern const string? MODULE_DATA_DIRECTORY_SECONDARY;
+-
+-	[CCode (cheader_filename="budgie-config.h")]
+-	public extern const string? RAVEN_PLUGIN_LIBDIR_SECONDARY;
+-
+-	[CCode (cheader_filename="budgie-config.h")]
+-	public extern const string? RAVEN_PLUGIN_DATADIR_SECONDARY;
+-
+     [CCode (cheader_filename="budgie-config.h")]
+     public extern const string DATADIR;
+ 
 diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala
-index d3cdb65c..9d569bd1 100644
+index f4f2e4da..9d569bd1 100644
 --- a/src/panel/plugin_manager.vala
 +++ b/src/panel/plugin_manager.vala
-@@ -40,10 +40,26 @@ namespace Budgie {
+@@ -40,13 +40,26 @@ namespace Budgie {
 			}
 
 			/* System path */
 -			var dir = Environment.get_user_data_dir();
 -			engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY);
+-			if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
+-				engine.add_search_path(Budgie.MODULE_DIRECTORY_SECONDARY, Budgie.MODULE_DATA_DIRECTORY_SECONDARY);
 +			var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR");
 +			if (libdir != null) {
 +				debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir);
 +			} else {
 +				debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY);
 +				libdir = Budgie.MODULE_DIRECTORY;
-+			}
-+
+ 			}
+ 
 +			var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR");
 +			if (datadir != null) {
 +				debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
@ -25,22 +157,24 @@ index d3cdb65c..9d569bd1 100644
 +			}
 +
 +			engine.add_search_path(libdir, datadir);
- 
+
 			/* User path */
 +			var dir = Environment.get_user_data_dir();
 			var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins");
 			var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data");
 			engine.add_search_path(user_mod, hdata);
 diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala
-index b0814693..d671109a 100644
+index 01f32553..d671109a 100644
 --- a/src/raven/plugin_manager.vala
 +++ b/src/raven/plugin_manager.vala
-@@ -51,10 +51,26 @@ namespace Budgie {
+@@ -51,13 +51,26 @@ namespace Budgie {
 			}
 
 			/* System path */
 -			var dir = Environment.get_user_data_dir();
 -			engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR);
+-			if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
+-				engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR_SECONDARY, Budgie.RAVEN_PLUGIN_DATADIR_SECONDARY);
 +			var libdir = Environment.get_variable("RAVEN_PLUGIN_LIBDIR");
 +			if (libdir != null) {
 +				debug("RAVEN_PLUGIN_LIBDIR is set to %s", libdir);
@ -55,10 +189,10 @@ index b0814693..d671109a 100644
 +			} else {
 +				debug("RAVEN_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.RAVEN_PLUGIN_DATADIR);
 +				datadir = Budgie.RAVEN_PLUGIN_DATADIR;
-+			}
-+
-+			engine.add_search_path(libdir, datadir);
+ 			}
 
+			engine.add_search_path(libdir, datadir);
+
 			/* User path */
 +			var dir = Environment.get_user_data_dir();
 			var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins");
--- a/pkgs/desktops/budgie/budgie-desktop/wrapper.nix
+++ b/pkgs/desktops/budgie/budgie-desktop/wrapper.nix
@ -4,7 +4,7 @@
 , xorg
 , wrapGAppsHook
 , budgie-desktop
-, plugins ? []
+, plugins ? [ ]
 }:

 stdenv.mkDerivation {
--- a/pkgs/development/compilers/august/default.nix
+++ b/pkgs/development/compilers/august/default.nix
@ -0,0 +1,30 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "august";
+  version = "unstable-2023-08-13";
+
+  src = fetchFromGitHub {
+    owner = "yoav-lavi";
+    repo = "august";
+    rev = "42b8a1bf5ca079aca1769d92315f70b193a9cd4a";
+    hash = "sha256-58DZMoRH9PBbM4sok/XbUcwSXBeqUAmFZpffdMKQ+dE=";
+  };
+
+  cargoHash = "sha256-/GvBbsSL0dZ0xTystIpb8sk1nNg5hmP4yceCHlh7EQE=";
+
+  postInstall = ''
+    mv $out/bin/{august-cli,ag}
+  '';
+
+  meta = with lib; {
+    description = "An Emmet-like language that produces JSON, TOML, or YAML";
+    homepage = "https://github.com/yoav-lavi/august";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ figsoda ];
+    mainProgram = "ag";
+  };
+}
--- a/pkgs/development/libraries/llhttp/default.nix
+++ b/pkgs/development/libraries/llhttp/default.nix
@ -2,13 +2,13 @@

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

  src = fetchFromGitHub {
    owner = "nodejs";
    repo = "llhttp";
    rev = "release/v${version}";
-    hash = "sha256-mk9tNZJONh1xdZ8lqquMfFDEvEdYRucNlSrR64U8eaA=";
+    hash = "sha256-cXqc6/lQUhp9GV8msXsPokd6OGSczvz8uAXkM16GEE0=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/science/math/nccl/tests.nix
+++ b/pkgs/development/libraries/science/math/nccl/tests.nix
@ -0,0 +1,57 @@
+{ config
+, cudaPackages
+, fetchFromGitHub
+, lib
+, mpiSupport ? false
+, mpi
+, stdenv
+, which
+}:
+
+cudaPackages.backendStdenv.mkDerivation (finalAttrs: {
+
+  pname = "nccl-tests";
+  version = "2.13.6";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = finalAttrs.pname;
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-3gSBQ0g6mnQ/MFXGflE+BqqrIUoiBgp8+fWRQOvLVkw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cudaPackages.cuda_nvcc
+    which
+  ];
+
+  buildInputs = [
+    cudaPackages.cuda_cudart
+    cudaPackages.nccl
+  ] ++ lib.optional mpiSupport mpi;
+
+  makeFlags = [
+    "CUDA_HOME=${cudaPackages.cuda_nvcc}"
+    "NCCL_HOME=${cudaPackages.nccl}"
+  ] ++ lib.optionals mpiSupport [
+    "MPI=1"
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -r build/* $out/bin/
+  '';
+
+  meta = with lib; {
+    description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations";
+    homepage = "https://github.com/NVIDIA/nccl-tests";
+    platforms = [ "x86_64-linux" ];
+    license = licenses.bsd3;
+    broken = !config.cudaSupport || (mpiSupport && mpi == null);
+    maintainers = with maintainers; [ jmillerpdt ];
+  };
+})
--- a/pkgs/development/python-modules/aioqsw/default.nix
+++ b/pkgs/development/python-modules/aioqsw/default.nix
@ -4,22 +4,29 @@
 , fetchFromGitHub
 , pytestCheckHook
 , pythonOlder
+, setuptools
+, wheel
 }:

 buildPythonPackage rec {
  pname = "aioqsw";
-  version = "0.3.2";
-  format = "setuptools";
+  version = "0.3.3";
+  format = "pyproject";

-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.11";

  src = fetchFromGitHub {
    owner = "Noltari";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-Z7Q9b+ameddvGu9KJUNsaqOHiu0qXnpzuiZwg+/0+64=";
+    hash = "sha256-2fu78mp9ztm229N+zhvY7FuWl3xZlqSYVk/Okp2RNJI=";
  };

+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
+
  propagatedBuildInputs = [
    aiohttp
  ];
--- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
@ -7,14 +7,14 @@

 buildPythonPackage rec {
  pname = "aliyun-python-sdk-config";
-  version = "2.2.10";
+  version = "2.2.11";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Yv0RIraWi1HMlzIQkH8JXvVi3FvyCmDvH9XjAamEDQo=";
+    hash = "sha256-nkCNzOg6JYQkIlmcFm3VIjHvoHDK7hfw4PhrUwnNp28=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "griffe";
-  version = "0.33.0";
+  version = "0.34.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "mkdocstrings";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-dmNALIXCkbkEh0orahvmKPvK2Nh5Voe9ZWZLw1Sgt4w=";
+    hash = "sha256-kc+RL5ulV2VfB4ojgv/ZSupPy36kyOqbLBWHPiSpqkk=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@ -9,19 +9,19 @@

 buildPythonPackage rec {
  pname = "grpcio-testing";
-  version = "1.56.2";
+  version = "1.57.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Cg1dONvESb1ayz5ogv9AWHywqd0LdVsRDpIwtos+0SA=";
+    hash = "sha256-xFMqJlY+Ehn0K3bXqdiGEvL2X3Pm7IPhHHPWTi8ecOk=";
  };

  postPatch = ''
    substituteInPlace setup.py \
-      --replace "'grpcio>={version}'.format(version=grpc_version.VERSION)" "'grpcio'"
+      --replace '"grpcio>={version}".format(version=grpc_version.VERSION)' '"grpcio"'
  '';

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/gsm0338/default.nix
+++ b/pkgs/development/python-modules/gsm0338/default.nix
@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+}:
+
+buildPythonPackage {
+  pname = "gsm0338";
+  version = "1.1.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "dsch";
+    repo = "gsm0338";
+    rev = "1c036bd3b656b5075fdc221cbc578c4a47b42b1f";
+    hash = "sha256-EkUVd4d4Te8brHerygDc6KQSpiX11NrHYkcZSDRi05w=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "gsm0338" ];
+
+  meta = with lib; {
+    description = "Python codec for GSM 03.38";
+    homepage = "https://github.com/dsch/gsm0338";
+    license = licenses.mit;
+    maintainers = with maintainers; [ flokli janik ];
+  };
+}
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@ -11,16 +11,16 @@

 buildPythonPackage rec {
  pname = "mkdocstrings-python";
-  version = "1.4.0";
+  version = "1.5.0";
  format = "pyproject";

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "mkdocstrings";
    repo = "python";
    rev = "refs/tags/${version}";
-    hash = "sha256-O4lKL7b85lbF04p8pZrtg5CSVLJQIsktNUn7HDdDYio=";
+    hash = "sha256-Z92w84JI7tzARHNdVZvOrMHFbMLUayf6uHak++C0suc=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "opower";
-  version = "0.0.29";
+  version = "0.0.31";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "tronikos";
    repo = "opower";
    rev = "refs/tags/v${version}";
-    hash = "sha256-UvpBTCccJgJmseIn3eZdq6M+wF+Nm/aRxGHmMiMZy6w=";
+    hash = "sha256-lJVaQnGfZBjMgWLKZG/LNao8l4Fj3z3AZhnfgJwOcxo=";
  };

  pythonRemoveDeps = [
--- a/pkgs/development/python-modules/pysim/default.nix
+++ b/pkgs/development/python-modules/pysim/default.nix
@ -0,0 +1,72 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools
+, pytestCheckHook
+, pytest-asyncio
+, colorlog
+, smpp_pdu
+, pyscard
+, packaging
+, gsm0338
+, bidict
+, jsonpath-ng
+, termcolor
+, pyyaml
+, pycryptodomex
+, construct
+, pyserial
+, pytlv
+, cmd2
+}:
+
+buildPythonPackage {
+  pname = "pysim";
+  version = "unstable-2023-08-13";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "osmocom";
+    repo = "pysim";
+    rev = "09ff0e2b433b7143d5b40b4494744569b805e554";
+    hash = "sha256-7IwIovGR0GcS1bidSqoytmombK6NkLSVAfKB2teW2JU=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace 'smpp.pdu @ git+https://github.com/hologram-io/smpp.pdu' 'smpp.pdu'
+  '';
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    bidict
+    cmd2
+    colorlog
+    construct
+    gsm0338
+    jsonpath-ng
+    packaging
+    pycryptodomex
+    pyscard
+    pyserial
+    pytlv
+    pyyaml
+    smpp_pdu
+    termcolor
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pySim" ];
+
+  meta = with lib; {
+    description = "A python tool to program SIMs / USIMs / ISIMs.";
+    homepage = "https://github.com/osmocom/pysim";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ flokli janik ];
+  };
+}
--- a/pkgs/development/python-modules/pytlv/default.nix
+++ b/pkgs/development/python-modules/pytlv/default.nix
@ -0,0 +1,30 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, poetry-core
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "pytlv";
+  version = "0.71";
+  format = "pyproject";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-btxZ0oQzn1ZpwXihHlg6CduLh8nkerLV7SoFyXzJjVY=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [ "pytlv" ];
+
+  meta = with lib; {
+    description = "TLV (tag length lavue) data parser, especially useful for EMV tags parsing";
+    homepage = "https://github.com/timgabets/pytlv";
+    license = licenses.lgpl2;
+    maintainers = with maintainers; [ flokli janik ];
+  };
+}
--- a/pkgs/development/python-modules/smpp.pdu/default.nix
+++ b/pkgs/development/python-modules/smpp.pdu/default.nix
@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pydantic
+, requests
+, pytestCheckHook
+, pytest-asyncio
+, setuptools
+}:
+
+buildPythonPackage {
+  pname = "smpp.pdu";
+  version = "unstable-2022-09-02";
+  format = "pyproject";
+
+  # Upstream was once mozes/smpp.pdu, but it's dead and Python 2 only.
+  src = fetchFromGitHub {
+    owner = "hologram-io";
+    repo = "smpp.pdu";
+    rev = "20acc840ded958898eeb35ae9a18df9b29bdaaac";
+    hash = "sha256-/icVexc2S8sbJqn4ioeIhYxyDFIENuCfsFhl0uAHa9g=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "smpp.pdu" ];
+
+  meta = with lib; {
+    description = "Library for parsing Protocol Data Units (PDUs) in SMPP protocol";
+    homepage = "https://github.com/hologram-io/smpp.pdu";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ flokli janik ];
+  };
+}
--- a/pkgs/development/python-modules/yalexs/default.nix
+++ b/pkgs/development/python-modules/yalexs/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "yalexs";
-  version = "1.5.2";
+  version = "1.7.0";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "bdraco";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-IkjRoomRcUQSTLloLpiyO2Llk3NZYxbx0oeH8TCVAHc=";
+    hash = "sha256-Lh+3ZpOAhOQjSLoJTaLY5706I3tKy7pqQE6M1cRCYrw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/tools/golangci-lint/default.nix
+++ b/pkgs/development/tools/golangci-lint/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "golangci-lint";
-  version = "1.54.1";
+  version = "1.54.2";

  src = fetchFromGitHub {
    owner = "golangci";
    repo = "golangci-lint";
    rev = "v${version}";
-    hash = "sha256-Dymo/ABlDh8JwaTMTQgsWARuAkqHbakyUzujTgtMTyQ=";
+    hash = "sha256-7nbgiUrp7S7sXt7uFXX8NHYbIRLZZQcg+18IdwAZBfE=";
  };

-  vendorHash = "sha256-rMektYjs8laN9ykc3bcYOgJ9twnjKl1gIEEL/wPkhfE=";
+  vendorHash = "sha256-IyH5lG2a4zjsg/MUonCUiAgMl4xx8zSflRyzNgk8MR0=";

  subPackages = [ "cmd/golangci-lint" ];

--- a/pkgs/development/tools/just/default.nix
+++ b/pkgs/development/tools/just/default.nix
@ -72,6 +72,8 @@ rustPlatform.buildRustPackage rec {
      --zsh completions/just.zsh
  '';

+  setupHook = ./setup-hook.sh;
+
  passthru.updateScript = nix-update-script { };

  meta = with lib; {
--- a/pkgs/development/tools/just/setup-hook.sh
+++ b/pkgs/development/tools/just/setup-hook.sh
@ -0,0 +1,58 @@
+justBuildPhase() {
+    runHook preBuild
+
+    local flagsArray=($justFlags "${justFlagsArray[@]}")
+
+    echoCmd 'build flags' "${flagsArray[@]}"
+    just "${flagsArray[@]}"
+
+    runHook postBuild
+}
+
+justCheckPhase() {
+    runHook preCheck
+
+    if [ -z "${checkTarget:-}" ]; then
+        if just -n test >/dev/null 2>&1; then
+            checkTarget=test
+        fi
+    fi
+
+    if [ -z "${checkTarget:-}" ]; then
+        echo "no test target found in just, doing nothing"
+    else
+        local flagsArray=(
+            $justFlags "${justFlagsArray[@]}"
+            $checkTarget
+        )
+
+        echoCmd 'check flags' "${flagsArray[@]}"
+        just "${flagsArray[@]}"
+    fi
+
+    runHook postCheck
+}
+
+justInstallPhase() {
+    runHook preInstall
+
+    # shellcheck disable=SC2086
+    local flagsArray=($justFlags "${justFlagsArray[@]}" ${installTargets:-install})
+
+    echoCmd 'install flags' "${flagsArray[@]}"
+    just "${flagsArray[@]}"
+
+    runHook postInstall
+}
+
+if [ -z "${dontUseJustBuild-}" -a -z "${buildPhase-}" ]; then
+    buildPhase=justBuildPhase
+fi
+
+if [ -z "${dontUseJustCheck-}" -a -z "${checkPhase-}" ]; then
+    checkPhase=justCheckPhase
+fi
+
+if [ -z "${dontUseJustInstall-}" -a -z "${installPhase-}" ]; then
+    installPhase=justInstallPhase
+fi
--- a/pkgs/development/tools/language-servers/gopls/default.nix
+++ b/pkgs/development/tools/language-servers/gopls/default.nix
@ -2,17 +2,17 @@

 buildGoModule rec {
  pname = "gopls";
-  version = "0.13.1";
+  version = "0.13.2";

  src = fetchFromGitHub {
    owner = "golang";
    repo = "tools";
    rev = "gopls/v${version}";
-    hash = "sha256-2eGnctA5HlNRGv9iV5HoT4ByA8fK/mTxldHll0UMD5c=";
+    hash = "sha256-fRpVAYg4UwRe3bcjQPOnCGWSANfoTwD5Y9vs3QET1eM=";
  };

  modRoot = "gopls";
-  vendorHash = "sha256-2H8Qh88ikmEqToGOCOoovcCh3dMToeFP/GavG9dlML8=";
+  vendorHash = "sha256-9d7vgCMc1M5Cab+O10lQmKGfL9gqO3sajd+3rF5cums=";

  doCheck = false;

--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "grails";
-  version = "5.3.3";
+  version = "6.0.0";

  src = fetchurl {
    url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "sha256-uNp6jQAlSOQlZ26PBYofBWANhKEnkYN+PTOSy8bQQ/o=";
+    sha256 = "sha256-Lh0bfU1A/deQiTunjGbhErd8GXiVwCJCI3cuvClVRTU=";
  };

  nativeBuildInputs = [ unzip ];
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@ -12,18 +12,21 @@ in
 callPackage ./generic.nix args {
  # check the release notes for compatible kernels
  kernelCompatible = if stdenv'.isx86_64 || removeLinuxDRM
-    then kernel.kernelOlder "6.4"
+    then kernel.kernelOlder "6.5"
    else kernel.kernelOlder "6.2";

-  latestCompatibleLinuxPackages = linuxKernel.packages.linux_6_1;
+  latestCompatibleLinuxPackages = if stdenv'.isx86_64 || removeLinuxDRM
+    then linuxKernel.packages.linux_6_4
+    else linuxKernel.packages.linux_6_1;

  # this package should point to a version / git revision compatible with the latest kernel release
  # IMPORTANT: Always use a tagged release candidate or commits from the
  # zfs-<version>-staging branch, because this is tested by the OpenZFS
  # maintainers.
-  version = "2.1.12";
+  version = "2.1.13-unstable-2023-08-02";
+  rev = "245850b66c1e93ec19744ca55aae143d007d2c32";

-  sha256 = "eYUR5d4gpTrlFu6j1uL83DWL9uPGgAUDRdSEb73V5i4=";
+  sha256 = "TtgKV02W8OfU6hssULF/IoFXAPHBTvTKXn5hJ/RGAc0=";

  isUnstable = true;
 }
--- a/pkgs/servers/dns/bind/default.nix
+++ b/pkgs/servers/dns/bind/default.nix
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
  enableParallelBuilding = true;
  # TODO: investigate the aarch64-linux failures; see this and linked discussions:
  # https://github.com/NixOS/nixpkgs/pull/192962
-  doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux);
+  doCheck = with stdenv.hostPlatform; !isStatic && !(isAarch64 && isLinux) && !isi686;
  checkTarget = "unit";
  checkInputs = [
    cmocka
--- a/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
+++ b/pkgs/servers/monitoring/buildkite-agent-metrics/default.nix
@ -1,11 +1,10 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
-, fetchpatch
 }:
 buildGoModule rec {
  pname = "buildkite-agent-metrics";
-  version = "5.2.1";
+  version = "5.7.0";

  outputs = [ "out" "lambda" ];

@ -13,20 +12,10 @@ buildGoModule rec {
    owner = "buildkite";
    repo = "buildkite-agent-metrics";
    rev = "v${version}";
-    sha256 = "XZYVCSJ/DIwoLrz37aQ3yW3RUhOhorY8L1AsAWxywcg=";
+    hash = "sha256-+DK8OP/rOWIBw+5Fprd5gzFo1rJDkDt4G20iUVmrfLw=";
  };

-  vendorSha256 = "UIkU3i45IEXWHdiakTj7f4W9kR49k4A93msfkqeXmQQ=";
-
-  patches = [
-    # Necessary to support passing the agent token in an env var, rather than on
-    # the command line. Should be removed upon the next release.
-    (fetchpatch {
-      name = "BUILDKITE_AGENT_TOKEN-env-var.patch";
-      url = "https://github.com/buildkite/buildkite-agent-metrics/commit/6c40b478b95f0e05fc12b87158222a9ff68169e0.patch";
-      sha256 = "Y4m9qGyPIROSqOY6G6xRQfFENEG4bFF3q5dZcHI4XiY=";
-    })
-  ];
+  vendorHash = "sha256-QfvHTJQEG5nvJy5ZZ9c66JYWMcR9Irow8OOyqDDjQN0=";

  postInstall = ''
    mkdir -p $lambda/bin
--- a/pkgs/servers/nosql/victoriametrics/default.nix
+++ b/pkgs/servers/nosql/victoriametrics/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "VictoriaMetrics";
-  version = "1.92.1";
+  version = "1.93.0";

  src = fetchFromGitHub {
    owner = pname;
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-s4OxOyOfPd98ZTdn/VYr9Z12zrQM5ZCsoJBx6nwz1Ww=";
+    hash = "sha256-NkpMGsNz4knt5QY6B9sPJ3GcXEgPNyNgAsNBs9F2GOQ=";
  };

  vendorHash = null;
--- a/pkgs/test/texlive/default.nix
+++ b/pkgs/test/texlive/default.nix
@ -253,8 +253,9 @@
        "cefpdflatex" "cefslatex" "cefspdflatex" "chkdvifont" "dvi2fax" "dvired" "dviselect" "dvitodvi" "epsffit"
        "findhyph" "gbklatex" "gbkpdflatex" "komkindex" "kpsepath" "listbib" "listings-ext" "mag" "mathspic" "mf2pt1"
        "mk4ht" "mkt1font" "mkgrkindex" "musixflx" "pdf2ps" "pdftosrc" "pdfxup" "pedigree" "pfb2pfa" "pk2bm" "prepmx"
-        "ps2pk" "psselect" "pstops" "rubibtex" "rubikrotation" "sjislatex" "sjispdflatex" "srcredact" "t4ht" "tex4ht"
-        "texdiff" "texdirflatten" "texplate" "tie" "ttf2kotexfont" "ttfdump" "vlna" "vpl2ovp" "vpl2vpl" "yplan" ];
+        "ps2pk" "psselect" "pstops" "rubibtex" "rubikrotation" "sjislatex" "sjispdflatex" "srcredact" "t4ht"
+        "teckit_compile" "tex4ht" "texdiff" "texdirflatten" "texplate" "tie" "ttf2kotexfont" "ttfdump" "vlna" "vpl2ovp"
+        "vpl2vpl" "yplan" ];
      # (3) binaries requiring a .tex file
      contextTest = [ "htcontext" ];
      latexTest = [ "de-macro" "e2pall" "htlatex" "htxelatex" "makeindex" "pslatex" "rumakeindex" "tpic2pdftex"
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@ -11,23 +11,14 @@

 stdenv.mkDerivation rec {
  pname = "screen";
-  version = "4.9.0";
+  version = "4.9.1";

  src = fetchurl {
    url = "mirror://gnu/screen/${pname}-${version}.tar.gz";
-    sha256 = "1x1hqy4h47i7hk85f779lkwkm7gkq8h8mxwd0znkh5adpf0m4czr";
+    hash = "sha256-Js7z48QlccDUhK1vrxEMXBUJH7+HKwb6eqR2bHQFrGk=";
  };

-  patches = [
-    (fetchpatch {
-      name = "CVE-2023-24626.patch";
-      url = "https://git.savannah.gnu.org/cgit/screen.git/patch/?id=e9ad41bfedb4537a6f0de20f00b27c7739f168f7";
-      stripLen = 1;
-      sha256 = "sha256-NV6Uh4h9AK7kQMHqbxeuhjFEvwQH7OWdu7h8pZCGFog=";
-    })
-  ];
-
-  configureFlags= [
+  configureFlags = [
    "--enable-telnet"
    "--enable-pam"
    "--with-sys-screenrc=/etc/screenrc"
--- a/pkgs/tools/misc/tmux-sessionizer/default.nix
+++ b/pkgs/tools/misc/tmux-sessionizer/default.nix
@ -9,16 +9,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "tmux-sessionizer";
-  version = "0.2.1";
+  version = "0.2.3";

  src = fetchFromGitHub {
    owner = "jrmoulton";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-fV+LBs+jbcOjArUfygEXkyxg/xGhI35YduUkx4AyQhk=";
+    sha256 = "sha256-TTt4pEWlt1cL9SBM6C5dX88MqhBqr4Qt8INnWny8WL4=";
  };

-  cargoHash = "sha256-Bg4C4r3h/kaMsAqzit9JVuAe7vYrRB9W5OLOWPgCJHc=";
+  cargoHash = "sha256-Jq4wpSKo5kq6xSr/qRPlMy9QREUHQ33oQgXrvKi25lM=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
--- a/pkgs/tools/networking/dogdns/default.nix
+++ b/pkgs/tools/networking/dogdns/default.nix
@ -41,6 +41,10 @@ rustPlatform.buildRustPackage rec {
    };
  };

+  dontUseJustBuild = true;
+  dontUseJustCheck = true;
+  dontUseJustInstall = true;
+
  postPatch = ''
    # update Cargo.lock to work with openssl 3
    ln -sf ${./Cargo.lock} Cargo.lock
--- a/pkgs/tools/networking/veilid/Cargo.lock
+++ b/pkgs/tools/networking/veilid/Cargo.lock
@ -1562,9 +1562,9 @@ dependencies = [

 [[package]]
 name = "deranged"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
+checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"

 [[package]]
 name = "derivative"
@ -5642,7 +5642,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"

 [[package]]
 name = "veilid-cli"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
 "arboard",
 "async-std",
@ -5678,7 +5678,7 @@ dependencies = [

 [[package]]
 name = "veilid-core"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
 "argon2",
 "async-io",
@ -5781,7 +5781,7 @@ dependencies = [

 [[package]]
 name = "veilid-flutter"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
 "allo-isolate",
 "async-std",
@ -5810,7 +5810,7 @@ dependencies = [

 [[package]]
 name = "veilid-server"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
 "ansi_term",
 "async-std",
@ -5860,7 +5860,7 @@ dependencies = [

 [[package]]
 name = "veilid-tools"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
 "android-logd-logger",
 "async-lock",
@ -5911,7 +5911,7 @@ dependencies = [

 [[package]]
 name = "veilid-wasm"
-version = "0.1.9"
+version = "0.1.10"
 dependencies = [
 "cfg-if 1.0.0",
 "console_error_panic_hook",
--- a/pkgs/tools/networking/veilid/default.nix
+++ b/pkgs/tools/networking/veilid/default.nix
@ -10,14 +10,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "veilid";
-  version = "0.1.9";
+  version = "0.1.10";

  src = fetchFromGitLab {
    owner = "veilid";
    repo = pname;
    rev = "v${version}";
    fetchSubmodules = true;
-    sha256 = "sha256-mkb10JishprTyHV5lsFp/P57E2xTX+baHkJM4K2p4x4=";
+    sha256 = "sha256-43VCv0MqRIqKioM5Uj3sap9SvGnjgrZFxGPG98hk1v0=";
  };

  cargoLock = {
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@ -1,5 +1,19 @@
-{ lib, stdenv, fetchgit, perl, gnutar, zlib, bzip2, xz, zstd
-, libmd, makeWrapper, coreutils, autoreconfHook, pkg-config
+{ lib
+, stdenv
+, fetchgit
+, perl
+, gnutar
+, zlib
+, bzip2
+, xz
+, zstd
+, libmd
+, makeWrapper
+, coreutils
+, autoreconfHook
+, pkg-config
+, diffutils
+, glibc
 }:

 stdenv.mkDerivation rec {
@ -14,12 +28,11 @@ stdenv.mkDerivation rec {

  configureFlags = [
    "--disable-dselect"
+    "--disable-start-stop-daemon"
    "--with-admindir=/var/lib/dpkg"
    "PERL_LIBDIR=$(out)/${perl.libPrefix}"
    "TAR=${gnutar}/bin/tar"
-    (lib.optionalString stdenv.isDarwin "--disable-linker-optimisations")
-    (lib.optionalString stdenv.isDarwin "--disable-start-stop-daemon")
-  ];
+  ] ++ lib.optional stdenv.isDarwin "--disable-linker-optimisations";

  enableParallelBuilding = true;

@ -37,7 +50,7 @@ stdenv.mkDerivation rec {
    done
  '';

-  patchPhase = ''
+  postPatch = ''
    patchShebangs .

    # Dpkg commands sometimes calls out to shell commands
@ -52,7 +65,9 @@ stdenv.mkDerivation rec {
       --replace '"debsig-verify"' \"$out/bin/debsig-verify\" \
       --replace '"rm"' \"${coreutils}/bin/rm\" \
       --replace '"cat"' \"${coreutils}/bin/cat\" \
-       --replace '"diff"' \"${coreutils}/bin/diff\"
+       --replace '"diff"' \"${diffutils}/bin/diff\"
+    substituteInPlace src/main/help.c \
+       --replace '"ldconfig"' \"${glibc.bin}/bin/ldconfig\"
  '';

  buildInputs = [ perl zlib bzip2 xz zstd libmd ];
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
@ -322,6 +322,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex
    mv "$out/bin"/{luatex,texlua,texluac} "$luatex/bin/"
    mv "$out/bin"/luahbtex "$luahbtex/bin/"
    mv "$out/bin"/xetex "$xetex/bin/"
+    cp ../../libs/teckit/teckit_compile "$xetex/bin/"
  '' + lib.optionalString withLuaJIT ''
    mv "$out/bin"/mfluajit{,-nowin} "$mflua/bin/"
    mv "$out/bin"/{luajittex,luajithbtex,texluajit,texluajitc} "$luajittex/bin/"
@ -472,6 +473,19 @@ xdvi = stdenv.mkDerivation {
  # TODO: it's suspicious that mktexpk generates fonts into ~/.texlive2014
 };

+xpdfopen = stdenv.mkDerivation {
+  pname = "texlive-xpdfopen.bin";
+  inherit (lib.head texlive.xpdfopen.pkgs) version;
+
+  inherit (common) src;
+
+  buildInputs = [ libX11 ];
+
+  preConfigure = "cd utils/xpdfopen";
+
+  enableParallelBuilding = true;
+};
+
 } # un-indented

 // lib.optionalAttrs (!clisp.meta.broken) # broken on aarch64 and darwin (#20062)
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@ -123,9 +123,6 @@ let
      #### adjustments to binaries
      # TODO patch the scripts from bin.* directly in bin.* instead of here

-      # TODO we do not build binaries for the following packages (yet!)
-      xpdfopen.binfiles = [];
-
      # mptopdf is a format link, but not generated by texlinks
      # so we add it back to binfiles to generate it from mkPkgBin
      mptopdf.binfiles = (orig.mptopdf.binfiles or []) ++ [ "mptopdf" ];
@ -136,10 +133,6 @@ let
      # upmendex is "TODO" in bin.nix
      uptex.binfiles = lib.remove "upmendex" orig.uptex.binfiles;

-      # teckit_compile seems to be missing from bin.core{,-big}
-      # TODO find it!
-      xetex.binfiles = lib.remove "teckit_compile" orig.xetex.binfiles;
-
      # xindy is broken on some platforms unfortunately
      xindy.binfiles = if bin ? xindy
        then lib.subtractLists [ "xindy.mem" "xindy.run" ] orig.xindy.binfiles
--- a/pkgs/tools/video/rwedid/default.nix
+++ b/pkgs/tools/video/rwedid/default.nix
@ -0,0 +1,47 @@
+{ lib
+, rustPlatform
+, fetchFromGitea
+, pkg-config
+, xz
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rwedid";
+  version = "0.3.2";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "ral";
+    repo = "rwedid";
+    rev = version;
+    hash = "sha256-lbZD/QLCgkD5OQZdn6oCjry9edMcJ+q9qGF7IbY36U4=";
+  };
+
+  cargoHash = "sha256-eY12p8pyUjSaoP4QKfVFwKQGdvFNG7GMAbFkFa8i05I=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    xz
+  ];
+
+  postInstall = ''
+    mkdir -p $out/etc/udev/rules.d
+    echo 'SUBSYSTEM=="i2c-dev",KERNEL=="i2c-[0-9]*", ATTRS{class}=="0x030000", TAG+="uaccess"' > $out/etc/udev/rules.d/60-rwedid.rules
+  '';
+
+  meta = with lib; {
+    description = "Read and write EDID data over an I2C bus";
+    longDescription = ''
+      To install udev rules, you also have to add `services.udev.packages = [ pkgs.rwedid ]` into your configuration.
+      Additionally you will also have to create the i2c group, on NixOS this can be done using `users.groups.i2c = {};`.
+      And you will have to load i2c-dev kernel module, for that add `boot.initrd.availableKernelModules = [ i2c-dev ] to your config.
+    '';
+    homepage = "https://codeberg.org/ral/rwedid";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ janik ];
+  };
+}
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -12755,6 +12755,8 @@ with pkgs;

  rwc = callPackage ../tools/system/rwc { };

+  rwedid = callPackage ../tools/video/rwedid { };
+
  rxp = callPackage ../tools/text/xml/rxp { };

  rzip = callPackage ../tools/compression/rzip { };
@ -15379,6 +15381,8 @@ with pkgs;

  ats-acc = callPackage ../development/tools/ats-acc { };

+  august = callPackage ../development/compilers/august { };
+
  avra = callPackage ../development/compilers/avra { };

  ballerina = callPackage ../development/compilers/ballerina {
@ -30299,6 +30303,8 @@ with pkgs;

  appvm = callPackage ../applications/virtualization/appvm { };

+  anilibria-winmaclinux = libsForQt5.callPackage ../applications/video/anilibria-winmaclinux { };
+
  yggdrasil = callPackage ../tools/networking/yggdrasil { };

  masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { };
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@ -47,6 +47,8 @@ let

    nccl = final.callPackage ../development/libraries/science/math/nccl { };

+    nccl-tests = final.callPackage ../development/libraries/science/math/nccl/tests.nix { };
+
    autoAddOpenGLRunpathHook = final.callPackage ( { makeSetupHook, addOpenGLRunpath }:
      makeSetupHook {
        name = "auto-add-opengl-runpath-hook";
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -4608,6 +4608,8 @@ self: super: with self; {

  gsd = callPackage ../development/python-modules/gsd { };

+  gsm0338 = callPackage ../development/python-modules/gsm0338 { };
+
  gspread = callPackage ../development/python-modules/gspread { };

  gssapi = callPackage ../development/python-modules/gssapi {
@ -8206,6 +8208,8 @@ self: super: with self; {

  pytest-pudb = callPackage ../development/python-modules/pytest-pudb { };

+  pytlv = callPackage ../development/python-modules/pytlv { };
+
  python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };

  python-creole = callPackage ../development/python-modules/python-creole { };
@ -9837,6 +9841,8 @@ self: super: with self; {

  pysigset = callPackage ../development/python-modules/pysigset { };

+  pysim = callPackage ../development/python-modules/pysim { };
+
  pysimplegui = callPackage ../development/python-modules/pysimplegui { };

  pysingleton = callPackage ../development/python-modules/pysingleton { };
@ -11820,6 +11826,8 @@ self: super: with self; {

  smpplib = callPackage ../development/python-modules/smpplib { };

+  smpp_pdu = callPackage ../development/python-modules/smpp.pdu { };
+
  snack = toPythonModule (pkgs.newt.override {
    inherit (self) python;
  });