From 01b159092f9ff80ae76fb40ee61a342729d6160e Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Sat, 15 Jun 2024 20:29:01 +0530
Subject: [PATCH 01/51] nixos/proxmox-lxc: fix ping in unprivileged LXCs

---
 nixos/modules/virtualisation/proxmox-lxc.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/virtualisation/proxmox-lxc.nix b/nixos/modules/virtualisation/proxmox-lxc.nix
index ff1c0972166c..9af02deed473 100644
--- a/nixos/modules/virtualisation/proxmox-lxc.nix
+++ b/nixos/modules/virtualisation/proxmox-lxc.nix
@@ -65,6 +65,14 @@ with lib;
         hostName = mkIf (!cfg.manageHostName) (mkForce "");
       };
 
+      # unprivileged LXCs can't set net.ipv4.ping_group_range
+      security.wrappers.ping = mkIf (!cfg.privileged) {
+        owner = "root";
+        group = "root";
+        capabilities = "cap_net_raw+p";
+        source = "${pkgs.iputils.out}/bin/ping";
+      };
+
       services.openssh = {
         enable = mkDefault true;
         startWhenNeeded = mkDefault true;

From a4b0afdfbdc92d8f0887d2dcf330b1bd6685b476 Mon Sep 17 00:00:00 2001
From: Florens Pauwels <github@florens.be>
Date: Sun, 14 Jul 2024 00:49:09 +0200
Subject: [PATCH 02/51] openrct2: 0.4.11 -> 0.4.12

https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.12

Changes from OpenRCT2/OpenRCT2#21043 are now upstreamed, so the patch was removed here.
---
 pkgs/games/openrct2/default.nix | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix
index 4a8a1c255e89..ac33578ca351 100644
--- a/pkgs/games/openrct2/default.nix
+++ b/pkgs/games/openrct2/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 
 , SDL2
 , cmake
@@ -30,11 +29,11 @@
 }:
 
 let
-  openrct2-version = "0.4.11";
+  openrct2-version = "0.4.12";
 
   # Those versions MUST match the pinned versions within the CMakeLists.txt
   # file. The REPLAYS repository from the CMakeLists.txt is not necessary.
-  objects-version = "1.4.4";
+  objects-version = "1.4.6";
   openmsx-version = "1.5";
   opensfx-version = "1.0.5";
   title-sequences-version = "0.4.6";
