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

2023-11-13 14:31:51 -06:00 · 2023-11-13 14:31:51 -06:00 · 884449105e
commit 884449105e
parent c1eb661271 5c6e85ee47
154 changed files with 2456 additions and 1674 deletions
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@ -24,7 +24,7 @@ jobs:
        with:
          ref: ${{ github.event.pull_request.head.sha }}
      - name: Create backport PRs
-        uses: korthout/backport-action@v2.1.0
+        uses: korthout/backport-action@v2.1.1
        with:
          # Config README: https://github.com/korthout/backport-action#backport-action
          copy_labels_pattern: 'severity:\ssecurity'
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -465,7 +465,7 @@ Is the change [acceptable for releases][release-acceptable] and do you wish to h
 - No: Use the `master` branch, do not backport the pull request.
 - Yes: Can the change be implemented the same way on the `master` and release branches?
  For example, a packages major version might differ between the `master` and release branches, such that separate security patches are required.
-  - Yes: Use the `master` branch and [backport the pull request](#backporting-changes).
+  - Yes: Use the `master` branch and [backport the pull request](#how-to-backport-pull-requests).
  - No: Create separate pull requests to the `master` and `release-XX.YY` branches.

 Furthermore, if the change causes a [mass rebuild][mass-rebuild], use the appropriate staging branch instead:
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@ -13,7 +13,7 @@ If you find you are lacking inspiration for packing javascript applications, the
 ### Github {#javascript-finding-examples-github}

 - Searching Nix files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+language%3ANix&type=code>
- Searching just `flake.nix` files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+filename%3Aflake.nix&type=code>
+- Searching just `flake.nix` files for `mkYarnPackage`: <https://github.com/search?q=mkYarnPackage+path%3A**%2Fflake.nix&type=code>

 ### Gitlab {#javascript-finding-examples-gitlab}

--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -3692,6 +3692,12 @@
    githubId = 1222362;
    name = "Matías Lang";
  };
+  criyle = {
+    email = "i+nixos@goj.ac";
+    name = "Yang Gao";
+    githubId = 6821729;
+    github = "criyle";
+  };
  CRTified = {
    email = "carl.schneider+nixos@rub.de";
    matrix = "@schnecfk:ruhr-uni-bochum.de";
@ -4245,6 +4251,12 @@
    githubId = 5503422;
    name = "Dmitriy Demin";
  };
+  demine = {
+    email = "riches_tweaks0o@icloud.com";
+    github = "demine0";
+    githubId = 51992962;
+    name = "Nikita Demin";
+  };
  demize = {
    email = "johannes@kyriasis.com";
    github = "kyrias";
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@ -324,12 +324,16 @@ with lib.maintainers; {
  geospatial = {
    members = [
      imincik
-      sikmir
      nh2
+      sikmir
      willcohen
    ];
+    githubTeams = [
+      "geospatial"
+    ];
    scope = "Maintain geospatial packages.";
    shortName = "Geospatial";
+    enableFeatureFreezePing = true;
  };

  gitlab = {
--- a/nixos/README.md
+++ b/nixos/README.md
@ -21,12 +21,14 @@ Reviewing process:
 - Ensure that the module maintainers are notified.
  - [CODEOWNERS](https://help.github.com/articles/about-codeowners/) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
 - Ensure that the module tests, if any, are succeeding.
+  - You may invoke OfBorg with `@ofborg test <module>` to build `nixosTests.<module>`
 - Ensure that the introduced options are correct.
  - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).
  - Description, default and example should be provided.
 - Ensure that option changes are backward compatible.
-  - `mkRenamedOptionModuleWith` provides a way to make option changes backward compatible.
- Ensure that removed options are declared with `mkRemovedOptionModule`
+  - `mkRenamedOptionModuleWith` provides a way to make renamed option backward compatible.
+  - Use `lib.versionAtLeast config.system.stateVersion "23.11"` on backward incompatible changes which may corrupt, change or update the state stored on existing setups.
+- Ensure that removed options are declared with `mkRemovedOptionModule`.
 - Ensure that changes that are not backward compatible are mentioned in release notes.
 - Ensure that documentations affected by the change is updated.

@ -55,6 +57,7 @@ New modules submissions introduce a new module to NixOS.

 Reviewing process:

+- Ensure that all file paths [fit the guidelines](../CONTRIBUTING.md#file-naming-and-organisation).
 - Ensure that the module tests, if any, are succeeding.
 - Ensure that the introduced options are correct.
  - Type should be appropriate (string related types differs in their merging capabilities, `loaOf` and `string` types are deprecated).
@ -76,9 +79,9 @@ Sample template for a new module review is provided below.
 - [ ] options have default
 - [ ] options have example
 - [ ] options have descriptions
- [ ] No unneeded package is added to environment.systemPackages
- [ ] meta.maintainers is set
- [ ] module documentation is declared in meta.doc
+- [ ] No unneeded package is added to `environment.systemPackages`
+- [ ] `meta.maintainers` is set
+- [ ] module documentation is declared in `meta.doc`

 ##### Possible improvements

--- a/nixos/modules/programs/ausweisapp.nix
+++ b/nixos/modules/programs/ausweisapp.nix
@ -7,11 +7,11 @@ let
 in
 {
  options.programs.ausweisapp = {
-    enable = mkEnableOption (lib.mdDoc "AusweisApp2");
+    enable = mkEnableOption (lib.mdDoc "AusweisApp");

    openFirewall = mkOption {
      description = lib.mdDoc ''
-        Whether to open the required firewall ports for the Smartphone as Card Reader (SaC) functionality of AusweisApp2.
+        Whether to open the required firewall ports for the Smartphone as Card Reader (SaC) functionality of AusweisApp.
      '';
      default = false;
      type = lib.types.bool;
@ -19,7 +19,7 @@ in
  };

  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [ AusweisApp2 ];
+    environment.systemPackages = with pkgs; [ ausweisapp ];
    networking.firewall.allowedUDPPorts = lib.optionals cfg.openFirewall [ 24727 ];
  };
 }
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@ -493,6 +493,9 @@ in {
          RuntimeDirectory = "mailman";
          LogsDirectory = "mailman";
          PIDFile = "/run/mailman/master.pid";
+          Restart = "on-failure";
+          TimeoutStartSec = 180;
+          TimeoutStopSec = 180;
        };
      };

@ -596,6 +599,7 @@ in {
          User = cfg.webUser;
          Group = "mailman";
          RuntimeDirectory = "mailman-uwsgi";
+          Restart = "on-failure";
        };
      });

@ -620,6 +624,7 @@ in {
          User = cfg.webUser;
          Group = "mailman";
          WorkingDirectory = "/var/lib/mailman-web";
+          Restart = "on-failure";
        };
      };
    } // flip lib.mapAttrs' {
--- a/nixos/modules/services/misc/soft-serve.nix
+++ b/nixos/modules/services/misc/soft-serve.nix
@ -12,7 +12,7 @@ in
 {
  options = {
    services.soft-serve = {
-      enable = mkEnableOption "Enable soft-serve service";
+      enable = mkEnableOption "soft-serve";

      package = mkPackageOption pkgs "soft-serve" { };

@ -20,7 +20,7 @@ in
        type = format.type;
        default = { };
        description = mdDoc ''
-          The contents of the configuration file.
+          The contents of the configuration file for soft-serve.

          See <${docUrl}>.
        '';
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@ -109,11 +109,10 @@ let
  getGutenprint = pkgs: head (filterGutenprint pkgs);

  parsePorts = addresses: let
-    splitAddress = addr: lib.strings.splitString ":" addr;
-    extractPort = addr: builtins.elemAt (builtins.tail (splitAddress addr)) 0;
-    toInt = str: lib.strings.toInt str;
+    splitAddress = addr: strings.splitString ":" addr;
+    extractPort = addr: builtins.foldl' (a: b: b) "" (splitAddress addr);
  in
-    builtins.map (address: toInt (extractPort address)) addresses;
+    builtins.map (address: strings.toInt (extractPort address)) addresses;

 in

--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@ -11,10 +11,6 @@ let
  qemu-common = import ../../lib/qemu-common.nix { inherit lib pkgs; };

  backdoorService = {
-    wantedBy = [ "sysinit.target" ];
-    unitConfig.DefaultDependencies = false;
-    conflicts = [ "shutdown.target" "initrd-switch-root.target" ];
-    before = [ "shutdown.target" "initrd-switch-root.target" ];
    requires = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
    after = [ "dev-hvc0.device" "dev-${qemu-common.qemuSerialDevice}.device" ];
    script =
@ -80,7 +76,12 @@ in
      }
    ];

-    systemd.services.backdoor = backdoorService;
+    systemd.services.backdoor = lib.mkMerge [
+      backdoorService
+      {
+        wantedBy = [ "multi-user.target" ];
+      }
+    ];

    boot.initrd.systemd = lib.mkMerge [
      {
@ -104,7 +105,21 @@ in
          "/bin/true"
        ];

-        services.backdoor = backdoorService;
+        services.backdoor = lib.mkMerge [
+          backdoorService
+          {
+            # TODO: Both stage 1 and stage 2 should use these same
+            # settings. But a lot of existing tests rely on
+            # backdoor.service having default orderings,
+            # e.g. systemd-boot.update relies on /boot being mounted
+            # as soon as backdoor starts. But it can be useful for
+            # backdoor to start even earlier.
+            wantedBy = [ "sysinit.target" ];
+            unitConfig.DefaultDependencies = false;
+            conflicts = [ "shutdown.target" "initrd-switch-root.target" ];
+            before = [ "shutdown.target" "initrd-switch-root.target" ];
+          }
+        ];

        contents."/usr/bin/env".source = "${pkgs.coreutils}/bin/env";
      })
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@ -1318,12 +1318,12 @@ let
        wait_for_open_port(9374)
        wait_until_succeeds(
            "curl -sSf localhost:9374/metrics | grep '{}' | grep -v ' 0$'".format(
-                'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1"} '
+                'smokeping_requests_total{host="127.0.0.1",ip="127.0.0.1",source=""} '
            )
        )
        wait_until_succeeds(
            "curl -sSf localhost:9374/metrics | grep '{}'".format(
-                'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1"}'
+                'smokeping_response_ttl{host="127.0.0.1",ip="127.0.0.1",source=""}'
            )
        )
      '';
--- a/pkgs/README.md
+++ b/pkgs/README.md
@ -696,16 +696,16 @@ It can happen that non-trivial updates include patches or more complex changes.

 Reviewing process:

- Ensure that the package versioning fits the guidelines.
- Ensure that the commit text fits the guidelines.
+- Ensure that the package versioning [fits the guidelines](#versioning).
+- Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions).
 - Ensure that the package maintainers are notified.
  - [CODEOWNERS](https://help.github.com/articles/about-codeowners) will make GitHub notify users based on the submitted changes, but it can happen that it misses some of the package maintainers.
- Ensure that the meta field information is correct.
+- Ensure that the meta field information [fits the guidelines](#meta-attributes) and is correct:
  - License can change with version updates, so it should be checked to match the upstream license.
  - If the package has no maintainer, a maintainer must be set. This can be the update submitter or a community member that accepts to take maintainership of the package.
 - Ensure that the code contains no typos.
- Building the package locally.
-  - pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds.
+- Build the package locally.
+  - Pull requests are often targeted to the master or staging branch, and building the pull request locally when it is submitted can trigger many source builds.
  - It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone.

    ```ShellSession
@ -722,7 +722,7 @@ Reviewing process:
    ```ShellSession
    $ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER"
    ```
- Running every binary.
+- Run every binary.

 Sample template for a package update review is provided below.

@ -731,7 +731,7 @@ Sample template for a package update review is provided below.

 - [ ] package name fits guidelines
 - [ ] package version fits guidelines
- [ ] package build on ARCHITECTURE
+- [ ] package builds on ARCHITECTURE
 - [ ] executables tested on ARCHITECTURE
 - [ ] all depending packages build
 - [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed
@ -748,18 +748,20 @@ New packages are a common type of pull requests. These pull requests consists in

 Review process:

- Ensure that the package versioning fits the guidelines.
- Ensure that the commit name fits the guidelines.
- Ensure that the meta fields contain correct information.
+- Ensure that all file paths [fit the guidelines](../CONTRIBUTING.md#file-naming-and-organisation).
+- Ensure that the package name and version [fits the guidelines](#package-naming).
+- Ensure that the package versioning [fits the guidelines](#versioning).
+- Ensure that the commit text [fits the guidelines](../CONTRIBUTING.md#commit-conventions).
+- Ensure that the meta fields [fits the guidelines](#meta-attributes) and contain the correct information:
  - License must match the upstream license.
  - Platforms should be set (or the package will not get binary substitutes).
  - Maintainers must be set. This can be the package submitter or a community member that accepts taking up maintainership of the package.
 - Report detected typos.
 - Ensure the package source:
-  - Uses mirror URLs when available.
+  - Uses `mirror://` URLs when available.
  - Uses the most appropriate functions (e.g. packages from GitHub should use `fetchFromGitHub`).
- Building the package locally.
- Running every binary.
+- Build the package locally.
+- Run every binary.

 Sample template for a new package review is provided below.

@ -769,7 +771,7 @@ Sample template for a new package review is provided below.
 - [ ] package path fits guidelines
 - [ ] package name fits guidelines
 - [ ] package version fits guidelines
- [ ] package build on ARCHITECTURE
+- [ ] package builds on ARCHITECTURE
 - [ ] executables tested on ARCHITECTURE
 - [ ] `meta.description` is set and fits guidelines
 - [ ] `meta.license` fits upstream license
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@ -61,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
        filename="$(basename -- "$file")"
        substituteInPlace "$file" --replace '--with-appname="$0"' "--with-appname=\"$filename\""
    done
+  '' + lib.optionalString withGtk2 ''
+    # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge.
+    substituteInPlace source/bridges-ui/Makefile \
+        --replace '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0'
  '';

  dontWrapQtApps = true;
--- a/pkgs/applications/audio/jack-capture/default.nix
+++ b/pkgs/applications/audio/jack-capture/default.nix
@ -1,12 +1,14 @@
-{ lib, stdenv, fetchurl, libjack2, libsndfile, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, libjack2, libsndfile, pkg-config }:

 stdenv.mkDerivation rec {
  pname = "jack_capture";
-  version = "0.9.73";
+  version = "0.9.73.2023-01-04";

-  src = fetchurl {
-    url = "https://archive.notam02.no/arkiv/src/${pname}-${version}.tar.gz";
-    sha256 = "1pji0zdwm3kxjrkbzj7fnxhr8ncrc8pyqnwyrh47fhypgqjv1br1";
+  src = fetchFromGitHub {
+    owner = "kmatheussen";
+    repo = "jack_capture";
+    rev = "a539d444d388c4cfed7279e385830e7767d59c41";
+    sha256 = "sha256-2DavZS4esV17a3vkiPvfCfp0QF94ZcXqdIw84h9HDjA=";
  };

  nativeBuildInputs = [ pkg-config ];
@ -23,9 +25,9 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "A program for recording soundfiles with jack";
-    homepage = "http://archive.notam02.no/arkiv/src";
+    homepage = "https://github.com/kmatheussen/jack_capture/";
    license = licenses.gpl2;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = with maintainers; [ goibhniu orivej ];
    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/applications/audio/listenbrainz-mpd/default.nix
+++ b/pkgs/applications/audio/listenbrainz-mpd/default.nix
@ -6,25 +6,48 @@
 , openssl
 , libiconv
 , sqlite
-, Security }:
+, Security
+, SystemConfiguration
+, CoreFoundation
+, installShellFiles
+, asciidoctor }:

 rustPlatform.buildRustPackage rec {
  pname = "listenbrainz-mpd";
-  version = "2.2.0";
+  version = "2.3.1";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "elomatreb";
    repo = "listenbrainz-mpd";
    rev = "v${version}";
-    hash = "sha256-9o0PsmOkanPcES3y8NvvEOA/lsUU1vtKQAqBQwQtazk=";
+    hash = "sha256-rI6GBDUzI0pHjULoNKWZ4GKlrtpX/4x6Q1Q+DByNqRs=";
  };

-  cargoHash = "sha256-z7L6VQmCYo4YoEmwrvNU3u3UxnLkAqPgFBqJv4K1N1k=";
+  cargoHash = "sha256-8/0WkoDxUJz0QoQiDGHTuU7HmiY9nqUNPvztI0xmqvk=";

-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config installShellFiles asciidoctor ];

-  buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [ libiconv Security ] else [ openssl ]);
+  buildInputs = [ sqlite ] ++ (if stdenv.isDarwin then [
+    libiconv
+    Security
+    SystemConfiguration
+    CoreFoundation
+  ] else [
+    openssl
+  ]);
+
+  buildFeatures = [ "shell_completion" ];
+
+  postInstall = ''
+    installShellCompletion \
+      --bash generated_completions/listenbrainz-mpd.bash \
+      --fish generated_completions/listenbrainz-mpd.fish \
+      --zsh generated_completions/_listenbrainz-mpd
+
+    asciidoctor --backend=manpage listenbrainz-mpd.adoc -o listenbrainz-mpd.1
+    installManPage listenbrainz-mpd.1
+  '';

  meta = with lib; {
    homepage = "https://codeberg.org/elomatreb/listenbrainz-mpd";
--- a/pkgs/applications/audio/openutau/default.nix
+++ b/pkgs/applications/audio/openutau/default.nix
@ -88,10 +88,10 @@ buildDotnetModule rec {
      binaryNativeCode
    ];
    license = with licenses; [
-      # dotnet code
+      # dotnet code and worldline resampler binary
      mit
-      # worldline resampler
-      unfree
+      # worldline resampler binary - no source is available (hence "unfree") but usage of the binary is MIT
+      unfreeRedistributable
    ];
    maintainers = with maintainers; [ lilyinstarlight ];
    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "reaper";
-  version = "7.02";
+  version = "7.03";

  src = fetchurl {
    url = url_for_platform version stdenv.hostPlatform.qemuArch;
    hash = {
-      x86_64-linux = "sha256-86BGWaZ+zkxgC1Tz14lkBniwhs26G4EPpG2LjsSe9io=";
-      aarch64-linux = "sha256-kJfy4ji5YBv5ztilkAIuPswu3O9pwBL0coD6wU1gU5c=";
+      x86_64-linux = "sha256-74fQXN6a3SqNZIc2MkOf2iWwP6oQToklbb3kBuaku6s=";
+      aarch64-linux = "sha256-BF7iN8NdejqwZzHTFdys422p3qoNIm20IpFuaHdUx3U=";
    }.${stdenv.hostPlatform.system};
  };

--- a/pkgs/applications/audio/tenacity/default.nix
+++ b/pkgs/applications/audio/tenacity/default.nix
@ -49,7 +49,7 @@

 stdenv.mkDerivation rec {
  pname = "tenacity";
-  version = "1.3.2";
+  version = "1.3.3";

  src = fetchFromGitea {
    domain = "codeberg.org";
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
    repo = pname;
    fetchSubmodules = true;
    rev = "v${version}";
-    hash = "sha256-JgmAuCfXP345xgg5jac8Sa0cBSsWJbtoYmVV0DLcIkk=";
+    hash = "sha256-UU3iKfab6en4IyGlpNLUhOil3snzaZ2nI6JMqoL6DUs=";
  };

  postPatch = ''
--- a/pkgs/applications/audio/xtuner/default.nix
+++ b/pkgs/applications/audio/xtuner/default.nix
@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , pkg-config
 , cairo
 , libX11
@ -22,6 +23,17 @@ stdenv.mkDerivation rec {
    fetchSubmodules = true;
  };

+  patches = [
+    # Fix build against glibc-2.38.
+    (fetchpatch {
+      name = "glibc-2.38.patch";
+      url = "https://github.com/brummer10/libxputty/commit/7eb70bf3f7bce0af9e1919d6c875cdb8efca734e.patch";
+      hash = "sha256-VspR0KJjBt4WOrnlo7rHw1oAYM1d2RSz6JhuAEfsO3M=";
+      stripLen = 1;
+      extraPrefix = "libxputty/";
+    })
+  ];
+
  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ cairo libX11 libjack2 liblo libsigcxx zita-resampler fftwFloat ];

--- a/pkgs/applications/blockchains/optimism/geth.nix
+++ b/pkgs/applications/blockchains/optimism/geth.nix
@ -8,13 +8,13 @@

 buildGoModule rec {
  pname = "op-geth";
-  version = "1.101301.1";
+  version = "1.101304.0";

  src = fetchFromGitHub {
    owner = "ethereum-optimism";
    repo = "op-geth";
    rev = "v${version}";
-    hash = "sha256-3W246cY2l0ZkeaCuDbq/TvKacTKqX7iPs5MMy1+7LxY=";
+    hash = "sha256-MpLkAAYQmceabVChixF1yqvGSoRm+A9p9mOeKHhqxQE=";
    fetchSubmodules = true;
  };

@ -33,7 +33,7 @@ buildGoModule rec {
    "cmd/utils"
  ];

-  vendorHash = "sha256-CqmhIz03qrcEetiWjR5A+TCW0ACrxL1UzugcKzTVme0=";
+  vendorHash = "sha256-JIuS2qWFf9g5MIJP6jVTSAkPG15XCDeMHcoYeJQz7Og=";

  # Fix for usb-related segmentation faults on darwin
  propagatedBuildInputs =
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -305,12 +305,12 @@ final: prev:

  SchemaStore-nvim = buildVimPlugin {
    pname = "SchemaStore.nvim";
-    version = "2023-11-10";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "80580573cb7be3f9253ff4b4213328074cf15c59";
-      sha256 = "0fq73dlyar77ym60szfv62gik70bzldk7djfy5k70w4fbgilfpb1";
+      rev = "a937222abcc2843c13f0a92576a215d391829811";
+      sha256 = "1snvkv6ba4kciz4xq2810ffsg4nnlzjp5vddj9x68q2bvssh8xlc";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -522,12 +522,12 @@ final: prev:

  aerial-nvim = buildVimPlugin {
    pname = "aerial.nvim";
-    version = "2023-11-10";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "aerial.nvim";
-      rev = "3b89343711d5e2847feaa280ebe418c452a2a923";
-      sha256 = "0py7clhanhifi2rrsgq41fvikr2ga33fcb2d7af401bdi9m9vmfw";
+      rev = "51bdd35f4f984293d4200e52aeff44f12febc6f2";
+      sha256 = "1kg7bzs01h05c0x8lgq1h98qwfy8x6ljbwcryya2750azc6bgmh8";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -811,12 +811,12 @@ final: prev:

  aurora = buildVimPlugin {
    pname = "aurora";
-    version = "2023-11-01";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "aurora";
-      rev = "a7517e3dca1d4b75cba6e37d9d1f96ee1af1e7d1";
-      sha256 = "14gv7w3kwlj20hhmjcd86n1mgk0fgmda39km59b947d4k6l6y6l9";
+      rev = "b085a8952dfa3a0fe245a8aae2799236833001f1";
+      sha256 = "04pz7cn876dqysr8ky5wfffi6zybvzqz7hx59z7fbf59x4jzlpfg";
    };
    meta.homepage = "https://github.com/ray-x/aurora/";
  };
@ -1243,12 +1243,12 @@ final: prev:

  ccc-nvim = buildVimPlugin {
    pname = "ccc.nvim";
-    version = "2023-10-05";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "uga-rosa";
      repo = "ccc.nvim";
-      rev = "cd2a10557b4a13e80929f59a7076ae792b2c60fa";
-      sha256 = "0mfzxb9xw325b3li077qd23gys9j66jhpyz2dd9kz2xya7jvl6rb";
+      rev = "f77b477d9f0b9a28612212b3fc43145f2a5591cc";
+      sha256 = "0xp4h8yhlm9kfr4m5446g95mvqr4imhrzwhg726hrdkfs04b1hzq";
    };
    meta.homepage = "https://github.com/uga-rosa/ccc.nvim/";
  };
@ -2287,12 +2287,12 @@ final: prev:

  conform-nvim = buildVimPlugin {
    pname = "conform.nvim";
-    version = "2023-11-10";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "conform.nvim";
-      rev = "e388bd6725d83f83639e24482b9d1bca01c0c040";
-      sha256 = "18pim7niv4x8rbfm5bsz2fnnpsskw65qcl0rq7hfhnj7pvb0lb3i";
+      rev = "ca3dfba94600aa62bfc88ae37cbd4f17eaea2553";
+      sha256 = "192r845pyszbl5jwxzs36pvjn4c4si4n0ywnqlia0w03vac4zz8g";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/conform.nvim/";
@ -2444,12 +2444,12 @@ final: prev:

  crates-nvim = buildVimPlugin {
    pname = "crates.nvim";
-    version = "2023-10-19";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "saecki";
      repo = "crates.nvim";
-      rev = "aac57ef84cf4fecf7907114b22e875f84a6128ee";
-      sha256 = "0xqpj6zhydx8n08s00i3zji2383dp13xy3smsvzgim8wmwfklk6s";
+      rev = "f47c77d99f11362ddc2f4891f35407fb0b76d485";
+      sha256 = "1sr71k5ngsjxzhldr06cb2bf79mn6096czn17ql22j99w92gydk5";
    };
    meta.homepage = "https://github.com/saecki/crates.nvim/";
  };
@ -3046,12 +3046,12 @@ final: prev:

  dropbar-nvim = buildVimPlugin {
    pname = "dropbar.nvim";
-    version = "2023-11-10";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "Bekaboo";
      repo = "dropbar.nvim";
-      rev = "af022e088b98d935d4a12337f7c4bbde6d7a59c9";
-      sha256 = "0pawws18fbizavc3vba89lmd4qmdfpi3gqizjbb79c0hk2qgls5v";
+      rev = "c41904a3dcc103587b1157da13d565a0a5f9f3a5";
+      sha256 = "0q0b5llz4jmpqlv4yx929wbhsnqjd62ng5kjmiwl3nylz1gndgmk";
    };
    meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
  };
@ -3143,12 +3143,12 @@ final: prev:

  elixir-tools-nvim = buildVimPlugin {
    pname = "elixir-tools.nvim";
-    version = "2023-11-08";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "elixir-tools";
      repo = "elixir-tools.nvim";
-      rev = "f98a90e071786c3a99a280c7b11cf6c0a6c00a0b";
-      sha256 = "1n1hh0arlhn9jh01m2f9sv19g7hfwz8lg7yhr50n0xcdmg0z4adh";
+      rev = "517ffd8366e4065ba66e0fb0c8e8ce192906db5d";
+      sha256 = "1b38zb5nisyk5msz045vw5ibl35jd31zskj26qm93z8h29b3f0xa";
    };
    meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
  };
@ -3877,12 +3877,12 @@ final: prev:

  godbolt-nvim = buildVimPlugin {
    pname = "godbolt.nvim";
-    version = "2023-11-10";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "p00f";
      repo = "godbolt.nvim";
-      rev = "e7da918f2f76d1eef490b0a6034b8a4bed5c5f72";
-      sha256 = "08937wj7d33k7wpix5676d44k29fn3pln1r6935h4a2p1j8hw9rh";
+      rev = "09b78f294ea26af678a9ac363b7d5ce8e20b696e";
+      sha256 = "0g9zp1p9rpx4bixm6hdpd7w9a483yrz73p6vfl9pn5ky0vavaz25";
    };
    meta.homepage = "https://github.com/p00f/godbolt.nvim/";
  };
