From 933ccc51f4a539ad731c062fd347c7235531eb80 Mon Sep 17 00:00:00 2001
From: Robert Krahn <robert.krahn@gmail.com>
Date: Thu, 17 Oct 2024 00:31:44 +0200
Subject: [PATCH 01/28] maintainers: add rksm

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 723f7611268b..10cf084820f9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18250,6 +18250,12 @@
     githubId = 82817;
     name = "Robert Kreuzer";
   };
+  rksm = {
+    email = "robert@kra.hn";
+    github = "rksm";
+    githubId = 467450;
+    name = "Robert Krahn";
+  };
   rlupton20 = {
     email = "richard.lupton@gmail.com";
     github = "rlupton20";

From c3ceedeac1ac9cbf8f0f99d96ff87b56e5dd3df8 Mon Sep 17 00:00:00 2001
From: detroyejr <detroyejr@outlook.com>
Date: Thu, 17 Oct 2024 12:28:41 -0400
Subject: [PATCH 02/28] obs-studio-plugins.obs-hyperion: patch stateChanged
 deprecation

---
 .../plugins/obs-hyperion/check-state-changed.patch  | 13 +++++++++++++
 .../obs-studio/plugins/obs-hyperion/default.nix     |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch
new file mode 100644
index 000000000000..59bf7b4724b5
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/check-state-changed.patch
@@ -0,0 +1,13 @@
+diff --git a/src/HyperionProperties.cpp b/src/HyperionProperties.cpp
+index b585702..3fd308c 100644
+--- a/src/HyperionProperties.cpp
++++ b/src/HyperionProperties.cpp
+@@ -59,7 +59,7 @@ HyperionProperties::HyperionProperties(QWidget *parent)
+ 	signal_handler_connect(handler, "log", logger_message, this);
+ 
+ 	connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::saveSettings);
+-	connect(ui->AutoStart, &QCheckBox::stateChanged, this, &HyperionProperties::saveSettings);
++	connect(ui->AutoStart, &QCheckBox::checkStateChanged, this, &HyperionProperties::saveSettings);
+ 
+ 	connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::onStart);
+ 	connect(ui->ButtonStop, &QPushButton::clicked, this, &HyperionProperties::onStop);
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
index 85606e05f0c1..6fcd7744fe3d 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
+  patches = [ ./check-state-changed.patch ];
+
   cmakeFlags = [
     "-DOBS_SOURCE=${obs-studio.src}"
     "-DGLOBAL_INSTALLATION=ON"

From 6030ff068ad72c6fe0671a113fa19eb7d48816c1 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Thu, 31 Oct 2024 20:00:50 -0600
Subject: [PATCH 03/28] gnuplot: fix build with `withTeXLive = true`

---
 pkgs/tools/graphics/gnuplot/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index c43059c03af5..0646718f4c75 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -49,7 +49,8 @@ in
     (if withX then "--with-x" else "--without-x")
     (if withQt then "--with-qt=qt5" else "--without-qt")
     (if aquaterm then "--with-aquaterm" else "--without-aquaterm")
-  ] ++ lib.optional withCaca "--with-caca";
+  ] ++ lib.optional withCaca "--with-caca"
+    ++ lib.optional withTeXLive "--with-texdir=${placeholder "out"}/share/texmf/tex/latex/gnuplot";
 
   CXXFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin && withQt) "-std=c++11";
 