@@ -43,14 +42,14 @@ let
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     rev = "v${openrct2-version}";
-    hash = "sha256-zaaVieU/hulc2G/F19diJug3xuj3ejn5ihnmKfkBDcQ=";
+    hash = "sha256-AZFJt1ZsYO07hHN9Nt+N95wTGfYPob/kZ7EkVVkUezg=";
   };
 
   objects-src = fetchFromGitHub {
     owner = "OpenRCT2";
     repo = "objects";
     rev = "v${objects-version}";
-    hash = "sha256-wKxWp/DSKkxCEI0lp4X8F9LxQsUKZfLk2CgajQ+y84k=";
+    hash = "sha256-XfVic6b5jB1P2I0w5C+f97vvWvCh2zlcWpaXGLOj3CA=";
   };
 
   openmsx-src = fetchFromGitHub {
@@ -80,19 +79,6 @@ stdenv.mkDerivation {
 
   src = openrct2-src;
 
-  patches = [
-    # https://github.com/OpenRCT2/OpenRCT2/pull/21043
-    #
-    # Basically <https://github.com/OpenRCT2/OpenRCT2/pull/19785> has broken
-    # OpenRCT2 - at least with older maps, as were used for testing - as stated
-    # in <https://github.com/NixOS/nixpkgs/issues/263025>.
-    (fetchpatch {
-      name = "remove-openrct2-music.patch";
-      url = "https://github.com/OpenRCT2/OpenRCT2/commit/9ea13848be0b974336c34e6eb119c49ba42a907c.patch";
-      hash = "sha256-2PPRqUZf4+ys89mdzp5nvdtdv00V9Vzj3v/95rmlf1c=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config

From 0e6664a30cd217c9c0ad08fd9088efa06a2bb999 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 14 Jul 2024 22:54:44 +0200
Subject: [PATCH 03/51] clever-tools: fix cleanup for cross compilation

---
 pkgs/by-name/cl/clever-tools/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index b1dcca9abf2d..2a0a368d28f7 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -30,6 +30,7 @@ buildNpmPackage rec {
     installShellCompletion --cmd clever \
       --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \
       --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever)
+  '' + ''
     rm $out/bin/install-clever-completion
     rm $out/bin/uninstall-clever-completion
   '';

From 8e26d7ca856c055f7bf15b32ab9e94b1b4d3c917 Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Tue, 16 Jul 2024 22:29:11 -0700
Subject: [PATCH 04/51] freebsd.mkDerivation: do not crash on packages not
 using FreeBSD src

This includes drm-kmod and drm-kmod firmware.
---
 pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix | 3 +++
 pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix     | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix
index 42806392d217..c604ee573628 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix
@@ -22,6 +22,9 @@ let
   fetchOptions = (lib.importJSON ./versions.json).${branch};
 in
 mkDerivation {
+  # this derivation is tricky; it is not an in-tree FreeBSD build but it is meant to be built
+  # at the same time as the in-tree FreeBSD code, so it expects the same environment. Therefore,
+  # it is appropriate to use the freebsd mkDerivation.
   pname = "drm-kmod";
   version = branch;
 
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
index ec4b698116b9..c574d7dd80ec 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
@@ -107,7 +107,9 @@ lib.makeOverridable (
     // {
       patches =
         (lib.optionals (attrs.autoPickPatches or true) (
-          freebsd-lib.filterPatches patches (attrs.extraPaths or [ ] ++ [ attrs.path ])
+          freebsd-lib.filterPatches patches (
+            attrs.extraPaths or [ ] ++ (lib.optional (attrs ? path) attrs.path)
+          )
         ))
         ++ attrs.patches or [ ];
     }

From 43c3cb6dff84e8089b47d20a72a9171e582d9a08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Jul 2024 22:26:26 +0000
Subject: [PATCH 05/51] victoriametrics: 1.101.0 -> 1.102.0

---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index d17b8ce22974..21853f0519d5 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -14,13 +14,13 @@
 
 buildGoModule rec {
   pname = "VictoriaMetrics";
-  version = "1.101.0";
+  version = "1.102.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     rev = "v${version}";
-    hash = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg=";
+    hash = "sha256-5p50DEL5XhXncJKH2ebFkh9/l0EABj+Pebf5oHV1yk8=";
   };
 
   vendorHash = null;

From c02466f1bbbce91313566d8de4b204684c6cad0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 08:35:21 +0000
Subject: [PATCH 06/51] radicle-httpd: 0.13.0 -> 0.14.0

---
 pkgs/by-name/ra/radicle-httpd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index f1f9e5e5993f..6f2333e3d745 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.13.0";
+  version = "0.14.0";
   env.RADICLE_VERSION = version;
 
   src = fetchgit {
     url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
     rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-C7kMREIEq2nv+mq/YXS4yPNKgJxz5tTzqRwO9CtM1Bg=";
+    hash = "sha256-WuaKYX3rGcIGmz4OAtCvoSwWUr09qfmXM2KI4uGu9s0=";
     sparseCheckout = [ "radicle-httpd" ];
   };
   sourceRoot = "${src.name}/radicle-httpd";
-  cargoHash = "sha256-fbHg1hwHloy9AZMDCHNVkNTfLMG4Dv6IPxTp8F5okrk=";
+  cargoHash = "sha256-pe+x4fn45I1+6WaLT23KmO7RyAMNdU+7nwG9GSGSeMc=";
 
   nativeBuildInputs = [
     asciidoctor

From ee51a9e129b2247a52aec3da129808c56327b0db Mon Sep 17 00:00:00 2001
From: Jason Balaci <jason@balaci.me>
Date: Thu, 18 Jul 2024 14:21:04 -0400
Subject: [PATCH 07/51] vikunja: 0.24.0 -> 0.24.1

---
 pkgs/by-name/vi/vikunja/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix
index baf2d46e36c9..9af6170d5663 100644
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests }:
 
 let
-  version = "0.24.0";
+  version = "0.24.1";
   src = fetchFromGitHub {
     owner = "go-vikunja";
     repo = "vikunja";
     rev = "v${version}";
-    hash = "sha256-KbtyDGuJN63mFEhAPCqV0tajAq1ZIR3CmN9Deb5XWcU=";
+    hash = "sha256-39S7Xl8He+unIkAZ9GnjqWHBOfdDj4rSUmrExB+Q6Vc=";
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +17,7 @@ let
 
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src sourceRoot;
-      hash = "sha256-KmeZlvt7DA5uDFSkYS71k8qCaHRw3sSTn1NfJPCJxpA=";
+      hash = "sha256-iEcic/oQ33IO9tWqIQGfyjSY4YpJ8FckaI59qTgdq3c=";
     };
 
     nativeBuildInputs = [
@@ -67,7 +67,7 @@ buildGoModule {
     in
     [ fakeGit mage ];
 
-  vendorHash = "sha256-SnVCc6SWG6LH2ZzKV1A2dvO9/4wYzwnINO1Kyz1+3kg=";
+  vendorHash = "sha256-oOa9qTy5jNYq05Tbp9hI4L0OBtKtglhk6Uz380nZH1Y=";
 
   inherit frontend;
 

From 289dd22132674e63ad2ce09f987ef12b55f80f35 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Thu, 29 Jun 2023 23:22:55 +0200
Subject: [PATCH 08/51] nixos/qemu-vm: simplify building nix store image

Summary of this change:

- Simplify code.
- Stop a disk image from being cached in the binary cache.
- Make erofs Nix Store image build in an acceptable time outside of
  testing environments (like `darwin.builder`).
- Do not regress on performance for tests that use many store paths in
  their Nix store image.
- Slightly longer startup time for tests where not many store paths are
  included in the image (these probably shouldn't use `useNixStoreImage`
  anyways).
- Slightly longer startup time when inputs of VM do not change because
  the Nix store image is not cached anymore.

Remove the `storeImage` built with make-disk-image.nix. This produced a
separate derivation which is then cached in the binary cache. These
types of images should be avoided because they gunk up the cache as they
change frequently. Now all Nix store images, whether read-only or
writable are based on the erofs image previously only used for read-only
images.

Additionally, simplify the way the erofs image is built by copying the
paths to include to a separate directory and build the erofs image from
there.

Before this change, the list of Nix store paths to include in the Nix
store image was converted to a complex regex that *excludes* all other
paths from a potentially large Nix store.

This previous approach suffers from two issues:

1. The regex is complex and, as admitted in the source code of the
   includes-to-excludes.py script, most likely contains at least one
   error. This means that it's unlikely that anyone will touch this
   piece of software again.

2. When the Nix store image is built from a large Nix store (like when
   you build the VM script to run outside of any testing context) this
   regex becomes painfully slow. There is at least one prominent
   use-case where this matters: `darwin.builder`.

Benchmarking impressions:

- Building Nix store via make-disk-image.nix takes ~25s
- Building Nix store as an erofs image takes ~4s
- Running nixosTests.qemu-vm-writable-store-image takes ~10s when
  building the erofs image with the regex vs ~14s when building by
  copying to a temporary directory.
- nixosTests.gitlab which had the biggest gains from the initial erofs
  change takes the same time as before.
- On a host with ~140k paths in /nix/store, building the erofs image
  with the regex takes 410s as opposed to 6s when copying to a temporary
  directory.
---
 .../virtualisation/includes-to-excludes.py    | 86 ----------------
 nixos/modules/virtualisation/qemu-vm.nix      | 97 ++++++-------------
 2 files changed, 30 insertions(+), 153 deletions(-)
 delete mode 100644 nixos/modules/virtualisation/includes-to-excludes.py

diff --git a/nixos/modules/virtualisation/includes-to-excludes.py b/nixos/modules/virtualisation/includes-to-excludes.py
deleted file mode 100644
index 05ef9c0f23b9..000000000000
--- a/nixos/modules/virtualisation/includes-to-excludes.py
+++ /dev/null
@@ -1,86 +0,0 @@
-
-# Convert a list of strings to a regex that matches everything but those strings
-# ... and it had to be a POSIX regex; no negative lookahead :(
-# This is a workaround for erofs supporting only exclude regex, not an include list
-
-import sys
-import re
-from collections import defaultdict
-
-# We can configure this script to match in different ways if we need to.
-# The regex got too long for the argument list, so we had to truncate the
-# hashes and use MATCH_STRING_PREFIX. That's less accurate, and might pick up some
-# garbage like .lock files, but only if the sandbox doesn't hide those. Even
-# then it should be harmless.
-
-# Produce the negation of ^a$
-MATCH_EXACTLY = ".+"
-# Produce the negation of ^a
-MATCH_STRING_PREFIX = "//X" # //X should be epsilon regex instead. Not supported??
-# Produce the negation of ^a/?
-MATCH_SUBPATHS = "[^/].*$"
-
-# match_end = MATCH_SUBPATHS
-match_end = MATCH_STRING_PREFIX
-# match_end = MATCH_EXACTLY
-
-def chars_to_inverted_class(letters):
-    assert len(letters) > 0
-    letters = list(letters)
-
-    s = "[^"
-
-    if "]" in letters:
-        s += "]"
-        letters.remove("]")
-
-    final = ""
-    if "-" in letters:
-        final = "-"
-        letters.remove("-")
-
-    s += "".join(letters)
-
-    s += final
-
-    s += "]"
-
-    return s
-
-# There's probably at least one bug in here, but it seems to works well enough
-# for filtering store paths.
-def strings_to_inverted_regex(strings):
-    s = "("
-
-    # Match anything that starts with the wrong character
-
-    chars = defaultdict(list)
-
-    for item in strings:
-        if item != "":
-            chars[item[0]].append(item[1:])
-
-    if len(chars) == 0:
-        s += match_end
-    else:
-        s += chars_to_inverted_class(chars)
-
-    # Now match anything that starts with the right char, but then goes wrong
-
-    for char, sub in chars.items():
-        s += "|(" + re.escape(char) + strings_to_inverted_regex(sub) + ")"
-
-    s += ")"
-    return s
-
-if __name__ == "__main__":
-    stdin_lines = []
-    for line in sys.stdin:
-        if line.strip() != "":
-            stdin_lines.append(line.strip())
-
-    print("^" + strings_to_inverted_regex(stdin_lines))
-
-# Test:
-# (echo foo; echo fo/; echo foo/; echo foo/ba/r; echo b; echo az; echo az/; echo az/a; echo ab; echo ab/a; echo ab/; echo abc; echo abcde; echo abb; echo ac; echo b) | grep -vE "$((echo ab; echo az; echo foo;) | python includes-to-excludes.py | tee /dev/stderr )"
-# should print ab, az, foo and their subpaths
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 3cc20464b00b..10f69f3a744a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -134,32 +134,25 @@ let
           TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir)
       fi
 
-      ${lib.optionalString (cfg.useNixStoreImage)
-        (if cfg.writableStore
-          then ''
-            # Create a writable copy/snapshot of the store image.
-            ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${storeImage}/nixos.qcow2 "$TMPDIR"/store.img
-          ''
-          else ''
-            (
-              cd ${builtins.storeDir}
-              ${hostPkgs.erofs-utils}/bin/mkfs.erofs \
-                --force-uid=0 \
-                --force-gid=0 \
-                -L ${nixStoreFilesystemLabel} \
-                -U eb176051-bd15-49b7-9e6b-462e0b467019 \
-                -T 0 \
-                --exclude-regex="$(
-                  <${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \
-                    sed -e 's^.*/^^g' \
-                  | cut -c -10 \
-                  | ${hostPkgs.python3}/bin/python ${./includes-to-excludes.py} )" \
-                "$TMPDIR"/store.img \
-                . \
-                </dev/null >/dev/null
-            )
-          ''
-        )
+      ${lib.optionalString (cfg.useNixStoreImage) ''
+        echo "Creating Nix store image..."
+
+        ${hostPkgs.gnutar}/bin/tar --create \
+          --absolute-names \
+          --verbatim-files-from \
+          --transform 'flags=rSh;s|/nix/store/||' \
+          --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \
+          | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \
+            --force-uid=0 \
+            --force-gid=0 \
+            -L ${nixStoreFilesystemLabel} \
+            -U eb176051-bd15-49b7-9e6b-462e0b467019 \
+            -T 0 \
+            --tar=f \
+            "$TMPDIR"/store.img
+
+        echo "Created Nix store image."
+      ''
       }
 
       # Create a directory for exchanging data with the VM.
@@ -298,21 +291,6 @@ let
     OVMF = cfg.efi.OVMF;
   };
 
-  storeImage = import ../../lib/make-disk-image.nix {
-    name = "nix-store-image";
-    inherit pkgs config lib;
-    additionalPaths = [ regInfo ];
-    format = "qcow2";
-    onlyNixStore = true;
-    label = nixStoreFilesystemLabel;
-    partitionTableType = "none";
-    installBootLoader = false;
-    touchEFIVars = false;
-    diskSize = "auto";
-    additionalSpace = "0M";
-    copyChannel = false;
-  };
-
 in
 
 {
@@ -788,10 +766,14 @@ in
           this can drastically improve performance, but at the cost of
           disk space and image build time.
 
-          As an alternative, you can use a bootloader which will provide you
-          with a full NixOS system image containing a Nix store and
-          avoid mounting the host nix store through
-          {option}`virtualisation.mountHostNixStore`.
+          The Nix store image is built just-in-time right before the VM is
+          started. Because it does not produce another derivation, the image is
+          not cached between invocations and never lands in the store or binary
+          cache.
+
+          If you want a full disk image with a partition table and a root
+          filesystem instead of only a store image, enable
+          {option}`virtualisation.useBootLoader` instead.
         '';
       };
 
@@ -1019,25 +1001,7 @@ in
         ];
 
     warnings =
-      optional (
-        cfg.writableStore &&
-        cfg.useNixStoreImage &&
-        opt.writableStore.highestPrio > lib.modules.defaultOverridePriority)
-        ''
-          You have enabled ${opt.useNixStoreImage} = true,
-          without setting ${opt.writableStore} = false.
-
-          This causes a store image to be written to the store, which is
-          costly, especially for the binary cache, and because of the need
-          for more frequent garbage collection.
-
-          If you really need this combination, you can set ${opt.writableStore}
-          explicitly to true, incur the cost and make this warning go away.
-          Otherwise, we recommend
-
-            ${opt.writableStore} = false;
-            ''
-      ++ optional (cfg.directBoot.enable && cfg.useBootLoader)
+      optional (cfg.directBoot.enable && cfg.useBootLoader)
         ''
           You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering
           `useBootLoader` useless. You might want to disable one of those options.
@@ -1050,8 +1014,6 @@ in
     boot.loader.grub.device = mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice);
     boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}";
 
-    boot.initrd.kernelModules = optionals (cfg.useNixStoreImage && !cfg.writableStore) [ "erofs" ];
-
     boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false);
 
     # After booting, register the closure of the paths in
@@ -1171,7 +1133,7 @@ in
         name = "nix-store";
         file = ''"$TMPDIR"/store.img'';
         deviceExtraOpts.bootindex = "2";
-        driveExtraOpts.format = if cfg.writableStore then "qcow2" else "raw";
+        driveExtraOpts.format = "raw";
       }])
       (imap0 (idx: _: {
         file = "$(pwd)/empty${toString idx}.qcow2";
@@ -1226,6 +1188,7 @@ in
         });
         "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage {
           device = "/dev/disk/by-label/${nixStoreFilesystemLabel}";
+          fsType = "erofs";
           neededForBoot = true;
           options = [ "ro" ];
         };