@ -3997,12 +3997,12 @@ final: prev:

  gruvbox-nvim = buildVimPlugin {
    pname = "gruvbox.nvim";
-    version = "2023-10-07";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "ellisonleao";
      repo = "gruvbox.nvim";
-      rev = "477c62493c82684ed510c4f70eaf83802e398898";
-      sha256 = "0250c24c6n6yri48l288irdawhqs16qna3y74rdkgjd2jvh66vdm";
+      rev = "517b012757fbe7a4d6e507baf5cc75837e62734f";
+      sha256 = "1ndbd6mn19g3wiqshw9wckkl976kjvgy2dc3lmb92cyxjni8a507";
    };
    meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
  };
@ -4080,12 +4080,12 @@ final: prev:

  haskell-tools-nvim = buildNeovimPlugin {
    pname = "haskell-tools.nvim";
-    version = "2023-11-08";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "haskell-tools.nvim";
-      rev = "4ba45b6a820bd87328c44f7053a00d243a3ff8f1";
-      sha256 = "0a0brmxjlggs2rzvjm6sn0k8m4j57icd2cijgzsm1i5ylqaribg1";
+      rev = "3076ac21d6ffc6d0100eb5878a1b77c6a53d8871";
+      sha256 = "0fc0npgmv6zxc3v5rzxh9lqa0868pyj4kcsyg8vw9qwl1waz6pa9";
    };
    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
  };
@ -4355,12 +4355,12 @@ final: prev:

  image-nvim = buildVimPlugin {
    pname = "image.nvim";
-    version = "2023-11-01";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "3rd";
      repo = "image.nvim";
-      rev = "ec91b89d3d3ba02b66cf7123042b90c432a7e413";
-      sha256 = "0gdnkn58nqmdvkrd6zx7bg6abbzzfwz9dqpc24lz480wzvgrp9sw";
+      rev = "f458f33e6ba0f3bfee233b90fb9318d42941d972";
+      sha256 = "14kspw9s6wsgh0afyskkyqdbr68l7fiq75r1d22a3ffvc8m5a81w";
    };
    meta.homepage = "https://github.com/3rd/image.nvim/";
  };
@ -4812,12 +4812,12 @@ final: prev:

  lean-nvim = buildVimPlugin {
    pname = "lean.nvim";
-    version = "2023-11-09";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "Julian";
      repo = "lean.nvim";
-      rev = "d60c954168caf61e00af1c42dd2eb2d2ec1c1b56";
-      sha256 = "05rddkw2n2dpw22inj1af4ycwkgr9dq71zap3dr2wpi6f4gaag69";
+      rev = "a4868d184b0cf5114d5b0ee6aa13b1c5c4fb47fa";
+      sha256 = "0q4nhp3bgbxfzg8x9grhpqfdvs7z6z4sxiz9vdm7q1ch9vq2g12q";
    };
    meta.homepage = "https://github.com/Julian/lean.nvim/";
  };
@ -5064,12 +5064,12 @@ final: prev:

  litee-calltree-nvim = buildVimPlugin {
    pname = "litee-calltree.nvim";
-    version = "2022-09-28";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "ldelossa";
      repo = "litee-calltree.nvim";
-      rev = "e2dffec35740032258fee3a3c7f30123226f2271";
-      sha256 = "091iga42vmkwxwr8y4p4j8l2cawja5q7n10bq7bqc9j8z6jvl9x8";
+      rev = "14b66cc6ff76deb67259db99196c0da5a6c75ca2";
+      sha256 = "0ynnn2rknyzyjn796lig32n1jycapg6q4zrpzllxlvqyhyhxsjf5";
    };
    meta.homepage = "https://github.com/ldelossa/litee-calltree.nvim/";
  };
@ -5100,12 +5100,12 @@ final: prev:

  litee-nvim = buildVimPlugin {
    pname = "litee.nvim";
-    version = "2022-12-11";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "ldelossa";
      repo = "litee.nvim";
-      rev = "bf366a1414fd0f9401631ac8884f2f9fa4bf18d2";
-      sha256 = "1kl3wb0p5dwdf543hzmai07myf9i28s36y11mlxw5j7hai1cabmq";
+      rev = "3c51764a615566e4c0223362f4be00acc23c430e";
+      sha256 = "1y68zqlzm4ba7fg62drs2flxbyizar1m9vyqgbah7bfdvw4gw0al";
    };
    meta.homepage = "https://github.com/ldelossa/litee.nvim/";
  };
@ -5231,12 +5231,12 @@ final: prev:

  lsp_signature-nvim = buildVimPlugin {
    pname = "lsp_signature.nvim";
-    version = "2023-11-07";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "ray-x";
      repo = "lsp_signature.nvim";
-      rev = "9ed85616b772a07f8db56c26e8fff2d962f1f211";
-      sha256 = "0vymhx89wzmqw9xzvqj9sni0a86wql88ibn07h08qinqcnsg8kb3";
+      rev = "1fba8f477b8c65add5e07cda0504cf7f81a9a4ab";
+      sha256 = "1qrzr6x90m6kksrw0hknraplkzxh6zkdw46gchr89y05j54wvlgs";
    };
    meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
  };
@ -5267,12 +5267,12 @@ final: prev:

  lspsaga-nvim = buildVimPlugin {
    pname = "lspsaga.nvim";
-    version = "2023-11-07";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "8b027966d1d5845831107a2505999d380cb18669";
-      sha256 = "10nnrm2ijjycl95r0k01kgamvrai9w4pi1hcy24i01yc0nm8r234";
+      rev = "283a3fc8e01191095d33c078031c577e8f9427b9";
+      sha256 = "0r70gssbdkplmfacbcafr1d9hh0k61ybpcw65lplx7ya8q62yb0k";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
@ -5315,12 +5315,12 @@ final: prev:

  luasnip = buildVimPlugin {
    pname = "luasnip";
-    version = "2023-11-04";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "l3mon4d3";
      repo = "luasnip";
-      rev = "a4de64570b9620875c8ea04175cd07ed8e32ac99";
-      sha256 = "0k6ql48hm0z9ii5p07cs217wz376fz8q1syl65xjcfnlvbdxb6x8";
+      rev = "46c91e814732c1630b8a8b50d04acbf54b8320fa";
+      sha256 = "1bx2sjqr2rvyl2zyc4rymg1sl67gw542vfpl857dx7yhabr9xj4d";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/l3mon4d3/luasnip/";
@ -5544,12 +5544,12 @@ final: prev:

  mini-nvim = buildVimPlugin {
    pname = "mini.nvim";
-    version = "2023-11-09";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "e1f49ae456f4e6e8b79e657965f295886fbe2101";
-      sha256 = "1nawpz9ssw4igca3q3jm74q1mk16f1r20mgmncpayijvcl1l5nxg";
+      rev = "f2b89efbbad1943657e43f474fe308fceb63597e";
+      sha256 = "1yyqb3plmzmfpidcij66j3mcg37ysf3bs1s5wyyi7hxqw6hqqhk4";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -5604,12 +5604,12 @@ final: prev:

  modicator-nvim = buildVimPlugin {
    pname = "modicator.nvim";
-    version = "2023-11-07";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "mawkler";
      repo = "modicator.nvim";
-      rev = "1bd568305834b7355cd33826e0984d5818f01d11";
-      sha256 = "0wx0zdzdfwc7ihglhn978c2i59b7r3b0nazwfcyi2yqsva2y8gb7";
+      rev = "3918f17ab136a469a81881a194068609f0a878d4";
+      sha256 = "1xkfg8hmglyx8y8b2hlv40n904naiar1abb29r2lvdwri8aksql5";
    };
    meta.homepage = "https://github.com/mawkler/modicator.nvim/";
  };
@ -5940,12 +5940,12 @@ final: prev:

  neo-tree-nvim = buildVimPlugin {
    pname = "neo-tree.nvim";
-    version = "2023-11-10";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "nvim-neo-tree";
      repo = "neo-tree.nvim";
-      rev = "b6d8bee23444a267afa8b5dbdb9d82dbf39173ec";
-      sha256 = "0vnlg9hswzamdbqy842ymfm4h4mny97ijwsl3fq987ql3cjbpvx3";
+      rev = "0f6e7acfd86b052acf78baccba04d5c61dcbbc0d";
+      sha256 = "0glq1ywx1q8sqs3fkq071cqmwa6sn18glx1l0gmyvaxr0q9bijmh";
    };
    meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
  };
@ -5988,24 +5988,24 @@ final: prev:

  neodev-nvim = buildVimPlugin {
    pname = "neodev.nvim";
-    version = "2023-11-10";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neodev.nvim";
-      rev = "20f1e5d3c143333bdf5ea48729f7b50660135cb3";
-      sha256 = "0zkxq0wkbxq3yk1vgmhnb4cszvf13yx3z8886nfadnbl9v7rhkl5";
+      rev = "f93a984ee75ba6d532d85419619cc6e91d954ee9";
+      sha256 = "0aisb4kwjys02za4rp2ai9qk64f3rx8xwwz1y20ki9q6729623d5";
    };
    meta.homepage = "https://github.com/folke/neodev.nvim/";
  };

  neoformat = buildVimPlugin {
    pname = "neoformat";
-    version = "2023-10-31";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "sbdchd";
      repo = "neoformat";
-      rev = "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f";
-      sha256 = "19x9yppzln80pqdwbinfdn7ip0syrcq8wf45j0y80x1v7hk6hn1q";
+      rev = "e5fe7e8f7c3dd071b90f19af0e8c7cfa56cdedc7";
+      sha256 = "1263nvq9a275340hdnkimz70xq615a9rz2s8szncii35z10szjm7";
    };
    meta.homepage = "https://github.com/sbdchd/neoformat/";
  };
