Merge master into staging-next

nixos/lib/test-driver/src/test_driver/machine.py

···
             retry(tty_matches, timeout)
 
     def send_chars(self, chars: str, delay: float | None = 0.01) -> None:
-        """
+        r"""
         Simulate typing a sequence of characters on the virtual keyboard,
         e.g., `send_chars("foobar\n")` will type the string `foobar`
         followed by the Enter key.

nixos/modules/programs/wayland/sway.nix

···
       # https://github.com/emersion/xdg-desktop-portal-wlr/pull/315
       xdg.portal.config.sway = {
         # Use xdg-desktop-portal-gtk for every portal interface...
-        default = "gtk";
+        default = [ "gtk" ];
         # ... except for the ScreenCast, Screenshot and Secret
         "org.freedesktop.impl.portal.ScreenCast" = "wlr";
         "org.freedesktop.impl.portal.Screenshot" = "wlr";

nixos/modules/system/boot/systemd/journald.nix

···
   config,
   lib,
   pkgs,
+  utils,
   ...
 }:
 let
···
       '';
     };
 
+    services.journald.audit = lib.mkOption {
+      default = null;
+      type = lib.types.nullOr lib.types.bool;
+      description = ''
+        If enabled systemd-journald will turn on auditing on start-up.
+        If disabled it will turn it off. If unset it will neither enable nor disable it, leaving the previous state unchanged.
+
+        NixOS defaults to leaving this unset as enabling audit without auditd running leads to spamming /dev/kmesg with random messages
+        and if you enable auditd then auditd is responsible for turning auditing on.
+
+        If you want to have audit logs in journald and do not mind audit logs also ending up in /dev/kmesg you can set this option to true.
+
+        If you want to for some ununderstandable reason disable auditing if auditd enabled it then you can set this option to false.
+        It is of NixOS' opinion that setting this to false is definitely the wrong thing to do - but it's an option.
+      '';
+    };
+
     services.journald.extraConfig = lib.mkOption {
       default = "";
       type = lib.types.lines;
···
         "syslog.socket"
       ];
 
+    systemd.sockets.systemd-journald-audit.wantedBy = [
+      "systemd-journald.service"
+      "sockets.target"
+    ];
+
     environment.etc = {
       "systemd/journald.conf".text = ''
         [Journal]
···
         ${lib.optionalString (cfg.forwardToSyslog) ''
           ForwardToSyslog=yes
         ''}
+        Audit=${utils.systemdUtils.lib.toOption cfg.audit}
         ${cfg.extraConfig}
       '';
     };

nixos/tests/systemd-journal.nix

···
       maintainers = [ lewo ];
     };
 
-    nodes.machine = { };
+    nodes.machine = {
+      environment.systemPackages = [ pkgs.audit ];
+    };
+    nodes.auditd = {
+      security.auditd.enable = true;
+      environment.systemPackages = [ pkgs.audit ];
+    };
+    nodes.journaldAudit = {
+      services.journald.audit = true;
+      environment.systemPackages = [ pkgs.audit ];
+    };
 
     testScript = ''
       machine.wait_for_unit("multi-user.target")
+      machine.succeed("journalctl --grep=systemd")
 
-      machine.succeed("journalctl --grep=systemd")
+      with subtest("no audit messages"):
+        machine.fail("journalctl _TRANSPORT=audit --grep 'unit=systemd-journald'")
+        machine.fail("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'")
+
+      with subtest("auditd enabled"):
+        auditd.wait_for_unit("multi-user.target")
+
+        # logs should end up in the journald
+        auditd.succeed("journalctl _TRANSPORT=audit --grep 'unit=systemd-journald'")
+        # logs should end up in the auditd audit log
+        auditd.succeed("grep 'unit=systemd-journald' /var/log/audit/audit.log")
+        # logs should not end up in kmesg
+        machine.fail("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'")
+
+
+      with subtest("journald audit"):
+        journaldAudit.wait_for_unit("multi-user.target")
+
+        # logs should end up in the journald
+        journaldAudit.succeed("journalctl _TRANSPORT=audit --grep 'unit=systemd-journald'")
+        # logs should NOT end up in audit log
+        journaldAudit.fail("grep 'unit=systemd-journald' /var/log/audit/audit.log")
+        # FIXME: If systemd fixes #15324 this test will start failing.
+        # You can fix this text by removing the below line.
+        # logs ideally should NOT end up in kmesg, but they do due to
+        # https://github.com/systemd/systemd/issues/15324
+        journaldAudit.succeed("journalctl _TRANSPORT=kernel --grep 'unit=systemd-journald'")
     '';
   }
 )

pkgs/applications/editors/vim/plugins/overrides.nix

···
     dependencies = [ self.plenary-nvim ];
   };
 