From 1c53140edf18c916857e2408d98c380fc434000c Mon Sep 17 00:00:00 2001
From: datafoo <34766150+datafoo@users.noreply.github.com>
Date: Fri, 19 Jul 2024 08:12:04 +0200
Subject: [PATCH 09/51] 
 vscode-extensions.streetsidesoftware.code-spell-checker: 4.0.3 -> 4.0.4

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 66b3362cc9c4..8625d12e0889 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4354,8 +4354,8 @@ let
         mktplcRef = {
           name = "code-spell-checker";
           publisher = "streetsidesoftware";
-          version = "4.0.3";
-          hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg=";
+          version = "4.0.4";
+          hash = "sha256-WbEhTIuPqH77IuEDgjPUz9chHM/aYjMdpCI9Kf0KS2Q=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog";

From 20014a95f60308bc38e0582259c712507d7d94c9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 19 Jul 2024 11:56:41 +0200
Subject: [PATCH 10/51] libressl,libressl_3_8: Fix build for ppc64

---
 .../development/libraries/libressl/default.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index f8350f7c4a53..9629c0e961a9 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -127,10 +127,28 @@ in {
   libressl_3_8 = generic {
     version = "3.8.4";
     hash = "sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0=";
+
+    patches = [
+      # Fixes build on ppc64
+      # https://github.com/libressl/portable/pull/1073
+      (fetchpatch {
+        url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch";
+        hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw=";
+      })
+    ];
   };
 
   libressl_3_9 = generic {
     version = "3.9.2";
     hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c=";
+
+    patches = [
+      # Fixes build on ppc64
+      # https://github.com/libressl/portable/pull/1073
+      (fetchpatch {
+        url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch";
+        hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw=";
+      })
+    ];
   };
 }

From 1cbd07c4e6cca50e6244c2ec373d19d4d0d6a98a Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:02:20 +0300
Subject: [PATCH 11/51] koboldcpp: backport old interfaces

Refs: https://github.com/NixOS/nixpkgs/pull/327102#discussion_r1677136308
Refs: https://github.com/NixOS/nixpkgs/pull/327102#discussion_r1677136419
Refs: https://github.com/NixOS/nixpkgs/pull/327102#discussion_r1677137201

Co-authored-by: SomeoneSerge <sergei.kozlukov@aalto.fi>
---
 pkgs/by-name/ko/koboldcpp/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 23b0f21bdac8..db7894de9b2e 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -5,6 +5,7 @@
   makeWrapper,
   gitUpdater,
   python3Packages,
+  python311Packages ? null, # Ignored. Kept for compatibility with the release
   tk,
   addDriverRunpath,
 
@@ -31,6 +32,8 @@
   vulkan-loader,
 
   metalSupport ? stdenv.isDarwin && stdenv.isAarch64,
+  march ? "",
+  mtune ? "",
 }:
 
 let
@@ -106,6 +109,14 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
   env.NIX_LDFLAGS = lib.concatStringsSep " " (finalAttrs.darwinLdFlags ++ finalAttrs.metalLdFlags);
 
+  env.NIX_CFLAGS_COMPILE =
+    lib.optionalString (march != "") (
+      lib.warn "koboldcpp: the march argument is only kept for compatibility; use overrideAttrs intead" "-march=${march}"
+    )
+    + lib.optionalString (mtune != "") (
+      lib.warn "koboldcpp: the mtune argument is only kept for compatibility; use overrideAttrs intead" "-mtune=${mtune}"
+    );
+
   makeFlags = [
     (makeBool "LLAMA_OPENBLAS" openblasSupport)
     (makeBool "LLAMA_CUBLAS" cublasSupport)

From 81f62b817fd57f6f51512218576adf78f581d627 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 19 Jul 2024 13:07:47 +0200
Subject: [PATCH 12/51] yanic: set version variable during build

Setting this allows `yanic version` to report the package version.
---
 pkgs/by-name/ya/yanic/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix
index 4784d98dccc3..cf314e90a575 100644
--- a/pkgs/by-name/ya/yanic/package.nix
+++ b/pkgs/by-name/ya/yanic/package.nix
@@ -17,7 +17,11 @@ buildGoModule rec {
 
   vendorHash = "sha256-6UiiajKLzW5e7y0F6GMYDZP6xTyOiccLIKlwvOY7LRo=";
 
-  ldflags = [ "-s" "-w" ];
+  ldflags = [
+    "-X github.com/FreifunkBremen/yanic/cmd.VERSION=${version}"
+    "-s"
+    "-w"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
 

From 201ee231068c2353497a3d73b99c22ff0f83f769 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:18:32 +0300
Subject: [PATCH 13/51] koboldcpp: fix x86_64-darwin build

Refs: https://github.com/NixOS/nixpkgs/pull/327102/checks?check_run_id=27511352788
---
 pkgs/by-name/ko/koboldcpp/package.nix | 28 ++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index db7894de9b2e..79821a3838a8 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -43,6 +43,12 @@ let
     --prefix LD_LIBRARY_PATH: "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}"
   '';
 
+  darwinFrameworks =
+    if (stdenv.isDarwin && stdenv.isx86_64) then
+      darwin.apple_sdk.frameworks
+    else
+      darwin.apple_sdk_11_0.frameworks;
+
   effectiveStdenv = if cublasSupport then cudaPackages.backendStdenv else stdenv;
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
@@ -69,15 +75,15 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     [ tk ]
     ++ finalAttrs.pythonInputs
     ++ lib.optionals effectiveStdenv.isDarwin [
-      darwin.apple_sdk_11_0.frameworks.Accelerate
-      darwin.apple_sdk_11_0.frameworks.CoreVideo
-      darwin.apple_sdk_11_0.frameworks.CoreGraphics
-      darwin.apple_sdk_11_0.frameworks.CoreServices
+      darwinFrameworks.Accelerate
+      darwinFrameworks.CoreVideo
+      darwinFrameworks.CoreGraphics
+      darwinFrameworks.CoreServices
     ]
     ++ lib.optionals metalSupport [
-      darwin.apple_sdk_11_0.frameworks.MetalKit
-      darwin.apple_sdk_11_0.frameworks.Foundation
-      darwin.apple_sdk_11_0.frameworks.MetalPerformanceShaders
+      darwinFrameworks.MetalKit
+      darwinFrameworks.Foundation
+      darwinFrameworks.MetalPerformanceShaders
     ]
     ++ lib.optionals openblasSupport [ openblas ]
     ++ lib.optionals cublasSupport [
@@ -95,14 +101,14 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   pythonPath = finalAttrs.pythonInputs;
 
   darwinLdFlags = lib.optionals stdenv.isDarwin [
-    "-F${darwin.apple_sdk_11_0.frameworks.CoreServices}/Library/Frameworks"
-    "-F${darwin.apple_sdk_11_0.frameworks.Accelerate}/Library/Frameworks"
+    "-F${darwinFrameworks.CoreServices}/Library/Frameworks"
+    "-F${darwinFrameworks.Accelerate}/Library/Frameworks"
     "-framework CoreServices"
     "-framework Accelerate"
   ];
   metalLdFlags = lib.optionals metalSupport [
-    "-F${darwin.apple_sdk_11_0.frameworks.Foundation}/Library/Frameworks"
-    "-F${darwin.apple_sdk_11_0.frameworks.Metal}/Library/Frameworks"
+    "-F${darwinFrameworks.Foundation}/Library/Frameworks"
+    "-F${darwinFrameworks.Metal}/Library/Frameworks"
     "-framework Foundation"
     "-framework Metal"
   ];

From cb6ea4729eec2d04495e54b8436ca7ee42996f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 19 Jul 2024 04:15:08 -0700
Subject: [PATCH 14/51] python312Packages.py-nextbusnext: 1.0.2 -> 2.0.3

Diff: https://github.com/ViViDboarder/py_nextbus/compare/refs/tags/v1.0.2...v2.0.3

Changelog: https://github.com/ViViDboarder/py_nextbusnext/releases/tag/v2.0.0
---
 .../python-modules/py-nextbusnext/default.nix     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix
index 8aeae2b22b1f..ab889f86ff2c 100644
--- a/pkgs/development/python-modules/py-nextbusnext/default.nix
+++ b/pkgs/development/python-modules/py-nextbusnext/default.nix
@@ -2,31 +2,34 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
   pythonOlder,
+  requests,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "py-nextbusnext";
-  version = "1.0.2";
+  version = "2.0.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "ViViDboarder";
     repo = "py_nextbus";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM=";
+    hash = "sha256-dSBjOMqryEddWB54AddGDojRE8/STi3kxfjJsVFBuOw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  dependencies = [ requests ];
 
   pythonImportsCheck = [ "py_nextbus" ];
 
+  # upstream has no tests
+  doCheck = false;
+
   meta = with lib; {
     description = "Minimalistic Python client for the NextBus public API";
     homepage = "https://github.com/ViViDboarder/py_nextbus";

From 269a863769cf470897f57c4115922e24c701a0c2 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:19:28 +0300
Subject: [PATCH 15/51] koboldcpp: rename interface arches -> cudaArches

Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1677129990

Co-authored-by: SomeoneSerge <sergei.kozlukov@aalto.fi>
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 79821a3838a8..c096948565b0 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -22,7 +22,7 @@
   cublasSupport ? config.cudaSupport,
   # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
   # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60"
-  arches ? cudaPackages.cudaFlags.arches or [ ],
+  cudaArches ? cudaPackages.cudaFlags.arches or [ ],
 
   clblastSupport ? stdenv.isLinux,
   clblast,
@@ -129,7 +129,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (makeBool "LLAMA_CLBLAST" clblastSupport)
     (makeBool "LLAMA_VULKAN" vulkanSupport)
     (makeBool "LLAMA_METAL" metalSupport)
-    (lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head arches}")
+    (lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}")
   ];
 
   installPhase = ''

From fd54fe25e06e763cf15549a5877f808e0553450e Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:23:51 +0300
Subject: [PATCH 16/51] koboldcpp: lib.optionalString -> lib.optionals
 (cublasSupport)

Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1677129629

Co-authored-by: SomeoneSerge <sergei.kozlukov@aalto.fi>
---
 pkgs/by-name/ko/koboldcpp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index c096948565b0..bc64a8d9e0fe 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -129,7 +129,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     (makeBool "LLAMA_CLBLAST" clblastSupport)
     (makeBool "LLAMA_VULKAN" vulkanSupport)
     (makeBool "LLAMA_METAL" metalSupport)
-    (lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}")
+    (lib.optionals cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}")
   ];
 
   installPhase = ''

From e04cfef691595a3953ee552700463c4e928fc13a Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 19 Jul 2024 14:30:44 +0300
Subject: [PATCH 17/51] koboldcpp: makeWrapperArgs -> libraryPathWrapperArgs

`makeWrapperArgs` was quite ambiguous and unclear. `libraryPathWrapperArgs` is clearer on what it's supposed to actually do
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index bc64a8d9e0fe..ae0e441ce434 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -39,7 +39,7 @@
 let
   makeBool = option: bool: (if bool then "${option}=1" else "");
 
-  makeWrapperArgs = lib.optionalString config.cudaSupport ''
+  libraryPathWrapperArgs = lib.optionalString config.cudaSupport ''
     --prefix LD_LIBRARY_PATH: "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}"
   '';
 
@@ -158,7 +158,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     wrapPythonProgramsIn "$out/bin" "$pythonPath"
     makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \
-      --prefix PATH ${lib.makeBinPath [ tk ]} ${makeWrapperArgs}
+      --prefix PATH ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs}
   '';
 
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };

From 77c6cd5d35965539def1d9ccd96e6b9bb0797bed Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Tue, 9 Jul 2024 22:52:21 +0200
Subject: [PATCH 18/51] flexget: 3.11.39 -> 3.11.40

Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.11.39...v3.11.40

Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.40
---
 .../networking/flexget/default.nix            | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index 5bdda1c1f4ef..dcf34e8da05d 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.11.39";
+  version = "3.11.40";
   pyproject = true;
 
   # Fetch from GitHub in order to use `requirements.in`
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "Flexget";
     repo = "Flexget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-saNxs+Xdf6OTRRcMTceU8/ITcYzwtP8VqRKxsWyas+o=";
+    hash = "sha256-96f6NrU928BhhHZmA2vHIhOrczL6AifKvKcdxoV3ihI=";
   };
 
   postPatch = ''