@ -6108,24 +6108,24 @@ final: prev:

  neorg-telescope = buildVimPlugin {
    pname = "neorg-telescope";
-    version = "2023-10-26";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "nvim-neorg";
      repo = "neorg-telescope";
-      rev = "c3d25cc46145fba82c410245fb5bea66945eb1de";
-      sha256 = "0pskhg2d5c6abcv568aiv39jqd50bpykbrhhyi7s582ikdhqis04";
+      rev = "6a7a677c40fa3c348924a4e2a06a513e0b34c056";
+      sha256 = "05m64vwi55kzknz9za0izc9hs1djc46467d7d8ijx3268sw3l0x6";
    };
    meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/";
  };

  neoscroll-nvim = buildVimPlugin {
    pname = "neoscroll.nvim";
-    version = "2023-08-10";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "karb94";
      repo = "neoscroll.nvim";
-      rev = "4bc0212e9f2a7bc7fe7a6bceb15b33e39f0f41fb";
-      sha256 = "1rbfmxzfwbb2sqvcgzfhbkjz0w765psakaah7jp9rl72zjbnqy72";
+      rev = "e85740d1a54ab0f10127b08c67a291053bc3acfa";
+      sha256 = "0klmrkmhc3b52v7f03dvhysywixkh2zqqllq7sbrs278gnlxm2yl";
    };
    meta.homepage = "https://github.com/karb94/neoscroll.nvim/";
  };
@ -6168,12 +6168,12 @@ final: prev:

  neotest = buildVimPlugin {
    pname = "neotest";
-    version = "2023-10-20";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "nvim-neotest";
      repo = "neotest";
-      rev = "901891484db3d46ce43d56871273dc7d40621356";
-      sha256 = "1w8lrwjcnd8fs8b7mwm12vnbnfdmcpkm7p13b3hjv1fm7k2d8pca";
+      rev = "009328955066ae6c170d24bb0de5f168d8760ff8";
+      sha256 = "1i6lkbq5iadn9as9fy9lw1m1aw3vj00j6hxrrflgpnf3wqkvxb6a";
    };
    meta.homepage = "https://github.com/nvim-neotest/neotest/";
  };
@ -6241,12 +6241,12 @@ final: prev:

  neotest-haskell = buildVimPlugin {
    pname = "neotest-haskell";
-    version = "2023-11-05";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "MrcJkb";
      repo = "neotest-haskell";
-      rev = "328e8e40eacb2b5b0ea9c1e480644e768dc37df1";
-      sha256 = "044zrhjmkxj1as4h91jpwmfjdbdl2bmcflzd3zm4lyyydb8rcxpp";
+      rev = "6f4b11212ef7a83889a3b488f562242198ddae4a";
+      sha256 = "00h283dx9k9bdd89379q200h5kg7x02fk7cb6fac6ybnnbvp53pm";
    };
    meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
  };
@ -6301,12 +6301,12 @@ final: prev:

  neotest-python = buildVimPlugin {
    pname = "neotest-python";
-    version = "2023-08-25";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "nvim-neotest";
      repo = "neotest-python";
-      rev = "81d2265efac717bb567bc15cc652ae10801286b3";
-      sha256 = "0ymi6rkb7qsqh1jvyvnpvnqix3c0p79kydww9va0cnj1ylfhqwp4";
+      rev = "c969a5b0073f2b5c8eaf017d1652f9251d761a15";
+      sha256 = "0vjbc6sj9d4l8553g10wqxqpjr8z064g143i4ig4d42vsxh24ccc";
    };
    meta.homepage = "https://github.com/nvim-neotest/neotest-python/";
  };
@ -6577,12 +6577,12 @@ final: prev:

  no-neck-pain-nvim = buildVimPlugin {
    pname = "no-neck-pain.nvim";
-    version = "2023-10-26";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "shortcuts";
      repo = "no-neck-pain.nvim";
-      rev = "e32701cd26c590be614fc85d7cf36c9994c3a936";
-      sha256 = "1j3n1mj680nh2r8za16ridngd3bd31jik5b6wxjs02g4zvwp6cr7";
+      rev = "2bcb6b761a34c69739da9aab642839b59236b801";
+      sha256 = "1pd2qzc3gvrbwhxd5i2bc5jd1ll762m23qsjpbhc4xm5dyq66i89";
    };
    meta.homepage = "https://github.com/shortcuts/no-neck-pain.nvim/";
  };
@ -7224,12 +7224,12 @@ final: prev:

  nvim-lspconfig = buildVimPlugin {
    pname = "nvim-lspconfig";
-    version = "2023-11-10";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "b0852218bc5fa6514a71a9da6d5cfa63a263c83d";
-      sha256 = "05qi1yiawvl4nj867q9fh6v9aaafxypx3md00dx5mhcg9jy5hchs";
+      rev = "90a28fd7637b66e055af62387ecee06f7cbd3173";
+      sha256 = "0vzvbw8fh2j1l1sjkk5dfj5l5yghp5fk9pparvar1cyadpa6mcsh";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -7380,12 +7380,12 @@ final: prev:

  nvim-osc52 = buildVimPlugin {
    pname = "nvim-osc52";
-    version = "2023-10-15";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "ojroques";
      repo = "nvim-osc52";
-      rev = "5689dc08ee1ade3feb7f74bdd6e539fba70f3064";
-      sha256 = "0pq68f0rfvvxw3y9kkwhqxrlvyk8gjfn8i8a06pb7m9k91r2qm5s";
+      rev = "89307570b3bffe115d8b6b6fd3a4066cde0ba2d7";
+      sha256 = "0alsh1r6c5b8zf3jcymmrp921mmmhvws38ih9hbw5yffcy0lqhl2";
    };
    meta.homepage = "https://github.com/ojroques/nvim-osc52/";
  };
@ -7452,12 +7452,12 @@ final: prev:

  nvim-scrollview = buildVimPlugin {
    pname = "nvim-scrollview";
-    version = "2023-11-10";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "5af95a6ce8494edb5182b13d140b93dc186a7fa1";
-      sha256 = "1ib3azimg2h6v9k91sdppz4s11m44iw579cy54l76fffarpabnkk";
+      rev = "c9b5422a845bff25ddeb8057b42afbf0f7b25e32";
+      sha256 = "08x62lpjir0zhmscln14id0lz59wqmvdixacz7z9ghi00r7lrwxf";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -7476,12 +7476,12 @@ final: prev:

  nvim-snippy = buildVimPlugin {
    pname = "nvim-snippy";
-    version = "2023-11-10";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "dcampos";
      repo = "nvim-snippy";
-      rev = "815895f3158878d6ef79a167b2f4e7bfe0342393";
-      sha256 = "1s5p5q26yl6zp6cqpz4ymgdc5fb6900nf3gxsx3hc6j1ll94zhx4";
+      rev = "9192f310afe34ab925d61add187a5ff278879333";
+      sha256 = "1wcw0xjh44ik1j9gaalrwl86d7mp4v5hcdas3qy3bg8w8aqvgwaw";
    };
    meta.homepage = "https://github.com/dcampos/nvim-snippy/";
  };
@ -7500,12 +7500,12 @@ final: prev:

  nvim-spectre = buildVimPlugin {
    pname = "nvim-spectre";
-    version = "2023-11-10";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "nvim-pack";
      repo = "nvim-spectre";
-      rev = "3eb207fcafb6522e1ed531d760af3ef896cce030";
-      sha256 = "0salsb05vwc72wmghyhw9v12pf000f19hjdivspl3fnp3ksygjf6";
+      rev = "07201e6bd3b43a193d891cec844dfd1f23e775d1";
+      sha256 = "0rpp9ddyq7yd462mlf99khrpway04vi892538ss8zqmz2lazchrn";
    };
    meta.homepage = "https://github.com/nvim-pack/nvim-spectre/";
  };
@ -7524,12 +7524,12 @@ final: prev:

  nvim-surround = buildVimPlugin {
    pname = "nvim-surround";
-    version = "2023-10-22";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "kylechui";
      repo = "nvim-surround";
-      rev = "4f0e1f470595af067eca9b872778d83c7f52f134";
-      sha256 = "16q85dd79rdn1v7wqshzhjgrsgbnzk04l4vjgp6g9hbj8p8sna4k";
+      rev = "cfa2da7f469f1e759f2a961bc25fa4ccfe1795c2";
+      sha256 = "0r1nm8l736vvrxhqnszk65siphkn59473y88qahxzhfj4b98qgd3";
    };
    meta.homepage = "https://github.com/kylechui/nvim-surround/";
  };
@ -7572,36 +7572,36 @@ final: prev:

  nvim-tree-lua = buildVimPlugin {
    pname = "nvim-tree.lua";
-    version = "2023-11-09";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-tree.lua";
-      rev = "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c";
-      sha256 = "1s8y0k8qj1skxa7q5j53wisv6j63104ysvvyfd1p8mbw8f00xq83";
+      rev = "874ae6e9445a5eb5ba430e5fd10212450a261ad7";
+      sha256 = "0dn56zpbjxggcsbm7z6f1b4kcwsspj09ynzjkl8bq0l45qf3v50i";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPlugin {
    pname = "nvim-treesitter";
-    version = "2023-11-10";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "04a9a90c2a60c86aa9451c539586326b337b03e5";
-      sha256 = "072kziq27h3iz8byh6awyz4q8kf05cnmxb3vs88x9nhflwvlfd68";
+      rev = "075a64addc33390028ea124a1046a43497f05cd1";
+      sha256 = "1rkwc97h9pnxrzqq1bp72cr6182rvh0bi3c9dfq91q51g70a651h";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };

  nvim-treesitter-context = buildVimPlugin {
    pname = "nvim-treesitter-context";
-    version = "2023-10-28";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-context";
-      rev = "2806d83e3965017382ce08792ee527e708fa1bd4";
-      sha256 = "0pk6pvqq8xm3jspq7zpkh7rpqdammq1np3gc5x1kjly0q11rf5pn";
+      rev = "c03f8aab1e6649036d69ba7e3af4d09cb7e4d977";
+      sha256 = "0jx97czy9rywvaqbdbx4sb60yhiq50lw80xhm80vgrb1587lkciv";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
  };
@ -7680,12 +7680,12 @@ final: prev:

  nvim-ts-context-commentstring = buildVimPlugin {
    pname = "nvim-ts-context-commentstring";
-    version = "2023-10-12";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "joosepalviste";
      repo = "nvim-ts-context-commentstring";
-      rev = "92e688f013c69f90c9bbd596019ec10235bc51de";
-      sha256 = "1wfaqq7gfkpf8jf8calin0ycy3hjvylh945bvlacv4zjnq9c3n2m";
+      rev = "6c30f3c8915d7b31c3decdfe6c7672432da1809d";
+      sha256 = "15iq4ascb384q39ib8gvn5kbqwg99rdp3qfm2pqkgl4ycsnczp1s";
    };
    meta.homepage = "https://github.com/joosepalviste/nvim-ts-context-commentstring/";
  };
@ -7715,12 +7715,12 @@ final: prev:

  nvim-ufo = buildVimPlugin {
    pname = "nvim-ufo";
-    version = "2023-10-18";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "kevinhwang91";
      repo = "nvim-ufo";
-      rev = "ebbab711d909d5f675e38ad489765bd22bd2c6b3";
-      sha256 = "0cay5nznhry9g716pj7vzkyk58aagwqmbrysss8jfvwsx3pb93lg";
+      rev = "068053c5921b04d4ecb5fafc2e71b4f04cc35e80";
+      sha256 = "08kgrmcxv3rcf8lmvh4fif5njicvsirgsb8v48zhcg1ppn36c412";
    };
    meta.homepage = "https://github.com/kevinhwang91/nvim-ufo/";
  };
@ -7739,12 +7739,12 @@ final: prev:

  nvim-web-devicons = buildVimPlugin {
    pname = "nvim-web-devicons";
-    version = "2023-11-09";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-web-devicons";
-      rev = "47103b80c38c59f7a1b5408c232b92bf5d018651";
-      sha256 = "1lw7zf5qf6rdw9cnwxbim43f5a99spc4ic884s53yw1g75y3wwv7";
+      rev = "3fafeea5f339223e888fd15eb4032260849cb038";
+      sha256 = "14vwqj74icbh1zk23k833jfprh4bdb7yq850c4rn7cs6bl06nwrp";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
  };
@ -7920,12 +7920,12 @@ final: prev:

  onedarkpro-nvim = buildVimPlugin {
    pname = "onedarkpro.nvim";
-    version = "2023-11-02";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "3fb972ee2a835c1b83199c9dbb3661f36e472c97";
-      sha256 = "0h5fam6rhyh9nxnimp70w88w1h5qas37c7rlna27zhllvayp6gq9";
+      rev = "f3a7349156453500f1c053a1f8034a3975b1d793";
+      sha256 = "0xr665dmv8h87c681f114d3vmb9rh0g7map5m70gixdnd60v009p";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -8065,12 +8065,12 @@ final: prev:

  package-info-nvim = buildVimPlugin {
    pname = "package-info.nvim";
-    version = "2023-03-28";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "vuki656";
      repo = "package-info.nvim";
-      rev = "4d98c8cc90d970d87c472c04bf7ca712336cc753";
-      sha256 = "1wk9s1240f3vlyxi0xy97vkp3xz3r27582knav3zd6wrhqhih25r";
+      rev = "18f8126dd8e65b2e21804c9107785af4abbb5bfc";
+      sha256 = "0b9s9a3nz0449sl8zzf55xk12hrkksvnrnbc38i1la234xhrfpsw";
    };
    meta.homepage = "https://github.com/vuki656/package-info.nvim/";
  };
@ -8511,11 +8511,11 @@ final: prev:

  rainbow-delimiters-nvim = buildVimPlugin {
    pname = "rainbow-delimiters.nvim";
-    version = "2023-10-29";
+    version = "2023-11-11";
    src = fetchgit {
      url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
-      rev = "df8cdf68234fbf056202a9684931c3dfa89988c1";
-      sha256 = "03hmkdkny3rfhprjimxala058b31das66iqzkghm99jw7mbrd4xc";
+      rev = "a5e8fb4960f905a52031b28113cf43088cfeae22";
+      sha256 = "0d3yfy7a7jc0g4y3x6fff2skbkhp3hjjk0p4q2a66s6rm626pg6z";
    };
    meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
  };
@ -8762,12 +8762,12 @@ final: prev:

  rustaceanvim = buildNeovimPlugin {
    pname = "rustaceanvim";
-    version = "2023-11-06";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "mrcjkb";
      repo = "rustaceanvim";
-      rev = "a355a08d566aaac33374e24b12009cbe0f6a5b90";
-      sha256 = "1n8m4icv3ilzdw1la9zbak4x7pn96w0fvwm5qxja3vrz20ir05hm";
+      rev = "36cbeceb6602ce97f04d5526fd238957b77dd263";
+      sha256 = "108zzz088ll08h55ij0bb81ak53cyxbzfigkfvj31c8v2i3j9jr9";
    };
    meta.homepage = "https://github.com/mrcjkb/rustaceanvim/";
  };
@ -9051,12 +9051,12 @@ final: prev:

  snap = buildVimPlugin {
    pname = "snap";
-    version = "2023-11-06";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "camspiers";
      repo = "snap";
-      rev = "d4921fcbc2de5d3663747688555dc0379ce4c41b";
-      sha256 = "0by1p0aid5rg2wlh7alyshs01q70f6k7v7nkc985c38ag4bsnl24";
+      rev = "8a2c15665fab760ecfd854329d2170a6ab40aa83";
+      sha256 = "0b9zd8v8l2d89wsc8qfgk51pqs8wrfr6fj9vcdq2v7f648ly19lw";
    };
    meta.homepage = "https://github.com/camspiers/snap/";
  };
@ -9896,12 +9896,12 @@ final: prev:

  telescope-undo-nvim = buildVimPlugin {
    pname = "telescope-undo.nvim";
-    version = "2023-06-03";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "debugloop";
      repo = "telescope-undo.nvim";
-      rev = "3dec002ea3e7952071d26fbb5d01e2038a58a554";
-      sha256 = "1331qgsfxy1qsvxlkss2g713qlj2ri02ywbhiwwy5cyl8bc0rl76";
+      rev = "a3dcb6e32a3a59a5570a7cda33171eeef9753345";
+      sha256 = "1vx3zfb2mc56ggk1j2kh9xzpnid963wvg2ibhq1c7vzf0d3wigc0";
    };
    meta.homepage = "https://github.com/debugloop/telescope-undo.nvim/";
  };
@ -10005,12 +10005,12 @@ final: prev:

  term-edit-nvim = buildVimPlugin {
    pname = "term-edit.nvim";
-    version = "2023-07-30";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "chomosuke";
      repo = "term-edit.nvim";
-      rev = "929c45441adc5798d382caa50f4e5158e2097765";
-      sha256 = "0ggr9rg10r7hrai9rz89sa301z9pib0g6mav6byrxfnw1kww16xy";
+      rev = "aa3369a562b816ff0cec4fa6eddc9c32ac472710";
+      sha256 = "07fd9xqg2ykqnsqb9w6jqypzzl8klih5d67gi42jdawj3n4ijvcs";
    };
    meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
  };
@ -10065,12 +10065,12 @@ final: prev:

  text-case-nvim = buildVimPlugin {
    pname = "text-case.nvim";
-    version = "2023-11-08";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "johmsalas";
      repo = "text-case.nvim";
-      rev = "4df09daa30d2c58bc7baefce1428ed84e2f0fbc3";
-      sha256 = "0754x0x1bqk6yn51qdnl8mrv6pc0rn1jqgmcrn0s00jsl1nbpims";
+      rev = "51e043c27478823d3d914ccf8e373b189a084836";
+      sha256 = "1fggk1k1wfgrcapv2z8s7j9k1nkxc1g33c87pjld7dsm6477fvms";
    };
    meta.homepage = "https://github.com/johmsalas/text-case.nvim/";
  };
@ -10378,12 +10378,12 @@ final: prev:

  typst-vim = buildVimPlugin {
    pname = "typst.vim";
-    version = "2023-10-25";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "kaarmu";
      repo = "typst.vim";
-      rev = "2fddf2beeec265e0a41dd24ac668d825f8f3657a";
-      sha256 = "0arxrf5lrqp31l9118wmsfjniabb5l113h7wc19s8j6fzdldgs0q";
+      rev = "e72561f0023860eb83bd7680573b05ecfc016c55";
+      sha256 = "1i9ydjr9fzhwxf55451p4i0l4mnflp9gziyxz7z5w06qa1ya7cvd";
    };
    meta.homepage = "https://github.com/kaarmu/typst.vim/";
  };
@ -10402,12 +10402,12 @@ final: prev:

  undotree = buildVimPlugin {
    pname = "undotree";
-    version = "2023-10-30";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "mbbill";
      repo = "undotree";
-      rev = "170aa9e516b6926e6bddfe21bbf01f2283a00e7d";
-      sha256 = "1akmajm1fvf3dr0jm3n0f2qxana8lqi3k4wvrqn65h00g4ks6nd3";
+      rev = "36ff7abb6b60980338344982ad4cdf03f7961ecd";
+      sha256 = "1rjz58ggkrz0pfrbiq93p2zq4bif2m7rjn9jj8hbqikmp8g7h19g";
    };
    meta.homepage = "https://github.com/mbbill/undotree/";
  };