From 1301e4f0b024dfe7f11b921c798a35dab2d339d5 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 1 Nov 2024 10:07:28 +0000
Subject: [PATCH 04/28] pyamlboot.tests: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix build --no-link -f. pyamlboot.tests
    error:
       … while evaluating the attribute 'version'
         at pkgs/by-name/py/pyamlboot/package.nix:29:3:
           28|
           29|   passthru.tests.version = testers.testVersion {
             |   ^
           30|     package = "pyamlboot";

       … while evaluating the 'name' attribute of a derivation

       … while evaluating a branch condition
         at lib/strings.nix:2627:3:
         2626|   # First detect the common case of already valid strings, to speed those up
         2627|   if stringLength string <= 207 && okRegex string != null
             |   ^
         2628|   then unsafeDiscardStringContext string

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: expected a set but found a string: "pyamlboot"

After fixing the eval tests started failing as `--version` hardcodes 1.0.

Co-authored-by: Nick Cao <nickcao@nichi.co>
---
 pkgs/by-name/py/pyamlboot/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyamlboot/package.nix b/pkgs/by-name/py/pyamlboot/package.nix
index 6606fee6d187..82fe116dc133 100644
--- a/pkgs/by-name/py/pyamlboot/package.nix
+++ b/pkgs/by-name/py/pyamlboot/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   python3Packages,
   testers,
+  pyamlboot,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -27,9 +28,9 @@ python3Packages.buildPythonApplication rec {
   ];
 
   passthru.tests.version = testers.testVersion {
-    package = "pyamlboot";
+    package = pyamlboot;
     command = "boot.py -v";
-    version = "boot.py ${version}";
+    version = "boot.py ${lib.versions.majorMinor version}";
   };
 
   meta = {

From 9b7877aa1fc7b61d4803d995eed207f54af10a5a Mon Sep 17 00:00:00 2001
From: Robert Krahn <robert.krahn@gmail.com>
Date: Sun, 13 Oct 2024 17:35:15 +0200
Subject: [PATCH 05/28] kubectl-graph: init at 0.7.0

---
 pkgs/by-name/ku/kubectl-graph/package.nix | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/ku/kubectl-graph/package.nix

diff --git a/pkgs/by-name/ku/kubectl-graph/package.nix b/pkgs/by-name/ku/kubectl-graph/package.nix
new file mode 100644
index 000000000000..f0bbb4906e91
--- /dev/null
+++ b/pkgs/by-name/ku/kubectl-graph/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+
+buildGoModule rec {
+  pname = "kubectl-graph";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "steveteuber";
+    repo = "kubectl-graph";
+    rev = "v${version}";
+    hash = "sha256-5N1eC8J0nHEgFUCHEn5b3kUDj6MWejouQBKkdJKsaAo=";
+  };
+
+  vendorHash = "sha256-fvn+CoOyMRjsIemMRXitMjTlbbhjrlDIHu398b4/ZZ0=";
+
+  meta = {
+    description = "Kubectl plugin to visualize Kubernetes resources and relationships";
+    homepage = "https://github.com/steveteuber/kubectl-graph";
+    changelog = "https://github.com/steveteuber/kubectl-graph/releases/tag/v${version}";
+    mainProgram = "kubectl-graph";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.rksm ];
+  };
+}

From da0bfe8006008fffb2c9702bb96302edcc1330f5 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Thu, 7 Nov 2024 06:09:54 +0100
Subject: [PATCH 06/28] signal-desktop: remove stdenv.cc.cc from runtimeDeps

The signal desktop app does not require a C compiler to function.
---
 .../networking/instant-messengers/signal-desktop/generic.nix     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
index 85e9b9c9f667..dc3692435d96 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix
@@ -174,7 +174,6 @@ stdenv.mkDerivation rec {
     libnotify
     libdbusmenu
     pipewire
-    stdenv.cc.cc
     xdg-utils
     wayland
   ];

From bdfa0f011297b749d18954e76c8eb36309e3808d Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Tue, 5 Nov 2024 13:22:10 +0000
Subject: [PATCH 07/28] python3Packages.pywebview: build fix for tests

Fixes #353686

Basically the *tests/run.sh* used upstream has a few rough edges and this replaces it with a smoother version.
An issue was also opened on the upstream project to maybe get this smoothed out generally.

Story time for those who are curious.
Basically upstream uses this as a script to call for the CI pipeline where [the builds seem to run smoothly in appveyor](https://ci.appveyor.com/project/r0x0r/pywebview/builds/50791017).
However the general structure of the script iterates over the files, which in earlier versions had been done by collecting the list of tests via pytest itself, which replaced the earliest implementation which was a file hard-coding all the tests to run.
The latter had the benefit of being able to disable tests by commenting them out on our end, however the new version, at least for our purpose, is just a more complicated version of running pytest against the entire thing.
We can't just use plain pytest however (which'd presumably be supported by nixpkgs infra already) because we still need to shove the Qt and xvfb-run shims in between.
So with running pytest as a single command we are now (with this commit) able to specifically disable tests that we know to be flakey using regular pytest means.
With the Qt wrapper function passing extra args to *makeWrapper* we can use the extra flags to pass everything we need, and with the env invocation we avoid polluting the build environment so that the *checkPhase* itself doesn't change the output.

Now on to the actual failing tests, apparently those happened to be related to relative paths which use an internal HTTP server to be served (for absolute paths this is optional), and getting rid of the cwd shenanigans which were required by the upstream version of the script (since it globbed on the current directory) means that somehow pytest now runs these tests without changing directory in a subprocess so the asset used for testing is properly accessible (before this change one could "fix" the tests by changing to an absolute path in the tests).

Signed-off-by: benaryorg <binary@benary.org>
---
 .../python-modules/pywebview/default.nix      | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/pywebview/default.nix b/pkgs/development/python-modules/pywebview/default.nix