@@ -27,24 +27,18 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python3.pkgs; [
-    # See https://github.com/Flexget/Flexget/blob/master/requirements.txt
+    # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml
     apscheduler
     beautifulsoup4
-    click
     colorama
-    commonmark
     feedparser
     guessit
     html5lib
     jinja2
     jsonschema
     loguru
-    more-itertools
-    packaging
-    pendulum
     psutil
     pynzb
-    pyrsistent
     pyrss2gen
     python-dateutil
     pyyaml
@@ -53,27 +47,51 @@ python3.pkgs.buildPythonApplication rec {
     rich
     rpyc
     sqlalchemy
-    typing-extensions
 
     # WebUI requirements
     cherrypy
     flask-compress
     flask-cors
     flask-login
-    flask-restful
     flask-restx
     flask
+    packaging
     pyparsing
     werkzeug
     zxcvbn
+    pendulum
 
     # Plugins requirements
     transmission-rpc
+    qbittorrent-api
+    deluge-client
+    cloudscraper
+    python-telegram-bot
   ];
 
   pythonImportsCheck = [
     "flexget"
+    "flexget.api.core.authentication"
+    "flexget.api.core.database"
+    "flexget.api.core.plugins"
+    "flexget.api.core.schema"
+    "flexget.api.core.server"
+    "flexget.api.core.tasks"
+    "flexget.api.core.user"
+    "flexget.components.thetvdb.api"
+    "flexget.components.tmdb.api"
+    "flexget.components.trakt.api"
+    "flexget.components.tvmaze.api"
+    "flexget.plugins.clients.aria2"
+    "flexget.plugins.clients.deluge"
+    "flexget.plugins.clients.nzbget"
+    "flexget.plugins.clients.pyload"
+    "flexget.plugins.clients.qbittorrent"
+    "flexget.plugins.clients.rtorrent"
     "flexget.plugins.clients.transmission"
+    "flexget.plugins.services.kodi_library"
+    "flexget.plugins.services.myepisodes"
+    "flexget.plugins.services.pogcal_acquired"
   ];
 
   # ~400 failures

From 6fce24ec9c0df8e4e1547086e6452c127f508107 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 19 Jul 2024 13:32:42 +0200
Subject: [PATCH 19/51] flexget: downgrade to python311

---
 pkgs/applications/networking/flexget/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index dcf34e8da05d..a61a143aef81 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -1,9 +1,16 @@
 { lib
 , python3
+, python311
 , fetchFromGitHub
 }:
 
-python3.pkgs.buildPythonApplication rec {
+let
+  python = if (builtins.tryEval python3.pkgs.nose.outPath).success
+    then python3
+    else python311;
+in
+
+python.pkgs.buildPythonApplication rec {
   pname = "flexget";
   version = "3.11.40";
   pyproject = true;
@@ -21,12 +28,12 @@ python3.pkgs.buildPythonApplication rec {
     sed 's/[~<>=][^;]*//' -i requirements.txt
   '';
 
-  build-system = with python3.pkgs; [
+  build-system = with python.pkgs; [
     setuptools
     wheel
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python.pkgs; [
     # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml
     apscheduler
     beautifulsoup4

From 3b2f19accf9fa07bf108ba06884eb920aa97d019 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 19 Jul 2024 13:35:59 +0200
Subject: [PATCH 20/51] flexget: 3.11.40 -> 3.11.41

Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.41
---
 pkgs/applications/networking/flexget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix
index a61a143aef81..26ea275144a7 100644
--- a/pkgs/applications/networking/flexget/default.nix
+++ b/pkgs/applications/networking/flexget/default.nix
@@ -12,7 +12,7 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "flexget";
-  version = "3.11.40";
+  version = "3.11.41";
   pyproject = true;
 
   # Fetch from GitHub in order to use `requirements.in`
@@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "Flexget";
     repo = "Flexget";
     rev = "refs/tags/v${version}";
-    hash = "sha256-96f6NrU928BhhHZmA2vHIhOrczL6AifKvKcdxoV3ihI=";
+    hash = "sha256-ZSqkD53fdDnKulVPgM9NWXVFXDR0sZ94mRyV1iKS87o=";
   };
 
   postPatch = ''

From 9d0712a7b35004493452ca95a4e5581c4a2bfc9e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 19 Jul 2024 13:38:22 +0200
Subject: [PATCH 21/51] flexget: migrate to by-name

---
 .../flexget/default.nix => by-name/fl/flexget/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/flexget/default.nix => by-name/fl/flexget/package.nix} (100%)

diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/by-name/fl/flexget/package.nix
similarity index 100%
rename from pkgs/applications/networking/flexget/default.nix
rename to pkgs/by-name/fl/flexget/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6876296c4f9..0d2695e0d2bf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30306,8 +30306,6 @@ with pkgs;
 
   flamp = callPackage ../applications/radio/flamp { };
 
-  flexget = callPackage ../applications/networking/flexget { };
-
   fldigi = callPackage ../applications/radio/fldigi {
     hamlib = hamlib_4;
   };

From dab6fd1b2a1816c9a71f4de629d1808e8ffde0af Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 19 Jul 2024 12:53:59 +0000
Subject: [PATCH 22/51] consul: 1.19.0 -> 1.19.1

---
 pkgs/by-name/co/consul/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix
index 5dc8d88afe34..74f1ccbad672 100644
--- a/pkgs/by-name/co/consul/package.nix
+++ b/pkgs/by-name/co/consul/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule rec {
   pname = "consul";
-  version = "1.19.0";
+  version = "1.19.1";
 
   # Note: Currently only release tags are supported, because they have the Consul UI
   # vendored. See
@@ -22,7 +22,7 @@ buildGoModule rec {
     owner = "hashicorp";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-GO2BfdozsAo1r4iSyQdAEG8Tm6OkJhSUrH3bZ9lWuO8=";
+    hash = "sha256-UMKXI16QQHV9I+kH62KRbZCEcQLXkBwB6o/lqtCZa78=";
   };
 
   # This corresponds to paths with package main - normally unneeded but consul
@@ -32,7 +32,7 @@ buildGoModule rec {
     "connect/certgen"
   ];
 
-  vendorHash = "sha256-h3eTCj/0FPiY/Dj4cMj9VqKBs28ArnTPjRIC3LT06j0=";
+  vendorHash = "sha256-l1+KVygh0TuvN45UmU/bXksjHBTZZ6jt54nZtR9f+II=";
 
   doCheck = false;
 

From 2b68ca0090d890516caeb8811f5d33370e1b2861 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 19 Jul 2024 16:42:22 +0200
Subject: [PATCH 23/51] mautrix-whatsapp: 0.10.7 -> 0.10.9

ChangeLogs:
* https://github.com/mautrix/whatsapp/releases/tag/v0.10.8
* https://github.com/mautrix/whatsapp/releases/tag/v0.10.9

Closes #320405
---
 pkgs/servers/mautrix-whatsapp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index f7108c69a535..d7bad1c9c79b 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
-  version = "0.10.7";
+  version = "0.10.9";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
     rev = "v${version}";
-    hash = "sha256-GpeMzcWckh8q/Sh9YYV+qAdEvQ1XolhBw6+vgpACU20=";
+    hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4=";
   };
 
   buildInputs = [ olm ];
 
-  vendorHash = "sha256-XhqrgRCW9HTPaTO9gMqDzEW22h53oprOYPAvMSGbcS4=";
+  vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk=";
 
   doCheck = false;
 

From a6ece406b43f85757abf2013b897ecb4b34c53b9 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Fri, 19 Jul 2024 15:43:39 -0400
Subject: [PATCH 24/51] vscode-extensions.nefrob.vscode-just-syntax: 0.3.0 ->
 0.5.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a1fb287bf140..2981d38bfc81 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3551,8 +3551,8 @@ let
         mktplcRef = {
           name = "vscode-just-syntax";
           publisher = "nefrob";
-          version = "0.3.0";
-          hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518=";
+          version = "0.5.1";
+          hash = "sha256-DacDGK8gqlt8u0ZKcVxZ7jiUFFEX3ixv3P7RKWJVluA=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog";

From 9946cc142a05a865ccee79de967f38145a816249 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 01:26:42 +0000
Subject: [PATCH 25/51] kustomize: 5.4.2 -> 5.4.3

---
 pkgs/development/tools/kustomize/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix
index 8d364f2d58c5..e7e9a8d0b013 100644
--- a/pkgs/development/tools/kustomize/default.nix
+++ b/pkgs/development/tools/kustomize/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "kustomize";
-  version = "5.4.2";
+  version = "5.4.3";
 
   ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in
     [
@@ -15,13 +15,13 @@ buildGoModule rec {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "kustomize/v${version}";
-    hash = "sha256-cNmDhKRi4pk26vADFMXN6SocdPF1EIYf4wT4fQYgPVc=";
+    hash = "sha256-DrdExiGDWBrlbNIY6R9SXD4cuVyLBOE3ePw1J3hymHA=";
   };
 
   # avoid finding test and development commands
   modRoot = "kustomize";
   proxyVendor = true;
-  vendorHash = "sha256-Nbc3zdVD8KIL80TqdcVNFMowfFsKKIPsEpkwq5fvWAI=";
+  vendorHash = "sha256-cyTZCa1kmNhomkNNnt2Waww4czOZ5YzDBUDx5gqLHtQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 296370e75f0099b9782f576b84b744ee76135d70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 01:37:48 +0000
Subject: [PATCH 26/51] cargo-modules: 0.16.3 -> 0.16.6

---
 pkgs/development/tools/rust/cargo-modules/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix
index 2745b9c586b9..8c539eeb9651 100644
--- a/pkgs/development/tools/rust/cargo-modules/default.nix
+++ b/pkgs/development/tools/rust/cargo-modules/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-modules";
-  version = "0.16.3";
+  version = "0.16.6";
 
   src = fetchFromGitHub {
     owner = "regexident";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-6JFQuFISIKmR+dm2YYb4iwBjR61WrcLpfwcC67a96t4=";
+    hash = "sha256-noUlwAoJMDim1TI3aiacLtOXsHd2IEZbrjYQoeoo7yM=";
   };
 
-  cargoHash = "sha256-TiSiOMBkmH4Y5VORXZ59fl9+EwOjfWV2n/r3LTmSFxQ=";
+  cargoHash = "sha256-EbhLIVe9FizxNmyoEo3b/IZQ6jbL6vQUunFzfM2QRL8=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices

From ab11ce32aec390ad814b15470ae82d763c114729 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 19 Jul 2024 19:57:19 +0200
Subject: [PATCH 27/51] python312Packages.holidays: 0.52 -> 0.53

https://github.com/vacanza/python-holidays/releases/tag/v0.53
---
 pkgs/development/python-modules/holidays/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 22948219d3db..2a0dfec49bba 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.52";
+  version = "0.53";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sLtszBu/eyhfIW8xdkHb3FWx2pW/E8cxPeNa4o7DnIs=";
+    hash = "sha256-qL6ZjnVecAs8vHbbb2IRQPSDpFFPmFuu16UEBsY8vKw=";
   };
 
   build-system = [

From 451fb7a2bdb61e37df33e4e8e4876eb89097e7cc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 13 Jul 2024 23:35:09 +0200
Subject: [PATCH 28/51] python312Packages.pytedee-async: 0.2.17 -> 0.2.20

Diff: https://github.com/zweckj/pytedee_async/compare/refs/tags/v0.2.17...v0.2.20

Changelog: https://github.com/zweckj/pytedee_async/releases/tag/v0.2.20
---
 pkgs/development/python-modules/pytedee-async/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix
index 181da2761bab..ccf6fd94f7db 100644
--- a/pkgs/development/python-modules/pytedee-async/default.nix
+++ b/pkgs/development/python-modules/pytedee-async/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pytedee-async";
-  version = "0.2.17";
+  version = "0.2.20";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pytedee_async";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5mCHCzoDJ6+ao2guhAtVjvPaAS6Hutn+NwaQIjWDlgo=";
+    hash = "sha256-mBE5h6oGEJ2Wzb/PCD4vwFs52tWy+YmQVA06BPVW1Kg=";
   };
 
   build-system = [ setuptools ];

From 31f445c003a177df40271b9b29c57f34cc8283ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 19 Jul 2024 20:15:08 +0200
Subject: [PATCH 29/51] python312Packages.python-kasa: 0.7.0.3 -> 0.7.0.5

Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.7.0.3...0.7.0.5

Changelog: https://github.com/python-kasa/python-kasa/blob/0.7.0.5/CHANGELOG.md

Co-Authored-By: Martin Weinelt <hexa@darmstadt.ccc.de>
---
 .../python-modules/python-kasa/default.nix         | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix
index 087b5ffc66c5..11faea189227 100644
--- a/pkgs/development/python-modules/python-kasa/default.nix
+++ b/pkgs/development/python-modules/python-kasa/default.nix
@@ -9,27 +9,29 @@
   kasa-crypt,
   orjson,
   poetry-core,
+  ptpython,
   pydantic,
   pytest-asyncio,
   pytest-freezer,
   pytest-mock,
   pytestCheckHook,
   pythonOlder,
+  rich,
   voluptuous,
 }:
 
 buildPythonPackage rec {
   pname = "python-kasa";
-  version = "0.7.0.4";
+  version = "0.7.0.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "python-kasa";
     repo = "python-kasa";
     rev = "refs/tags/${version}";
-    hash = "sha256-MZgbHohp+QaTg7gdsIu3Q/4sLVqvtzDjmQScYSZO3Yw=";
+    hash = "sha256-ITXezc6m7ocOqSHTVP583lZZmYaZQn9nQSErEB9fV/M=";
   };
 
   build-system = [ poetry-core ];
@@ -51,6 +53,10 @@ buildPythonPackage rec {
   ];
 
   passthru.optional-dependencies = {
+    shell = [
+      ptpython
+      rich
+    ];
     speedups = [
       kasa-crypt
       orjson
@@ -68,10 +74,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python API for TP-Link Kasa Smarthome products";
-    mainProgram = "kasa";
     homepage = "https://python-kasa.readthedocs.io/";
     changelog = "https://github.com/python-kasa/python-kasa/blob/${version}/CHANGELOG.md";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "kasa";
   };
 }

From 183c48e99e7bbab447b555f7caf9d5e778660433 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 19 Jul 2024 08:29:17 -0700
Subject: [PATCH 30/51] python312Packages.upb-lib: 0.5.7 -> 0.5.8

Diff: https://github.com/gwww/upb-lib/compare/refs/tags/0.5.7...0.5.8

Changelog: https://github.com/gwww/upb-lib/releases/tag/0.5.8
---
 pkgs/development/python-modules/upb-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix
index 0798fd181281..b19508b01754 100644
--- a/pkgs/development/python-modules/upb-lib/default.nix
+++ b/pkgs/development/python-modules/upb-lib/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "upb-lib";
-  version = "0.5.7";
+  version = "0.5.8";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "gwww";
     repo = "upb-lib";
     rev = "refs/tags/${version}";
-    hash = "sha256-y06/XqdmGXTd2Qhr2iXnmIKCSpAetXwI1UXv555ewoc=";
+    hash = "sha256-YCJl3cIaNmRQ5+GbIDcAvDhI0R4r2AWG2Ba1zmnfbMA=";
   };
 
   build-system = [ poetry-core ];

From 4308f96052ed478d1fc800575c9d0600e9a32266 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 01:39:31 +0000
Subject: [PATCH 31/51] obs-studio-plugins.obs-move-transition: 3.0.1 -> 3.0.2

---
 .../video/obs-studio/plugins/obs-move-transition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
index e464079da93c..c4e2dc43d246 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "obs-move-transition";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "exeldro";
     repo = "obs-move-transition";
     rev = version;
-    sha256 = "sha256-LZL9f/pX74rKW+wnNHGKwGuuISOTcFVr6W9h/JEK0U4=";
+    sha256 = "sha256-Vwm0Eyb8MevZtS3PTqnFQAbCj7JuTw9Ju0lS9CZ6rf8=";
   };
 
   nativeBuildInputs = [ cmake ];

From ff6f53e8018ca5efc65040bdf148ad3666ddc6f2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 20 Jul 2024 03:48:00 +0200
Subject: [PATCH 32/51] home-assistant: 2024.7.2 -> 2024.7.3

https://github.com/home-assistant/core/releases/tag/2024.7.3
---
 pkgs/servers/home-assistant/component-packages.nix |  2 +-
 pkgs/servers/home-assistant/default.nix            | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index f072c83555e5..d623c3ddcbee 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2024.7.2";
+  version = "2024.7.3";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 1f3cba59882b..3d64bf38457d 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -476,7 +476,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2024.7.2";
+  hassVersion = "2024.7.3";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -494,13 +494,13 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-FML1JZFj2xebcQvXJmBu02Eczz3ejg4r7PfnpBiDc50=";
+    hash = "sha256-6f4z1mpoLOntImC161+0CyyuT3NrPdfuCa6/+wqzHgs=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-okukdAbBXJCaDpnOCDY91dsLQdm5pMJ1SKXV9A68eoQ=";
+    hash = "sha256-YtrOUSQFTgDFL+iPm3itkKsMXs9IKyB2rCnpe7Bn2Gk=";
   };
 
   build-system = with python.pkgs; [
@@ -649,6 +649,13 @@ in python.pkgs.buildPythonApplication rec {
     "--deselect=tests/helpers/test_translation.py::test_caching"
     # assert "Detected that integration 'hue' attempted to create an asyncio task from a thread at homeassistant/components/hue/light.py, line 23
     "--deselect=tests/util/test_async.py::test_create_eager_task_from_thread_in_integration"
+    # Services were renamed to Actions in language strings, but the tests are lagging behind
+    "--deselect=tests/test_core.py::test_serviceregistry_service_that_not_exists"
+    "--deselect=tests/test_core.py::test_services_call_return_response_requires_blocking"
+    "--deselect=tests/test_core.py::test_serviceregistry_return_response_arguments"
+    "--deselect=tests/helpers/test_script.py::test_parallel_error"
+    "--deselect=tests/helpers/test_script.py::test_propagate_error_service_not_found"
+    "--deselect=tests/helpers/test_script.py::test_continue_on_error_automation_issue"
     # tests are located in tests/
     "tests"
   ];

From d56ca2cc3c43f4380c450295f74bdf5766aa4386 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 20 Jul 2024 03:58:09 +0200
Subject: [PATCH 33/51] python312Packages.homeassistant-stubs: 2024.7.2 ->
 2024.7.3

https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.7.3
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 58a30d1c87b6..b5c963f2c434 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2024.7.2";
+  version = "2024.7.3";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-MMFt8TGWB+7wUKYWL4IJyhI3YOumll8Jq5GWZpaZZ8I=";
+    hash = "sha256-4n1dnQX7Mo2vFCrSUUAvdO3ZErBKK6oUCITazI9PlIQ=";
   };
 
   build-system = [

From 742a358a9375d7a1ae99bdac2ca85347854d8cbd Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Sat, 20 Jul 2024 12:26:09 +0800
Subject: [PATCH 34/51] emacsPackages.ott-mode: trivialBuild -> melpaBuild

Also fix homepage and license.
---
 .../manual-packages/ott-mode/default.nix      | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix
index 6eeead468ff2..ac208e29dbf4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix
@@ -1,19 +1,22 @@
-{ trivialBuild
-, ott
-, haskellPackages
-}:
+{ melpaBuild, ott }:
 
-trivialBuild {
+melpaBuild {
   pname = "ott-mode";
 
   inherit (ott) src version;
 
-  postUnpack = ''
-    mv $sourceRoot/emacs/ott-mode.el $sourceRoot
+  files = ''("emacs/*.el")'';
+
+  postPatch = ''
+    pushd emacs
+    echo ";;; ott-mode.el ---" > tmp.el
+    cat ott-mode.el >> tmp.el
+    mv tmp.el ott-mode.el
+    popd
   '';
 
   meta = {
     description = "Emacs ott mode (from ott sources)";
-    inherit (haskellPackages.Agda.meta) homepage license;
+    inherit (ott.meta) homepage license;
   };
 }

From e160c28cccec5ded3c2303b58afd6c4f6fad2836 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 09:28:18 +0000
Subject: [PATCH 35/51] erigon: 2.60.2 -> 2.60.4

---
 pkgs/applications/blockchains/erigon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix
index d2b90cf5952f..64d12a2fdab2 100644
--- a/pkgs/applications/blockchains/erigon/default.nix
+++ b/pkgs/applications/blockchains/erigon/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "erigon";
-  version = "2.60.2";
+  version = "2.60.4";
 in
 buildGoModule {
   inherit pname version;
@@ -11,7 +11,7 @@ buildGoModule {
     owner = "ledgerwatch";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-+KUe+wpcE59Y6ktDRpoMXQYSML9sfN4OaDV8+sKfzQQ=";
+    hash = "sha256-qcBKWwF9/i9ipE70+5AG5cuhYYqDBXAlY2OWxIh4KfU=";
     fetchSubmodules = true;
   };
 

From 243cd1b556785ae00f081ff38c1a9b8a682a5daa Mon Sep 17 00:00:00 2001
From: Benedikt Hiemer <ben.email@posteo.de>
Date: Sat, 20 Jul 2024 12:14:32 +0200
Subject: [PATCH 36/51] vscode-extensions.42crunch.vscode-openapi: 4.25.3 ->
 4.27.0

- Changelog: https://github.com/42Crunch/vscode-openapi/blob/master/CHANGELOG.md#version-4270-june-27-2024
- Comparing changes: https://github.com/42Crunch/vscode-openapi/compare/v4.25.3...v4.27.0
---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 66b3362cc9c4..b46ea0a13410 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -90,8 +90,8 @@ let
         mktplcRef = {
           publisher = "42Crunch";
           name = "vscode-openapi";
-          version = "4.25.3";
-          hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg=";
+          version = "4.27.0";
+          hash = "sha256-urXGyHpIDWQ0Bc+8LODC0DcEo6jQ5tA/QptyxCej9yU=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog";

From cad8d8bf430197ab27896d91202f150fe70b3626 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 12:02:04 +0000
Subject: [PATCH 37/51] silice: 0-unstable-2024-06-23 -> 0-unstable-2024-07-15

---
 pkgs/development/compilers/silice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/development/compilers/silice/default.nix
index fd3d0ba1538d..4256f589649b 100644
--- a/pkgs/development/compilers/silice/default.nix
+++ b/pkgs/development/compilers/silice/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "silice";
-  version = "0-unstable-2024-06-23";
+  version = "0-unstable-2024-07-15";
 
   src = fetchFromGitHub {
     owner = "sylefeb";
     repo = "silice";
-    rev = "5ba9ef0d03b3c8d4a43efe10acfb51c97d3679ef";
-    hash = "sha256-LrLUaCpwzaxH02TGyEfARIumPi0s2REc1g79fSxJjFc=";
+    rev = "80980cff659839fca63859be4565597053a82a3c";
+    hash = "sha256-G+ExPdkhMdC3m9TBwr+3Oj2K6np5MaUULgiXq0G0rLs=";
     fetchSubmodules = true;
   };
 

From c774c7bffe0d5fbf3da5c61e9b8bc3a8d8b11cf7 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sat, 20 Jul 2024 12:02:30 +0000
Subject: [PATCH 38/51] cudaPackages.writeGpuTestPython: allow a selector for
 `libraries` to accommodate different python versions

---
 .../cuda-modules/write-gpu-python-test.nix    | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/write-gpu-python-test.nix b/pkgs/development/cuda-modules/write-gpu-python-test.nix
index 5f0d5c6b8fe6..10b10fa3f923 100644
--- a/pkgs/development/cuda-modules/write-gpu-python-test.nix
+++ b/pkgs/development/cuda-modules/write-gpu-python-test.nix
@@ -2,16 +2,40 @@
   lib,
   writers,
   runCommand,
+  python3Packages,
 }:
 {
   feature ? "cuda",
   name ? feature,
-  libraries ? [ ],
+  libraries ? [ ], # [PythonPackage] | (PackageSet -> [PythonPackage])
 }:
+
+let
+  inherit (builtins) isFunction all;
+  librariesFun = if isFunction libraries then libraries else (_: libraries);
+in
+
+assert lib.assertMsg (
+  isFunction libraries || all (python3Packages.hasPythonModule) libraries
+) "writeGpuTestPython was passed `libraries` from the wrong python release";
+
 content:
 
 let
-  tester = writers.writePython3Bin "tester-${name}" { inherit libraries; } content;
+  interpreter = python3Packages.python.withPackages librariesFun;
+  tester =
+    runCommand "tester-${name}"
+      {
+        inherit content;
+        passAsFile = [ "content" ];
+      }
+      ''
+        mkdir -p "$out"/bin
+        cat << EOF >"$out"/bin/"tester-${name}"
+        #!${lib.getExe interpreter}
+        EOF
+        cat "$contentPath" >>"$out"/bin/"tester-${name}"
+      '';
   tester' = tester.overrideAttrs (oldAttrs: {
     passthru.gpuCheck =
       runCommand "test-${name}"

From 2d5e573acf2af54df6a8d6bcc4dc5dce639b2d72 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sat, 20 Jul 2024 12:03:36 +0000
Subject: [PATCH 39/51] cudaPackages.writeGpuTestPython: sync the attr and the
 filesystem paths

---
 .../{write-gpu-python-test.nix => write-gpu-test-python.nix}    | 0
 pkgs/top-level/cuda-packages.nix                                | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/cuda-modules/{write-gpu-python-test.nix => write-gpu-test-python.nix} (100%)

diff --git a/pkgs/development/cuda-modules/write-gpu-python-test.nix b/pkgs/development/cuda-modules/write-gpu-test-python.nix
similarity index 100%
rename from pkgs/development/cuda-modules/write-gpu-python-test.nix
rename to pkgs/development/cuda-modules/write-gpu-test-python.nix
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 5540b89f1b98..639fa70446be 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -81,7 +81,7 @@ let
     nccl = final.callPackage ../development/cuda-modules/nccl { };
     nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { };
 
-    writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-python-test.nix { };
+    writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-test-python.nix { };
   });
 
   mkVersionedPackageName =

From 904c5631f5506b90d3b72a34b0a73cfc92bc0290 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 20 Jul 2024 00:33:29 -0400
Subject: [PATCH 40/51] gnome-font-viewer: fix build with clang 16

---
 pkgs/by-name/gn/gnome-font-viewer/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix
index ddb98b787099..c97bad1879b8 100644
--- a/pkgs/by-name/gn/gnome-font-viewer/package.nix
+++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, fetchpatch2
 , meson
 , ninja
 , gettext
@@ -25,6 +26,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w=";
   };
 
+  patches = lib.optionals stdenv.cc.isClang [
+    # Fixes an incompatible function pointer error when building with clang 16
+    (fetchpatch2 {
+      url = "https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/565d795731471c27542bb9ee60820a2d0d15534e.diff";
+      hash = "sha256-8dgOVTx6ZbvXROlIWTZU2xNWJ11LlJykRs699cgZqow=";
+    })
+  ];
+
   doCheck = true;
 
   nativeBuildInputs = [

From e863b5843a3223998adf3f634aa1e6e7af0db6d4 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sat, 20 Jul 2024 13:05:15 +0000
Subject: [PATCH 41/51] cudaPackages.writeGpuTestPython: accept makeWrapperArgs

---
 .../cuda-modules/write-gpu-test-python.nix    | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/cuda-modules/write-gpu-test-python.nix b/pkgs/development/cuda-modules/write-gpu-test-python.nix
index 10b10fa3f923..23282e916929 100644
--- a/pkgs/development/cuda-modules/write-gpu-test-python.nix
+++ b/pkgs/development/cuda-modules/write-gpu-test-python.nix
@@ -1,14 +1,15 @@
 {
   lib,
-  writers,
   runCommand,
   python3Packages,
+  makeWrapper,
 }:
 {
   feature ? "cuda",
-  name ? feature,
+  name ? if feature == null then "cpu" else feature,
   libraries ? [ ], # [PythonPackage] | (PackageSet -> [PythonPackage])
-}:
+  ...
+}@args:
 
 let
   inherit (builtins) isFunction all;
@@ -25,23 +26,35 @@ let
   interpreter = python3Packages.python.withPackages librariesFun;
   tester =
     runCommand "tester-${name}"
-      {
-        inherit content;
-        passAsFile = [ "content" ];
-      }
+      (
+        lib.removeAttrs args [
+          "libraries"
+          "name"
+        ]
+        // {
+          inherit content;
+          nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ makeWrapper ];
+          passAsFile = args.passAsFile or [ ] ++ [ "content" ];
+        }
+      )
       ''
         mkdir -p "$out"/bin