@ -11362,12 +11362,12 @@ final: prev:

  vim-code-dark = buildVimPlugin {
    pname = "vim-code-dark";
-    version = "2023-07-18";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "tomasiser";
      repo = "vim-code-dark";
-      rev = "d05d1ab602048fc13fd8cc70cd722c083b0fd904";
-      sha256 = "1v0117rahgs2ap650xcqv48xmw2yk5qiz6rfny7q0vz9pvy9p1s0";
+      rev = "8def3d890b2087ee4c42af03117d7edc7d693706";
+      sha256 = "129mrz3jxw4kgbg5lz9gc7rznsjp2fbjvi60zyrpkmv8xa6yhmpw";
    };
    meta.homepage = "https://github.com/tomasiser/vim-code-dark/";
  };
@ -12250,12 +12250,12 @@ final: prev:

  vim-gitgutter = buildVimPlugin {
    pname = "vim-gitgutter";
-    version = "2023-11-10";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "airblade";
      repo = "vim-gitgutter";
-      rev = "6efb835aa2de69daaf164e1605decf4987609889";
-      sha256 = "1qggjby8878ggcvgwjzfzx673fmn6gcamfwj2a00vpsrk8banqmh";
+      rev = "fe0e8a2630eef548e4122096e4e2241f42208fe3";
+      sha256 = "1lzhkqr74z430zm61jy4hmrxv3nq89rhrpzlp8fj9vwfkbqpzrgm";
    };
    meta.homepage = "https://github.com/airblade/vim-gitgutter/";
  };
@ -13092,12 +13092,12 @@ final: prev:

  vim-lsp = buildVimPlugin {
    pname = "vim-lsp";
-    version = "2023-10-16";
+    version = "2023-11-11";
    src = fetchFromGitHub {
      owner = "prabirshrestha";
      repo = "vim-lsp";
-      rev = "c58edb98f09a650612adaaf8c47995c9e2b7ffb1";
-      sha256 = "0y839rrk5i3f6wmk94p28yy3alq5jnh8124v51prmzirzyhirhh1";
+      rev = "ee2bb88833766ed184a77d4caa1e43d0821eaeb2";
+      sha256 = "1bq745cx1ybzi84zjm6lj3mzy4bz5id5fs07jkvipakdpp44bxsa";
    };
    meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
  };
@ -13741,12 +13741,12 @@ final: prev:

  vim-pandoc = buildVimPlugin {
    pname = "vim-pandoc";
-    version = "2023-02-24";
+    version = "2023-11-10";
    src = fetchFromGitHub {
      owner = "vim-pandoc";
      repo = "vim-pandoc";
-      rev = "d4fc6f8234c37eef16b6de8055c5fe53b7d7316a";
-      sha256 = "03papfmlyrn410c7dflwbxinwymlvizdmwvyvrg24gdxc5vvp24q";
+      rev = "84ff781925a28346df99d3764ec697c3088862a7";
+      sha256 = "09lswvc5s97brx6iimkbqslmsmbb19nz0s6w0hpss8vf0fy38a8l";
    };
    meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
  };
@ -15194,12 +15194,12 @@ final: prev:

  vim-vsnip = buildVimPlugin {
    pname = "vim-vsnip";
-    version = "2023-09-15";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "vim-vsnip";
-      rev = "be277461265f1e5c7db470aa479f30956597ea9e";
-      sha256 = "0fiqz7qrcsla2ms5lfw0w8f6ysa5wivnhjn9463i00vasg19mcqi";
+      rev = "8eebdf6ab4a880d845893f210fd20516d2e2384f";
+      sha256 = "10aadjkisfsx4avylblp7zb97ikaay249fzw3f43xgknlajg35dg";
    };
    meta.homepage = "https://github.com/hrsh7th/vim-vsnip/";
  };
@ -16024,12 +16024,12 @@ final: prev:

  catppuccin-nvim = buildVimPlugin {
    pname = "catppuccin-nvim";
-    version = "2023-11-04";
+    version = "2023-11-12";
    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "nvim";
-      rev = "d7521f6050b94cb0e23067f63829d86886f870fe";
-      sha256 = "0rajb128dxdlbm0fhg5d6v5hhv1a9x6jik87bzdfr964jws05hg9";
+      rev = "9f3c13bbcf16fcaec3a429c03743a13e5923f3e3";
+      sha256 = "06m4mz3s53n5rw62jdrz66ygfqx02r0m7ixb14cl327hy1dfnsgc";
    };
    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
@ -138,12 +138,12 @@
  };
  bitbake = buildGrammar {
    language = "bitbake";
-    version = "0.0.0+rev=ffe6c2f";
+    version = "0.0.0+rev=10bacac";
    src = fetchFromGitHub {
      owner = "amaanq";
      repo = "tree-sitter-bitbake";
-      rev = "ffe6c2f3dbf30224479a28ca5d50df594b2486a9";
-      hash = "sha256-K9z533lsurYMznmHeSKfqpy5KfE2/NpqP9bpLrA+pLw=";
+      rev = "10bacac929ff36a1e8f4056503fe4f8717b21b94";
+      hash = "sha256-PSI1XVDGwDk5GjHjvCJfmBDfYM2Gmm1KR4h5KxBR1d0=";
    };
    meta.homepage = "https://github.com/amaanq/tree-sitter-bitbake";
  };
@ -835,12 +835,12 @@
  };
  groovy = buildGrammar {
    language = "groovy";
-    version = "0.0.0+rev=ae8aa51";
+    version = "0.0.0+rev=7e02322";
    src = fetchFromGitHub {
      owner = "Decodetalkers";
      repo = "tree-sitter-groovy";
-      rev = "ae8aa51ec3275afb567a4a67df1a26d89feb135f";
-      hash = "sha256-K9XoSVuAWXJCTxclod4pfxnGHhsbtdE7Xi60wfuCE8M=";
+      rev = "7e023227f46fee428b16a0288eeb0f65ee2523ec";
+      hash = "sha256-tWLc5guc5dxKHoACN3Byo/KV+2i/u2tpZgaS+Yi+CyA=";
    };
    meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy";
  };
@ -1033,12 +1033,12 @@
  };
  janet_simple = buildGrammar {
    language = "janet_simple";
-    version = "0.0.0+rev=77f8418";
+    version = "0.0.0+rev=51271e2";
    src = fetchFromGitHub {
      owner = "sogaiu";
      repo = "tree-sitter-janet-simple";
-      rev = "77f8418fdba7b402350e4817bbb54816bbc627d2";
-      hash = "sha256-WnJ5RvPZx/+BkaOoTHV/yZQ+HFf60Nj9xoylt+3AgqA=";
+      rev = "51271e260346878e1a1aa6c506ce6a797b7c25e2";
+      hash = "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU=";
    };
    meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
  };
@ -1231,12 +1231,12 @@
  };
  liquidsoap = buildGrammar {
    language = "liquidsoap";
-    version = "0.0.0+rev=cff1fea";
+    version = "0.0.0+rev=b35882f";
    src = fetchFromGitHub {
      owner = "savonet";
      repo = "tree-sitter-liquidsoap";
-      rev = "cff1fea7c2ef9eed066a4d3de8af6cb4d7117056";
-      hash = "sha256-WWq7aLFqjHnNe280u4+4SuqD+x73ww75fAE/Zm5ttAs=";
+      rev = "b35882f2e1460867ddddcbe8af586e6807d4676f";
+      hash = "sha256-N7mZrTzIqh55ogttm4T2O7uPFKbJd2odWDUWYfQz0F0=";
    };
    meta.homepage = "https://github.com/savonet/tree-sitter-liquidsoap";
  };
@ -1319,24 +1319,24 @@
  };
  markdown = buildGrammar {
    language = "markdown";
-    version = "0.0.0+rev=cd705f1";
+    version = "0.0.0+rev=7ce4c69";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94";
-      hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw=";
+      rev = "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45";
+      hash = "sha256-UxpTkiRChAwNJBVS9y/lydI8R035EuRy3t39Y1mscq0=";
    };
    location = "tree-sitter-markdown";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
  };
  markdown_inline = buildGrammar {
    language = "markdown_inline";
-    version = "0.0.0+rev=cd705f1";
+    version = "0.0.0+rev=7ce4c69";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "cd705f159127c947cd92ac163c6b17b5dcba7f94";
-      hash = "sha256-bVXzdGApDNAaYeWCgpGQfHDHUb0v6eixJcKYONQUbCw=";
+      rev = "7ce4c69fe92d1c10225e3d1b3676c87dd9427b45";
+      hash = "sha256-UxpTkiRChAwNJBVS9y/lydI8R035EuRy3t39Y1mscq0=";
    };
    location = "tree-sitter-markdown-inline";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@ -1777,12 +1777,12 @@
  };
  pymanifest = buildGrammar {
    language = "pymanifest";
-    version = "0.0.0+rev=8953f91";
+    version = "0.0.0+rev=a775470";
    src = fetchFromGitHub {
      owner = "ObserverOfTime";
      repo = "tree-sitter-pymanifest";
-      rev = "8953f91d733dd92c1ac43b3d58a7a2f43fa62dae";
-      hash = "sha256-1kG09tYE9FAxsE4MqLadi4dtqtJOFOZGOOVgnqvWc44=";
+      rev = "a77547018ada84ca4bc115c7650b19441120f065";
+      hash = "sha256-8aU3TA0KJAfsiJi326mixw6GcnFDTJzrHquCZi0lYOQ=";
    };
    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pymanifest";
  };
@ -1909,12 +1909,12 @@
  };
  requirements = buildGrammar {
    language = "requirements";
-    version = "0.0.0+rev=eda424e";
+    version = "0.0.0+rev=389dd46";
    src = fetchFromGitHub {
      owner = "ObserverOfTime";
      repo = "tree-sitter-requirements";
-      rev = "eda424eade0f2afbafbf0c89d18c77818fa19273";
-      hash = "sha256-cZjj17316Cnz/A+7K3f81H/iedrlu0IDTdDLkXThcnQ=";
+      rev = "389dd46a39075ce36af6ee3af50393d9aa506d14";
+      hash = "sha256-SGamdYeoBKMkyVzvA4nCWp3bqhfmkJctyhcVhqYBfPQ=";
    };
    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-requirements";
  };
@ -2121,12 +2121,12 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "0.0.0+rev=25be0b8";
+    version = "0.0.0+rev=5f928f4";
    src = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286";
-      hash = "sha256-ztiTMusfPkCpzqiEQt+HmkLt6gDhHt6dBdjIOb4ZBxs=";
+      rev = "5f928f404d2aa024abce8657778fc10c03f1511f";
+      hash = "sha256-7W6vuaZjDZgoaxJexPPBjJZlutlTT+hTFL1dq9k2NSo=";
    };
    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
  };
@ -2580,17 +2580,28 @@
  };
  wing = buildGrammar {
    language = "wing";
-    version = "0.0.0+rev=a30e8ec";
+    version = "0.0.0+rev=238200d";
    src = fetchFromGitHub {
      owner = "winglang";
      repo = "wing";
-      rev = "a30e8eca90b7a7deb3a85503dbdd172a68ba0e05";
-      hash = "sha256-B0XQ9C70AsbtDXZfZUcuoQf26rbiPcQrHrobrKjT+FM=";
+      rev = "238200d172538d5ff1228a929ea543465acfc410";
+      hash = "sha256-a/8lbO8/+XhD3i6hjAxCA1rpovlkVHnDxz8xkc3bPoY=";
    };
    location = "libs/tree-sitter-wing";
    generate = true;
    meta.homepage = "https://github.com/winglang/wing";
  };