+  mini-nvim = super.mini-nvim.overrideAttrs {
+    # reduce closure size
+    postInstall = ''
+      rm -rf $out/{Makefile,benchmarks,readmes,tests,scripts}
+    '';
+  };
+
   git-conflict-nvim = super.git-conflict-nvim.overrideAttrs {
     # TODO: Remove after next fixed version
     # https://github.com/akinsho/git-conflict.nvim/issues/103

pkgs/applications/graphics/qimgv/default.nix

···
   qtbase,
   qtimageformats,
   qtsvg,
+  qttools,
 }:
 
 mkDerivation rec {
   pname = "qimgv";
-  version = "1.0.3-alpha";
+  version = "1.0.3-unstable-2024-10-11";
 
   src = fetchFromGitHub {
     owner = "easymodo";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-fHMSo8zlOl9Lt8nYwClUzON4TPB9Ogwven+TidsesxY=";
+    rev = "a4d475fae07847be7c106cb628fb97dad51ab920";
+    sha256 = "sha256-iURUJiPe8hbCnpaf6lk8OVSzVqrJKGab889yOic5yLI=";
   };
 
   nativeBuildInputs = [
···
     qtbase
     qtimageformats
     qtsvg
+    qttools
   ];
 
   postPatch = ''

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

···
+{
+  lib,
+  stdenvNoCC,
+  darwin,
+  fetchurl,
+  _7zz,
+  undmg,
+}:
+
+let
+  source = import ./source.nix;
+in
+stdenvNoCC.mkDerivation {
+  pname = "chatgpt";
+  inherit (source) version;
+
+  src = fetchurl source.src;
+
+  nativeBuildInputs = [
+    undmg
+  ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    mkdir -p "$out/bin"
+    cp -a ChatGPT.app "$out/Applications"
+    ln -s "$out/Applications/ChatGPT.app/Contents/MacOS/ChatGPT" "$out/bin/ChatGPT"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Desktop application for ChatGPT";
+    homepage = "https://openai.com/chatgpt/desktop/";
+    changelog = "https://help.openai.com/en/articles/9703738-macos-app-release-notes";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ wattmto ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    mainProgram = "ChatGPT";
+  };
+}

pkgs/by-name/ch/chatgpt/source.nix

···
+{
+  version = "1.2025.014";
+  src = {
+    url = "https://persistent.oaistatic.com/sidekick/public/ChatGPT_Desktop_public_1.2025.014_1737150122.dmg";
+    hash = "sha256-NxCkrsPaptYNTZ+urkJqYeC4a0nGaEOFO/7SQL1Jmpc=";
+  };
+}

pkgs/by-name/ch/chatgpt/update.sh

···
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl libxml2
+
+XML_URL="https://persistent.oaistatic.com/sidekick/public/sparkle_public_appcast.xml"
+
+XML_DATA=$(curl -s $XML_URL)
+
+LATEST_VERSION=$(echo "$XML_DATA" | xmllint --xpath '/rss/channel/item[1]/*[local-name()="shortVersionString"]/text()' -)
+DOWNLOAD_URL=$(echo "$XML_DATA" | xmllint --xpath 'string(//item[1]/enclosure/@url)' -)
+
+HASH=$(nix-prefetch-url $DOWNLOAD_URL | xargs nix hash convert --hash-algo sha256)
+
+cat > source.nix << _EOF_
+{
+  version = "$LATEST_VERSION";
+  src = fetchurl {
+    url = "$DOWNLOAD_URL";
+    sha256 = "$HASH";
+  };
+}
+_EOF_

pkgs/by-name/ci/cinnamon-common/package.nix

···
 # TODO (after 25.05 branch-off): Rename to pkgs.cinnamon
 stdenv.mkDerivation rec {
   pname = "cinnamon-common";
-  version = "6.4.6";
+  version = "6.4.7";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "cinnamon";
     rev = version;
-    hash = "sha256-hvQINRvEqTDWV0ja1tHzkpJMexc0htL0IlCHuy8QCQk=";
+    hash = "sha256-WBdzlourYf2oEXUMbzNcNNsc8lBo6ujAy/K1Y6nGOjU=";
   };
 
   patches = [

pkgs/by-name/ep/ephemeralpg/package.nix

···
 }:
 stdenv.mkDerivation rec {
   pname = "ephemeralpg";
-  version = "3.3";
+  version = "3.4";
   src = fetchurl {
     url = "https://eradman.com/ephemeralpg/code/${pname}-${version}.tar.gz";
-    hash = "sha256-pVQrfSpwJnxCRXAUpZQZsb0Z/wlLbjdaYmhVevgHrgo=";
+    hash = "sha256-IwAIJFW/ahDXGgINi4N9mG3XKw74JXK6+SLxGMZ8tS0=";
   };
   nativeBuildInputs = [ makeWrapper ];
   installPhase = ''

pkgs/by-name/im/immich/package.nix

···
     preBuild = ''
       rm node_modules/@immich/sdk
       ln -s ${openapi} node_modules/@immich/sdk
-      # Rollup does not find the dependency otherwise
-      ln -s node_modules/@immich/sdk/node_modules/@oazapfts node_modules/
     '';
 
     installPhase = ''

pkgs/by-name/in/inconsolata/package.nix

···
   };
 
   installPhase = ''
-    install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf
+    install -m644 --target $out/share/fonts/truetype/inconsolata -D $src/ofl/inconsolata/static/*.ttf $src/ofl/inconsolata/*.ttf
   '';
 
   meta = with lib; {

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

···
-{
-  python3Packages,
-  lib,
-  fetchFromGitHub,
-}:
-
-python3Packages.buildPythonApplication rec {
-  pname = "litestar";
-  version = "2.13.0";
-  pyproject = true;
-
-  build-system = with python3Packages; [
-    hatchling
-  ];
-
-  src = fetchFromGitHub {
-    owner = "litestar-org";
-    repo = "litestar";
-    tag = "v${version}";
-    hash = "sha256-PR2DVNRtILHs7XwVi9/ZCVRJQFqfGLn1x2gpYtYjHDo=";
-  };
-
-  dependencies = with python3Packages; [
-    anyio
-    click
-    redis
-    httpx
-    msgspec
-    multidict
-    jinja2
-    pyyaml
-    rich
-    rich-click
-    typing-extensions
-    psutil
-    polyfactory
-    litestar-htmx
-    trio
-    cryptography
-    psycopg
-    fsspec
-    mako
-    time-machine
-    asyncpg
-    picologging
-  ];
-
-  meta = {
-    homepage = "https://litestar.dev/";
-    platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ bot-wxt1221 ];
-    changelog = "https://github.com/litestar-org/litestar/releases/tag/v${version}";
-    description = "Production-ready, Light, Flexible and Extensible ASGI API framework";
-    license = lib.licenses.mit;
-  };
-}
+{ python3Packages }: with python3Packages; toPythonApplication litestar

pkgs/by-name/ma/maildir-rank-addr/package.nix

···
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  ...
+}:
+buildGoModule rec {
+  pname = "maildir-rank-addr";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "ferdinandyb";
+    repo = "maildir-rank-addr";
+    tag = "v${version}";
+    hash = "sha256-3iDvVeiQjyck4+/IvxOe6w2ebR7yju2dV1ijVpajsKU=";
+  };
+
+  vendorHash = "sha256-Wl7KfvNYtvSUiYS1LpN027SrU+K3Uq0UQHv7slC2Xwc=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Generate a ranked addressbook from a maildir folder";
+    homepage = "https://github.com/ferdinandyb/maildir-rank-addr";
+    changelog = "https://github.com/ferdinandyb/maildir-rank-addr/blob/v${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "maildir-rank-addr";
+    maintainers = with lib.maintainers; [ antonmosich ];
+  };
+}

pkgs/by-name/mi/mirrord/manifest.json

···
     "aarch64-linux": {
       "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_linux_aarch64",
       "hash": "sha256-2SC/6Q43AhUjx2i3kwCLHIMEnxp23qbUuFXYKZBLin8="
+    },
+    "aarch64-darwin": {
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal",
+      "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk="
+    },
+    "x86_64-darwin": {
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.131.2/mirrord_mac_universal",
+      "hash": "sha256-uR7k9bE0J6Ald2joM+d51IbEIKBsigD+D5hAUeR17hk="
     }
   }
 }

pkgs/by-name/mi/mirrord/update.py

···
 platforms = {
     "x86_64-linux": "linux_x86_64",
     "aarch64-linux": "linux_aarch64",
+    "aarch64-darwin": "mac_universal",
+    "x86_64-darwin": "mac_universal",
 }
 
 if __name__ == "__main__":

pkgs/by-name/nv/nvidia_oc/package.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "nvidia_oc";
-  version = "0.1.16";
+  version = "0.1.18";
 
   src = fetchFromGitHub {
     owner = "Dreaming-Codes";
     repo = "nvidia_oc";
     tag = version;
-    hash = "sha256-9FNulyXLHDQ/FQBAGaINRW0F3KZdRcgmDHn7vQX2L2U=";
+    hash = "sha256-4dXdOwo7RidYEwKkoJp3+IvkGcXuS+irRbOlsfOKqIQ=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-DuuHqBhL25ghgcYxcOtWRArUqL9+c3d5mBrAcWTAFW8=";
+  cargoHash = "sha256-CxiKkm4NyYtKqSf/FtE7Pp3myCYxMMaV0h3Khd6HgTY=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath

pkgs/by-name/op/open-webui/package.nix

···
 }:
 let
   pname = "open-webui";
-  version = "0.5.9";
+  version = "0.5.10";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-r4jl1WNI8tyhwyYbTZ+Q52xvv3PJY2FvhexMYHIIDPg=";
+    hash = "sha256-zwVrDdCMapuHKmtlEUnCwxXCBU93C5uT9eqDk5Of2BE=";
   };
 
   frontend = buildNpmPackage {
     inherit pname version src;
 
-    npmDepsHash = "sha256-PAX3aa0WdvCBvAD8AGQYqnx5Sd/85luMqP6hAyICyhA=";
+    npmDepsHash = "sha256-G08r+2eelxV3ottsNEZ6xysu13AbzPNTwkwZdY1qadg=";
 
     # Disabling `pyodide:fetch` as it downloads packages during `buildPhase`
     # Until this is solved, running python packages from the browser will not work.

pkgs/by-name/pr/proton-ge-bin/package.nix

···
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton9-24";
+  version = "GE-Proton9-25";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-L0GkzpSn4f6dLDOm2iDJr8D1DINTHNW9Kkn1xFTuqfo=";
+    hash = "sha256-cMN/U09NAsghx0A8dy+mjuvSFZxgvETmkigeOLskiQs=";
   };
 
   dontUnpack = true;
···
 
     mkdir $steamcompattool
     ln -s $src/* $steamcompattool
-    rm $steamcompattool/{compatibilitytool.vdf,proton,version}
-    cp $src/{compatibilitytool.vdf,proton,version} $steamcompattool
+    rm $steamcompattool/compatibilitytool.vdf
+    cp $src/compatibilitytool.vdf $steamcompattool
 
     runHook postInstall
   '';
 
   preFixup = ''
     substituteInPlace "$steamcompattool/compatibilitytool.vdf" \
-      --replace-fail "${finalAttrs.version}" "${steamDisplayName}"
-    substituteInPlace "$steamcompattool/proton" \
       --replace-fail "${finalAttrs.version}" "${steamDisplayName}"
   '';
 

pkgs/by-name/ts/tsm-client/package.nix

···
       runHook postInstall
     '';
 
-    # fix relative symlinks after `/usr` was moved up one level,
-    # fix absolute symlinks pointing to `/opt`
+    # fix symlinks pointing to `..../opt/....`
     preFixup = ''
-      for link in $out/lib{,64}/* $out/bin/*
+      for link in $(find $out -type l -lname '*../opt*')
       do
-        target=$(readlink "$link")
-        if [ "$(cut -b -6 <<< "$target")" != "../../" ]
-        then
-          echo "cannot fix this symlink: $link -> $target"
-          exit 1
-        fi
-        ln --symbolic --force --no-target-directory "$out/$(cut -b 7- <<< "$target")" "$link"
-      done
-      for link in $(find $out -type l -lname '/opt/*')
-      do
-        ln --symbolic --force --no-target-directory "$out$(readlink "$link")" "$link"
+        ln --symbolic --force --no-target-directory "$(readlink "$link" | sed 's|../opt|opt|')" "$link"
       done
     '';
   });

pkgs/by-name/zb/zbus-xmlgen/package.nix

···
 
 rustPlatform.buildRustPackage rec {
   pname = "zbus_xmlgen";
-  version = "5.0.2";
+  version = "5.1.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-H3QA1Eh1AL1CtiUykEjJ7Ltskcen8tIfbGg6jy7Xic8=";
+    hash = "sha256-LHY4E2YemGksK8xJx0r3iTHnk3CqMl5abM08VSBPIfo=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-aD0aEMQ8YAOXTJCjGolqG9k5UciK3pXB7Z9dbp4E2uY=";
+  cargoHash = "sha256-g5GLyloeyVXcJgMVx21ePYlcYUj+NGFtVarpYeQN9rw=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
   nativeCheckInputs = [ rustfmt ];

pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix

···
 
   dontDropIconThemeCache = true;
 
+  # Remove broken symbolic link(https://github.com/linuxdeepin/developer-center/issues/11245)
   preFixup = ''
+    rm $out/share/icons/bloom/actions/24/{draw-triangle1.svg,draw-triangle2.svg,draw-triangle3.svg,draw-triangle4.svg}
     for theme in $out/share/icons/*; do
       gtk-update-icon-cache $theme
     done

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

···
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "12.4.1";
+  version = "12.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
···
     owner = "home-assistant-libs";
     repo = "aioshelly";
     tag = version;
-    hash = "sha256-OhfLl/IJUSmzVHoYjJszxwN4RZEr5zCfxxh5T0/z2Bg=";
+    hash = "sha256-QwO1Vi69rj4tCSSkp/j3vtdV6zpgkgM33waDw7ZjApw=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/bring-api/default.nix

···
 
 buildPythonPackage rec {
   pname = "bring-api";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
···
     owner = "miaucl";
     repo = "bring-api";
     tag = version;
-    hash = "sha256-ohWemgZhnUUz5O40nIlrTN1jEUDQvGGLNvqXNbYYAaM=";
+    hash = "sha256-GBRPC4oTCTy8MdGNsPYrgB8Lji0ojRL3Z4ELTe543PY=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/deepsearch-toolkit/default.nix

···
 
 buildPythonPackage rec {
   pname = "deepsearch-toolkit";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "DS4SD";
     repo = "deepsearch-toolkit";
     tag = "v${version}";
-    hash = "sha256-ObVil+0d5RIYwkz7OHJIziD3gANh9ZGN+pY9pqhY+Yg=";
+    hash = "sha256-nrz9pvyA5gPIaKt6CsJOB9cLy3sXiWW5e1Rk4vtNIY8=";
   };
 
   build-system = [

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

···
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "3.48.1";
+  version = "3.48.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
···
     owner = "iterative";
     repo = "dvclive";
     tag = version;
-    hash = "sha256-fLlP3kWmThQVVPEOd9KWitBIye/fhd/+zcHoVTF/pV8=";
+    hash = "sha256-KwS5426EU0vym2fDbtIH4bmlSLKWLfZRRxXE+bEmGfc=";
   };
 
   build-system = [ setuptools-scm ];

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

···
 {
   lib,
   buildPythonPackage,
+  cacert,
   entrypoints,
-  fastentrypoints,
   fetchFromGitHub,
   freezegun,
   funcy,
···
 
     git config --global user.email "[e-mail]"
     git config --global user.name "Nobody"
+
+    # _pygit2.GitError: OpenSSL error: failed to load certificates: error:00000000:lib(0)::reason(0)
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
   '';
 
   disabledTests = [

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

···
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "2.6.6";
+  version = "2.6.7";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
···
     owner = "pre-commit";
     repo = "identify";
     tag = "v${version}";
-    hash = "sha256-yglqCpaX9RnFn4kARf5HIu7xnL2ZbUet4ukbqECTwCw=";
+    hash = "sha256-eIBKuYiBKJL624e717EEIegUH0Pr0gnTEk+jRfX/Yzw=";
   };
 
   build-system = [ setuptools ];

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

···
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  anyio,
+  asyncpg,
+  click,
+  cryptography,
+  fsspec,
+  httpx,
+  jinja2,
+  litestar-htmx,
+  mako,
+  msgspec,
+  multidict,
+  picologging,
+  polyfactory,
+  psutil,
+  psycopg,
+  pyyaml,
+  redis,
+  rich,
+  rich-click,
+  time-machine,
+  trio,
+  typing-extensions,
+
+  # tests
+  pytestCheckHook,
+  pytest-lazy-fixtures,
+  pytest-xdist,
+  pytest-mock,
+  pytest-asyncio,
+  pytest-timeout,
+  pytest-rerunfailures,
+  versionCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "litestar";
+  version = "2.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "litestar-org";
+    repo = "litestar";
+    tag = "v${version}";
+    hash = "sha256-PR2DVNRtILHs7XwVi9/ZCVRJQFqfGLn1x2gpYtYjHDo=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    anyio
+    asyncpg
+    click
+    cryptography
+    fsspec
+    httpx
+    jinja2
+    litestar-htmx
+    mako
+    msgspec
+    multidict
+    picologging
+    polyfactory
+    psutil
+    psycopg
+    pyyaml
+    redis
+    rich
+    rich-click
+    time-machine
+    trio
+    typing-extensions
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-lazy-fixtures
+    pytest-xdist
+    pytest-mock
+    pytest-asyncio
+    pytest-timeout
+    pytest-rerunfailures
+    versionCheckHook
+  ];
+  versionCheckProgramArg = [ "version" ];
+
+  __darwinAllowLocalNetworking = true;
+
+  pytestFlagsArray = [
+    # Follow github CI
+    "docs/examples/"
+  ];
+
+  meta = {
+    homepage = "https://litestar.dev/";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    changelog = "https://github.com/litestar-org/litestar/releases/tag/v${version}";
+    description = "Production-ready, Light, Flexible and Extensible ASGI API framework";
+    license = lib.licenses.mit;
+    mainProgram = "litestar";
+  };
+}

pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix

···
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neptune";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
···
   src = fetchPypi {
     pname = "llama_index_graph_stores_neptune";
     inherit version;
-    hash = "sha256-RWrFrV35djxEF9Nfh5Fz5VxQA7Jon7cmxDJXigx2dmQ=";
+    hash = "sha256-wZRjK/ZFh5lVxya1q0vFvv+VnvGLNljMSvSeflR8Z7I=";
   };
 
   build-system = [ poetry-core ];

pkgs/development/python-modules/microsoft-kiota-serialization-multipart/default.nix

···
 
 buildPythonPackage rec {
   pname = "microsoft-kiota-serialization-multipart";
-  version = "1.9.1";
+  version = "1.9.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
···
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "kiota-python";
-    tag = "microsoft-kiota-serialization-multipart-v${version}";
-    hash = "sha256-ESRnI8prXG1h5H5RVD4eOQ1sQYSEMMLVHSk8yhzFGVw=";
+    tag = "microsoft-kiota-serialization-text-v${version}";
+    hash = "sha256-ribVfvKmDMxGmeqj30SDcnbNGdRBfs1DmqQGXP3EHCk=";
   };
 
   sourceRoot = "source/packages/serialization/multipart/";
···
   meta = with lib; {
     description = "Multipart serialization implementation for Kiota clients in Python";
     homepage = "https://github.com/microsoft/kiota-python/tree/main/packages/serialization/multipart";
-    changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-multipart-v${version}";
+    changelog = "https://github.com/microsoft/kiota-python/releases/tag/microsoft-kiota-serialization-multipart-${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

pkgs/development/python-modules/msgraph-core/default.nix

···
 
 buildPythonPackage rec {
   pname = "msgraph-core";
-  version = "1.2.0";
+  version = "1.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python-core";
     tag = "v${version}";
-    hash = "sha256-B0dff5ynokI49P0irgPOWvqwHKt4mKv3/+XwfbgwMF8=";
+    hash = "sha256-GtIKZRnjG9fZcVNcaT+B9SbCo3yxUiqKPIZ2Er0WhAU=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/msgraph-sdk/default.nix

···
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.18.0";
+  version = "1.20.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
···
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     tag = "v${version}";
-    hash = "sha256-qYlBRXYsZ71B33iwdwgjx/NFBRUF4I/0XCnNZePo/+M=";
+    hash = "sha256-kZ+m75oNTh/AJ+hl8Nhulzvk62CWVOx0hJKRFyc0CSI=";
   };
 
   build-system = [ flit-core ];

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

···
     hash = "sha256-t75D7aNKAifzeCPwtyKp8LoiXtbbXspRFYnsI0gx+V4=";
   };
 
+  patches = [
+    # For python 313
+    # https://github.com/microsoft/picologging/pull/212
+    ./pr-212.patch
+  ];
+
   build-system = [
     setuptools
     cmake
···
   ];
 
   dontUseCmakeConfigure = true;
+  __darwinAllowLocalNetworking = true;
 
   dependencies = [
     flaky

pkgs/development/python-modules/picologging/pr-212.patch

···
+diff --git a/src/picologging/compat.hxx b/src/picologging/compat.hxx
+index d3356da..be7a1fc 100644
+--- a/src/picologging/compat.hxx
++++ b/src/picologging/compat.hxx
+@@ -88,4 +88,12 @@ static inline PyObject* _Py_XNewRef(PyObject *obj)
+ }
+ #endif
+ 
++// For Python 3.13 and above, PyTime_t is now part of the public API
++#if PY_VERSION_HEX >= 0x030d0000
++#define _PyTime_t PyTime_t
++#define _PyTime_AsSecondsDouble PyTime_AsSecondsDouble
++#define _PyTime_AsMilliseconds PyTime_AsMilliseconds
++#define _PyTime_ROUND_CEILING PyTime_ROUND_CEILING
++#endif
++
+ #endif // COMPAT_H
+\ No newline at end of file
+
+From fe313d8b3dcf0115e1be781e03b20673d3f51c3f Mon Sep 17 00:00:00 2001
+From: Anthony Shaw <[e-mail]>
+Date: Sat, 14 Sep 2024 17:33:25 +1000
+Subject: [PATCH 2/2] Patch other changed APIs for pytime
+
+---
+ pyproject.toml                |  2 +-
+ src/picologging/compat.hxx    |  2 --
+ src/picologging/logrecord.cxx | 13 +++++++++++++
+ 3 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index 33abe66..27628c9 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,7 +1,7 @@
+ [build-system]
+ requires = [
+     "setuptools>=65.4.1",
+-    "scikit-build>=0.17.0",
++    "scikit-build>=0.18.0",
+     "cmake>=3.18",
+     "ninja",
+ ]
+diff --git a/src/picologging/compat.hxx b/src/picologging/compat.hxx
+index be7a1fc..7c6970d 100644
+--- a/src/picologging/compat.hxx
++++ b/src/picologging/compat.hxx
+@@ -92,8 +92,6 @@ static inline PyObject* _Py_XNewRef(PyObject *obj)
+ #if PY_VERSION_HEX >= 0x030d0000
+ #define _PyTime_t PyTime_t
+ #define _PyTime_AsSecondsDouble PyTime_AsSecondsDouble
+-#define _PyTime_AsMilliseconds PyTime_AsMilliseconds
+-#define _PyTime_ROUND_CEILING PyTime_ROUND_CEILING
+ #endif
+ 
+ #endif // COMPAT_H
+\ No newline at end of file
+diff --git a/src/picologging/logrecord.cxx b/src/picologging/logrecord.cxx
+index cec68c9..9f5cf86 100644
+--- a/src/picologging/logrecord.cxx
++++ b/src/picologging/logrecord.cxx
+@@ -16,11 +16,19 @@ _PyFloat_FromPyTime(_PyTime_t t)
+ 
+ _PyTime_t current_time()
+ {
++#if PY_VERSION_HEX >= 0x030d0000
++    _PyTime_t t;
++    if (PyTime_Time(&t) < 0) {
++        return -1;
++    }
++    return t;
++#else
+     _PyTime_t t;
+     if (_PyTime_GetSystemClockWithInfo(&t, NULL) < 0) {
+         return -1;
+     }
+     return t;
++#endif
+ }
+ 
+ PyObject* LogRecord_new(PyTypeObject* type, PyObject *initargs, PyObject *kwds)
+@@ -162,7 +170,12 @@ LogRecord* LogRecord_create(LogRecord* self, PyObject* name, PyObject* msg, PyOb
+     }
+ 
+     self->created = _PyTime_AsSecondsDouble(ctime);
++// msecs conversion isn't in 3.13 API
++#if PY_VERSION_HEX < 0x030d0000
+     self->msecs = _PyTime_AsMilliseconds(ctime, _PyTime_ROUND_CEILING);
++#else
++    self->msecs = 0;
++#endif
+     self->relativeCreated = _PyFloat_FromPyTime((ctime - startTime) * 1000);    
+     self->thread = PyThread_get_thread_ident(); // Only supported in Python 3.7+, if big demand for 3.6 patch this out for the old API.
+     // TODO #2 : See if there is a performant way to get the thread name.

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

···
   patchelf,
   gcc-unwrapped,
   python,
+  fetchpatch,
 }:
 
 let
+  boringsslPatched = boringssl.overrideAttrs (oa: {
+    # boringssl source obtained from https://github.com/0x676e67/boring2/tree/1a0f1cd24e728aac100df68027c820f858199224/boring-sys/deps
+    src = fetchFromGitHub {
+      owner = "google";
+      repo = "boringssl";
+      rev = "44b3df6f03d85c901767250329c571db405122d5";
+      hash = "sha256-REELo7X9aFy2OHjubYLO1UQXLTgekD4QFd2vyFthIrg=";
+    };
+    modRoot = "./src";
+    patches = [
+      # A patch required to build boringssl compatible with `boring-sys2`.
+      # See https://github.com/0x676e67/boring2/blob/1a0f1cd24e728aac100df68027c820f858199224/boring-sys/build/main.rs#L486-L489
+      (fetchpatch {
+        name = "boringssl-44b3df6f03d85c901767250329c571db405122d5.patch";
+        url = "https://raw.githubusercontent.com/0x676e67/boring2/4edbff8cade24d5d83cc372c4502b59c5192b5a1/boring-sys/patches/boringssl-44b3df6f03d85c901767250329c571db405122d5.patch";
+        hash = "sha256-lM+2lLvfDHnxLl+OgZ6R8Y4Z6JfA9AiDqboT1mbxmao=";
+      })
+    ];
+
+    # Remove bazel specific build file to make way for build directory
+    # This is a problem on Darwin because of case-insensitive filesystem
+    preBuild =
+      (lib.optionalString stdenv.isDarwin ''
+        rm ../BUILD
+      '')
+      + oa.preBuild;
+
+    env.NIX_CFLAGS_COMPILE =
+      oa.env.NIX_CFLAGS_COMPILE
+      + " "
+      + toString (
+        lib.optionals stdenv.cc.isGNU [
+          "-Wno-error=ignored-attributes"
+        ]
+      );
+
+    vendorHash = "sha256-06MkjXl0DKFzIH/H+uT9kXsQdPq7qdZh2dlLW/YhJuk=";
+  });
   # boring-sys expects the static libraries in build/ instead of lib/
   boringssl-wrapper = runCommand "boringssl-wrapper" { } ''
     mkdir $out
-    cd $out
-    ln -s ${boringssl.out}/lib build
-    ln -s ${boringssl.dev}/include include
+    ln -s ${boringsslPatched.out}/lib $out/build
+    ln -s ${boringsslPatched.dev}/include $out/include
   '';
 in
 buildPythonPackage rec {
   pname = "primp";
-  version = "0.6.5";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "primp";
     tag = "v${version}";
-    hash = "sha256-dexJdeNGpRsPLk8b/gNeQc1dsQLOiXNL5zgDEN9qHfQ=";
+    hash = "sha256-yzcrUER+NiDfSjJ3my45IS+2GmeusvJgyX5nFSaqFUk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-s+LAuZmnmTDPIFDSi9AkyWposFFnboJCmog1kiEBnrw=";
+    hash = "sha256-gCNnP0B0D6AJ1L/E6sQKASx8BbSJU5jTNia+tL2USvU=";
   };
 
   nativeBuildInputs = [
···
   ];
 
   env.BORING_BSSL_PATH = boringssl-wrapper;
+  env.BORING_BSSL_ASSUME_PATCHED = true;
 
   optional-dependencies = {
     dev = [ pytest ];

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

···
 
 let
   pname = "psycopg";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "psycopg";
-    repo = pname;
+    repo = "psycopg";
     tag = version;
-    hash = "sha256-vcUZvQeD5MnEM02phk73I9dpf0Eug95V7Rspi0s6S2M=";
+    hash = "sha256-gicntSAEK5VO67M2gAGR6wSwKQwgnbHxVUoPpaAbaDk=";
   };
 
   patches = [

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

···
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
···
     tag = version;
     hash = "sha256-HNtMLY83e6MQakIlmsJohmhjDWiM5/hqq25qSY1dPBw=";
   };
-
-  patches = [
-    # https://github.com/corteva/rioxarray/issues/836
-    (fetchpatch {
-      url = "https://github.com/corteva/rioxarray/commit/6294b7468587b8c243ee4f561a90ca8de90ea0f1.patch";
-      hash = "sha256-0IvDAr17ymMN1J2vC1U3z/2N1Np1RaRjCAODZthQz8g=";
-    })
-  ];
 
   build-system = [ setuptools ];
 

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

···
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1314";
+  version = "3.0.1315";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
···
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-8fcKPSkE+yZa8wm7tuyXuWdCWgKBRsxzTpcTcCVVE1M=";
+    hash = "sha256-rnrBlKeBY/D2Z+EQbUVg7zT6ZAwbxOmMbkV8Ig0qj6I=";
   };
 
   build-system = [ setuptools ];

pkgs/misc/cups/filters.nix

···
   stdenv,
   which,
   withAvahi ? true,
+  glib,
 }:
 
 (
···
         hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY=";
       };
 
+      strictDeps = true;
+
       nativeBuildInputs = [
-        pkg-config
-        makeWrapper
         autoreconfHook
+        cups
+        glib
+        makeWrapper
+        pkg-config
       ];
 
       buildInputs = [

pkgs/os-specific/linux/kernel/hardened/patches.json

···
     "5.10": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.10.233-hardened1.patch",
-            "sha256": "1dchzjp4dvdla2mpac8bk6cj4ymx2vkwllck9wvlsbi15897a50y",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.233-hardened1/linux-hardened-v5.10.233-hardened1.patch"
+            "name": "linux-hardened-v5.10.234-hardened1.patch",
+            "sha256": "0155pikfzyrmrf9xc2bid6s7jz6qw6pb1x1pbzgphsvsi83jm886",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.10.234-hardened1/linux-hardened-v5.10.234-hardened1.patch"
         },
-        "sha256": "0lkz2g8r032f027j3gih3f7crx991mrpng9qgqc5k4cc1wl5g7i3",
-        "version": "5.10.233"
+        "sha256": "1rgb4v6dvqlw1mgzsli0hxaj2d5d4m1nylgcrwm4bkpiwbzc95wm",
+        "version": "5.10.234"
     },
     "5.15": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.15.176-hardened1.patch",
-            "sha256": "10r86rxixrvclzfpzp449ry7j79gr0n75zvh4x9bzr1860f0mha6",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.176-hardened1/linux-hardened-v5.15.176-hardened1.patch"
+            "name": "linux-hardened-v5.15.178-hardened1.patch",
+            "sha256": "01gbhdfnbxsb20qvgchk1qar7mf9phrzfidx825jags1v565jbpf",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.15.178-hardened1/linux-hardened-v5.15.178-hardened1.patch"
         },
-        "sha256": "1cfk55469swywnf4r6pl7b3njxws8w3np81r99f0wnlaihrbajm8",
-        "version": "5.15.176"
+        "sha256": "0hkw2l4gr5m6jw2adxcgm2sb6kl0w51r6s4hcbn6rlm4bvmzgsgg",
+        "version": "5.15.178"
     },
     "5.4": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v5.4.289-hardened1.patch",
-            "sha256": "1gg4awiiggks5biyhkqdlxm7xxkpd754lxibflk3nwfj1rs44iwn",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.289-hardened1/linux-hardened-v5.4.289-hardened1.patch"
+            "name": "linux-hardened-v5.4.290-hardened1.patch",
+            "sha256": "0bd1g3zx5x5hxljw0qfis6h5y13pjlw1sizj7cx261iqb35vsv3x",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v5.4.290-hardened1/linux-hardened-v5.4.290-hardened1.patch"
         },
-        "sha256": "043dl195h06hs3zdjd6j1m1zgvmky3s0plrpma75zqf8ab05yghy",
-        "version": "5.4.289"
+        "sha256": "0mm4q8f6kbqddy4zaxjf5xyqpnla5qprvsf7v3vq01gmlzr3rivc",
+        "version": "5.4.290"
     },
     "6.1": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.1.126-hardened1.patch",
-            "sha256": "096bchjy9n7q48r7xzzky9pmicdzz9pvmg5sk6943s4q5icrhi6s",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.126-hardened1/linux-hardened-v6.1.126-hardened1.patch"
+            "name": "linux-hardened-v6.1.128-hardened1.patch",
+            "sha256": "1p3j0qr8zwqz2rpfm024ardm75xzxxkdrxb9kkffkanp40zrcilr",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.128-hardened1/linux-hardened-v6.1.128-hardened1.patch"
         },
-        "sha256": "140pprw2fkyz9qi5wnhi0yzpj65lzwi3zbmnvsk2yhgc9arj06f9",
-        "version": "6.1.126"
+        "sha256": "1wshgkgcxaf4mnm4ngngsj8gq1cg8kq56f5kqsdfcw0m339nfkc7",
+        "version": "6.1.128"
     },
     "6.11": {
         "patch": {
···
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.10-hardened1.patch",
-            "sha256": "1m48sf0ihzpcj4ca9420rmhrihhchd2qrv86vw8llq3jmv7xqij5",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.10-hardened1/linux-hardened-v6.12.10-hardened1.patch"
+            "name": "linux-hardened-v6.12.12-hardened1.patch",
+            "sha256": "0k413adalc62ykrfar8dgp6480jmc6sx9c60sbk869xq8ghs6hq3",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.12-hardened1/linux-hardened-v6.12.12-hardened1.patch"
         },
-        "sha256": "15xjjn8ff7g9q0ljr2g8k098ppxnpvxlgv22rdrplls8sxg6wlaa",
-        "version": "6.12.10"
+        "sha256": "1zwfw3lci3ihandx2cpq3h12x7l94jzr4xkd5lzkn1ppgv8l52g9",
+        "version": "6.12.12"
     },
     "6.6": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.6.73-hardened1.patch",
-            "sha256": "18jy2acz7gh4f8gqc6ifq1rkgxqlc53wmrhs0m8ndi5p70wswr6v",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.73-hardened1/linux-hardened-v6.6.73-hardened1.patch"
+            "name": "linux-hardened-v6.6.75-hardened1.patch",
+            "sha256": "12wsj7g431lb0abqs9dcryx9czycnrg4jl8760rgj2qvaa1cpfrc",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.75-hardened1/linux-hardened-v6.6.75-hardened1.patch"
         },
-        "sha256": "141428a3bxks9w5jj17w8jmp7zp90p3v33dyk046a0f2j2qqs0nj",
-        "version": "6.6.73"
+        "sha256": "1402g6qjk1242gsl6n8xlbg01m0nb19n30ac1ffi7fhnjzxb3pzp",
+        "version": "6.6.75"
     }
 }

pkgs/os-specific/linux/kernel/kernels-org.json

···
 {
     "testing": {
-        "version": "6.14-rc1",
-        "hash": "sha256:0schcgij7kdzj0zb6g3sjf32mq7s388hysrfzjzi5g1y3py21igk"
+        "version": "6.14-rc2",
+        "hash": "sha256:1i7zxjz0vckl31cb6anb0b9m0k7l3y2gk6r5y6in41p8mjf4rrpk"
     },
     "6.1": {
         "version": "6.1.128",

pkgs/os-specific/linux/kernel/linux-libre.nix

···
   linux,
   scripts ? fetchsvn {
     url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";
-    rev = "19707";
-    sha256 = "1ixvavd9rhhwfnyvkdnyyjwckdijh02xppl0sjv1vw9i0jn1s1l2";
+    rev = "19712";
+    sha256 = "0km2iaicrz17ahklcjcmbjq87bfrcjj0ynsyi7jnwp0l9n95i8jc";
   },
   ...
 }@args:

pkgs/top-level/python-packages.nix

···
 
   litestar-htmx = callPackage ../development/python-modules/litestar-htmx { };
 
+  litestar = callPackage ../development/python-modules/litestar { };
+
   littleutils = callPackage ../development/python-modules/littleutils { };
 
   livelossplot = callPackage ../development/python-modules/livelossplot { };