-        cat << EOF >"$out"/bin/"tester-${name}"
+        cat << EOF >"$out/bin/$name"
         #!${lib.getExe interpreter}
         EOF
-        cat "$contentPath" >>"$out"/bin/"tester-${name}"
+        cat "$contentPath" >>"$out/bin/$name"
+        chmod +x "$out/bin/$name"
+
+        if [[ -n "''${makeWrapperArgs+''${makeWrapperArgs[@]}}" ]] ; then
+          wrapProgram "$out/bin/$name" ''${makeWrapperArgs[@]}
+        fi
       '';
   tester' = tester.overrideAttrs (oldAttrs: {
     passthru.gpuCheck =
       runCommand "test-${name}"
         {
           nativeBuildInputs = [ tester' ];
-          requiredSystemFeatures = [ feature ];
+          requiredSystemFeatures = lib.optionals (feature != null) [ feature ];
         }
         ''
           set -e

From 3b76c33407a6b09d78b70717f43a2b32eda35902 Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sat, 20 Jul 2024 12:05:16 +0000
Subject: [PATCH 42/51] python311Packages.torch.tests.tester-*Available:
 unbreak for non-default python package sets

---
 .../python-modules/torch/mk-runtime-check.nix          |  7 ++++---
 pkgs/development/python-modules/torch/tests.nix        | 10 +++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/torch/mk-runtime-check.nix b/pkgs/development/python-modules/torch/mk-runtime-check.nix
index 14560b06f87c..61180a19aaba 100644
--- a/pkgs/development/python-modules/torch/mk-runtime-check.nix
+++ b/pkgs/development/python-modules/torch/mk-runtime-check.nix
@@ -1,14 +1,15 @@
 {
   cudaPackages,
   feature,
-  torch,
+  libraries,
   versionAttr,
+  pythonPackages,
 }:
 
-cudaPackages.writeGpuTestPython
+(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; })
   {
     inherit feature;
-    libraries = [ torch ];
+    inherit libraries;
     name = "${feature}Available";
   }
   ''
diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests.nix
index 76b901cbcea9..92ddccccbaeb 100644
--- a/pkgs/development/python-modules/torch/tests.nix
+++ b/pkgs/development/python-modules/torch/tests.nix
@@ -1,8 +1,4 @@
-{
-  callPackage,
-  torchWithCuda,
-  torchWithRocm,
-}:
+{ callPackage }:
 
 {
   # To perform the runtime check use either
@@ -11,11 +7,11 @@
   tester-cudaAvailable = callPackage ./mk-runtime-check.nix {
     feature = "cuda";
     versionAttr = "cuda";
-    torch = torchWithCuda;
+    libraries = ps: [ ps.torchWithCuda ];
   };
   tester-rocmAvailable = callPackage ./mk-runtime-check.nix {
     feature = "rocm";
     versionAttr = "hip";
-    torch = torchWithRocm;
+    libraries = ps: [ ps.torchWithRocm ];
   };
 }

From 2cc58226b0205fae68ff9266aa6edef09df06f6d Mon Sep 17 00:00:00 2001
From: Someone Serge <sergei.kozlukov@aalto.fi>
Date: Sat, 20 Jul 2024 12:05:52 +0000
Subject: [PATCH 43/51] python3Packages.torch.tests.*compile*: init

---
 .../torch/mk-torch-compile-check.nix          | 38 +++++++++++++++++++
 .../python-modules/torch/tests.nix            | 16 +++++++-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/torch/mk-torch-compile-check.nix