+  xcompose = buildGrammar {
+    language = "xcompose";
+    version = "0.0.0+rev=01344fe";
+    src = fetchFromGitHub {
+      owner = "ObserverOfTime";
+      repo = "tree-sitter-xcompose";
+      rev = "01344fed31a3cd37a63f03357ec80cbc592a93b5";
+      hash = "sha256-MZmtV8d5L7qF65cJuxZaJwMVvxSYMduwv8lbzljMJLM=";
+    };
+    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-xcompose";
+  };
  xml = buildGrammar {
    language = "xml";
    version = "0.0.0+rev=a3bfa1a";
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -1040,12 +1040,12 @@ self: super: {

  sniprun =
    let
-      version = "1.3.7";
+      version = "1.3.8";
      src = fetchFromGitHub {
        owner = "michaelb";
        repo = "sniprun";
-        rev = "v${version}";
-        hash = "sha256-Lh4S7n+bNbdzjDt4lAL271VeYO3cotMD/kbAbV20C0U=";
+        rev = "refs/tags/v${version}";
+        hash = "sha256-xQb/VZOuwB1J4m6iOs1JMfH1f1rOzJzpvq3D4HHOHAI=";
      };
      sniprun-bin = rustPlatform.buildRustPackage {
        pname = "sniprun-bin";
@ -1055,12 +1055,7 @@ self: super: {
          darwin.apple_sdk.frameworks.Security
        ];

-        # Cargo.lock is outdated
-        preBuild = ''
-          cargo update --offline
-        '';
-
-        cargoHash = "sha256-N+Okln3irqevUHC+ZUDQgQXhJ767peKMmsnt/sT77o8=";
+        cargoHash = "sha256-6h0P0UVks6dQz2PZ1A/CLa1T8okD3CIUnfrH3vHe4L8=";

        nativeBuildInputs = [ makeWrapper ];

--- a/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
+++ b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch
@ -1,5 +1,5 @@
 diff --git a/lua/sniprun.lua b/lua/sniprun.lua
-index aa39e0b..188d54a 100644
+index c9b811f..459cf07 100644
 --- a/lua/sniprun.lua
 +++ b/lua/sniprun.lua
@@ -4,9 +4,7 @@ M.custom_highlight=false
@ -13,11 +13,29 @@ index aa39e0b..188d54a 100644
 
 local sniprun_path = vim.fn.fnamemodify( vim.api.nvim_get_runtime_file("lua/sniprun.lua", false)[1], ":p:h") .. "/.."
 
+@@ -145,7 +143,7 @@ function M.setup_highlights()
+       highlight(group, styles)
+     end
+     vim.cmd('augroup END')
+-  else 
+  else
+     for group, styles in pairs(colors_table) do
+       local gui = styles.gui and 'gui='..styles.gui or 'gui=NONE'
+       local sp = styles.sp and 'guisp='..styles.sp or 'guisp=NONE'
+@@ -354,7 +352,7 @@ function M.health()
+   -- check if the log is recreated
+   if pcall(M.ping) then health_ok("Sent a ping to the sniprun binary")
+   else health_warn("Could not send a ping to the sniprun binary - is it present, executable and compatible with your CPU architecture?") end
+-    
+
+ 
+   os.execute("sleep 0.2")
+   if not M.file_exists(path_log_file) and not M.file_exists(path_log_file_mac)  then health_error("sniprun binary incompatible or crash at start", {"Compile sniprun locally, with a clean reinstall and 'bash ./install.sh 1' as post-install command."})
 diff --git a/ressources/init_repl.sh b/ressources/init_repl.sh
-index 2e6264d..0eab1c6 100644
+index eb51dbe..1382b5c 100755
 --- a/ressources/init_repl.sh
 +++ b/ressources/init_repl.sh
-@@ -23,7 +23,7 @@ mkfifo $working_dir/$pipe
+@@ -35,7 +35,7 @@ mkfifo $working_dir/$pipe
 touch $working_dir/$out
 sleep 36000 > $working_dir/$pipe &
 
@ -25,7 +43,7 @@ index 2e6264d..0eab1c6 100644
 +echo "cat " $working_dir/$pipe " | " $repl  > $working_dir/real_launcher.sh
 chmod +x $working_dir/real_launcher.sh
 
- echo $repl " process started at $(date +"%F %T")." >> $working_dir/log
+ echo $repl " process started at $(date +"%F %T")." >> $log
 diff --git a/ressources/launcher_repl.sh b/ressources/launcher_repl.sh
 index feaa91e..749c55e 100755
 --- a/ressources/launcher_repl.sh
--- a/pkgs/applications/graphics/oculante/default.nix
+++ b/pkgs/applications/graphics/oculante/default.nix
@ -17,6 +17,7 @@
 , gtk3
 , darwin
 , perl
+, wrapGAppsHook
 }:

 rustPlatform.buildRustPackage rec {
@ -39,6 +40,7 @@ rustPlatform.buildRustPackage rec {
    pkg-config
    nasm
    perl
+    wrapGAppsHook
  ];

  checkFlagsArray = [ "--skip=tests::net" ]; # requires network access
@ -74,6 +76,7 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/woelper/oculante";
    changelog = "https://github.com/woelper/oculante/blob/${version}/CHANGELOG.md";
    license = licenses.mit;
+    mainProgram = "oculante";
    maintainers = with maintainers; [ dit7ya figsoda ];
  };
 }
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  testers,
+  cmake,
+  pkg-config,
+  wrapQtAppsHook,
+  pcsclite,
+  qtscxml,
+  qtsvg,
+  qttools,
+  qtwayland,
+  qtwebsockets,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ausweisapp";
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "Governikus";
+    repo = "AusweisApp2";
+    rev = finalAttrs.version;
+    hash = "sha256-RUjc4KqyKZXBW+CMaRhKsbwVzmWw6/QHNK+RpBd7Gxw=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
+
+  # The build scripts copy the entire translations directory from Qt
+  # which ends up being read-only because it's in the store.
+  preBuild = ''
+    chmod +w resources/translations
+  '';
+
+  buildInputs = [
+    pcsclite
+    qtscxml
+    qtsvg
+    qttools
+    qtwayland
+    qtwebsockets
+  ];
+
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "QT_QPA_PLATFORM=offscreen ${finalAttrs.meta.mainProgram} --version";
+  };
+
+  meta = {
+    description = "Official authentication app for German ID card and residence permit";
+    downloadPage = "https://github.com/Governikus/AusweisApp2/releases";
+    homepage = "https://www.ausweisapp.bund.de/open-source-software";
+    license = lib.licenses.eupl12;
+    mainProgram = "AusweisApp";
+    maintainers = with lib.maintainers; [b4dm4n];
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/applications/misc/ausweisapp2/default.nix
+++ b/pkgs/applications/misc/ausweisapp2/default.nix
@ -1,33 +0,0 @@
-{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config, pcsclite, qtsvg, qttools, qtwebsockets
-, qtquickcontrols2, qtgraphicaleffects }:
-
-mkDerivation rec {
-  pname = "AusweisApp2";
-  version = "1.26.7";
-
-  src = fetchFromGitHub {
-    owner = "Governikus";
-    repo = "AusweisApp2";
-    rev = version;
-    hash = "sha256-i9hfmMp0pEqtIeKc1mcyINXetzD/33aM0utL8nomVcg=";
-  };
-
-  nativeBuildInputs = [ cmake pkg-config ];
-
-  # The build scripts copy the entire translations directory from Qt
-  # which ends up being read-only because it's in the store.
-  preBuild = ''
-    chmod +w resources/translations
-  '';
-
-  buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ];
-
-  meta = with lib; {
-    description = "Authentication software for the German ID card";
-    downloadPage = "https://github.com/Governikus/AusweisApp2/releases";
-    homepage = "https://www.ausweisapp.bund.de/ausweisapp2/";
-    license = licenses.eupl12;
-    maintainers = with maintainers; [ b4dm4n ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/applications/misc/krabby/default.nix
+++ b/pkgs/applications/misc/krabby/default.nix
@ -4,14 +4,14 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "krabby";
-  version = "0.1.7";
+  version = "0.1.8";

  src = fetchCrate {
    inherit pname version;
-    sha256 = "sha256-YI8OkNIDZWxAV+9n8AbKdZuWdA3A2cD94DuPgFvkokE=";
+    sha256 = "sha256-pqLk05hDPMvbrDG3xatAP0licaJszBSujo1fqsEtpRI=";
  };

-  cargoHash = "sha256-j4zCuPmn/+ZSLFkAivNs3lH7YWVLvLA9k9RKbh43tUU=";
+  cargoHash = "sha256-/wXfdH9ObKGOw8EXHG/3Gvhm66v632lpDp/V3zFIzh4=";

  meta = with lib; {
    description = "Print pokemon sprites in your terminal";
--- a/pkgs/applications/misc/moonlight-qt/default.nix
+++ b/pkgs/applications/misc/moonlight-qt/default.nix
@ -25,13 +25,13 @@ in

 stdenv.mkDerivation rec {
  pname = "moonlight-qt";
-  version = "5.0.0";
+  version = "5.0.1";

  src = fetchFromGitHub {
    owner = "moonlight-stream";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-rJCTISXN098A8CB34HM12WgdiSMNA31NO2x7u+iSwBM=";
+    sha256 = "sha256-0ONjUqpM1tUnyaEnMgVl7ff6pND7kyqouv2mpgteZP0=";
    fetchSubmodules = true;
  };

--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@ -1,12 +1,12 @@
 { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
  signal-desktop = {
    dir = "Signal";
-    version = "6.37.0";
-    hash = "sha256-oPW2YHyYsbTvQ+8VQtaubBki7w2wd1tlgVmPL5v5E5s=";
+    version = "6.38.0";
+    hash = "sha256-y2mwO7Qc01vuIeJUcAxYDD97DXOwXCd8wNZmkG4maF0=";
  };
  signal-desktop-beta = {
    dir = "Signal Beta";
-    version = "6.38.0-beta.1";
-    hash = "sha256-DZXqq4AD1arP+o5xbuR8yD5By5VPBtClchScZb2Nb1U=";
+    version = "6.39.0-beta.2";
+    hash = "sha256-1+1wvkMtEovBBs2bS9zUV5kpSxkPy0EqBAU01el8uko=";
  };
 }
--- a/pkgs/applications/office/portfolio/default.nix
+++ b/pkgs/applications/office/portfolio/default.nix
@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "PortfolioPerformance";
-  version = "0.65.5";
+  version = "0.65.6";

  src = fetchurl {
    url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
-    hash = "sha256-NdBs/WyN1WDOJ5tnIYPtQTAm4EdVJj1HXm2KIjOKC7E=";
+    hash = "sha256-sI2DqhR9LmXxjkkMTDiMG/f/QXcBVPmEjbHFsmEP8qE=";
  };

  nativeBuildInputs = [
--- 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.10.1";
+  version = "23.11.1";
 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-+BtzN+CdaxriA466m6aF0y7Jdvx1DGtSR+i6gGeAxSM=";
+    hash = "sha256-rsYB8aLVVpGGbiEDWCpGCPdZEsOajoGfoh6YYxilxpg=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/science/electronics/magic-vlsi/default.nix
+++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix
@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "magic-vlsi";
-  version = "8.3.446";
+  version = "8.3.447";

  src = fetchurl {
    url    = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
-    sha256 = "sha256-Isg8KAHicfTIETTmYoGsCYWt4+sLWdR+pGLaxu11Fe4=";
+    sha256 = "sha256-t/gJ43VIdBIiozLfqaTy7tJsXK674gWBbW1aPHKEj3U=";
  };

  nativeBuildInputs = [ python3 ];
--- a/pkgs/applications/science/physics/xnec2c/default.nix
+++ b/pkgs/applications/science/physics/xnec2c/default.nix
@ -2,6 +2,7 @@
 , stdenv
 , fetchurl
 , autoreconfHook
+, wrapGAppsHook
 , pkg-config
 , which
 , gtk3
@ -20,7 +21,12 @@ stdenv.mkDerivation rec {
    hash = "sha256-6Yrx6LkJjfnMA/kJUDWLhGzGopZeecARSrcR++UScsU=";
  };

-  nativeBuildInputs = [ autoreconfHook pkg-config which ];
+  nativeBuildInputs = [
+    autoreconfHook
+    wrapGAppsHook
+    pkg-config
+    which
+  ];
  buildInputs = [ gtk3 blas lapack ];

  meta = with lib; {
--- a/pkgs/applications/version-management/git-quick-stats/default.nix
+++ b/pkgs/applications/version-management/git-quick-stats/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "git-quick-stats";
-  version = "2.5.1";
+  version = "2.5.2";

  src = fetchFromGitHub {
    repo = "git-quick-stats";
    owner = "arzzen";
    rev = version;
-    sha256 = "sha256-IIvpUKJxeJYKmTSzEEMZPV6JElt6Ww/Whx3ytNcha7k=";
+    sha256 = "sha256-ff8n8SkeppZzJO58OrPQJ0MInZCIz8nTb7lmiCC0ATg=";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/video/manim/conftest-
+++ b/pkgs/applications/video/manim/conftest-
--- a/pkgs/applications/video/manim/default.nix
+++ b/pkgs/applications/video/manim/default.nix
@ -1,6 +1,5 @@
 { lib
 , fetchFromGitHub
-, fetchPypi

 , cairo
 , ffmpeg
@ -43,39 +42,19 @@ let
    babel-english gnu-freefont mathastext cbfonts-fd
  ]);

-  python = python3.override {
-    packageOverrides = self: super: {
-      networkx = super.networkx.overridePythonAttrs (oldAttrs: rec {
-        pname = "networkx";
-        version = "2.8.8";
-        src = fetchPypi {
-          inherit pname version;
-          hash = "sha256-Iw04gRevhw/OVkejxSQB/PdT6Ucg5uprQZelNVZIiF4=";
-        };
-      });
-
-      watchdog = super.watchdog.overridePythonAttrs (oldAttrs: rec{
-        pname = "watchdog";
-        version = "2.3.1";
-        src = fetchPypi {
-          inherit pname version;
-          hash = "sha256-2fntJu0iqdMxggqEMsNoBwfqi1QSHdzJ3H2fLO6zaQY=";
-        };
-      });
-    };
-  };
+  python = python3;

 in python.pkgs.buildPythonApplication rec {
  pname = "manim";
  pyproject = true;
-  version = "0.17.3";
+  version = "0.18.0";
  disabled = python3.pythonOlder "3.8";

  src = fetchFromGitHub {
    owner  = "ManimCommunity";
-    repo = pname;
+    repo = "manim";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-TU/b5nwk5Xc9wmFKAIMeBwC4YBy7HauGeGV9/n4Y64c=";
+    sha256 = "sha256-TI7O0b1JvUZAxTj6XfpAJKhbGqrGnhcrE9eRJUVx4GM=";
  };

  nativeBuildInputs = with python.pkgs; [
--- a/pkgs/applications/video/manim/failing_tests.nix
+++ b/pkgs/applications/video/manim/failing_tests.nix
@ -71,4 +71,7 @@
  # mismatching expecation on the new commandline
  "test_manim_new_command"

+  # This tests checks if the manim executable is a python script. In our case it is not.
+  # It is a wrapper shell script instead.
+  "test_manim_checkhealth_subcommand"
 ]
--- a/pkgs/applications/video/manim/pytest-report-header.patch
+++ b/pkgs/applications/video/manim/pytest-report-header.patch
@ -1,8 +1,8 @@
 diff --git a/conftest.py b/conftest.py
-index da37e19b..d9f850d8 100644
+index dacb730a..149c6702 100644
 --- a/conftest.py
 +++ b/conftest.py
-@@ -32,16 +32,3 @@ def temp_media_dir(tmpdir, monkeypatch, request):
+@@ -33,17 +33,3 @@ def temp_media_dir(tmpdir, monkeypatch, request):
         with tempconfig({"media_dir": str(tmpdir)}):
             assert config.media_dir == str(tmpdir)
             yield tmpdir
@ -13,6 +13,7 @@ index da37e19b..d9f850d8 100644
 -    info = ctx.info
 -    ctx.release()
 -    return (
+-        f"\nCairo Version: {cairo.cairo_version()}",
 -        "\nOpenGL information",
 -        "------------------",
 -        f"vendor: {info['GL_VENDOR'].strip()}",
--- a/pkgs/by-name/bk/bk/package.nix
+++ b/pkgs/by-name/bk/bk/package.nix
@ -0,0 +1,38 @@
+{ fetchCrate
+, go-md2man
+, installShellFiles
+, lib
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "bk";
+  version = "0.6.0";
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-rSMvx/zUZqRRgj48TVVG7RwQT8e70m0kertRJysDY4Y=";
+  };
+
+  cargoHash = "sha256-pE5loMwNMdHL3GODiw3kVVHj374hf3+vIDEYTqvx5WI=";
+
+  nativeBuildInputs = [ go-md2man installShellFiles ];
+
+  postBuild = ''
+    sed -i '$ a # Source and further info' README.md
+    sed -i '$ a https://github.com/aeosynth/bk' README.md
+    go-md2man -in README.md -out bk.1
+  '';
+
+  postInstall = ''
+    installManPage bk.?
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/aeosynth/bk";
+    description = "A terminal epub reader written in rust";
+    license = licenses.mit;
+    maintainers = with maintainers; [ vuimuich ];
+    mainProgram = "bk";
+  };
+}
--- a/pkgs/applications/window-managers/cosmic/comp/Cargo.lock
+++ b/pkgs/applications/window-managers/cosmic/comp/Cargo.lock
--- a/pkgs/applications/window-managers/cosmic/comp/default.nix
+++ b/pkgs/applications/window-managers/cosmic/comp/default.nix
@ -1,29 +1,40 @@
-{ lib, rustPlatform, fetchFromGitHub, makeBinaryWrapper, pkg-config
-, libinput, libglvnd, libxkbcommon, mesa, seatd, udev, wayland, xorg
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, makeBinaryWrapper
+, pkg-config
+, libinput
+, libglvnd
+, libxkbcommon
+, mesa
+, seatd
+, udev
+, xwayland
+, wayland
+, xorg
 }:

 rustPlatform.buildRustPackage {
  pname = "cosmic-comp";
-  version = "unstable-2023-10-04";
+  version = "unstable-2023-11-13";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-comp";
-    rev = "a3ac6c42b6913193b76e481d9a60f775f67aa858";
-    hash = "sha256-nPQx3Pkd9WAq9ooLs8K8UI1rCHYwJlu88SP2PbC/avU=";
+    rev = "d051d141979820f50b75bd686c745fb7f84fcd05";
+    hash = "sha256-8okRiVVPzmuPJjnv1YoQPQFI8g0j1DQhwUoO51dHgGA=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "calloop-0.12.2" = "sha256-d/LB65l1DEC/5Kk8yvenTQYfIFBs99XqXn4tAM2mfHI=";
-      "cosmic-config-0.1.0" = "sha256-0HKv0/UHZMpSGF54aCip9PbwfWiWMSMHZpiipM6Qrf0=";
-      "cosmic-protocols-0.1.0" = "sha256-oBE/69A4haCN6Etih6B8SlbSnKg1bEocI6Rvf9IegLE=";
+      "cosmic-config-0.1.0" = "sha256-5WajbfcfCc0ZRpJfysqEydthOsF04ipb35QVWuWKrEs=";
+      "cosmic-protocols-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8=";
      "id_tree-1.8.0" = "sha256-uKdKHRfPGt3vagOjhnri3aYY5ar7O3rp2/ivTfM2jT0=";
-      "smithay-0.3.0" = "sha256-7oOVAoEl+X09e0+V1eR5GviodntMbineEO8Igk2+BM0=";
+      "smithay-0.3.0" = "sha256-e6BSrsrVSBcOuF8m21m74h7DWZnYHGIYs/4D4ABvqNM=";
      "smithay-egui-0.1.0" = "sha256-FcSoKCwYk3okwQURiQlDUcfk9m/Ne6pSblGAzHDaVHg=";
      "softbuffer-0.2.0" = "sha256-VD2GmxC58z7Qfu/L+sfENE+T8L40mvUKKSfgLmCTmjY=";
-      "taffy-0.3.11" = "sha256-Py9D8+L9G+sBkHPtlenOdugH5nQKTXa+XdKArOg5+qU=";
+      "taffy-0.3.11" = "sha256-0hXOEj6IjSW8e1t+rvxBFX6V9XRum3QO2Des1XlHJEw=";
    };
  };

@ -48,14 +59,15 @@ rustPlatform.buildRustPackage {
    wrapProgram $out/bin/cosmic-comp \
      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [
        xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr
-      ]}
+      ]} \
+      --prefix PATH : ${lib.makeBinPath [ xwayland ]}
  '';

  meta = with lib; {
    homepage = "https://github.com/pop-os/cosmic-comp";
    description = "Compositor for the COSMIC Desktop Environment";
    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ qyliss ];
+    maintainers = with maintainers; [ qyliss nyanbinary ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/applications/window-managers/cosmic/panel/Cargo.lock
+++ b/pkgs/applications/window-managers/cosmic/panel/Cargo.lock
--- a/pkgs/applications/window-managers/cosmic/panel/default.nix
+++ b/pkgs/applications/window-managers/cosmic/panel/default.nix
@ -1,28 +1,36 @@
-{ lib, stdenv, fetchFromGitHub, cargo, just, pkg-config, rustPlatform
-, libglvnd, libxkbcommon, wayland
+{ lib
+, stdenv
+, fetchFromGitHub
+, just
+, pkg-config
+, rust
+, rustPlatform
+, libglvnd
+, libxkbcommon
+, wayland
 }:

 rustPlatform.buildRustPackage {
  pname = "cosmic-panel";
-  version = "unstable-2023-09-22";
+  version = "unstable-2023-11-13";

  src = fetchFromGitHub {
    owner = "pop-os";
    repo = "cosmic-panel";
-    rev = "df55f44f504c1cee9377cb331c1fb9d95ca83967";
-    hash = "sha256-qf1ITvP6PPATZ6jvlc0UuCes1UYMseY4Wr57/5xRZPE=";
+    rev = "f07cccbd2dc15ede5aeb7646c61c6f62cb32db0c";
+    sha256 = "sha256-uUq+xElZMcG5SWzha9/8COaenycII5aiXmm7sXGgjXE=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "cosmic-client-toolkit-0.1.0" = "sha256-pVWK+dODQxNej5jWyb5wX/insoiXkX8NFBDkDEejVV0=";
-      "cosmic-config-0.1.0" = "sha256-XsFfQzR1gn8Je5lbd6PmSgz/T7XAFTVnR1G6pUY+eX4=";
-      "cosmic-notifications-util-0.1.0" = "sha256-wRUPovWJucsrKGhjHXku/4UoZf9ih9+Wpbs0sLN+oCI=";
-      "launch-pad-0.1.0" = "sha256-gFtUtrD/cUVpLxPvg6iLxxAK97LTlvI4uLxo06UYIU4=";
-      "smithay-0.3.0" = "sha256-hulj6zr4h8A9RElQyrJBy3lvYMd7COe3uDaFMMaWNrM=";
-      "smithay-client-toolkit-0.17.0" = "sha256-13fXDYqO/701tzoOk8ujHtzgzzz1N6GGbcHUrsNhQ0U=";
-      "xdg-shell-wrapper-0.1.0" = "sha256-VCiDjvcCsb02LMo7UpEROV6lzX2DYf4Ix9zfEDO2pUg=";
+      "cosmic-client-toolkit-0.1.0" = "sha256-st46wmOncJvu0kj6qaot6LT/ojmW/BwXbbGf8s0mdZ8=";
+      "cosmic-config-0.1.0" = "sha256-eynEjV7eTRoOUA1v4Ac0FP2h9KQtIDx32WkY0hR4xig=";
+      "cosmic-notifications-util-0.1.0" = "sha256-F1+Y74JdpehRPTANzERwNVE6Q6n5f5HAFtawLQVMFrA=";
+      "launch-pad-0.1.0" = "sha256-tnbSJ/GP9GTnLnikJmvb9XrJSgnUnWjadABHF43L1zc=";
+      "smithay-0.3.0" = "sha256-OI+wtDeJ/2bJyiTxL+F53j1CWnZ0aH7XjUmM6oN45Ow=";
+      "smithay-client-toolkit-0.18.0" = "sha256-GhCZ7Eb6q7SwA+NeHSiHwx/Fnrw3R6Zm5N2meMOJ2/4=";
+      "xdg-shell-wrapper-0.1.0" = "sha256-8+RXbYiYeoIGUOsJ7yCc2iYtIGKIwDCzSdq9ISuWxIE=";
    };
  };

@ -48,7 +56,7 @@ rustPlatform.buildRustPackage {
    homepage = "https://github.com/pop-os/cosmic-panel";
    description = "Panel for the COSMIC Desktop Environment";
    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ qyliss ];
+    maintainers = with maintainers; [ qyliss nyanbinary ];
    platforms = platforms.linux;
  };
 }
--- a/pkgs/by-name/gi/gitmoji-cli/package.nix
+++ b/pkgs/by-name/gi/gitmoji-cli/package.nix
@ -10,18 +10,18 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gitmoji-cli";
-  version = "8.5.0";
+  version = "9.0.0";

  src = fetchFromGitHub {
    owner = "carloscuesta";
    repo = "gitmoji-cli";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-ZM6jOi0FnomkIZeK6ln1Z0d6R5cjav67qyly3yqR1HQ=";
+    hash = "sha256-cIc0AaP1AwhoVJLnonC9qvDWNZW4L6/jsQ3Q6z5VXI0=";
  };

  offlineCache = fetchYarnDeps {
    yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-HSAWFVOTlXlG7N5591hpfPAYaSrP413upW5u/HN9X2o=";
+    hash = "sha256-HXMRCTiUti/GZ1dzd+XbFOao3+QLC1t7H0TT9MS5lz4=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@ -0,0 +1,36 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "go-judge";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "criyle";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-iKSOD/jh7NgGUNeQxFqlZDcctUXBDC1Tjxsm0Q2iZ3I=";
+  };
+
+  vendorHash = "sha256-GVsRflqqt+PwVGWaNGMH4prKQ5pWqPRlsTBJZtC+7zo=";
+
+  tags = [ "nomsgpack" ];
+
+  subPackages = [ "cmd/go-judge" ];
+
+  preBuild = ''
+    echo v${version} > ./cmd/go-judge/version/version.txt
+  '';
+
+  CGO_ENABLED = 0;
+
+  meta = with lib; {
+    description = "High performance sandbox service based on container technologies";
+    homepage = "https://github.com/criyle/go-judge";
+    license = licenses.mit;
+    mainProgram = "go-judge";
+    maintainers = with maintainers; [ criyle ];
+  };
+}
--- a/pkgs/by-name/i3/i3bar-river/package.nix
+++ b/pkgs/by-name/i3/i3bar-river/package.nix
@ -7,16 +7,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "i3bar-river";
-  version = "0.1.3";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "MaxVerevkin";
    repo = "i3bar-river";
    rev = "v${version}";
-    hash = "sha256-c5R5V5J1ETBl6JAdNDSxa94OeMyqbTAUmJHJCo1B+WQ=";
+    hash = "sha256-AXa+K+njXkrJeqABD04WHpmvAzAL1Mw11ZhCfFNJxhY=";
  };

-  cargoHash = "sha256-D/WKv8rhb/ZGuVEZDp83PZxJydHbnZUQp+kVNlMBUCs=";
+  cargoHash = "sha256-tNuv+D75wox3HlUZSJJ67KEBKmGJXBkXHfvDsNHeM6A=";

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ pango ];
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@ -0,0 +1,39 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, ffmpeg
+, fftwFloat
+, chafa
+, freeimage
+, glib
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname = "kew";
+  version = "1.5.2";
+
+  src = fetchFromGitHub {
+    owner = "ravachol";
+    repo = "kew";
+    rev = "v${version}";
+    hash = "sha256-Om7v8eTlYxXQYf1MG+L0I5ICQ2LS7onouhPGosuK8NM=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ ffmpeg freeimage fftwFloat chafa glib ];
+
+  installFlags = [
+    "MAN_DIR=${placeholder "out"}/share/man"
+    "PREFIX=${placeholder "out"}"
+  ];
+
+  meta = with lib; {
+    description = "A command-line music player for Linux";
+    homepage = "https://github.com/ravachol/kew";
+    platforms = platforms.linux;
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ demine ];
+    mainProgram = "kew";
+  };
+}
--- a/pkgs/by-name/my/mystmd/package.nix
+++ b/pkgs/by-name/my/mystmd/package.nix
@ -2,16 +2,16 @@

 buildNpmPackage rec {
  pname = "mystmd";
-  version = "1.1.26";
+  version = "1.1.27";

  src = fetchFromGitHub {
    owner = "executablebooks";
    repo = "mystmd";
    rev = "mystmd@${version}";
-    hash = "sha256-hDXqUjJXQqEpaGCdfxGuAnUraB5/RjZB4MmomAG4aPM=";
+    hash = "sha256-aMoL125DjXM/HL+ebCkjywwEv1VTKPmF2CV/TJd1LMU=";
  };

-  npmDepsHash = "sha256-uq3HbmkeJl3A46/rfm29v+oXFnZOwp2SFArm6Wtv+wo=";
+  npmDepsHash = "sha256-i1tbHCI/z/kiGIROlVMvnt7x4f8D7pzTk1BcSPFDwFw=";

  dontNpmInstall = true;

--- a/pkgs/by-name/nu/numbat/package.nix
+++ b/pkgs/by-name/nu/numbat/package.nix
@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec {
    changelog = "https://github.com/sharkdp/numbat/releases/tag/v${version}";
    license = with licenses; [ asl20 mit ];
    mainProgram = "numbat";
-    maintainers = with maintainers; [ giomf ];
+    maintainers = with maintainers; [ giomf atemu ];
  };
 }