index 96b1213ca514..6346c96c62fc 100644
--- a/pkgs/development/python-modules/pywebview/default.nix
+++ b/pkgs/development/python-modules/pywebview/default.nix
@@ -50,21 +50,17 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    # Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED
-    export HOME=$TMPDIR
-    # QStandardPaths: XDG_RUNTIME_DIR not set
-    export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir
+    # a Qt wrapper is required to run the Qt backend
+    # since the upstream script does not have a way to disable tests individually pytest is used directly instead
+    makeQtWrapper "$(command -v pytest)" tests/run.sh \
+      --set PYWEBVIEW_LOG debug \
+      --add-flags "--deselect tests/test_js_api.py::test_concurrent"
 
-    pushd tests
-    substituteInPlace run.sh \
-      --replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \
-      --replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent"
-
-    patchShebangs run.sh
-    wrapQtApp run.sh
-
-    xvfb-run -s '-screen 0 800x600x24' ./run.sh
-    popd
+    # HOME and XDG directories are required for the tests
+    env \
+      HOME=$TMPDIR \
+      XDG_RUNTIME_DIR=$TMPDIR/xdg-runtime-dir \
+      xvfb-run -s '-screen 0 800x600x24' tests/run.sh
   '';
 
   pythonImportsCheck = [ "webview" ];

From ff18a1b2578d309aaf11059b8a96ee140e2e8f0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Oct 2024 23:20:35 +0000
Subject: [PATCH 08/28] rapidfuzz-cpp: 3.0.5 -> 3.1.1

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

diff --git a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
index ad5a525456c9..72978aa7c6ab 100644
--- a/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
+++ b/pkgs/by-name/ra/rapidfuzz-cpp/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rapidfuzz-cpp";
-  version = "3.0.5";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "rapidfuzz";
     repo = "rapidfuzz-cpp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8s2Jd1fI8iNmFyMbCEaGZdpqvYFB1tVNZ41ICLN4AeI=";
+    hash = "sha256-0ZMK9WVMflgGD4uEKp7/SvWXCByYQtPU9gSJsNEqTbM=";
   };
 
   nativeBuildInputs = [

From b322800344d5364fb67ca48544119092d84f7613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 26 Oct 2024 19:14:37 -0700
Subject: [PATCH 09/28] python312Packages.rapidfuzz: 3.10.0 -> 3.10.1

Diff: https://github.com/maxbachmann/RapidFuzz/compare/refs/tags/v3.10.0...v3.10.1

Changelog: https://github.com/maxbachmann/RapidFuzz/blob/refs/tags/v3.10.1/CHANGELOG.rst
---
 .../python-modules/rapidfuzz/default.nix           | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 3a99b5ac5667..495eff4e4670 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   cython,
   ninja,
@@ -20,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "rapidfuzz";
-  version = "3.10.0";
+  version = "3.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,18 +28,9 @@ buildPythonPackage rec {
     owner = "maxbachmann";
     repo = "RapidFuzz";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hLYidU09nCSOi42zgSh7dW83glxIjFY4C6BTmy/sf60=";
+    hash = "sha256-0L8nkjgWdP/w//M69ZRxYk9If3CIEcnAl9mkJKJ4o1g=";
   };
 