diff --git a/pkgs/development/python-modules/torch/mk-torch-compile-check.nix b/pkgs/development/python-modules/torch/mk-torch-compile-check.nix
new file mode 100644
index 000000000000..268ed5297da9
--- /dev/null
+++ b/pkgs/development/python-modules/torch/mk-torch-compile-check.nix
@@ -0,0 +1,38 @@
+{
+  cudaPackages,
+  feature ? null,
+  lib,
+  libraries,
+  name ? if feature == null then "torch-compile-cpu" else "torch-compile-${feature}",
+  pythonPackages,
+  stdenv,
+}:
+let
+  deviceStr = if feature == null then "" else '', device="cuda"'';
+in
+(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; })
+  {
+    inherit name feature libraries;
+    makeWrapperArgs = [
+      "--suffix"
+      "PATH"
+      ":"
+      "${lib.getBin stdenv.cc}/bin"
+    ];
+  }
+  ''
+    import torch
+
+
+    @torch.compile
+    def opt_foo2(x, y):
+        a = torch.sin(x)
+        b = torch.cos(y)
+        return a + b
+
+
+    print(
+      opt_foo2(
+        torch.randn(10, 10${deviceStr}),
+        torch.randn(10, 10${deviceStr})))
+  ''
diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests.nix
index 92ddccccbaeb..e3f2ca44ba5a 100644
--- a/pkgs/development/python-modules/torch/tests.nix
+++ b/pkgs/development/python-modules/torch/tests.nix
@@ -1,6 +1,6 @@
 { callPackage }:
 
-{
+rec {
   # To perform the runtime check use either
   # `nix run .#python3Packages.torch.tests.tester-cudaAvailable` (outside the sandbox), or
   # `nix build .#python3Packages.torch.tests.tester-cudaAvailable.gpuCheck` (in a relaxed sandbox)
@@ -14,4 +14,18 @@
     versionAttr = "hip";
     libraries = ps: [ ps.torchWithRocm ];
   };
+
+  compileCpu = tester-compileCpu.gpuCheck;
+  tester-compileCpu = callPackage ./mk-torch-compile-check.nix {
+    feature = null;
+    libraries = ps: [ ps.torch ];
+  };
+  tester-compileCuda = callPackage ./mk-torch-compile-check.nix {
+    feature = "cuda";
+    libraries = ps: [ ps.torchWithCuda ];
+  };
+  tester-compileRocm = callPackage ./mk-torch-compile-check.nix {
+    feature = "rocm";
+    libraries = ps: [ ps.torchWithRocm ];
+  };
 }

From 58b9659b655cf540a66e25bcaa0ba4b0e89cf428 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Fri, 19 Jul 2024 23:15:40 -0400
Subject: [PATCH 44/51] bustle: use gettext from nixpkgs

The vendored gettext fails to build with clang 16 on Darwin. The gettext in nixpkgs works.
---
 pkgs/by-name/bu/bustle/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix
index 1e57c9122f8a..a6e3e6474729 100644
--- a/pkgs/by-name/bu/bustle/package.nix
+++ b/pkgs/by-name/bu/bustle/package.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitLab
+, buildPackages
 , cargo
 , meson
 , ninja