--- a/pkgs/by-name/pi/pioasm/package.nix
+++ b/pkgs/by-name/pi/pioasm/package.nix
@ -0,0 +1,38 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, ninja
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pioasm";
+  version = "1.5.1";
+
+  src = fetchFromGitHub {
+    owner = "raspberrypi";
+    repo = "pico-sdk";
+    rev = finalAttrs.version;
+    hash = "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU=";
+  };
+  sourceRoot = "${finalAttrs.src.name}/tools/pioasm";
+
+  nativeBuildInputs = [ cmake ninja ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D pioasm $out/bin/pioasm
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Assemble PIO programs for Raspberry Pi Pico";
+    homepage = "https://github.com/raspberrypi/pico-sdk";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ emilytrau ];
+    platforms = platforms.unix;
+    mainProgram = "pioasm";
+  };
+})
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@ -0,0 +1,36 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, undmg
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "stats";
+  version = "2.9.11";
+
+  src = fetchurl {
+    url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
+    hash = "sha256-L7E3naVeFYxeS8OAEkXEgY7YB+6E+yrGfIAUr52EWvA=";
+  };
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -r *.app $out/Applications
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "macOS system monitor in your menu bar";
+    homepage = "https://github.com/exelban/stats";
+    license = licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with maintainers; [ emilytrau Enzime ];
+    platforms = platforms.darwin;
+  };
+})
--- a/pkgs/by-name/tp/tplay/cargo.diff
+++ b/pkgs/by-name/tp/tplay/cargo.diff
@ -0,0 +1,13 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 0eb70e4..8d81ba0 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -2069,7 +2069,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+ 
+ [[package]]
+ name = "tplay"
+-version = "0.4.4"
+version = "0.4.5"
+ dependencies = [
+  "clap",
+  "crossbeam-channel",
--- a/pkgs/by-name/tp/tplay/package.nix
+++ b/pkgs/by-name/tp/tplay/package.nix
@ -0,0 +1,51 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, clang
+, ffmpeg
+, openssl
+, alsa-lib
+, libclang
+, opencv
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "tplay";
+  version = "0.4.5";
+
+  src = fetchFromGitHub {
+    owner = "maxcurzi";
+    repo = "tplay";
+    rev =  "v${version}";
+    hash = "sha256-qt5I5rel88NWJZ6dYLCp063PfVmGTzkUUKgF3JkhLQk=";
+  };
+
+  cargoHash = "sha256-0kHh7Wb9Dp+t2G9/Kz/3K43bQdFCl+q2Vc3W32koc2I=";
+  cargoPatches = [ ./cargo.diff ];
+  checkFlags = [
+        # requires network access
+    "--skip=pipeline::image_pipeline::tests::test_process"
+    "--skip=pipeline::image_pipeline::tests::test_to_ascii"
+    "--skip=pipeline::image_pipeline::tests::test_to_ascii_ext"
+    "--skip=pipeline::runner::tests::test_time_to_send_next_frame"
+  ];
+
+  nativeBuildInputs = [ pkg-config clang ffmpeg ];
+  buildInputs = [
+    openssl.dev
+    alsa-lib.dev
+    libclang.lib
+    ffmpeg.dev
+    opencv
+  ];
+
+  env.LIBCLANG_PATH = "${libclang.lib}/lib";
+
+  meta = {
+    description = "Terminal Media Player";
+    homepage = "https://github.com/maxcurzi/tplay";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ demine ];
+  };
+}
--- a/pkgs/by-name/wa/warp-terminal/package.nix
+++ b/pkgs/by-name/wa/warp-terminal/package.nix
@ -0,0 +1,35 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, undmg
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "warp-terminal";
+  version = "0.2023.11.07.08.02.stable_00";
+
+  src = fetchurl {
+    url = "https://releases.warp.dev/stable/v${finalAttrs.version}/Warp.dmg";
+    hash = "sha256-oGsoIzNlrknaZtrGWT3oUEzwJIutxB1wnAvxTzF6Fis=";
+  };
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -r *.app $out/Applications
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Rust-based terminal";
+    homepage = "https://www.warp.dev";
+    license = licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with maintainers; [ emilytrau Enzime ];
+    platforms = platforms.darwin;
+  };
+})
--- a/pkgs/by-name/wh/whistle/package.nix
+++ b/pkgs/by-name/wh/whistle/package.nix
@ -2,16 +2,16 @@

 buildNpmPackage rec {
  pname = "whistle";
-  version = "2.9.58";
+  version = "2.9.59";

  src = fetchFromGitHub {
    owner = "avwo";
    repo = "whistle";
    rev = "v${version}";
-    hash = "sha256-/dt4xwUZrvymCpc3xRyWM2Wsh7zk7ndepgOWJwJ2Das=";
+    hash = "sha256-2eb31qV49r8U4arj4TuA+lyi9HTBPRgmW3vR+qF6QfE=";
  };

-  npmDepsHash = "sha256-9GBhC2PQyaqi64ncIuMZSf9CLB8l+cywT7QTzW9WiTs=";
+  npmDepsHash = "sha256-HkBcizAao4uV+EDJc3z8P97ivMhbYr27hwY7x2jqEIc=";

  dontNpmBuild = true;

--- a/pkgs/data/fonts/material-design-icons/default.nix
+++ b/pkgs/data/fonts/material-design-icons/default.nix
@ -2,13 +2,13 @@

 stdenvNoCC.mkDerivation rec {
  pname = "material-design-icons";
-  version = "7.2.96";
+  version = "7.3.67";

  src = fetchFromGitHub {
    owner = "Templarian";
    repo = "MaterialDesign-Webfont";
    rev = "v${version}";
-    sha256 = "sha256-4r/l7QkD04OR74FZBH0l81hDY5TexEIIJnECYFKsGxM=";
+    sha256 = "sha256-gQT+5MqYo1qUiLJTzlhF5dB5BZMtr34JWn9rMa9MJvQ=";
    sparseCheckout = [ "fonts" ];
  };

--- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix
@ -0,0 +1,68 @@
+{ lib
+, stdenv
+, fetchurl
+, ncurses5
+, python38
+, libxcrypt-legacy
+, runtimeShell
+}:
+
+stdenv.mkDerivation rec {
+  pname = "gcc-arm-embedded";
+  version = "13.2.rel1";
+
+  platform = {
+    aarch64-darwin = "darwin-arm64";
+    aarch64-linux  = "aarch64";
+    x86_64-darwin  = "darwin-x86_64";
+    x86_64-linux   = "x86_64";
+  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+
+  src = fetchurl {
+    url = "https://developer.arm.com/-/media/Files/downloads/gnu/${version}/binrel/arm-gnu-toolchain-${version}-${platform}-arm-none-eabi.tar.xz";
+    sha256 = {
+      aarch64-darwin = "39c44f8af42695b7b871df42e346c09fee670ea8dfc11f17083e296ea2b0d279";
+      aarch64-linux  = "8fd8b4a0a8d44ab2e195ccfbeef42223dfb3ede29d80f14dcf2183c34b8d199a";
+      x86_64-darwin  = "075faa4f3e8eb45e59144858202351a28706f54a6ec17eedd88c9fb9412372cc";
+      x86_64-linux   = "6cd1bbc1d9ae57312bcd169ae283153a9572bd6a8e4eeae2fedfbc33b115fdbb";
+    }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  };
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontPatchELF = true;
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r * $out
+  '';
+
+  preFixup = ''
+    find $out -type f | while read f; do
+      patchelf "$f" > /dev/null 2>&1 || continue
+      patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
+      patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true
+    done
+  '';
+
+  postFixup = ''
+    mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped
+    cat <<EOF > $out/bin/arm-none-eabi-gdb
+    #!${runtimeShell}
+    export PYTHONPATH=${python38}/lib/python3.8
+    export PYTHONHOME=${python38}/bin/python3.8
+    exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@"
+    EOF
+    chmod +x $out/bin/arm-none-eabi-gdb
+  '';
+
+  meta = with lib; {
+    description = "Pre-built GNU toolchain from ARM Cortex-M & Cortex-R processors";
+    homepage = "https://developer.arm.com/open-source/gnu-toolchain/gnu-rm";
+    license = with licenses; [ bsd2 gpl2 gpl3 lgpl21 lgpl3 mit ];
+    maintainers = with maintainers; [ prusnak prtzl ];
+    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+  };
+}
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@ -411,6 +411,9 @@ package-maintainers:
    - ttn-client
    - update-nix-fetchgit
    - zre
+  srid:
+    - ema
+    - emanote
  sternenseemann:
    # also maintain upstream package
    - cabal2nix
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -96497,6 +96497,7 @@ self: {
       ];
       description = "Static site generator library with hot reload";
       license = lib.licenses.agpl3Only;
+       maintainers = [ lib.maintainers.srid ];
     }) {};

  "ema-extra" = callPackage
@ -96822,6 +96823,7 @@ self: {
       badPlatforms = [ "x86_64-darwin" ];
       hydraPlatforms = lib.platforms.none;
       mainProgram = "emanote";
+       maintainers = [ lib.maintainers.srid ];
     }) {};

  "embed-config" = callPackage
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@ -233,6 +233,9 @@ stdenv.mkDerivation (finalAttrs: {
    "test_sentinel2_zipped"
    # tries to call unwrapped executable
    "test_SetPROJAuxDbPaths"
+    # fixed and renamed in 3.8.0RC1
+    # https://github.com/OSGeo/gdal/commit/c8b471ca1e6318866ff668d2b57bb6f076e3ae29
+    "test_visoss_6"
  ] ++ lib.optionals (!stdenv.isx86_64) [
    # likely precision-related expecting x87 behaviour
    "test_jp2openjpeg_22"
--- a/pkgs/development/libraries/libcifpp/default.nix
+++ b/pkgs/development/libraries/libcifpp/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "libcifpp";
-  version = "5.2.2";
+  version = "5.2.4";

  src = fetchFromGitHub {
    owner = "PDB-REDO";
    repo = "libcifpp";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-+OVfMXkBALT8v/30JU8v2gTsw12FM5n1I2COV/b5vGY=";
+    hash = "sha256-AAEk9gDxtlNDEG8B4HmOJ5Nd+GyWibT+yuMccylU8iQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/monocypher/default.nix
+++ b/pkgs/development/libraries/monocypher/default.nix
@ -2,23 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "monocypher";
-  version = "3.1.3";
+  version = "4.0.2";

  src = fetchurl {
    url = "https://monocypher.org/download/monocypher-${version}.tar.gz";
-    hash = "sha256-tEK1d98o+MNsqgHZrpARtd2ccX2UvlIBaKBONtf1AW4=";
+    hash = "sha256-ONBxeXOMDJBnfbo863p7hJa8/qdYuhpT6AP+0wrgh5w=";
  };

-  patches = [
-    # Fix cross-compilation
-    (fetchpatch {
-      url = "https://github.com/LoupVaillant/Monocypher/commit/376715e1c0ebb375e50dfa757bc89486c9a7b404.patch";
-      hash = "sha256-tuwSUaU4w+jkaj10ChMgUmOQmoKYnv5JgJ1og8EXxFk=";
-    })
-  ];
-
-  makeFlags = [ "AR:=$(AR)" "CC:=$(CC)" ];
-
  installFlags = [ "PREFIX=$(out)" ];

  doCheck = true;
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@ -1,6 +1,7 @@
 { lib, stdenv
 , fetchFromGitHub
 , fetchpatch
+, callPackage
 , cmake, pkg-config, unzip, zlib, pcre, hdf5
 , glog, boost, gflags, protobuf_21
 , config
@ -14,8 +15,7 @@
 , enableOpenblas  ? true, openblas, blas, lapack
 , enableContrib   ? true

-, enableCuda      ? config.cudaSupport &&
-                    stdenv.hostPlatform.isx86_64
+, enableCuda      ? config.cudaSupport
 , cudaPackages ? { }
 , enableUnfree    ? false
 , enableIpp       ? false
@ -289,7 +289,11 @@ stdenv.mkDerivation {

  hardeningDisable = [ "bindnow" "relro" ];

-  passthru = lib.optionalAttrs enablePython { pythonPath = []; };
+  passthru = lib.optionalAttrs enablePython { pythonPath = []; } // {
+    tests = lib.optionalAttrs enableCuda {
+      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv3"; };
+    };
+  };

  meta = with lib; {
    description = "Open Computer Vision Library with more than 500 algorithms";
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@ -37,12 +37,11 @@
 , blas
 , enableContrib ? true

-, enableCuda ? config.cudaSupport && stdenv.hostPlatform.isx86_64
+, enableCuda ? config.cudaSupport
 , enableCublas ? enableCuda
 , enableCudnn ? false # NOTE: CUDNN has a large impact on closure size so we disable it by default
 , enableCufft ? enableCuda
 , cudaPackages ? {}
-, symlinkJoin
 , nvidia-optical-flow-sdk

 , enableLto ? true
@ -83,11 +82,16 @@
 , Accelerate
 , bzip2
 , callPackage
-}:
+}@inputs:

 let
  version = "4.7.0";

+  # It's necessary to consistently use backendStdenv when building with CUDA
+  # support, otherwise we get libstdc++ errors downstream
+  stdenv = throw "Use effectiveStdenv instead";
+  effectiveStdenv = if enableCuda then cudaPackages.backendStdenv else inputs.stdenv;
+
  src = fetchFromGitHub {
    owner = "opencv";
    repo = "opencv";
@ -121,11 +125,11 @@ let
      sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq";
    } + "/ippicv";
    files = let name = platform: "ippicv_2019_${platform}_general_20180723.tgz"; in
-      if stdenv.hostPlatform.system == "x86_64-linux" then
+      if effectiveStdenv.hostPlatform.system == "x86_64-linux" then
        { ${name "lnx_intel64"} = "c0bd78adb4156bbf552c1dfe90599607"; }
-      else if stdenv.hostPlatform.system == "i686-linux" then
+      else if effectiveStdenv.hostPlatform.system == "i686-linux" then
        { ${name "lnx_ia32"} = "4f38432c30bfd6423164b7a24bbc98a0"; }
-      else if stdenv.hostPlatform.system == "x86_64-darwin" then
+      else if effectiveStdenv.hostPlatform.system == "x86_64-darwin" then
        { ${name "mac_intel64"} = "fe6b2bb75ae0e3f19ad3ae1a31dfa4a2"; }
      else
        throw "ICV is not available for this platform (or not yet supported by this package)";
@ -232,35 +236,12 @@ let
  #https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded
  openblas_ = blas.provider.override { singleThreaded = true; };

-  inherit (cudaPackages) backendStdenv cudaFlags cudaVersion;
+  inherit (cudaPackages) cudaFlags cudaVersion;
  inherit (cudaFlags) cudaCapabilities;

-  cuda-common-redist = with cudaPackages; [
-    cuda_cccl # <thrust/*>
-    libnpp # npp.h
-  ] ++ lib.optionals enableCublas [
-    libcublas # cublas_v2.h
-  ] ++ lib.optionals enableCudnn [
-    cudnn # cudnn.h
-  ] ++ lib.optionals enableCufft [
-    libcufft # cufft.h
-  ];
-
-  cuda-native-redist = symlinkJoin {
-    name = "cuda-native-redist-${cudaVersion}";
-    paths = with cudaPackages; [
-      cuda_cudart # cuda_runtime.h
-      cuda_nvcc
-    ] ++ cuda-common-redist;
-   };
-
-  cuda-redist = symlinkJoin {
-    name = "cuda-redist-${cudaVersion}";
-    paths = cuda-common-redist;
-   };
 in

-stdenv.mkDerivation {
+effectiveStdenv.mkDerivation {
  pname = "opencv";
  inherit version src;

@ -319,7 +300,7 @@ stdenv.mkDerivation {

  buildInputs = [ zlib pcre boost gflags protobuf_21 ]
    ++ lib.optional enablePython pythonPackages.python
-    ++ lib.optional (stdenv.buildPlatform == stdenv.hostPlatform) hdf5
+    ++ lib.optional (effectiveStdenv.buildPlatform == effectiveStdenv.hostPlatform) hdf5
    ++ lib.optional enableGtk2 gtk2
    ++ lib.optional enableGtk3 gtk3
    ++ lib.optional enableVtk vtk
@ -330,7 +311,7 @@ stdenv.mkDerivation {
    ++ lib.optionals enableEXR [ openexr ilmbase ]
    ++ lib.optional enableJPEG2000 openjpeg
    ++ lib.optional enableFfmpeg ffmpeg
-    ++ lib.optionals (enableFfmpeg && stdenv.isDarwin)
+    ++ lib.optionals (enableFfmpeg && effectiveStdenv.isDarwin)
      [ VideoDecodeAcceleration bzip2 ]
    ++ lib.optionals enableGStreamer (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good ])
    ++ lib.optional enableOvis ogre
@ -343,11 +324,21 @@ stdenv.mkDerivation {
    # tesseract & leptonica.
    ++ lib.optionals enableTesseract [ tesseract leptonica ]
    ++ lib.optional enableTbb tbb
-    ++ lib.optionals stdenv.isDarwin [
+    ++ lib.optionals effectiveStdenv.isDarwin [
      bzip2 AVFoundation Cocoa VideoDecodeAcceleration CoreMedia MediaToolbox Accelerate
    ]
    ++ lib.optionals enableDocs [ doxygen graphviz-nox ]
-    ++ lib.optionals enableCuda [ cuda-redist ];
+    ++ lib.optionals enableCuda  (with cudaPackages; [
+      cuda_cudart
+      cuda_cccl # <thrust/*>
+      libnpp # npp.h
+    ] ++ lib.optionals enableCublas [
+      libcublas # cublas_v2.h
+    ] ++ lib.optionals enableCudnn [
+      cudnn # cudnn.h
+    ] ++ lib.optionals enableCufft [
+      libcufft # cufft.h
+  ]);

  propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
    ++ lib.optionals enableCuda [ nvidia-optical-flow-sdk ];
@ -357,7 +348,9 @@ stdenv.mkDerivation {
    pythonPackages.pip
    pythonPackages.wheel
    pythonPackages.setuptools
-  ] ++ lib.optionals enableCuda [ cuda-native-redist ];
+  ] ++ lib.optionals enableCuda [
+    cudaPackages.cuda_nvcc
+  ];

  env.NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";

@ -400,17 +393,14 @@ stdenv.mkDerivation {
    (opencvFlag "ENABLE_LTO" enableLto)
    (opencvFlag "ENABLE_THIN_LTO" (
      enableLto && (
-        # Only clang supports thin LTO, so we must either be using clang through the stdenv,
-        stdenv.cc.isClang ||
-          # or through the backend stdenv.
-          (enableCuda && backendStdenv.cc.isClang)
+        # Only clang supports thin LTO, so we must either be using clang through the effectiveStdenv,
+        effectiveStdenv.cc.isClang ||
+          # or through the backend effectiveStdenv.
+          (enableCuda && effectiveStdenv.cc.isClang)
      )
    ))
  ] ++ lib.optionals enableCuda [
    "-DCUDA_FAST_MATH=ON"
-    # We need to set the C and C++ host compilers for CUDA to the same compiler.
-    "-DCMAKE_C_COMPILER=${backendStdenv.cc}/bin/cc"
-    "-DCMAKE_CXX_COMPILER=${backendStdenv.cc}/bin/c++"
    "-DCUDA_NVCC_FLAGS=--expt-relaxed-constexpr"

    # OpenCV respects at least three variables:
@ -421,7 +411,7 @@ stdenv.mkDerivation {
    "-DCUDA_ARCH_PTX=${lib.last cudaCapabilities}"

    "-DNVIDIA_OPTICAL_FLOW_2_0_HEADERS_PATH=${nvidia-optical-flow-sdk}"
-  ] ++ lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals effectiveStdenv.isDarwin [
    "-DWITH_OPENCL=OFF"
    "-DWITH_LAPACK=OFF"

@ -435,7 +425,7 @@ stdenv.mkDerivation {
    "-DBUILD_JPEG=OFF"
    "-DBUILD_PNG=OFF"
    "-DBUILD_WEBP=OFF"
-  ] ++ lib.optionals (!stdenv.isDarwin) [
+  ] ++ lib.optionals (!effectiveStdenv.isDarwin) [
    "-DOPENCL_LIBRARY=${ocl-icd}/lib/libOpenCL.so"
  ] ++ lib.optionals enablePython [
    "-DOPENCV_SKIP_PYTHON_LOADER=ON"
@ -489,14 +479,17 @@ stdenv.mkDerivation {
    tests = {
      inherit (gst_all_1) gst-plugins-bad;
    }
-    // lib.optionalAttrs (!stdenv.isDarwin) { inherit qimgv; }
+    // lib.optionalAttrs (!effectiveStdenv.isDarwin) { inherit qimgv; }
    // lib.optionalAttrs (!enablePython) { pythonEnabled = pythonPackages.opencv4; }
-    // lib.optionalAttrs (stdenv.buildPlatform != "x86_64-darwin") {
+    // lib.optionalAttrs (effectiveStdenv.buildPlatform != "x86_64-darwin") {
      opencv4-tests = callPackage ./tests.nix {
        inherit enableGStreamer enableGtk2 enableGtk3 runAccuracyTests runPerformanceTests testDataSrc;
        inherit opencv4;
-        };
      };
+    }
+    // lib.optionalAttrs (enableCuda) {
+      no-libstdcxx-errors = callPackage ./libstdcxx-test.nix { attrName = "opencv4"; };
+    };
  } // lib.optionalAttrs enablePython { pythonPath = [ ]; };

  meta = with lib; {
--- a/pkgs/development/libraries/opencv/libstdcxx-test.nix
+++ b/pkgs/development/libraries/opencv/libstdcxx-test.nix
@ -0,0 +1,17 @@
+{ python3Packages, runCommand, attrName }:
+
+runCommand "${python3Packages.${attrName}.name}-libstdcxx-test"
+{
+  nativeBuildInputs = [
+    (python3Packages.python.withPackages (ps: [
+      (ps.${attrName}.override { enableCuda = true; })
+      ps.scikit-image
+    ]))
+  ];
+} ''
+  python << EOF
+  import cv2
+  from skimage.transform import pyramid_reduce
+  EOF
+  touch $out
+''
--- a/pkgs/development/libraries/pdfhummus/default.nix
+++ b/pkgs/development/libraries/pdfhummus/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "pdfhummus";
-  version = "4.6";
+  version = "4.6.1";

  src = fetchFromGitHub {
    owner = "galkahana";
    repo = "PDF-Writer";
    rev = "v${version}";
-    hash = "sha256-TP/NDh5fPPHuiRaj6+YZfhtHZmlb+mqtnXfzyjVKAHY=";
+    hash = "sha256-4QJxYxLELBDg5GZISdO2xKzJej8F21BY+GD+KkrGXws=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@ -1,8 +1,9 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, qtbase
+, fetchpatch
 , qmake
+, qtbase
 , qtmultimedia
 , utmp
 }:
@ -12,13 +13,15 @@ stdenv.mkDerivation {
  version = "unstable-2022-01-09";

  src = fetchFromGitHub {
-    repo = "qmltermwidget";
    owner = "Swordfish90";
+    repo = "qmltermwidget";
    rev = "63228027e1f97c24abb907550b22ee91836929c5";
    hash = "sha256-aVaiRpkYvuyomdkQYAgjIfi6a3wG2a6hNH1CfkA2WKQ=";
  };

-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    qmake
+  ];

  buildInputs = [
    qtbase
@ -26,24 +29,31 @@ stdenv.mkDerivation {
  ] ++ lib.optional stdenv.isDarwin utmp;

  patches = [
+    # Changes required to make it compatible with lomiri-terminal-app
+    # QML-exposed colorscheme, scrollbar & clipboard functionality
+    # Remove when https://github.com/Swordfish90/qmltermwidget/pull/39 merged
+    (fetchpatch {
+      name = "0001-qmltermwidget-lomiri-submissions.patch";
+      url = "https://github.com/Swordfish90/qmltermwidget/compare/63228027e1f97c24abb907550b22ee91836929c5..ffc6b2b2a20ca785f93300eca93c25c4b74ece17.patch";
+      hash = "sha256-1GjC2mdfP3NpePDWZaT8zvIq3vwWIZs+iQ9o01iQtD4=";
+    })
+
    # Some files are copied twice to the output which makes the build fails
    ./do-not-copy-artifacts-twice.patch
  ];

  postPatch = ''
    substituteInPlace qmltermwidget.pro \
-      --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/"
+      --replace '$$[QT_INSTALL_QML]' '$$PREFIX/${qtbase.qtQmlPrefix}/'
  '';

-  installFlags = [ "INSTALL_ROOT=${placeholder "out"}" ];
-
  dontWrapQtApps = true;

  meta = {
    description = "A QML port of qtermwidget";
    homepage = "https://github.com/Swordfish90/qmltermwidget";
-    license = lib.licenses.gpl2;
+    license = lib.licenses.gpl2Plus;
    platforms = with lib.platforms; linux ++ darwin;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
  };
 }
--- a/pkgs/development/libraries/spglib/default.nix
+++ b/pkgs/development/libraries/spglib/default.nix
@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, cmake, gtest, openmp }:
+{ stdenv, lib, fetchFromGitHub, cmake, gfortran, gtest, openmp }:

 stdenv.mkDerivation rec {
  pname = "spglib";
@ -11,10 +11,12 @@ stdenv.mkDerivation rec {
    hash = "sha256-EL3jkzyurc8fnzk9kAdTaEtLfLlLtmaVDFwChfCDOrQ=";
  };

-  nativeBuildInputs = [ cmake gtest ];
+  nativeBuildInputs = [ cmake gfortran gtest ];

  buildInputs = lib.optionals stdenv.isDarwin [ openmp ];

+  cmakeFlags = [ "-DSPGLIB_WITH_Fortran=On" ];
+
  doCheck = true;

  meta = with lib; {
--- a/pkgs/development/ocaml-modules/erm_xml/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xml/default.nix
@ -1,6 +1,7 @@
 { stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }:

 if lib.versionOlder ocaml.version "4.02"
+|| lib.versionAtLeast ocaml.version "5.0"
 then throw "erm_xml is not available for OCaml ${ocaml.version}"
 else

--- a/pkgs/development/ocaml-modules/fontconfig/default.nix
+++ b/pkgs/development/ocaml-modules/fontconfig/default.nix
@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, pkg-config, fontconfig, ocaml }:

 stdenv.mkDerivation {
-  pname = "ocaml-fontconfig";
+  pname = "ocaml${ocaml.version}-fontconfig";
  version = "unstable-2013-11-03";

  src = fetchFromGitHub {
@ -11,6 +11,12 @@ stdenv.mkDerivation {
    sha256 = "1fw6bzydmnyh2g4x35mcbg0hypnxqhynivk4nakcsx7prr8zr3yh";
  };

+  postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.03") ''
+    substituteInPlace extract_consts.ml \
+      --replace String.lowercase String.lowercase_ascii \
+      --replace String.capitalize String.capitalize_ascii
+  '';
+
  nativeBuildInputs = [ pkg-config ocaml ];
  buildInputs = [ fontconfig ];

@ -24,7 +30,7 @@ stdenv.mkDerivation {
  meta = {
    description = "Fontconfig bindings for OCaml";
    license = lib.licenses.gpl2Plus;
-    platforms = ocaml.meta.platforms or [ ];
+    platforms = ocaml.meta.platforms;
    maintainers = with lib.maintainers; [ vbgl ];
  };
 }
--- a/pkgs/development/ocaml-modules/functory/default.nix
+++ b/pkgs/development/ocaml-modules/functory/default.nix
@ -1,7 +1,5 @@
 { lib, stdenv, fetchurl, ocaml, findlib }:

-assert lib.versionAtLeast (lib.getVersion ocaml) "3.11";
-
 let param =
  if lib.versionAtLeast ocaml.version "4.02" then {
    version = "0.6";
@ -12,6 +10,9 @@ let param =
  };
 in

+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "functory is not available for OCaml ${ocaml.version}"
+
 stdenv.mkDerivation {
  pname = "ocaml${ocaml.version}-functory";
  inherit (param) version;
--- a/pkgs/development/ocaml-modules/gd4o/default.nix
+++ b/pkgs/development/ocaml-modules/gd4o/default.nix
@ -1,5 +1,8 @@
 { lib, stdenv, fetchurl, ocaml, gd, freetype, findlib, zlib, libpng, libjpeg }:

+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "gd4o is not available for OCaml ${ocaml.version}"
+
 stdenv.mkDerivation rec {
  pname = "ocaml${ocaml.version}-gd4o";
  version = "1.0a5";
--- a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix
@ -1,6 +1,9 @@
 { lib, buildDunePackage, ocaml, ocaml_gettext, dune-configurator, ounit }:

-buildDunePackage rec {
+lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
+  "gettext-stub is not available for OCaml ${ocaml.version}"
+
+buildDunePackage {

  pname = "gettext-stub";

--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@ -12,7 +12,7 @@

 buildPythonPackage rec {
  pname = "aws-lambda-builders";
-  version = "1.40.0";
+  version = "1.41.0";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@ -21,7 +21,7 @@ buildPythonPackage rec {
    owner = "awslabs";
    repo = "aws-lambda-builders";
    rev = "refs/tags/v${version}";
-    hash = "sha256-4LapTxeJtzuXdWRgDmsQ8/yDeYZfMz+kJwpZKF7stmc=";
+    hash = "sha256-Uxf52UzzCqXFFnQD1DwcSy3ylY+rYq6qbI5XK5JiVto=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@ -29,7 +29,7 @@
 , pip-tools
 , prometheus-client
 , psutil
-, pynvml
+, nvidia-ml-py
 , python-dateutil
 , python-json-logger
 , python-multipart
@ -69,7 +69,7 @@
 }:

 let
-  version = "1.1.7";
+  version = "1.1.9";
  aws = [ fs-s3fs ];
  grpc = [
    grpcio
@ -105,7 +105,7 @@ buildPythonPackage {
    owner = "bentoml";
    repo = "BentoML";
    rev = "refs/tags/v${version}";
-    hash = "sha256-xuUfdVa0d4TzJqPBNJvUikIPsjSgn+VdhdZidHMnAxA=";
+    hash = "sha256-+5enRlk05IGdsNY6KIzYgh7vGRua0duI57o/AIevcdM=";
  };

  # https://github.com/bentoml/BentoML/pull/4227 should fix this test
@ -150,7 +150,7 @@ buildPythonPackage {
    pip-tools
    prometheus-client
    psutil
-    pynvml
+    nvidia-ml-py
    python-dateutil
    python-json-logger
    python-multipart
--- a/pkgs/development/python-modules/django-crontab/default.nix
+++ b/pkgs/development/python-modules/django-crontab/default.nix
@ -0,0 +1,52 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, django
+, setuptools
+, pytestCheckHook
+, pytest-django
+, mock
+, nose
+}:
+
+buildPythonPackage rec {
+  pname = "django-crontab";
+  version = "0.7.1";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "kraiz";
+    repo = "django-crontab";
+    rev = "refs/tags/${version}";
+    hash = "sha256-qX+N3SMUyhMWoWluRCeOPGYKCMBnjg61P281HXHkfJk=";
+  };
+
+  propagatedBuildInputs = [
+    django
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    django
+    mock
+    nose
+    pytestCheckHook
+    pytest-django
+  ];
+
+  # Tests currently fail with: RuntimeError: setup_test_environment() was
+  # already called and can't be called again without first calling
+  # teardown_test_environment()
+  doCheck = false;
+
+  DJANGO_SETTINGS_MODULE = "tests.settings";
+
+  pythonImportsCheck = [ "django_crontab" ];
+
+  meta = with lib; {
+    description = "Simple crontab powered job scheduling for Django";
+    homepage = "https://github.com/kraiz/django-crontab";
+    license = licenses.mit;
+    maintainers = with maintainers; [ onny ];
+  };
+}
--- a/pkgs/development/python-modules/django-q/default.nix
+++ b/pkgs/development/python-modules/django-q/default.nix
@ -15,6 +15,7 @@
 , pytest-mock
 , pytestCheckHook
 , pythonOlder
+, redis
 }:

 buildPythonPackage rec {
@ -55,7 +56,7 @@ buildPythonPackage rec {
    pytest-django
    pytest-mock
    pytestCheckHook
-  ];
+  ] ++ django-redis.optional-dependencies.hiredis;

  pythonImportsCheck = [
    "django_q"
@ -86,6 +87,6 @@ buildPythonPackage rec {
    maintainers = with maintainers; [ gador ];
    # django-q is unmaintained at the moment
    # https://github.com/Koed00/django-q/issues/733
-    broken = true;
+    broken = lib.versionAtLeast redis.version "5";
  };
 }
--- 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.20.0";
+  version = "2.21.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "iterative";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-CtTagSfAYrEOkEZaeeQ71Dn0RvFpHwH552RpAy+kjlg=";
+    hash = "sha256-q9wVPT8mUZyX0I4GdC6qtsCTFH80HsUrrtR2oAby8VE=";
  };

  SETUPTOOLS_SCM_PRETEND_VERSION = version;
--- a/pkgs/development/python-modules/experiment-utilities/default.nix
+++ b/pkgs/development/python-modules/experiment-utilities/default.nix
@ -19,14 +19,14 @@

 buildPythonPackage rec {
  pname = "experiment-utilities";
-  version = "0.3.5";
+  version = "0.3.6";

  src = fetchFromGitLab {
    owner = "creinke";
    repo = "exputils";
    domain = "gitlab.inria.fr";
    rev = "refs/tags/version_${version}";
-    hash = "sha256-y+I/TpEC1alP3145ByM6H//lZl2FrpLT/70lzn04P6w=";
+    hash = "sha256-jo0CBSpUc/F1lJ2vagocngDM1Lopw5/AJnt1QwCunA8=";
  };

  # This dependency constraint (<=7.6.5) was due to a bug in qgrid that has been patched in its
--- a/pkgs/development/python-modules/genanki/default.nix
+++ b/pkgs/development/python-modules/genanki/default.nix
@ -11,14 +11,14 @@

 buildPythonPackage rec {
  pname = "genanki";
-  version = "0.13.0";
+  version = "0.13.1";
  format = "setuptools";

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

  src = fetchPypi {
    inherit pname version;
-    sha256 = "bfacdcadd7903ed6afce6168e1977e473b431677b358f8fd42e80b48cedd19ab";
+    hash = "sha256-hNCQQjqIeVIEZb/peECD7ay4014rpRH6Whve8B2Pce0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/hwdata/default.nix
+++ b/pkgs/development/python-modules/hwdata/default.nix
@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pkgs
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "hwdata";
+  version = "2.4.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "xsuchy";
+    repo = "python-hwdata";
+    rev = "python-hwdata-${version}-1";
+    hash = "sha256-hmvxVF9LOkezXnJdbtbEJWhU4uvUJgxQHYeWUoiniF0=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  patchPhase = ''
+    substituteInPlace hwdata.py --replace "/usr/share/hwdata" "${pkgs.hwdata}/share/hwdata"
+  '';
+
+  pythonImportsCheck = [
+    "hwdata"
+  ];
+
+  doCheck = false; # no tests
+
+  meta = with lib; {
+    description = "Python bindings to hwdata";
+    homepage = "https://github.com/xsuchy/python-hwdata";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ lurkki ];
+  };
+}
--- a/pkgs/development/python-modules/jupyterlab-server/default.nix
+++ b/pkgs/development/python-modules/jupyterlab-server/default.nix
@ -1,91 +1,92 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, hatchling
-, jsonschema
 , pythonOlder
-, requests
-, pytestCheckHook
-, json5
+, hatchling
 , babel
+, importlib-metadata
+, jinja2
+, json5
+, jsonschema
 , jupyter-server
-, tomli
+, packaging
+, requests
 , openapi-core
 , pytest-jupyter
+, pytestCheckHook
 , requests-mock
 , ruamel-yaml
 , strict-rfc3339
-, importlib-metadata
 }:

 buildPythonPackage rec {
-  pname = "jupyterlab_server";
-  version = "2.25.0";
-  format = "pyproject";
+  pname = "jupyterlab-server";
+  version = "2.25.1";
+  pyproject = true;

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

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-d8Lx8oLWEPleSW4g1b8dKncGgm37exjzN4rihw0nL7c=";
+    pname = "jupyterlab_server";
+    inherit version;
+    hash = "sha256-ZJEoOwAAaY6uGjjEhQeTBWDfz3RhrqABU2hpiqs03Zw=";
  };

+  postPatch = ''
+    sed -i "/timeout/d" pyproject.toml
+  '';
+
  nativeBuildInputs = [
    hatchling
  ];

  propagatedBuildInputs = [
-    requests
-    jsonschema
-    json5
    babel
+    jinja2
+    json5
+    jsonschema
    jupyter-server
-    tomli
+    packaging
+    requests
  ] ++ lib.optionals (pythonOlder "3.10") [
    importlib-metadata
  ];

-  nativeCheckInputs = [
-    openapi-core
-    pytestCheckHook
-    pytest-jupyter
-    requests-mock
-    ruamel-yaml
-    strict-rfc3339
-  ];
+  passthru.optional-dependencies = {
+    openapi = [
+      openapi-core
+      ruamel-yaml
+    ];
+  };

-  postPatch = ''
-    sed -i "/timeout/d" pyproject.toml
-  '';
+  nativeCheckInputs = [
+    pytest-jupyter
+    pytestCheckHook
+    requests-mock
+    strict-rfc3339
+  ] ++ passthru.optional-dependencies.openapi;

  preCheck = ''
    export HOME=$(mktemp -d)
  '';

-  pytestFlagsArray = [
-    # DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12.
-    # Use setuptools or check PEP 632 for potential alternatives.
-    "-W ignore::DeprecationWarning"
-  ];
-
  disabledTestPaths = [
-    "tests/test_settings_api.py"
-    "tests/test_themes_api.py"
+    # require optional language pack packages for tests
    "tests/test_translation_api.py"
-    "tests/test_workspaces_api.py"
  ];

-  disabledTests = [
-    "test_get_listing"
+  pythonImportsCheck = [
+    "jupyterlab_server"
+    "jupyterlab_server.pytest_plugin"
  ];

  __darwinAllowLocalNetworking = true;

  meta = with lib; {
    description = "A set of server components for JupyterLab and JupyterLab like applications";
-    homepage = "https://jupyterlab-server.readthedocs.io/";
+    homepage = "https://github.com/jupyterlab/jupyterlab_server";
    changelog = "https://github.com/jupyterlab/jupyterlab_server/blob/v${version}/CHANGELOG.md";
-    license = licenses.bsdOriginal;
+    license = licenses.bsd3;
    maintainers = lib.teams.jupyter.members;
  };
 }
--- a/pkgs/development/python-modules/jupyterlab/default.nix
+++ b/pkgs/development/python-modules/jupyterlab/default.nix
@ -9,7 +9,7 @@
 , ipykernel
 , jupyter-core
 , jupyter-lsp
-, jupyterlab_server
+, jupyterlab-server
 , jupyter-server
 , notebook-shim
 , jinja2
@ -42,7 +42,7 @@ buildPythonPackage rec {
    ipykernel
    jupyter-core
    jupyter-lsp
-    jupyterlab_server
+    jupyterlab-server
    jupyter-server
    notebook-shim
    jinja2
--- a/pkgs/development/python-modules/ludios_wpull/default.nix
+++ b/pkgs/development/python-modules/ludios_wpull/default.nix
@ -1,41 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, chardet
-, dnspython
-, html5-parser
-, lxml
-, namedlist
-, sqlalchemy
-, tornado
-, yapsy
-, pythonAtLeast
-}:
-
-buildPythonPackage rec {
-  pname = "ludios_wpull";
-  version = "3.0.9";
-
-  # https://github.com/ArchiveTeam/ludios_wpull/issues/20
-  disabled = pythonAtLeast "3.9";
-
-  src = fetchFromGitHub {
-    rev = version;
-    owner = "ArchiveTeam";
-    repo = "ludios_wpull";
-    sha256 = "0j4dir0dgg8pkf4d1znicz6wyyi1wzij50r21z838cycsdr54j4c";
-  };
-
-  propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado yapsy ];
-
-  # Test suite has tests that fail on all platforms
-  doCheck = false;
-
-  meta = {
-    description = "Web crawler; fork of wpull used by grab-site";
-    homepage = "https://github.com/ArchiveTeam/ludios_wpull";
-    license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ ivan ];
-    broken = lib.versions.major tornado.version != "4";
-  };
-}
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "mautrix";
-  version = "0.20.2";
+  version = "0.20.3";
  format = "setuptools";

  disabled = pythonOlder "3.9";
@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "mautrix";
    repo = "python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-c6NSDFQGKtT8Otw+ivNUZ2+Qm/LEDGpZNs3FrYq+N1A=";
+    hash = "sha256-7ZSPxKRLAgwC1ECxa1eOTH60cMJXs1iv2PE2Vq9f0co=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/nose2/default.nix
+++ b/pkgs/development/python-modules/nose2/default.nix
@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "nose2";
-  version = "0.13.0";
+  version = "0.14.0";
  format = "setuptools";

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

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-V8aK1nbvS4i1BpSTfrUvSUOqHKJhB0tJCbbhYwRrRvA=";
+    hash = "sha256-XCjXcKC5pwKGK9bDdVuizS95lN1RjJguXOKY1/N0ZqQ=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@ -7,7 +7,7 @@
 , hatchling
 , jupyter-server
 , jupyterlab
-, jupyterlab_server
+, jupyterlab-server
 , notebook-shim
 , tornado
 , pytest-jupyter
@ -40,7 +40,7 @@ buildPythonPackage rec {
  propagatedBuildInputs = [
    jupyter-server
    jupyterlab
-    jupyterlab_server
+    jupyterlab-server
    notebook-shim
    tornado
  ];
--- a/pkgs/development/python-modules/prayer-times-calculator/default.nix
+++ b/pkgs/development/python-modules/prayer-times-calculator/default.nix
@ -7,7 +7,7 @@

 buildPythonPackage rec {
  pname = "prayer-times-calculator";
-  version = "0.0.9";
+  version = "0.0.10";
  format = "setuptools";

  disabled = pythonOlder "3.6";
@ -16,7 +16,7 @@ buildPythonPackage rec {
    owner = "uchagani";
    repo = pname;
    rev = "refs/tags/${version}";
-    hash = "sha256-QIUMxs6NOqnljTi1UNp7bCQ9TgBy/u+BWEqgr2C854g=";
+    hash = "sha256-T+rXJy+9haepF6TKSoOjb6o75YQwQnzAaWRtLMwfGOw=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/py-stringmatching/default.nix
+++ b/pkgs/development/python-modules/py-stringmatching/default.nix
@ -1,7 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, nose
+, setuptools
+, pytestCheckHook
 , numpy
 , pythonOlder
 , six
@ -10,25 +11,33 @@
 buildPythonPackage rec {
  pname = "py-stringmatching";
  version = "0.4.3";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    pname = "py_stringmatching";
    inherit version;
-    sha256 = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4=";
+    hash = "sha256-khubsWOzEN80HDOCORMgT3sMqfajGfW0UUCDAL03je4=";
  };

+  nativeBuildInputs = [
+    setuptools
+  ];
+
  propagatedBuildInputs = [
    numpy
    six
  ];

  nativeCheckInputs = [
-    nose
+    pytestCheckHook
  ];

+  preCheck = ''
+    cd $out
+  '';
+
  pythonImportsCheck = [
    "py_stringmatching"
  ];
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "pyenphase";
-  version = "1.14.2";
+  version = "1.14.3";
  format = "pyproject";

  disabled = pythonOlder "3.11";
@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "pyenphase";
    repo = "pyenphase";
    rev = "refs/tags/v${version}";
-    hash = "sha256-8tBxepvNT+EVGKRhLqmAaLYvmf4J2Jquz0R8sSLUCH8=";
+    hash = "sha256-cjkmRGieSKynL8cZORp11/ViK8oCBAZXrgbFKumWKaM=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pyglm/default.nix
+++ b/pkgs/development/python-modules/pyglm/default.nix
@ -1,22 +1,39 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, setuptools
+, pytestCheckHook
 }:
+
 buildPythonPackage rec {
-  pname = "PyGLM";
-  version = "2.7.0";
+  pname = "pyglm";
+  version = "2.7.1";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "Zuzu-Typ";
    repo = "PyGLM";
-    rev = "${version}";
-    hash = "sha256-+On4gqfB9hxuINQdcGcrZyOsphfylUNq7tB2uvjsCkE=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-nCkwYZLibQcmlF1Nvv2I6qi+97ue7Q1HVxpw32G5qpo=";
    fetchSubmodules = true;
  };

+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "glm"
+  ];
+
  meta = with lib; {
    homepage = "https://github.com/Zuzu-Typ/PyGLM";
    description = "An OpenGL Mathematics (GLM) library for Python written in C++";
+    changelog = "https://github.com/Zuzu-Typ/PyGLM/releases/tag/${src.rev}";
    license = licenses.zlib;
    maintainers = with maintainers; [ sund3RRR ];
  };
--- a/pkgs/development/python-modules/pytenable/default.nix
+++ b/pkgs/development/python-modules/pytenable/default.nix
@ -14,13 +14,14 @@
 , responses
 , restfly
 , semver
+, setuptools
 , typing-extensions
 }:

 buildPythonPackage rec {
  pname = "pytenable";
  version = "1.4.13";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.7";

@ -31,6 +32,10 @@ buildPythonPackage rec {
    hash = "sha256-UY3AFnPplmU0jrV4LIKH4+2tcJEFkKMqO2GWVkgaHYE=";
  };

+  nativeBuildInputs = [
+    setuptools
+  ];
+
  propagatedBuildInputs = [
    defusedxml
    marshmallow
@ -50,12 +55,20 @@ buildPythonPackage rec {
    responses
  ];

+  disabledTestPaths = [
+    # Disable tests that requires network access
+    "tests/io/"
+  ];
+
  disabledTests = [
    # Disable tests that requires a Docker container
    "test_uploads_docker_push_name_typeerror"
    "test_uploads_docker_push_tag_typeerror"
    "test_uploads_docker_push_cs_name_typeerror"
    "test_uploads_docker_push_cs_tag_typeerror"
+    # Test requires network access
+    "test_assets_list_vcr"
+    "test_events_list_vcr"
  ];

  pythonImportsCheck = [
--- a/pkgs/development/python-modules/pytest-json-report/default.nix
+++ b/pkgs/development/python-modules/pytest-json-report/default.nix
@ -6,22 +6,27 @@
 , pytest-xdist
 , pytestCheckHook
 , pythonOlder
+, setuptools
 }:

 buildPythonPackage rec {
  pname = "pytest-json-report";
  version = "1.5.0";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "numirias";
-    repo = pname;
-    rev = "v${version}";
+    repo = "pytest-json-report";
+    rev = "refs/tags/v${version}";
    hash = "sha256-hMB/atDuo7CjwhHFUOxVfgJ7Qp4AA9J428iv7hyQFcs=";
  };

+  nativeBuildInputs = [
+    setuptools
+  ];
+
  buildInputs = [
    pytest
  ];
@ -38,6 +43,7 @@ buildPythonPackage rec {
  disabledTests = [
    # pytest-flaky is not available at the moment
    "test_bug_31"
+    "test_environment_via_metadata_plugin"
  ];

  pythonImportsCheck = [
@ -47,6 +53,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Pytest plugin to report test results as JSON";
    homepage = "https://github.com/numirias/pytest-json-report";
+    changelog = "https://github.com/numirias/pytest-json-report/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/python-frontmatter/default.nix
+++ b/pkgs/development/python-modules/python-frontmatter/default.nix
@ -2,13 +2,13 @@

 buildPythonPackage rec {
  pname = "python-frontmatter";
-  version = "1.0.0";
+  version = "1.0.1";

  src = fetchFromGitHub {
    owner = "eyeseast";
    repo = pname;
-    rev = "v${version}";
-    sha256 = "0flyh2pb0z4lq66dmmsgyakvg11yhkp4dk7qnzanl34z7ikp97bx";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-lkBCKZ1fZF580+4TnHYkfaGJjsWk7/Ksnk7VagZuef8=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/python-twitch-client/default.nix
+++ b/pkgs/development/python-modules/python-twitch-client/default.nix
@ -5,32 +5,50 @@
 , pythonOlder
 , requests
 , responses
+, setuptools
 }:

 buildPythonPackage rec {
  pname = "python-twitch-client";
  version = "0.7.1";
+  pyproject = true;
+
  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "tsifrer";
-    repo = pname;
-    rev = version;
-    sha256 = "10wwkam3dw0nqr3v9xzigx1zjlrnrhzr7jvihddvzi84vjb6j443";
+    repo = "python-twitch-client";
+    rev = "refs/tags/${version}";
+    sha256 = "sha256-gxBpltwExb9bg3HLkz/MNlP5Q3/x97RHxhbwNqqanIM=";
  };

-  propagatedBuildInputs = [ requests ];
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  propagatedBuildInputs = [
+    requests
+  ];

  nativeCheckInputs = [
    pytestCheckHook
    responses
  ];

-  pythonImportsCheck = [ "twitch" ];
+  pythonImportsCheck = [
+    "twitch"
+  ];
+
+  disabledTests = [
+    # Tests require network access
+    "test_delete_from_community"
+    "test_update"
+  ];

  meta = with lib; {
    description = "Python wrapper for the Twitch API";
    homepage = "https://github.com/tsifrer/python-twitch-client";
+    changelog = "https://github.com/tsifrer/python-twitch-client/blob/${version}/CHANGELOG.md";
    license = with licenses; [ mit ];
    maintainers = with maintainers; [ fab ];
  };
--- a/pkgs/development/python-modules/qcelemental/default.nix
+++ b/pkgs/development/python-modules/qcelemental/default.nix
@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "qcelemental";
-  version = "0.27.0";
+  version = "0.27.1";

  pyproject = true;

@ -21,7 +21,7 @@ buildPythonPackage rec {

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-5VLNGD4glAIGgtt+q8YvwyAQvJU9mfyTpngwVr6gOYg=";
+    hash = "sha256-dlcfIUKAg6yc4S3RXVJ1sKM29E1ZvHY82kjx1CM8/08=";
  };

  nativeBuildInputs = [
@ -46,7 +46,8 @@ buildPythonPackage rec {
  meta = with lib; {
    broken = stdenv.isDarwin;
    description = "Periodic table, physical constants and molecule parsing for quantum chemistry";
-    homepage = "http://docs.qcarchive.molssi.org/projects/qcelemental/";
+    homepage = "https://github.com/MolSSI/QCElemental";
+    changelog = "https://github.com/MolSSI/QCElemental/blob/v${version}/docs/changelog.rst";
    license = licenses.bsd3;
    maintainers = with maintainers; [ sheepforce ];
  };
--- a/pkgs/development/python-modules/ring-doorbell/default.nix
+++ b/pkgs/development/python-modules/ring-doorbell/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "ring-doorbell";
-  version = "0.7.7";
+  version = "0.8.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "ring_doorbell";
    inherit version;
-    hash = "sha256-chhZj9yr/MCbvh3wo8RTqtyyt1Mj22ku4aRMK2c8Efc=";
+    hash = "sha256-6kfD87GlEb+f6hUSqhyPIy4Xg63f8zDdGKMaOxQYWoM=";
  };

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

 buildPythonPackage rec {
  pname = "rokuecp";
-  version = "0.18.1";
+  version = "0.18.2";
  format = "pyproject";

  disabled = pythonOlder "3.9";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "ctalkington";
    repo = "python-rokuecp";
    rev = "refs/tags/${version}";
-    hash = "sha256-0ArnP9xITVpbIfDrsNK3ukmeJBdd6SE3tnDwCLWSHMo=";
+    hash = "sha256-fgnR3TZh+cHvC8qJnvwfrrtxCdEr89Uw8ciACzaQPYE=";
  };

  nativeBuildInputs = [
--- a/Show More
+++ b/Show More