-  patches = [
-    # https://github.com/rapidfuzz/RapidFuzz/pull/414
-    (fetchpatch2 {
-      name = "support-taskflow-3.8.0.patch";
-      url = "https://github.com/rapidfuzz/RapidFuzz/commit/8f0429bbd970ccc036018b87108845c384911ff7.patch";
-      hash = "sha256-1wizdCkXYEMe5JWXUHCOCuDdS0z76FKimR47B3s2oVU=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "Cython >=3.0.11, <3.1.0" "Cython"

From 2ff82ba8deea35e5b0ff1264e257709d811ba089 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 24 Oct 2024 00:29:03 +0000
Subject: [PATCH 10/28] libdatachannel: 0.21.2 -> 0.22.2

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

diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix
index bc831d354e77..c36dda9707f0 100644
--- a/pkgs/by-name/li/libdatachannel/package.nix
+++ b/pkgs/by-name/li/libdatachannel/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdatachannel";
-  version = "0.21.2";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "paullouisageneau";
     repo = "libdatachannel";
     rev = "v${version}";
-    hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA=";
+    hash = "sha256-ZGxv4JfJ3b0S7zacIHBlBtCbChADCQG1CfxStA1lKKE=";
   };
 
   outputs = [

From 64b28c617d26f6d93678a0f26f59097f09257150 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 26 Oct 2024 07:55:45 +0000
Subject: [PATCH 11/28] gcsfuse: 2.4.0 -> 2.5.1

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

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index e4dbfb1cf57b..bd9245ba36e8 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "2.4.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-4susiXFe1aBcakxRkhmOe7dvcwsNfam4KKyFFzYXhcU=";
+    hash = "sha256-4UzRg6fNKBrTSoimJ9jURW9oPRhUOAUDMG3JaM7f100=";
   };
 
-  vendorHash = "sha256-uOr929RS8q7LB+WDiyxEIyScE/brmvPJKfnq28PfsDM=";
+  vendorHash = "sha256-QrpILFzgUQwmrvjCdtrlgq1zSW7f82qMHsifI39WaB0=";
 
   subPackages = [ "." "tools/mount_gcsfuse" ];
 

From ca3eca77cd85bef71ada663bd8c27932eed71230 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 2 Nov 2024 21:35:48 +0100
Subject: [PATCH 12/28] gcsfuse: mark as broken on darwin

---
 pkgs/by-name/gc/gcsfuse/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index bd9245ba36e8..315fc51a7a1b 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -1,6 +1,7 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
+, stdenv
 }:
 
 buildGoModule rec {
@@ -41,5 +42,7 @@ buildGoModule rec {
     changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = [ ];
+    # internal/cache/file/downloader/job.go:386:77: undefined: syscall.O_DIRECT
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 35110b71bd78ba9f30d506aac8124f97dd92d820 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 1 Nov 2024 02:55:19 +0000
Subject: [PATCH 13/28] azure-storage-azcopy: 10.26.0 -> 10.27.0

---
 pkgs/by-name/az/azure-storage-azcopy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix
index 1ca6c587c974..84c8fffc15d5 100644
--- a/pkgs/by-name/az/azure-storage-azcopy/package.nix
+++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix
@@ -5,18 +5,18 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.26.0";
+  version = "10.27.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-u6ngYEHqNVjz0YYkWhFnoQGCBRMHLdOzFTee8plwoDo=";
+    hash = "sha256-TF0vChuM3OF/YbCsP8Vg4x609Q1QgqwBNmKUdWCHHUc=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-C8UopiCSp6qFeaDNE+w2QUKbSHALSSeV5WVo4lkLDrs=";
+  vendorHash = "sha256-dYIZb8sSh1Y8yllWOSsWEpiaIwcwZL2wCet3Terl0Ro=";
 
   doCheck = false;
 

From 1a4eb8b7a96e4d31b8eb93716f25d37304a593aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Oct 2024 18:02:09 +0000
Subject: [PATCH 14/28] libnvme: 1.10 -> 1.11

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

diff --git a/pkgs/by-name/li/libnvme/package.nix b/pkgs/by-name/li/libnvme/package.nix
index 3209539f020f..2cc11d95157a 100644
--- a/pkgs/by-name/li/libnvme/package.nix
+++ b/pkgs/by-name/li/libnvme/package.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libnvme";
-  version = "1.10";
+  version = "1.11";
 
   outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "linux-nvme";
     repo = "libnvme";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-guNABLpDKdWDE79gxoNq0ukAUE7CnMw5QRXA3rl3Dk4=";
+    hash = "sha256-c7+vNUTU0J1e8aWl49C7rEbFAQZ3X53PKtv7r8CcheE=";
   };
 
   postPatch = ''

From 9e960c976873758289981b4daac611466c726c04 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Nov 2024 05:44:38 +0100
Subject: [PATCH 15/28] python312Packages.google-cloud-bigquery-logging: 1.4.5
 -> 1.5.0

Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-logging-v1.5.0/packages/google-cloud-bigquery-logging/CHANGELOG.md
---
 .../python-modules/google-cloud-bigquery-logging/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
index 7f671c9eff4e..81739ef91b60 100644
--- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigquery-logging";
-  version = "1.4.5";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_bigquery_logging";
     inherit version;
-    hash = "sha256-XrBXr0Y1vpxWceSR59ERQJKziMBI4+QBoHWK0Wt1cec=";
+    hash = "sha256-4eDfCpkZBDZySWq92C/fr0FKeKdbkymN6sbl+/qzKfg=";
   };
 
   build-system = [ setuptools ];

From c188d417cf0718ee7beebbb5fb66dcf613de50b3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 10 Nov 2024 09:21:23 +0100
Subject: [PATCH 16/28] python312Packages.soco: 0.30.5 -> 0.30.6

Diff: https://github.com/SoCo/SoCo/compare/refs/tags/v0.30.5...v0.30.6

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

diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix
index 373ffc0531df..66eadefb449a 100644
--- a/pkgs/development/python-modules/soco/default.nix
+++ b/pkgs/development/python-modules/soco/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "soco";
-  version = "0.30.5";
+  version = "0.30.6";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "SoCo";
     repo = "SoCo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Lw/VXEfIb+avRpQHcy0TVhWDjdGQlHHtVs2gZZkAAM4=";
+    hash = "sha256-3/BDqCYNgICb8NGYR1VJM9MsMRmdvJVruqFXuyG6tIY=";
   };
 
   build-system = [ setuptools ];

From 88b620a72b65e28523f5509809806b5e4766acf0 Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sun, 10 Nov 2024 19:19:41 +0800
Subject: [PATCH 17/28] completely: move to by-name