@@ -9,9 +10,12 @@
 , rustPlatform
 , rustc
 , wrapGAppsHook4
+, darwin
+, gettext
 , glib
 , gtk4
 , libadwaita
+, libiconv
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -32,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4=";
   };
 
+  env = lib.optionalAttrs stdenv.isDarwin {
+    # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one.
+    # The vendored gettext does not build with clang 16.
+    GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin";
+    GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
+    GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib";
+  };
+
   nativeBuildInputs = [
     cargo
     meson
@@ -48,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk4
     libadwaita
+  ] ++ lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Foundation
+    libiconv
   ];
 
   meta = with lib; {

From 88cf071fb903118e21b1d2aae996ad3f4a36f215 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 05:12:21 +0000
Subject: [PATCH 45/51] vscodium: 1.90.2.24171 -> 1.91.1.24193

---
 pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index c1f275b6911e..072c1a1ca5c5 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,11 +15,11 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr";
-    x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9";
-    aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q";
-    aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7";
-    armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr";
+    x86_64-linux = "0am2g0vpb2fgqqs9m5v9dx8w47l2xnjy7bf3rr0bjr4yv4qn7g0n";
+    x86_64-darwin = "0520kpdfa2k1qlgnmnzisbbq0n4h119nfgnaljymsviw1ix02v7k";
+    aarch64-linux = "0r6sqyfcj3qs2iqpfhdjcd8jfazkmyxx0f92qpxlc6a5gllm3hlj";
+    aarch64-darwin = "03b0akbkmqp1fm6i61dx09lln8m3598xigi4wr0rkdsy0yq2vpl8";
+    armv7l-linux = "1sdml7bhrrn2qskhzs4ymibq7cw4nhjimxi8fmaj94dk5yri4wd3";
   }.${system} or throwSystem;
 
   sourceRoot = lib.optionalString (!stdenv.isDarwin) ".";
@@ -29,7 +29,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.90.2.24171";
+    version = "1.91.1.24193";
     pname = "vscodium";
 
     executableName = "codium";

From 8afba669e2a9c116f06e8852495a71cb2462343d Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Tue, 7 May 2024 22:46:23 +0200
Subject: [PATCH 46/51] nixos/wrappers: use normal mount for /run/wrappers

We want to get rid of specialFileSystems / earlyMountScript eventually and
there is no need to run this before systemd anymore now that
the wrappers themselves are set up in a systemd unit since https://github.com/NixOS/nixpkgs/pull/263203

Also this is needed to make soft-reboot work. We want to make sure
that we remount /run/wrappers with the nosuid bit removed on soft-reboot
but because @earlyMountScript@ happens in initrd, this wouldn't happen
---
 nixos/modules/security/wrappers/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix
index 606b620ef120..b5dae96d79c6 100644
--- a/nixos/modules/security/wrappers/default.nix
+++ b/nixos/modules/security/wrappers/default.nix
@@ -255,11 +255,6 @@ in
         umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount";
       };
 
-    boot.specialFileSystems.${parentWrapperDir} = {
-      fsType = "tmpfs";
-      options = [ "nodev" "mode=755" "size=${config.security.wrapperDirSize}" ];
-    };
-
     # Make sure our wrapperDir exports to the PATH env variable when
     # initializing the shell
     environment.extraInit = ''
@@ -275,6 +270,17 @@ in
       mrpx ${wrap.source},
     '') wrappers;
 
+    systemd.mounts = [{
+      where = parentWrapperDir;
+      what = "tmpfs";
+      type = "tmpfs";
+      options = lib.concatStringsSep "," ([
+        "nodev"
+        "mode=755"
+        "size=${config.security.wrapperDirSize}"
+      ]);
+    }];
+
     systemd.services.suid-sgid-wrappers = {
       description = "Create SUID/SGID Wrappers";
       wantedBy = [ "sysinit.target" ];

From 28555fca2a873315cf415523da6e7f1bd9fd9964 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 01:43:32 +0000
Subject: [PATCH 47/51] xdg-desktop-portal-xapp: 1.0.7 -> 1.0.8

---
 .../development/libraries/xdg-desktop-portal-xapp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
index 8675bab269c0..d8659de53782 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-xapp";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = "xdg-desktop-portal-xapp";
     rev = version;
-    hash = "sha256-1Q00aEWl/mk37NcBJPgg443V1IXmNaJcSlilzvAJ1QQ=";
+    hash = "sha256-e8yfFL09nztFF6FZpnT0JZyPSQCPQEI76Q29V1b0gs8=";
   };
 
   nativeBuildInputs = [

From 066e65c2f0c6e6bbe05efecf2d09c6ecc1227066 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 01:39:32 +0000
Subject: [PATCH 48/51] cinnamon.pix: 3.4.1 -> 3.4.2

Also enable optional brasero / colord support.

https://github.com/linuxmint/pix/compare/3.4.1...3.4.2
---
 pkgs/desktops/cinnamon/pix/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix
index 8d74bdbe7122..ca16fe960dca 100644
--- a/pkgs/desktops/cinnamon/pix/default.nix
+++ b/pkgs/desktops/cinnamon/pix/default.nix
@@ -4,6 +4,8 @@
 , pkg-config
 , meson
 , ninja
+, brasero
+, colord
 , exiv2
 , libheif
 , libjpeg
@@ -17,10 +19,10 @@
 , gsettings-desktop-schemas
 , librsvg
 , libwebp
+, libX11
 , lcms2
 , bison
 , flex
-, clutter-gtk
 , wrapGAppsHook3
 , shared-mime-info
 , python3
@@ -31,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pix";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-QkgjUzoBOXE3mxXy/Lq3YkHq7f9oE97FeP7PHIBDHvc=";
+    sha256 = "sha256-Ra+5hXSNPRc2LvTeEYwg1xSnIYgrpfvTrpPwzuTXhdU=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +55,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    clutter-gtk
+    brasero
+    colord
     exiv2
     glib
     gsettings-desktop-schemas
@@ -72,6 +75,7 @@ stdenv.mkDerivation rec {
     libsecret
     libtiff
     libwebp
+    libX11
     xapp
   ];
 

From de83d38d29d9d2634c5c7a66ff95f10ad2e6d32c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 02:05:02 +0000
Subject: [PATCH 49/51] cinnamon.cinnamon-session: 6.2.0 -> 6.2.1

---
 pkgs/desktops/cinnamon/cinnamon-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix
index a7262b2f937c..835e4af12b58 100644
--- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix
+++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix
@@ -32,13 +32,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "cinnamon-session";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-2KQJNUc/uvbXnqqV0Yt3cltTHNbCo+wK67NXlid02Sk=";
+    hash = "sha256-mr+QOFogzoloasGt1uK6zH/KHuH+uWYzXAZxPYkW57A=";
   };
 
   patches = [

From 595151c300fb8d3b9f7be552d9552e0016ab77f0 Mon Sep 17 00:00:00 2001
From: A1ca7raz <7345998+A1ca7raz@users.noreply.github.com>
Date: Sat, 20 Jul 2024 22:01:38 +0800
Subject: [PATCH 50/51] applet-window-buttons6: init at 0.13.0

---
 pkgs/kde/default.nix                          |  1 +
 .../applet-window-buttons6/default.nix        | 44 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/kde/third-party/applet-window-buttons6/default.nix

diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix
index 6fd2d2232c5d..6f80e4eaadb4 100644
--- a/pkgs/kde/default.nix
+++ b/pkgs/kde/default.nix
@@ -61,6 +61,7 @@
       libmediawiki = null;
 
       alpaka = self.callPackage ./misc/alpaka {};
+      applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {};
       kdiagram = self.callPackage ./misc/kdiagram {};
       kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {};
       kirigami-addons = self.callPackage ./misc/kirigami-addons {};
diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix
new file mode 100644
index 000000000000..3f157eb2f5b0
--- /dev/null
+++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix
@@ -0,0 +1,44 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, cmake
+, extra-cmake-modules
+, kcoreaddons
+, kdeclarative
+, kdecoration
+, libplasma
+}:
+
+stdenv.mkDerivation rec {
+  pname = "applet-window-buttons6";
+  version = "0.13.0";
+
+  src = fetchFromGitHub {
+    owner = "moodyhunter";
+    repo = "applet-window-buttons6";
+    rev = "v${version}";
+    hash = "sha256-S7JcDPo4QDqi/RtvreFNoPKwTg14bgaFGsuGSDxs5nM=";
+  };
+
+  dontWrapQtApps = true;
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kcoreaddons
+    kdeclarative
+    kdecoration
+    libplasma
+  ];
+
+  meta = with lib; {
+    description = "Plasma 6 applet in order to show window buttons in your panels";
+    homepage = "https://github.com/moodyhunter/applet-window-buttons6";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ A1ca7raz ];
+  };
+}

From e79bacd1e736ce27f576b9ce2c8d76d779f613eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Jul 2024 17:07:14 +0000
Subject: [PATCH 51/51] iosevka: 30.3.2 -> 30.3.3

---
 pkgs/data/fonts/iosevka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index b684843c34a2..64da2cb722a6 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "30.3.2";
+  version = "30.3.3";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-Ksd1REqCe+42hpIwikIeKNYIYaHc5hqxuny8lYRuQcY=";
+    hash = "sha256-vbtcnBj+mYqUBUpyDXDjoz1elL5xPybZ60DBA3iFRME=";
   };
 
-  npmDepsHash = "sha256-8IyQK1eoVwq6E/HZkavLSRXiZst3LuyDIPc8D/yMD9E=";
+  npmDepsHash = "sha256-5PTwvwGQKIL22BDq252DGddsXodaYlXUr0PiejFW+28=";
 
   nativeBuildInputs = [
     remarshal