From 83da4f513d8880707ef3886523539340f12b9426 Mon Sep 17 00:00:00 2001
From: j-brn <me@jbrn.eu>
Date: Tue, 30 Jul 2024 22:10:06 +0200
Subject: [PATCH 01/20] kvmfr: fix build for linux-6_10

---
 pkgs/os-specific/linux/kvmfr/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix
index 3224fc137db1..77739f06cc17 100644
--- a/pkgs/os-specific/linux/kvmfr/default.nix
+++ b/pkgs/os-specific/linux/kvmfr/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, kernel, looking-glass-client }:
+{ lib, stdenv, fetchpatch, kernel, looking-glass-client }:
 
 stdenv.mkDerivation {
   pname = "kvmfr";
@@ -9,6 +9,15 @@ stdenv.mkDerivation {
   hardeningDisable = [ "pic" "format" ];
   nativeBuildInputs = kernel.moduleBuildDependencies;
 
+  patches = [
+    # fix build for linux-6_10
+    (fetchpatch {
+      url = "https://github.com/gnif/LookingGlass/commit/7305ce36af211220419eeab302ff28793d515df2.patch";
+      hash = "sha256-97nZsIH+jKCvSIPf1XPf3i8Wbr24almFZzMOhjhLOYk=";
+      stripLen = 1;
+    })
+  ];
+
   makeFlags = [
     "KVER=${kernel.modDirVersion}"
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"

From 1b640cc0e4468628d180f7911efae0ba7b3c8580 Mon Sep 17 00:00:00 2001
From: j-brn <me@jbrn.eu>
Date: Tue, 30 Jul 2024 22:16:37 +0200
Subject: [PATCH 02/20] looking-glass-client: replace patch file with
 fetchpatch

---
 ...e-X11-config-directives-to-displayse.patch | 57 -------------------
 .../looking-glass-client/default.nix          |  7 ++-
 2 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch

diff --git a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch b/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch
deleted file mode 100644
index b044fb47c2e1..000000000000
--- a/pkgs/applications/virtualization/looking-glass-client/0001-client-cmake-move-X11-config-directives-to-displayse.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Geoffrey McRae <geoff@hostfission.com>
-Date: Wed, 13 Mar 2024 11:17:25 +1100
-Subject: [PATCH] [client] cmake: move X11 config directives to
- `displayservers`
-
----
- client/CMakeLists.txt                | 7 -------
- client/displayservers/CMakeLists.txt | 7 +++++++
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git client/CMakeLists.txt client/CMakeLists.txt
-index 3755adcf..eeeb3eb0 100644
---- client/CMakeLists.txt
-+++ client/CMakeLists.txt
-@@ -42,19 +42,12 @@ add_feature_info(ENABLE_ASAN ENABLE_ASAN "AddressSanitizer support.")
- option(ENABLE_UBSAN "Build with UndefinedBehaviorSanitizer" OFF)
- add_feature_info(ENABLE_UBSAN ENABLE_UBSAN "UndefinedBehaviorSanitizer support.")
-
--option(ENABLE_X11 "Build with X11 support" ON)
--add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")
--
- option(ENABLE_PIPEWIRE "Build with PipeWire audio output support" ON)
- add_feature_info(ENABLE_PIPEWIRE ENABLE_PIPEWIRE "PipeWire audio support.")
-
- option(ENABLE_PULSEAUDIO "Build with PulseAudio audio output support" ON)
- add_feature_info(ENABLE_PULSEAUDIO ENABLE_PULSEAUDIO "PulseAudio audio support.")
-
--if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)
--  message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")
--endif()
--
- add_compile_options(
-   "-Wall"
-   "-Wextra"
-diff --git client/displayservers/CMakeLists.txt client/displayservers/CMakeLists.txt
-index 5b5f827a..e7c4b25a 100644
---- client/displayservers/CMakeLists.txt
-+++ client/displayservers/CMakeLists.txt
-@@ -18,9 +18,16 @@ function(add_displayserver name)
-   add_subdirectory(${name})
- endfunction()
-
-+option(ENABLE_X11 "Build with X11 support" ON)
-+add_feature_info(ENABLE_X11 ENABLE_X11 "X11 support.")
-+
- option(ENABLE_WAYLAND "Build with Wayland support" ON)
- add_feature_info(ENABLE_WAYLAND ENABLE_WAYLAND "Wayland support.")
-
-+if (NOT ENABLE_X11 AND NOT ENABLE_WAYLAND)
-+  message(FATAL_ERROR "Either ENABLE_X11 or ENABLE_WAYLAND must be on")
-+endif()
-+
- # Add/remove displayservers here!
- if (ENABLE_WAYLAND)
-   add_displayserver(Wayland)
---
-2.43.1
diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix
index 62e65aec3ad8..5c5976fc493b 100644
--- a/pkgs/applications/virtualization/looking-glass-client/default.nix
+++ b/pkgs/applications/virtualization/looking-glass-client/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , lib
+, fetchpatch
 , fetchFromGitHub
 , makeDesktopItem
 , pkg-config
@@ -61,7 +62,11 @@ stdenv.mkDerivation rec {
 
   patches = [
     # Fix failing cmake assertion when disabling X11 whithout explicitly enabling Wayland.
-    ./0001-client-cmake-move-X11-config-directives-to-displayse.patch
+    (fetchpatch {
+      url = "https://github.com/gnif/LookingGlass/commit/20972cfd9b940fddf9e7f3d2887a271d16398979.patch";
+      hash = "sha256-CqB8AmOZ4YxnEsQkyu/ZEaun6ywpSh4B7PM+MFJF0qU=";
+      stripLen = 1;
+    })
   ];
 
   nativeBuildInputs = [ cmake pkg-config ];

From 71142ee93bde866d7790552d6d4a4e07b4baf849 Mon Sep 17 00:00:00 2001
From: j-brn <me@jbrn.eu>
Date: Wed, 28 Aug 2024 21:05:22 +0200
Subject: [PATCH 03/20] kvmfr: backport security fix for potential buffer
 overflow

---
 pkgs/os-specific/linux/kvmfr/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/kvmfr/default.nix b/pkgs/os-specific/linux/kvmfr/default.nix
index 77739f06cc17..a527351262be 100644
--- a/pkgs/os-specific/linux/kvmfr/default.nix
+++ b/pkgs/os-specific/linux/kvmfr/default.nix
@@ -16,6 +16,14 @@ stdenv.mkDerivation {
       hash = "sha256-97nZsIH+jKCvSIPf1XPf3i8Wbr24almFZzMOhjhLOYk=";
       stripLen = 1;
     })
+
+    # securtiy patch for potential buffer overflow
+    # https://github.com/gnif/LookingGlass/issues/1133
+    (fetchpatch {
+      url = "https://github.com/gnif/LookingGlass/commit/3ea37b86e38a87ee35eefb5d8fcc38b8dc8e2903.patch";
+      hash = "sha256-Kk1gN1uB86ZJA374zmzM9dwwfMZExJcix3hee7ifpp0=";
+      stripLen = 1;
+    })
   ];
 
   makeFlags = [

From 9bc6d2311105f2b46653cb8d39bf4a4c45db1a3c Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Wed, 25 Sep 2024 09:32:41 +0000
Subject: [PATCH 04/20] buildFHSEnvBubblewrap: extraPreBwrapCmds after variable
 initialisation

Prior to this commit it was not possible to modify e.g. the list of ignored directories at all, however given that `buildFHSEnvBubblewrap` effectively uses a sandboxing tool (*bwrap*) I feel like this is a missed opportunity.
The code in nixpkgs already covers all the knobs that are required to get *Nix* itself to run inside bubblewrap, so why not allow users to make that additional modification?
While additional `ro_mounts` and such can be *added* to the bubblewrap invocation, the already mounted directories cannot be removed, and even if shadowed by e.g. a tmpfs mount, this would still allow something inside the sandbox to potentially unmount the tmpfs and access the data.

So what this change does is moving the snippet where custom code can be injected down by four lines so that users can actually modify those variables e.g. using `ignored+=( /home /srv /mnt /boot )`.
The only cases in which this would break is:

- someone using those variable names in `extraPreBwrapCmds` already and relying on them being overwritten; I would consider that chance slim, and the fix would be easy enough
- someone using a construct like `false && \` to disable the `ignored` initialisation and effectively working around this limitation; again the chances are slim (even though I know I'd be affected), and the fix would be easy enough (as this change makes the workaround needless anyway so it's an improvement)

Signed-off-by: benaryorg <binary@benary.org>
---
 pkgs/build-support/build-fhsenv-bubblewrap/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
index 398a99e80e8c..25fcabf7a408 100644
--- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
+++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix
@@ -125,12 +125,13 @@ let
 
   indentLines = str: concatLines (map (s: "  " + s) (filter (s: s != "") (splitString "\n" str)));
   bwrapCmd = { initArgs ? "" }: ''
-    ${extraPreBwrapCmds}
     ignored=(/nix /dev /proc /etc ${optionalString privateTmp "/tmp"})
     ro_mounts=()
     symlinks=()
     etc_ignored=()
 
+    ${extraPreBwrapCmds}
+
     # loop through all entries of root in the fhs environment, except its /etc.
     for i in ${fhsenv}/*; do
       path="/''${i##*/}"

From 9c168f7c8d8bd8628c82d0852b98e8cd66935a0c Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Wed, 2 Oct 2024 18:26:06 +0300
Subject: [PATCH 05/20] arc-browser: 1.61.0-53949 -> 1.61.2-54148

Changelog: https://arc.net/e/3661425B-9A2A-4947-B64C-6599CF11FE53
---
 pkgs/by-name/ar/arc-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index ec1c9db783fb..2956a9ed021e 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.61.0-53949";
+  version = "1.61.2-54148";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-FuRWi4+vPt31bd3muMDEn3Fu20h9oWEd1XuPJU7W1OU=";
+    hash = "sha256-y5oQFPdk6Y7AjzeTrA2U8MhGkPi6RJUcGqsvpjJ++UE=";
   };
 
   nativeBuildInputs = [ undmg ];

From f388f87efa52b57a83d940fb5aa5a4d488bce1f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 2 Oct 2024 16:27:56 +0000
Subject: [PATCH 06/20] rpcs3: 0.0.33-16959-60b5adab6 -> 0.0.33-16999-938306a7b

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

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 83bf017a6654..12942225207d 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -33,10 +33,10 @@
 
 let
   # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "16959-60b5adab6";
-  rpcs3Version = "0.0.33-16959-60b5adab6";
-  rpcs3Revision = "60b5adab636f0cef6987165b38b42cbd7b2a9768";
-  rpcs3Hash = "sha256-0/cNiPUnjuik6YyiNeZ5ZAZBExex5WVW56PCzm80Xx8=";
+  rpcs3GitVersion = "16999-938306a7b";
+  rpcs3Version = "0.0.33-16999-938306a7b";
+  rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f";
+  rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34=";
 
   inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
 in

From 6e8fc5515afc6c2e6ee8b5c5ccd4f163ac54bc32 Mon Sep 17 00:00:00 2001
From: Plurpio <148961679+plurpio@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:08:46 +1000
Subject: [PATCH 07/20] onedrive: 1.5.1 -> 1.5.2

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

diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index e4f51c53c818..ae59c1c10ac9 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "onedrive";
-  version = "2.5.1";
+  version = "2.5.2";
 
   src = fetchFromGitHub {
     owner = "abraunegg";
     repo = "onedrive";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-up7o1myrQutDOEX98rkMlxJZs+Wzaf9HkOYNsX/JC4s=";
+    hash = "sha256-neJi5lIx45GsuwZPzzwwEm1bfrL2DFSysVkxa4fCBww";
   };
 
   outputs = [

From 7c2ece28c87c3f1c8ca2c8536a6ea53d49eb2f43 Mon Sep 17 00:00:00 2001
From: amesgen <amesgen@amesgen.de>
Date: Fri, 4 Oct 2024 00:59:51 +0200
Subject: [PATCH 08/20] rustls-ffi: remove superseded non-by-name version

---
 .../libraries/rustls-ffi/default.nix          | 52 -------------------
 1 file changed, 52 deletions(-)
 delete mode 100644 pkgs/development/libraries/rustls-ffi/default.nix

diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix
deleted file mode 100644
index 92dffbc2682f..000000000000
--- a/pkgs/development/libraries/rustls-ffi/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  rustPlatform,
-  Security,
-  apacheHttpd,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "rustls-ffi";
-  version = "0.10.0";
-
-  src = fetchFromGitHub {
-    owner = "rustls";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-IDIWN5g1aaE6SDdXSm4WYK6n+BpuypPYQITuDj1WJEc=";
-  };
-
-  propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
-
-  cargoLock.lockFile = ./Cargo.lock;
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    make install DESTDIR=${placeholder "out"}
-
-    runHook postInstall
-  '';
-
-  passthru.tests = {
-    apacheHttpd = apacheHttpd.override { modTlsSupport = true; };
-    # Currently broken notably because of https://github.com/curl/curl/issues/13248
-    # curl = curl.override { opensslSupport = false; rustlsSupport = true; };
-  };
-
-  meta = with lib; {
-    description = "C-to-rustls bindings";
-    homepage = "https://github.com/rustls/rustls-ffi/";
-    license = with lib.licenses; [
-      mit
-      asl20
-      isc
-    ];
-    maintainers = [ maintainers.lesuisse ];
-  };
-}

From cc27cb939897bc168810bfce79e3ace88bddb18d Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 4 Oct 2024 23:36:23 +0800
Subject: [PATCH 09/20] pantheon.elementary-photos: 8.0.0 -> 8.0.1

https://github.com/elementary/photos/compare/8.0.0...8.0.1
---
 .../pantheon/apps/elementary-photos/default.nix       | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
index 8d7a4afb69de..7e3794083f34 100644
--- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix
@@ -19,27 +19,25 @@
 , libgudev
 , libraw
 , sqlite
-, python3
 , libwebp
 , wrapGAppsHook3
 }:
 
 stdenv.mkDerivation rec {
   pname = "elementary-photos";
-  version = "8.0.0";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "photos";
     rev = version;
-    sha256 = "sha256-EULNLtoZ8M68cp1DT11G6O2TONH/0DXWNX0k4AUqa/w=";
+    sha256 = "sha256-+aqBeGRisngbH/EALROTr0IZvyrWIlQvFFEgJNfv95Y=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
     pkg-config
-    python3
     vala
     wrapGAppsHook3
   ];
@@ -66,11 +64,6 @@ stdenv.mkDerivation rec {
     gstreamer
   ]);
 
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
   passthru = {
     updateScript = nix-update-script { };
   };

From 58e29b3bd32c8c25885197b9c3f03653e305d614 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 3 Oct 2024 12:27:27 +0000
Subject: [PATCH 10/20] bundletool: modernized derivation and formatted via
 nixfmt-rfc-style

- Removed rec
- Removed with lib;
- Formatted via nixfmt-rfc-style
- Added @momeemt to maintainers

Co-authored-by: OTABI Tomoya <tomoya.otabi@gmail.com>
---
 pkgs/development/tools/bundletool/default.nix | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix
index 0a7629958227..da40101e5523 100644
--- a/pkgs/development/tools/bundletool/default.nix
+++ b/pkgs/development/tools/bundletool/default.nix
@@ -1,11 +1,17 @@
-{ lib, stdenvNoCC, fetchurl, makeBinaryWrapper, jre_headless }:
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  makeBinaryWrapper,
+  jre_headless,
+}:
 
-stdenvNoCC.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "bundletool";
   version = "1.17.1";
 
   src = fetchurl {
-    url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar";
+    url = "https://github.com/google/bundletool/releases/download/${finalAttrs.version}/bundletool-all-${finalAttrs.version}.jar";
     sha256 = "sha256-RYgerRM4iHLYLEJVsZVIi3/DPyysWpqXewr8XpI2dZI=";
   };
 
@@ -19,14 +25,14 @@ stdenvNoCC.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool to manipulate Android App Bundles";
     mainProgram = "bundletool";
     homepage = "https://developer.android.com/studio/command-line/bundletool";
-    changelog = "https://github.com/google/bundletool/releases/tag/${version}";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    maintainers = [ ];
+    changelog = "https://github.com/google/bundletool/releases/tag/${finalAttrs.version}";
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = with lib.maintainers; [ momeemt ];
     platforms = jre_headless.meta.platforms;
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
   };
-}
+})

From 1eec2d3b0c429714eb05ad847a5fd60576fc6eb5 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 3 Oct 2024 12:28:16 +0000
Subject: [PATCH 11/20] bundletool: moved to by-name

---
 .../default.nix => by-name/bu/bundletool/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/bundletool/default.nix => by-name/bu/bundletool/package.nix} (100%)

diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/by-name/bu/bundletool/package.nix
similarity index 100%
rename from pkgs/development/tools/bundletool/default.nix
rename to pkgs/by-name/bu/bundletool/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 20802383bd4c..5d9c392c297f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4217,8 +4217,6 @@ with pkgs;
 
   buildtorrent = callPackage ../tools/misc/buildtorrent { };
 
-  bundletool = callPackage ../development/tools/bundletool { };
-
   bwm_ng = callPackage ../tools/networking/bwm-ng { };
 
   bwbasic = callPackage ../development/interpreters/bwbasic { };

From 347e5caf9a4df17255e1ae1e919465890fb36607 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Oct 2024 16:57:07 +0000
Subject: [PATCH 12/20] okteto: 2.31.0 -> 3.0.0

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

diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 32c8c0c77519..0970b4f0f011 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "okteto";
-  version = "2.31.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     rev = version;
-    hash = "sha256-YY8PWBEd8MV/k0wvXqyFTuNi3mvUnFNm2GrmrFF7TKQ=";
+    hash = "sha256-TxZdHR6SNHrIAdrrg3X9TnWCR8bjos93d7k7eaKpvQ8=";
   };
 
-  vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY=";
+  vendorHash = "sha256-GiA/fmLT9x3gGF066bHTBWDd1yhygeG9snwCpwhOlMM=";
 
   postPatch = ''
     # Disable some tests that need file system & network access.

From c083125fd4490d1c59d971503272495649b87be3 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 5 Oct 2024 00:30:15 +0200
Subject: [PATCH 13/20] octodns-powerdns: 0.0.5 -> 0.0.7

https://github.com/octodns/octodns-powerdns/compare/v0.0.5...v0.0.7
---
 .../networking/octodns/providers/powerdns/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/pkgs/tools/networking/octodns/providers/powerdns/default.nix
index d1c39b628da1..8278e6ea8537 100644
--- a/pkgs/tools/networking/octodns/providers/powerdns/default.nix
+++ b/pkgs/tools/networking/octodns/providers/powerdns/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "octodns-powerdns";
-  version = "0.0.5";
+  version = "0.0.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,15 +19,15 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns-powerdns";
-    rev = "v${version}";
-    hash = "sha256-jt0+JnpCgvsoqMcC9mANX7uq2WPTiI2JQjwQi7LGWj0=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-wa/SHyTfj+iHnTq8t+3yzyGn+YULOdI88Aii16qPwPM=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     octodns
     requests
   ];

From 8c2c39098ea900c7537e47f91ed8ef50e348717b Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 5 Oct 2024 00:27:40 +0200
Subject: [PATCH 14/20] octodns: 1.4.0 -> 1.9.1

https://github.com/octodns/octodns/compare/v1.4.0...v1.9.1
---
 pkgs/tools/networking/octodns/default.nix | 54 ++++++++++++-----------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix
index f298e7f4f75e..0cfc80cef907 100644
--- a/pkgs/tools/networking/octodns/default.nix
+++ b/pkgs/tools/networking/octodns/default.nix
@@ -1,22 +1,23 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, setuptools
-, pytestCheckHook
-, dnspython
-, fqdn
-, idna
-, natsort
-, python-dateutil
-, pyyaml
-, python
-, runCommand
+{
+  lib,
+  buildPythonPackage,
+  dnspython,
+  fetchFromGitHub,
+  fqdn,
+  idna,
+  natsort,
+  pytestCheckHook,
+  python-dateutil,
+  python3,
+  pythonOlder,
+  pyyaml,
+  runCommand,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "octodns";
-  version = "1.4.0";
+  version = "1.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,15 +25,15 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "octodns";
     repo = "octodns";
-    rev = "v${version}";
-    hash = "sha256-l4JGodbUmFxHFeEaxgClEozHcbyYP0F2yj5gDqV88IA=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-5EKa5G1rX/BRMMpGd861qTaACa2tBgNrKX52uJPV+N8=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dnspython
     fqdn
     idna
@@ -47,12 +48,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "octodns" ];
 
-  passthru.withProviders = ps: let
-    pyEnv = python.withPackages ps;
-  in runCommand "octodns-with-providers" { } ''
-    mkdir -p $out/bin
-    ln -st $out/bin ${pyEnv}/bin/octodns-*
-  '';
+  passthru.withProviders =
+    ps:
+    let
+      pyEnv = python3.withPackages ps;
+    in
+    runCommand "octodns-with-providers" { } ''
+      mkdir -p $out/bin
+      ln -st $out/bin ${pyEnv}/bin/octodns-*
+    '';
 
   meta = with lib; {
     description = "Tools for managing DNS across multiple providers";

From e00806af791b311ebcbc192975503fdb4d25a613 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 5 Oct 2024 00:28:25 +0200
Subject: [PATCH 15/20] octodns: add anthonyroussel to maintainers

---
 pkgs/tools/networking/octodns/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/octodns/default.nix b/pkgs/tools/networking/octodns/default.nix
index 0cfc80cef907..42c8acf5618e 100644
--- a/pkgs/tools/networking/octodns/default.nix
+++ b/pkgs/tools/networking/octodns/default.nix
@@ -63,6 +63,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/octodns/octodns";
     changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = [ maintainers.anthonyroussel ];
   };
 }

From 94034513bde1733eaedb46dd85ae954279e1461b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Oct 2024 23:59:02 +0000
Subject: [PATCH 16/20] wit-bindgen: 0.32.0 -> 0.33.0

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

diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index 4599629cbeda..7404dd906335 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wit-bindgen";
-  version = "0.32.0";
+  version = "0.33.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
     rev = "v${version}";
-    hash = "sha256-AsKbmJBWIv/NjWzGdjTpbCs+esSkIli08qbEApppvOU=";
+    hash = "sha256-+3tWqNdDZagJa9cLSz1OBaPtCr2F1joYyzB//BPqV34=";
   };
 
-  cargoHash = "sha256-+/7asqF4eXtl+/AhgSf+M3KIVqFf44EHb0FJTT4lo4c=";
+  cargoHash = "sha256-3TrnSU7qXC8INlEZMbYTNwZsqiKMZ6j7tdGmz3DFl1g=";
 
   # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
   # However, GitHub Actions ensures a proper build.

From 9b996f7396eac15575cc132a1c9139ed7d73572e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Oct 2024 23:57:19 +0200
Subject: [PATCH 17/20] nixos/xfce: Fix ambiguous `with`

Pull request 345352 introduces `pkgs.exo`, don't pick up that package.
---
 .../services/x11/desktop-managers/xfce.nix    | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix
index 98d3555ccbc5..8810b5f8c8b0 100644
--- a/nixos/modules/services/x11/desktop-managers/xfce.nix
+++ b/nixos/modules/services/x11/desktop-managers/xfce.nix
@@ -80,7 +80,7 @@ in
   };
 
   config = mkIf cfg.enable {
-    environment.systemPackages = utils.removePackagesByName (with pkgs.xfce // pkgs; [
+    environment.systemPackages = utils.removePackagesByName (with pkgs; [
       glib # for gsettings
       gtk3.out # gtk-update-icon-cache
 
@@ -88,7 +88,7 @@ in
       adwaita-icon-theme
       hicolor-icon-theme
       tango-icon-theme
-      xfce4-icon-theme
+      xfce.xfce4-icon-theme
 
       desktop-file-utils
       shared-mime-info # for update-mime-database
@@ -99,37 +99,37 @@ in
       # Needed by Xfce's xinitrc script
       xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
 
-      exo
-      garcon
-      libxfce4ui
+      xfce.exo
+      xfce.garcon
+      xfce.libxfce4ui
 
-      mousepad
-      parole
-      ristretto
-      xfce4-appfinder
-      xfce4-notifyd
-      xfce4-screenshooter
-      xfce4-session
-      xfce4-settings
-      xfce4-taskmanager
-      xfce4-terminal
+      xfce.mousepad
+      xfce.parole
+      xfce.ristretto
+      xfce.xfce4-appfinder
+      xfce.xfce4-notifyd
+      xfce.xfce4-screenshooter
+      xfce.xfce4-session
+      xfce.xfce4-settings
+      xfce.xfce4-taskmanager
+      xfce.xfce4-terminal
     ] # TODO: NetworkManager doesn't belong here
       ++ optional config.networking.networkmanager.enable networkmanagerapplet
-      ++ optional config.powerManagement.enable xfce4-power-manager
+      ++ optional config.powerManagement.enable xfce.xfce4-power-manager
       ++ optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [
         pavucontrol
         # volume up/down keys support:
         # xfce4-pulseaudio-plugin includes all the functionalities of xfce4-volumed-pulse
         # but can only be used with xfce4-panel, so for no-desktop usage we still include
         # xfce4-volumed-pulse
-        (if cfg.noDesktop then xfce4-volumed-pulse else xfce4-pulseaudio-plugin)
+        (if cfg.noDesktop then xfce.xfce4-volumed-pulse else xfce.xfce4-pulseaudio-plugin)
       ] ++ optionals cfg.enableXfwm [
-        xfwm4
-        xfwm4-themes
+        xfce.xfwm4
+        xfce.xfwm4-themes
       ] ++ optionals (!cfg.noDesktop) [
-        xfce4-panel
-        xfdesktop
-      ] ++ optional cfg.enableScreensaver xfce4-screensaver) excludePackages;
+        xfce.xfce4-panel
+        xfce.xfdesktop
+      ] ++ optional cfg.enableScreensaver xfce.xfce4-screensaver) excludePackages;
 
     programs.gnupg.agent.pinentryPackage = mkDefault pkgs.pinentry-gtk2;
     programs.xfconf.enable = true;

From a12cbb6ddb5c68ac908d77aa01edd015aa64bb09 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 4 Oct 2024 06:25:27 +0100
Subject: [PATCH 18/20] libtorrent: fix updateScript eval

Without the change updater run fails as:

    error: function 'anonymous lambda' called with unexpected argument 'tagPrefix'
---
 pkgs/by-name/li/libtorrent/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libtorrent/package.nix b/pkgs/by-name/li/libtorrent/package.nix
index 2867124b5814..3f3e5a40ea46 100644
--- a/pkgs/by-name/li/libtorrent/package.nix
+++ b/pkgs/by-name/li/libtorrent/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
-  passthru.updateScript = gitUpdater { tagPrefix = "v"; };
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   enableParallelBuilding = true;
 

From 92248b23e5925b7a69108488e1f6d4577eea9f76 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 4 Oct 2024 06:28:51 +0100
Subject: [PATCH 19/20] rtorrent: fix updateScript eval

Without the change updater run fails as:

    error: function 'anonymous lambda' called with unexpected argument 'tagPrefix'
---
 pkgs/by-name/rt/rtorrent/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/rt/rtorrent/package.nix b/pkgs/by-name/rt/rtorrent/package.nix
index 53acbd8ea9f4..b2739defd11b 100644
--- a/pkgs/by-name/rt/rtorrent/package.nix
+++ b/pkgs/by-name/rt/rtorrent/package.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   ];
 
   passthru = {
-    updateScript = gitUpdater { tagPrefix = "v"; };
+    updateScript = gitUpdater { rev-prefix = "v"; };
     tests = {
       inherit (nixosTests) rtorrent;
     };

From a9ba5ff545f0be6c07570e1e7e8572c73453b8ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Oct 2024 05:08:30 +0000
Subject: [PATCH 20/20] python312Packages.msgraph-core: 1.1.4 -> 1.1.5

---
 pkgs/development/python-modules/msgraph-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msgraph-core/default.nix b/pkgs/development/python-modules/msgraph-core/default.nix
index b7bddc916ab8..c2e9a8b653d0 100644
--- a/pkgs/development/python-modules/msgraph-core/default.nix
+++ b/pkgs/development/python-modules/msgraph-core/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "msgraph-core";
-  version = "1.1.4";
+  version = "1.1.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python-core";
     rev = "refs/tags/v${version}";
-    hash = "sha256-r8awjj4yo8BXQ0vZiJW+ky1sTvC04FzcViJY725/P6k=";
+    hash = "sha256-cyqhNpV3gowSDmZhdI3NbbJ1VOwnrJTXZYR/rYNnFVE=";
   };
 
   build-system = [ setuptools ];