---
 pkgs/{tools/misc => by-name/co}/completely/Gemfile              | 0
 pkgs/{tools/misc => by-name/co}/completely/Gemfile.lock         | 0
 pkgs/{tools/misc => by-name/co}/completely/gemset.nix           | 0
 .../default.nix => by-name/co/completely/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/misc => by-name/co}/completely/Gemfile (100%)
 rename pkgs/{tools/misc => by-name/co}/completely/Gemfile.lock (100%)
 rename pkgs/{tools/misc => by-name/co}/completely/gemset.nix (100%)
 rename pkgs/{tools/misc/completely/default.nix => by-name/co/completely/package.nix} (100%)

diff --git a/pkgs/tools/misc/completely/Gemfile b/pkgs/by-name/co/completely/Gemfile
similarity index 100%
rename from pkgs/tools/misc/completely/Gemfile
rename to pkgs/by-name/co/completely/Gemfile
diff --git a/pkgs/tools/misc/completely/Gemfile.lock b/pkgs/by-name/co/completely/Gemfile.lock
similarity index 100%
rename from pkgs/tools/misc/completely/Gemfile.lock
rename to pkgs/by-name/co/completely/Gemfile.lock
diff --git a/pkgs/tools/misc/completely/gemset.nix b/pkgs/by-name/co/completely/gemset.nix
similarity index 100%
rename from pkgs/tools/misc/completely/gemset.nix
rename to pkgs/by-name/co/completely/gemset.nix
diff --git a/pkgs/tools/misc/completely/default.nix b/pkgs/by-name/co/completely/package.nix
similarity index 100%
rename from pkgs/tools/misc/completely/default.nix
rename to pkgs/by-name/co/completely/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3226511390c..73725413db7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13763,8 +13763,6 @@ with pkgs;
 
   communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
 
-  completely = callPackage ../tools/misc/completely { };
-
   confclerk = libsForQt5.callPackage ../applications/misc/confclerk { };
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };

From 9828bad63a499f7e710196bf93f05da28d25d050 Mon Sep 17 00:00:00 2001
From: zendo <linzway@qq.com>
Date: Sun, 10 Nov 2024 19:30:21 +0800
Subject: [PATCH 18/28] completely: 0.5.2 -> 0.6.3

---
 pkgs/by-name/co/completely/Gemfile.lock | 18 +++++++++---------
 pkgs/by-name/co/completely/gemset.nix   | 20 ++++++++++----------
 pkgs/by-name/co/completely/package.nix  | 15 ++++++++-------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/co/completely/Gemfile.lock b/pkgs/by-name/co/completely/Gemfile.lock
index 656c96cbc40c..d6985978275b 100644
--- a/pkgs/by-name/co/completely/Gemfile.lock
+++ b/pkgs/by-name/co/completely/Gemfile.lock
@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    colsole (0.8.2)
-    completely (0.5.2)
-      colsole (~> 0.6)
-      mister_bin (~> 0.7.2)
-    docopt (0.6.1)
-    mister_bin (0.7.3)
-      colsole (~> 0.7)
-      docopt (~> 0.6)
+    colsole (1.0.0)
+    completely (0.6.3)
+      colsole (>= 0.8.1, < 2)
+      mister_bin (~> 0.7)
+    docopt_ng (0.7.1)
+    mister_bin (0.7.6)
+      colsole (>= 0.8.1, < 2)
+      docopt_ng (~> 0.7, >= 0.7.1)
 
 PLATFORMS
   ruby
@@ -17,4 +17,4 @@ DEPENDENCIES
   completely
 
 BUNDLED WITH
-   2.4.5
+   2.5.16
diff --git a/pkgs/by-name/co/completely/gemset.nix b/pkgs/by-name/co/completely/gemset.nix
index a078a113f6d4..f99da8f72218 100644
--- a/pkgs/by-name/co/completely/gemset.nix
+++ b/pkgs/by-name/co/completely/gemset.nix
@@ -4,10 +4,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp";
+      sha256 = "1fvf6dz2wsvjk7q24z0dm8lajq3p2l6i5ywf3mxj683rmhwq49bg";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "1.0.0";
   };
   completely = {
     dependencies = ["colsole" "mister_bin"];
@@ -15,30 +15,30 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b";
+      sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb";
       type = "gem";
     };
-    version = "0.5.2";
+    version = "0.6.3";
   };
-  docopt = {
+  docopt_ng = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k";
+      sha256 = "0rsnl5s7k2s1gl4n4dg68ssg577kf11sl4a4l2lb2fpswj718950";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.7.1";
   };
   mister_bin = {
-    dependencies = ["colsole" "docopt"];
+    dependencies = ["colsole" "docopt_ng"];
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd";
+      sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.7.6";
   };
 }
diff --git a/pkgs/by-name/co/completely/package.nix b/pkgs/by-name/co/completely/package.nix
index 326887299c0c..47e6189bd530 100644
--- a/pkgs/by-name/co/completely/package.nix
+++ b/pkgs/by-name/co/completely/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, bundlerApp
-, bundlerUpdateScript
+{
+  lib,
+  bundlerApp,
+  bundlerUpdateScript,
 }:
 
 bundlerApp {
@@ -11,12 +12,12 @@ bundlerApp {
 
   passthru.updateScript = bundlerUpdateScript "completely";
 
-  meta = with lib; {
+  meta = {
     description = "Generate bash completion scripts using a simple configuration file";
     homepage = "https://github.com/DannyBen/completely";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ zendo ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ zendo ];
     mainProgram = "completely";
   };
 }

From 822590d062486876765c1c988eae739d5d19148e Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sun, 10 Nov 2024 12:00:00 +0000
Subject: [PATCH 19/28] python3Packages.protobuf4: disable tests that fail on
 32bit

---
 .../development/python-modules/protobuf/4.nix | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/protobuf/4.nix b/pkgs/development/python-modules/protobuf/4.nix
index d58e21d195a1..2d1a3f9d861f 100644
--- a/pkgs/development/python-modules/protobuf/4.nix
+++ b/pkgs/development/python-modules/protobuf/4.nix
@@ -4,6 +4,7 @@
   fetchpatch,
   isPyPy,
   lib,
+  stdenv,
   numpy,
   protobuf,
   pytestCheckHook,
@@ -84,15 +85,21 @@ buildPythonPackage {
     pytestCheckHook
   ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ];
 
-  disabledTests = lib.optionals isPyPy [
-    # error message differs
-    "testInvalidTimestamp"
-    # requires tracemalloc which pypy does not implement
-    # https://foss.heptapod.net/pypy/pypy/-/issues/3048
-    "testUnknownFieldsNoMemoryLeak"
-    # assertion is not raised for some reason
-    "testStrictUtf8Check"
-  ];
+  disabledTests =
+    lib.optionals isPyPy [
+      # error message differs
+      "testInvalidTimestamp"
+      # requires tracemalloc which pypy does not implement
+      # https://foss.heptapod.net/pypy/pypy/-/issues/3048
+      "testUnknownFieldsNoMemoryLeak"
+      # assertion is not raised for some reason
+      "testStrictUtf8Check"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.is32bit [
+      # OverflowError: timestamp out of range for platform time_t
+      "testTimezoneAwareDatetimeConversionWhereTimestampLosesPrecision"
+      "testTimezoneNaiveDatetimeConversionWhereTimestampLosesPrecision"
+    ];
 
   disabledTestPaths =
     lib.optionals (lib.versionAtLeast protobuf.version "23") [

From 982ff0b08e25e028da30697ad378e1722b363c91 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@gmail.com>
Date: Sat, 9 Nov 2024 09:33:24 +0100
Subject: [PATCH 20/28] buck2: Install completions for bash and zsh

---
 .../tools/build-managers/buck2/default.nix    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/build-managers/buck2/default.nix b/pkgs/development/tools/build-managers/buck2/default.nix
index 4e92900f1287..b40748d76278 100644
--- a/pkgs/development/tools/build-managers/buck2/default.nix
+++ b/pkgs/development/tools/build-managers/buck2/default.nix
@@ -1,5 +1,11 @@
-{ fetchurl, lib, stdenv, zstd
-, testers, buck2 # for passthru.tests
+{
+  fetchurl,
+  lib,
+  stdenv,
+  zstd,
+  installShellFiles,
+  testers,
+  buck2, # for passthru.tests
 }:
 
 # NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the
@@ -74,7 +80,10 @@ in stdenv.mkDerivation {
   version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made
   inherit src;
 
-  nativeBuildInputs = [ zstd ];
+  nativeBuildInputs = [
+    installShellFiles
+    zstd
+  ];
 
   doCheck = true;
   dontConfigure = true;
@@ -87,6 +96,12 @@ in stdenv.mkDerivation {
     mkdir -p $out/bin
     install -D buck2 $out/bin/buck2
   '';
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd buck2 \
+      --bash <( $out/bin/buck2 completion bash ) \
+      --fish <( $out/bin/buck2 completion fish ) \
+      --zsh <( $out/bin/buck2 completion zsh )
+  '';
 
   passthru = {
     prelude = prelude-src;

From da9757048d7dea2c24a7aa3c9baca1bd298908b2 Mon Sep 17 00:00:00 2001
From: Claudio Bley <claudio.bley@gmail.com>
Date: Sat, 9 Nov 2024 13:44:10 +0100
Subject: [PATCH 21/28] buck2: Use stdenvNoCC

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7fd4ee0f3815..2f6e075ce6ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16939,7 +16939,7 @@ with pkgs;
     python3 = python311;
   };
 
-  buck2 = callPackage ../development/tools/build-managers/buck2 { };
+  buck2 = callPackage ../development/tools/build-managers/buck2 { stdenv = stdenvNoCC; };
 
   build2 = callPackage ../development/tools/build-managers/build2 {
     # Break cycle by using self-contained toolchain for bootstrapping

From 62d3c4fb592bf4c07db38a1183dcefa6fd273213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Sun, 10 Nov 2024 19:50:17 +0100
Subject: [PATCH 22/28] netsurf.browser: fix darwin builds

https://hydra.nixos.org/build/276866240
---
 pkgs/applications/networking/browsers/netsurf/browser.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/netsurf/browser.nix b/pkgs/applications/networking/browsers/netsurf/browser.nix
index 2397145a21c4..760bd691dfb8 100644
--- a/pkgs/applications/networking/browsers/netsurf/browser.nix
+++ b/pkgs/applications/networking/browsers/netsurf/browser.nix
@@ -109,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
 
+  env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
+
   patchPhase = lib.optionalString stdenv.cc.isClang ''
     runHook prePatch
 

From 5b74eb9b909e652fb27452074c071bb18c588e4e Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Sat, 9 Nov 2024 18:33:15 +0100
Subject: [PATCH 23/28] scopehal-apps: darwin support

---
 pkgs/by-name/sc/scopehal-apps/package.nix | 75 +++++++++++++++--------
 1 file changed, 49 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index 9b13dcf52be5..aae1cbb53f04 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -21,9 +21,13 @@
   glslang,
   spirv-tools,
   ffts,
+  moltenvk,
+  apple-sdk_11,
+  darwinMinVersionHook,
+  llvmPackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "scopehal-apps";
   version = "0-unstable-2024-09-16";
 
@@ -37,30 +41,42 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    shaderc
-    spirv-tools
-    wrapGAppsHook4
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+      shaderc
+      spirv-tools
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      wrapGAppsHook4
+    ];
 
-  buildInputs = [
-    cairomm
-    ffts
-    glew
-    glfw
-    glslang
-    gtkmm3
-    liblxi
-    libsigcxx
-    libtirpc
-    vulkan-headers
-    vulkan-loader
-    vulkan-tools
-    yaml-cpp
-    zstd
-  ];
+  buildInputs =
+    [
+      cairomm
+      glew
+      glfw
+      glslang
+      liblxi
+      libsigcxx
+      vulkan-headers
+      vulkan-loader
+      vulkan-tools
+      yaml-cpp
+      zstd
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      ffts
+      gtkmm3
+      libtirpc
+    ]
+    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
+    ++ lib.optionals stdenv.isDarwin [
+      apple-sdk_11
+      (darwinMinVersionHook "10.15")
+      moltenvk
+    ];
 
   # Targets InitializeSearchPaths
   postPatch = ''
@@ -68,12 +84,19 @@ stdenv.mkDerivation rec {
       --replace-fail '"/share/' '"/../share/'
   '';
 
+  cmakeFlags = lib.optionals stdenv.isDarwin [
+    "-DCMAKE_INSTALL_RPATH=${lib.strings.makeLibraryPath [ vulkan-loader ]}"
+  ];
+
   meta = {
     description = "Advanced test & measurement remote control and analysis suite";
     homepage = "https://www.ngscopeclient.org/";
     license = lib.licenses.bsd3;
     mainProgram = "ngscopeclient";
-    maintainers = with lib.maintainers; [ bgamari ];
-    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      bgamari
+      carlossless
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From b3c4badad7e20ca2a8bd7d9134a0cad8ac709468 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 10 Nov 2024 22:34:09 -0300
Subject: [PATCH 24/28] roboto-flex: init at 3.200
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The roboto font repository has not been update since 2017, and
recently it has been archived.

Roboto Flex is its continuation, in a brand new repository.

See https://github.com/googlefonts/roboto-flex for more information.

Maintainers of packages that depend on roboto should consider
migrating them to using roboto-flex.
---
 pkgs/by-name/ro/roboto-flex/package.nix | 32 +++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/ro/roboto-flex/package.nix

diff --git a/pkgs/by-name/ro/roboto-flex/package.nix b/pkgs/by-name/ro/roboto-flex/package.nix
new file mode 100644
index 000000000000..22d0d854adac
--- /dev/null
+++ b/pkgs/by-name/ro/roboto-flex/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "roboto-flex";
+  version = "3.200";
+
+  src = fetchzip {
+    url = "https://github.com/googlefonts/roboto-flex/releases/download/${version}/roboto-flex-fonts.zip";
+    stripRoot = false;
+    hash = "sha256-p8BvE4f6zQLygl49hzYTXXVQFZEJjrlfUvjNW+miar4=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 roboto-flex-fonts/fonts/variable/*.ttf -t $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/googlefonts/roboto-flex";
+    description = "Google Roboto Flex family of fonts";
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.romildo ];
+  };
+}

From f94a3e0cd12e244f3cc495aea294b83acceea29d Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Mon, 11 Nov 2024 01:45:04 +0000
Subject: [PATCH 25/28] nix-unit: 2.24.0 -> 2.24.1

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

diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix
index f7e6d22911b1..aefeb2d63ec9 100644
--- a/pkgs/by-name/ni/nix-unit/package.nix
+++ b/pkgs/by-name/ni/nix-unit/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nix-unit";
-  version = "2.24.0";
+  version = "2.24.1";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "nix-unit";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6O4Q51PSUbr/ODVbfEfAAcoRdID3fqn0lAuHERHq+h4=";
+    hash = "sha256-PcT0jtv2QFaht5eSs1Vq4XGDqtMLdPC49ao9uwGYclE=";
   };
 
   buildInputs = [

From 8feb5e84c9e98ab540a953ad62576093148ef01b Mon Sep 17 00:00:00 2001
From: yadokani389 <155296849+yadokani389@users.noreply.github.com>
Date: Mon, 11 Nov 2024 12:30:44 +0900
Subject: [PATCH 26/28] libskk: fix parse error (#355005)

Co-authored-by: OTABI Tomoya <tomoya.otabi@gmail.com>
---
 pkgs/by-name/li/libskk/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libskk/package.nix b/pkgs/by-name/li/libskk/package.nix
index 88b1991c5473..219a71447e08 100644
--- a/pkgs/by-name/li/libskk/package.nix
+++ b/pkgs/by-name/li/libskk/package.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub,
+{ lib, stdenv, fetchFromGitHub, fetchpatch,
   libtool, gettext, pkg-config,
   vala, gnome-common, gobject-introspection,
   libgee, json-glib, skkDictionaries, libxkbcommon }:
@@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
     sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5";
   };
 
+  patches = [
+    # fix parse error in default.json
+    # https://github.com/ueno/libskk/pull/90
+    (fetchpatch {
+      url = "https://github.com/ueno/libskk/commit/2382ebedc8dca88e745d223ad7badb8b73bbb0de.diff";
+      hash = "sha256-e1bKVteNjqmr40XI82Qar63LXPWYIfnUVlo5zQSkPNw=";
+    })
+  ];
+
   buildInputs = [ libxkbcommon ];
   nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ];
   propagatedBuildInputs = [ libgee json-glib ];

From 7d4246729b4466e8b8a7385815e711420c9f4b45 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Nov 2024 07:35:57 +0300
Subject: [PATCH 27/28] vaultwarden: 1.32.3 -> 1.32.4

Diff: https://github.com/dani-garcia/vaultwarden/compare/1.32.3...1.32.4

Changelog: https://github.com/dani-garcia/vaultwarden/releases/tag/1.32.4
---
 pkgs/tools/security/vaultwarden/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix
index 571dfcc8d53e..8cf055733d6e 100644
--- a/pkgs/tools/security/vaultwarden/default.nix
+++ b/pkgs/tools/security/vaultwarden/default.nix
@@ -9,16 +9,16 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "vaultwarden";
-  version = "1.32.3";
+  version = "1.32.4";
 
   src = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "vaultwarden";
     rev = version;
-    hash = "sha256-dtzC5T96fBrIvy5LFDnwLfx1wF9aVGv/FuAUDH56yto=";
+    hash = "sha256-fT1o+nR7k1fLFS4TeoP1Gm1P0uLTu6Dai6hMGraAKjE=";
   };
 
-  cargoHash = "sha256-a4OwL7yD2i4uJLnSzWpwfRZRSgFFammfUOE+PHA2iw0=";
+  cargoHash = "sha256-xidkmkRVIyQ3mutkmR3oObEwi1uRLCiRSyF5GpWVM9w=";
 
   # used for "Server Installed" version in admin panel
   env.VW_VERSION = version;

From 4c3539c70b796baae64fc9cd682531b26d1752a6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 11 Nov 2024 07:42:37 +0300
Subject: [PATCH 28/28] linux-firmware: 20241017 -> 20241110

---
 pkgs/os-specific/linux/firmware/linux-firmware/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
index a1e13be4febe..25ac7067982d 100644
--- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
+++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix
@@ -20,11 +20,11 @@ let
   '';
 in stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20241017";
+  version = "20241110";
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
-    hash = "sha256-q4StJdoLCHQThFTzhxETDYlQP/ywmb3vwCr13xtrQzc=";
+    hash = "sha256-AsEJfAkr+E2Tnev/UkYLRXsf+PWCp7brvO99bMgLQ1A=";
   };
 
   postUnpack = ''