From a7e4ae9c8c483e57c87d99efb526ecd5f6cf2826 Mon Sep 17 00:00:00 2001
From: Quantenzitrone <nix@dev.quantenzitrone.eu>
Date: Wed, 5 Jun 2024 18:27:04 +0200
Subject: [PATCH 01/17] added linux_{default,latest} to linuxKernel.kernels

this improves discoverability, as many users (including me) have been confused why only custom kernels are available

fixes #260636
---
 pkgs/top-level/linux-kernels.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 24eadff372f1..ea747650f21d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -221,6 +221,10 @@ in {
        then latest
        else testing;
 
+    linux_default = packageAliases.linux_default.kernel;
+
+    linux_latest = packageAliases.linux_latest.kernel;
+
     # Using zenKernels like this due lqx&zen came from one source, but may have different base kernel version
     # https://github.com/NixOS/nixpkgs/pull/161773#discussion_r820134708
     zenKernels = callPackage ../os-specific/linux/kernel/zen-kernels.nix;

From a41f2a9ba2bf2d8e33c9da919b8a31933de342ed Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 2 Nov 2024 16:33:13 +0200
Subject: [PATCH 02/17] goku: format with `nixfmt-rfc-style`

---
 pkgs/os-specific/darwin/goku/default.nix | 39 ++++++++++++------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 4babe83c6351..e361186f27c5 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -1,31 +1,30 @@
-{ lib
-, stdenv
-, fetchurl
-, unzip
-, joker
+{
+  lib,
+  stdenv,
+  fetchurl,
+  unzip,
+  joker,
 }:
 
 stdenv.mkDerivation rec {
   pname = "goku";
   version = "0.6.0";
 
-  src = if stdenv.hostPlatform.isAarch64 then
-    fetchurl {
-      url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip";
-      hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk=";
-    }
-    else fetchurl {
-      url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip";
-      hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ=";
-    };
+  src =
+    if stdenv.hostPlatform.isAarch64 then
+      fetchurl {
+        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip";
+        hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk=";
+      }
+    else
+      fetchurl {
+        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip";
+        hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ=";
+      };
 
-  nativeBuildInputs = [
-    unzip
-  ];
+  nativeBuildInputs = [ unzip ];
 
-  buildInputs = [
-    joker
-  ];
+  buildInputs = [ joker ];
 
   sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else ".";
 

From 00baf6001ca54c985f17288383fccca957fcd5b0 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 2 Nov 2024 16:33:56 +0200
Subject: [PATCH 03/17] goku: use `finalAttrs` pattern

---
 pkgs/os-specific/darwin/goku/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index e361186f27c5..5271a7d45a20 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -6,19 +6,19 @@
   joker,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "goku";
   version = "0.6.0";
 
   src =
     if stdenv.hostPlatform.isAarch64 then
       fetchurl {
-        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku-arm.zip";
+        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip";
         hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk=";
       }
     else
       fetchurl {
-        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${version}/goku.zip";
+        url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku.zip";
         hash = "sha256-8HdIwtpzR6O2WCbMYIJ6PHcM27Xmb+4Tc5Fmjl0dABQ=";
       };
 
@@ -43,4 +43,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.nikitavoloboev ];
     platforms = platforms.darwin;
   };
-}
+})

From 855ce12c2a9f08307010f3f66deadf37101e0de6 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 2 Nov 2024 16:34:39 +0200
Subject: [PATCH 04/17] goku: remove `with lib;` from `meta`

---
 pkgs/os-specific/darwin/goku/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 5271a7d45a20..339809a9c4a4 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -36,11 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     cp gokuw $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Karabiner configurator";
     homepage = "https://github.com/yqrashawn/GokuRakuJoudo";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.nikitavoloboev ];
-    platforms = platforms.darwin;
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.nikitavoloboev ];
+    platforms = lib.platforms.darwin;
   };
 })

From 2ba3e897135ae2fdb16ec37972ad3ea80ad73fe8 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 2 Nov 2024 16:36:42 +0200
Subject: [PATCH 05/17] goku: add `passthru.updateScript`

---
 pkgs/os-specific/darwin/goku/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 339809a9c4a4..a07877b893f0 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -4,6 +4,7 @@
   fetchurl,
   unzip,
   joker,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else ".";
 
+  passthru.updateScript = nix-update-script { };
+
   installPhase = ''
     chmod +x goku
     chmod +x gokuw

From 027352dc05195333ab8319a0b7a5ff133722609c Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 2 Nov 2024 14:39:09 +0000
Subject: [PATCH 06/17] goku: 0.6.0 -> 0.7.2

Changelog: https://github.com/yqrashawn/GokuRakuJoudo/releases/tag/v0.7.2
Diff: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.6.0...v0.7.2
---
 pkgs/os-specific/darwin/goku/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index a07877b893f0..15746e52309e 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "goku";
-  version = "0.6.0";
+  version = "0.7.2";
 
   src =
     if stdenv.hostPlatform.isAarch64 then
       fetchurl {
         url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip";
-        hash = "sha256-TIoda2kDckK1FBLAmKudsDs3LXO4J0KWiAD2JlFb4rk=";
+        hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM=";
       }
     else
       fetchurl {

From 2490a405c2edfbb3b8b57124710403728c93f584 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 2 Nov 2024 16:43:37 +0200
Subject: [PATCH 07/17] goku: `stdenv` -> `stdenvNoCC`

---
 pkgs/os-specific/darwin/goku/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index 15746e52309e..e97f1b51e12a 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -1,18 +1,18 @@
 {
   lib,
-  stdenv,
+  stdenvNoCC,
   fetchurl,
   unzip,
   joker,
   nix-update-script,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "goku";
   version = "0.7.2";
 
   src =
-    if stdenv.hostPlatform.isAarch64 then
+    if stdenvNoCC.hostPlatform.isAarch64 then
       fetchurl {
         url = "https://github.com/yqrashawn/GokuRakuJoudo/releases/download/v${finalAttrs.version}/goku-arm.zip";
         hash = "sha256-mjz1JD12U23Pi8kumELtT9ENhXpX8Db4LUS3DOtP5GM=";
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ joker ];
 
-  sourceRoot = if stdenv.hostPlatform.isAarch64 then "goku" else ".";
+  sourceRoot = if stdenvNoCC.hostPlatform.isAarch64 then "goku" else ".";
 
   passthru.updateScript = nix-update-script { };
 

From e68e39d98812c16625326f8acb077ae3ec7c803a Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 2 Nov 2024 16:46:26 +0200
Subject: [PATCH 08/17] goku: refactor `installPhase`

---
 pkgs/os-specific/darwin/goku/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix
index e97f1b51e12a..70f76836709d 100644
--- a/pkgs/os-specific/darwin/goku/default.nix
+++ b/pkgs/os-specific/darwin/goku/default.nix
@@ -32,11 +32,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   installPhase = ''
-    chmod +x goku
-    chmod +x gokuw
-    mkdir -p $out/bin
-    cp goku $out/bin
-    cp gokuw $out/bin
+    runHook preInstall
+    mkdir -p "$out/bin"
+    chmod +x {goku,gokuw}
+    cp {goku,gokuw} "$out/bin"
+    runHook postInstall
   '';
 
   meta = {

From 0335471fde0104385ccea1a77723bd64ec8f3678 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 27 Aug 2024 20:09:01 +0100
Subject: [PATCH 09/17] immudb: 1.9DOM.2 -> 1.9.5

add mechanism to detect webconsole mismatch

(vendor hash did indeed not change)

https://github.com/codenotary/immudb/compare/v1.9DOM.2...v1.9.5
---
 pkgs/servers/nosql/immudb/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/servers/nosql/immudb/default.nix
index 74571dfff5f1..2ebe92995bd9 100644
--- a/pkgs/servers/nosql/immudb/default.nix
+++ b/pkgs/servers/nosql/immudb/default.nix
@@ -14,15 +14,24 @@ let
 in
 buildGoModule rec {
   pname = "immudb";
-  version = "1.9DOM.2";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
     owner = "codenotary";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-bNMJZWXelHQatW9rhqf3eYs61nJJEBwMXZhUZWQv6S0=";
+    sha256 = "sha256-XKioPk0Rv+I916OLInJEtOaDV9KcBMWSHmPOq2k3LTQ=";
   };
 
+  postPatch = ''
+    EXPECTED_WEBCONSOLE_STRING='DEFAULT_WEBCONSOLE_VERSION=${webconsoleVersion}'
+    if ! grep -F "$EXPECTED_WEBCONSOLE_STRING" Makefile ; then
+      echo "Did not find $EXPECTED_WEBCONSOLE_STRING in Makefile. " \
+        "Our webconsole version may need bumping (or the Makefile may have changed)"
+      exit 3
+    fi
+  '';
+
   preBuild = ''
     mkdir -p webconsole/dist
     cp -r ${webconsoleDist}/* ./webconsole/dist

From 8477b05aac862a91ca181d6ead7d58cffff37e31 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Mon, 14 Oct 2024 21:38:15 -0700
Subject: [PATCH 10/17] gettext: fix compiling with clang

---
 .../development/libraries/gettext/default.nix | 11 +++-
 .../libraries/gettext/fix-getcwd-clang.patch  | 63 +++++++++++++++++++
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gettext/fix-getcwd-clang.patch

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 0518a40c2930..2a69b5702172 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -19,7 +19,16 @@ stdenv.mkDerivation rec {
     # fix reproducibile output, in particular in the grub2 build
     # https://savannah.gnu.org/bugs/index.php?59658
     ./0001-msginit-Do-not-use-POT-Creation-Date.patch
-  ];
+  ]
+    # An accidental inclusion in https://marc.info/?l=glibc-alpha&m=150511271003225&w=2
+    # resulted in a getcwd prototype to be added in when it isn't needed.
+    # Clang does not like this unless the "overridable" attribute was appied.
+    # Since we don't need to redeclare getcwd, we can just remove it.
+    #
+    # Issue: https://github.com/NixOS/nixpkgs/issues/348658
+    # Fixed in https://github.com/autotools-mirror/gettext/commit/cb2c1486336462c8180f487221181ee798b0e73e
+    # Remove in 0.22.5 upgrade.
+    ++ lib.optional (stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin) ./fix-getcwd-clang.patch;
 
   outputs = [ "out" "man" "doc" "info" ];
 
diff --git a/pkgs/development/libraries/gettext/fix-getcwd-clang.patch b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch
new file mode 100644
index 000000000000..fb040b652681
--- /dev/null
+++ b/pkgs/development/libraries/gettext/fix-getcwd-clang.patch
@@ -0,0 +1,63 @@
+From cb2c1486336462c8180f487221181ee798b0e73e Mon Sep 17 00:00:00 2001
+From: Bruno Haible <bruno@clisp.org>
+Date: Thu, 9 Feb 2023 16:58:20 +0100
+Subject: [PATCH] Fix compilation errors with ISO C 23 compilers.
+
+* gettext-runtime/intl/dcigettext.c (getwd, getcwd): Assume a declaration in the
+system header files.
+* gettext-runtime/intl/gettextP.h (SWAP): Drop K&C compatibility.
+---
+ gettext-runtime/intl/dcigettext.c | 5 +----
+ gettext-runtime/intl/gettextP.h   | 7 +------
+ 2 files changed, 2 insertions(+), 10 deletions(-)
+
+diff --git a/gettext-runtime/intl/dcigettext.c b/gettext-runtime/intl/dcigettext.c
+index e7cb9b962..666a624b0 100644
+--- a/gettext-runtime/intl/dcigettext.c
++++ b/gettext-runtime/intl/dcigettext.c
+@@ -1,5 +1,5 @@
+ /* Implementation of the internal dcigettext function.
+-   Copyright (C) 1995-2021 Free Software Foundation, Inc.
++   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+ 
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+@@ -139,13 +139,10 @@ extern int errno;
+ # define tfind __tfind
+ #else
+ # if !defined HAVE_GETCWD
+-char *getwd ();
+ #  define getcwd(buf, max) getwd (buf)
+ # else
+ #  if VMS
+ #   define getcwd(buf, max) (getcwd) (buf, max, 0)
+-#  else
+-char *getcwd ();
+ #  endif
+ # endif
+ # ifndef HAVE_STPCPY
+diff --git a/gettext-runtime/intl/gettextP.h b/gettext-runtime/intl/gettextP.h
+index bb00555ee..536e8bd43 100644
+--- a/gettext-runtime/intl/gettextP.h
++++ b/gettext-runtime/intl/gettextP.h
+@@ -1,5 +1,5 @@
+ /* Header describing internals of libintl library.
+-   Copyright (C) 1995-2021 Free Software Foundation, Inc.
++   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+    Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
+ 
+    This program is free software: you can redistribute it and/or modify
+@@ -113,12 +113,7 @@ extern char *libintl_dcigettext (const char *__domainname,
+ # define SWAP(i) bswap_32 (i)
+ #else
+ static inline nls_uint32
+-# ifdef __cplusplus
+ SWAP (nls_uint32 i)
+-# else
+-SWAP (i)
+-     nls_uint32 i;
+-# endif
+ {
+   return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24);
+ }
+

From c387142f8cf2e2cdb2557e7adb82bb2b030c876b Mon Sep 17 00:00:00 2001
From: Audrey Dutcher <audrey@rhelmot.io>
Date: Mon, 4 Nov 2024 01:31:21 -0700
Subject: [PATCH 11/17] multivnc: init at 2.8.1

Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
---
 pkgs/by-name/mu/multivnc/nixpkgs.patch |  65 ++++++++++++++++
 pkgs/by-name/mu/multivnc/package.nix   | 104 +++++++++++++++++++++++++
 2 files changed, 169 insertions(+)
 create mode 100644 pkgs/by-name/mu/multivnc/nixpkgs.patch
 create mode 100644 pkgs/by-name/mu/multivnc/package.nix

diff --git a/pkgs/by-name/mu/multivnc/nixpkgs.patch b/pkgs/by-name/mu/multivnc/nixpkgs.patch
new file mode 100644
index 000000000000..086d6423df53
--- /dev/null
+++ b/pkgs/by-name/mu/multivnc/nixpkgs.patch
@@ -0,0 +1,65 @@
+diff -ruZ source/CMakeLists.txt source2/CMakeLists.txt
+--- source/CMakeLists.txt	1969-12-31 17:00:01.000000000 -0700
++++ source2/CMakeLists.txt	2024-11-03 21:24:22.153712626 -0700
+@@ -12,9 +12,6 @@
+ 
+ set(WXSERVDISC_INSTALL OFF CACHE BOOL "Set to OFF to not include wxservdisc artifacts in install")
+ add_subdirectory(libwxservdisc/src)
+-set(LIBVNCSERVER_INSTALL OFF CACHE BOOL "Set to OFF to not include libvncserver artifacts in install")
+-set(WITH_EXAMPLES OFF CACHE BOOL "Set to OFF to not build libvncserver examples")
+-add_subdirectory(libvncserver)
+ 
+ add_subdirectory(src)
+ 
+diff -ruZ source/src/CMakeLists.txt source2/src/CMakeLists.txt
+--- source/src/CMakeLists.txt	1969-12-31 17:00:01.000000000 -0700
++++ source2/src/CMakeLists.txt	2024-11-03 21:51:56.015301604 -0700
+@@ -1,15 +1,17 @@
+ #
+ # dependencies
+ #
++include(FindPkgConfig)
+ find_package(wxWidgets 3.0 REQUIRED core base net adv qa)
++find_package(LibVNCServer)
++pkg_search_module(GTK3 REQUIRED gtk+-3.0)
+ include(${wxWidgets_USE_FILE})
+ include_directories(
+     ${CMAKE_BINARY_DIR}
+     ${CMAKE_SOURCE_DIR}
+     ${CMAKE_SOURCE_DIR}/src/
+     ${CMAKE_SOURCE_DIR}/libwxservdisc/src
+-    ${CMAKE_SOURCE_DIR}/libvncserver
+-    ${CMAKE_BINARY_DIR}/libvncserver
++    ${GTK3_INCXLUDE_DIRS}
+ )
+ 
+ 
+@@ -39,7 +41,7 @@
+ 
+ add_executable(${executable_name} MACOSX_BUNDLE ${multivnc_SRCS})
+ 
+-target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient)
++target_link_libraries(${executable_name} MultiVNCgui ${wxWidgets_LIBRARIES} wxservdisc vncclient ${GTK3_LIBRARIES})
+ 
+ if(APPLE AND wxWidgets_VERSION_STRING LESS 3.1)
+     set_target_properties(${executable_name} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in)
+@@ -47,7 +49,6 @@
+ 
+ 
+ 
+-
+ 
+ #original Makefile.am contents follow:
+ 
+diff -ruZ source/src/VNCConn.h source2/src/VNCConn.h
+--- source/src/VNCConn.h	1969-12-31 17:00:01.000000000 -0700
++++ source2/src/VNCConn.h	2024-11-03 21:28:06.620032553 -0700
+@@ -37,7 +37,7 @@
+ #include <wx/secretstore.h>
+ #endif
+ #include <wx/msgqueue.h>
+-#include "rfb/rfbclient.h"
++#include <rfb/rfbclient.h>
+ 
+ 
+ 
diff --git a/pkgs/by-name/mu/multivnc/package.nix b/pkgs/by-name/mu/multivnc/package.nix
new file mode 100644
index 000000000000..a17e323628c1
--- /dev/null
+++ b/pkgs/by-name/mu/multivnc/package.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  wxGTK32,
+  gtk3,
+  zlib,
+  libjpeg,
+  libvncserver,
+  cmake,
+  pkg-config,
+  libsysprof-capture,
+  pcre2,
+  util-linux,
+  libselinux,
+  libsepol,
+  libthai,
+  libdatrie,
+  xorg,
+  lerc,
+  libxkbcommon,
+  libepoxy,
+  wrapGAppsHook3,
+}:
+
+let
+  # libvncserver does not support multicast. since multivnc is mostly about multicast, it requires a special branch of libvncserver.
+  libvncserver-patched = libvncserver.overrideAttrs {
+    src = fetchFromGitHub {
+      owner = "LibVNC";
+      repo = "libvncserver";
+      rev = "ef3b57438564f2877148a23055f3f0ffce66df11";
+      hash = "sha256-Cg96tsi6h1DX4VSsq1B8DTn0GxnBfoZK2nuxeT/+ca0=";
+    };
+    patches = [ ];
+  };
+
+in
+stdenv.mkDerivation {
+  pname = "MultiVNC";
+  version = "2.8.1";
+
+  src = fetchFromGitHub {
+    owner = "bk138";
+    repo = "multivnc";
+    rev = "89225243412f43ba2903ffeda98af7fe1f8f4975";
+    hash = "sha256-qdF6nUSGaTphoe6T3gTAJTSQwvu+v/g8xfYobFBmGsI=";
+    fetchSubmodules = true;
+  };
+
+  patches = [
+    # remove part of vendored libraries that can be provided by Nixpkgs
+    ./nixpkgs.patch
+
+    # silences a compiler warning
+    (fetchpatch {
+      url = "https://github.com/bk138/multivnc/commit/002ba7f6b5b88dac3da5c08f99be1f237dcde904.patch";
+      hash = "sha256-Qnk7RrUaw9jsaNTbzYqsH0LU8ivT9xX2jfxrES82ArE=";
+    })
+  ];
+
+  # remove submodules we don't need
+  # some submodules can be provided by nixpkgs
+  postPatch = ''
+    rm -rfv libvncserver libsshtunnel libjpeg-turbo libressl libssh2
+  '';
+
+  buildInputs = [
+    gtk3
+    wxGTK32
+    zlib
+    libjpeg
+    libvncserver-patched
+
+    # transitive dependencies
+    libsysprof-capture
+    pcre2
+    util-linux # mount
+    libselinux
+    libsepol
+    libthai
+    libdatrie
+    lerc
+    libxkbcommon
+    libepoxy
+    xorg.libXdmcp
+    xorg.libXtst
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  meta = {
+    mainProgram = "multivnc";
+    description = "Cross-platform Multicast-enabled VNC viewer based on LibVNCClient";
+    homepage = "https://github.com/bk138/multivnc";
+    maintainers = with lib.maintainers; [ rhelmot ];
+    license = lib.licenses.gpl3Plus;
+  };
+}

From 9138d320efd33698ce1fccfacae731b88a91c3b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 7 Nov 2024 22:17:18 +0100
Subject: [PATCH 12/17] osu-lazer: add vulkan support

---
 pkgs/by-name/os/osu-lazer/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index a2523df7853c..6bd569a4b33f 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -15,6 +15,7 @@
   libglvnd,
   xorg,
   udev,
+  vulkan-loader,
 }:
 
 buildDotnetModule rec {
@@ -57,6 +58,9 @@ buildDotnetModule rec {
     # [verbose]: SDL error log [debug]: Failed loading udev_device_get_action: /nix/store/*-osu-lazer-*/lib/osu-lazer/runtimes/linux-x64/native/libSDL2.so: undefined symbol: _udev_device_get_action
     # [verbose]: SDL error log [debug]: Failed loading libudev.so.1: libudev.so.1: cannot open shared object file: No such file or directory
     udev
+
+    # needed for vulkan renderer, can fall back to opengl if omitted
+    vulkan-loader
   ];
 
   executables = [ "osu!" ];

From 8bdc3c1d710d488f02a77b9eaa57f4bb99e655b2 Mon Sep 17 00:00:00 2001
From: nixpkgs-upkeep-bot <skainsworth@gmail.com>
Date: Fri, 8 Nov 2024 00:32:38 +0000
Subject: [PATCH 13/17] vscode: 1.95.1 -> 1.95.2

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 09da2fe3b631..a82c876216cc 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -31,21 +31,21 @@ let
   archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1dysz5yajm9v8p8x19lmbhbfij5k99h9m39ifvn1908dhgyc5d36";
-    x86_64-darwin = "175sxw1z6mzs5adcgy2902irp0yb666lgmrckbd3dr7rqfav9d36";
-    aarch64-linux = "04pf8b42kh23pii9qahsdf3979icvqbhadr5m8x79y16hv1h2h8j";
-    aarch64-darwin = "1766h2awzh8wjwzkc7r1ymsjyh4j7rfb7nj6bpigy2b2dyfp53w2";
-    armv7l-linux = "1zmqrvqq07vkhmb9shbrh2jjkv3rpvi3pv0b1cg690jfixnsyk04";
+    x86_64-linux = "1d99kbvbd17h02m85gd8dircb39jsbifdk61w1hsvhri6dbfah8f";
+    x86_64-darwin = "1bay90s0asfms4cg4hng9f4bpjyg5d884ffjrqy6mdxwyqmjyzb1";
+    aarch64-linux = "0g1v26qax14fghawjqb9xbkr8kwhzwh52qz30jg3pfsixw5q5kkx";
+    aarch64-darwin = "0m7b6dnfwqal20iq6nwwzvd23l5alqgbc02ih2pjflzk794fj2mf";
+    armv7l-linux = "04jbcqwpbp7d89van8dq5zilfcalxwbx62yzipdzsjlmfnxf65vy";
   }.${system} or throwSystem;
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.95.1";
+    version = "1.95.2";
     pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
     # This is used for VS Code - Remote SSH test
-    rev = "65edc4939843c90c34d61f4ce11704f09d3e5cb6";
+    rev = "e8653663e8840adaf45af01eab5c627a5af81807";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
     longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -69,7 +69,7 @@ in
       src = fetchurl {
         name = "vscode-server-${rev}.tar.gz";
         url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "05w76c50j85b7hc0q8gjzssy142ncbns0kmcyqydaqrzj8n41jd8";
+        sha256 = "14vfylcx3gcx5vjdp861mjr98wq2f3242ysygpa3r5xnl8941wki";
       };
       stdenv = stdenvNoCC;
     };

From c167ff0416b3805dbc29f6f1f12593039f6d520f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 8 Nov 2024 01:25:41 +0000
Subject: [PATCH 14/17] _1password-cli: 2.30.0 -> 2.30.3

---
 pkgs/by-name/_1/_1password-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index 085013667620..6bc67fb04d6a 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -23,13 +23,13 @@ let
     if extension == "zip" then fetchzip args else fetchurl args;
 
   pname = "1password-cli";
-  version = "2.30.0";
+  version = "2.30.3";
   sources = rec {
-    aarch64-linux = fetch "linux_arm64" "sha256-KNduqspTzLEHmymSefLnnhIBcIQWx2tshvOc0NwDek0=" "zip";
-    i686-linux = fetch "linux_386" "sha256-StdWtD3tz6bKqSem/GFqeRHzkbv4aP7d7dKKtgNhuY8=" "zip";
-    x86_64-linux = fetch "linux_amd64" "sha256-bzhRkpR3te1bcBEfP2BR6SECTC9sRFDshl7B+/278Kg=" "zip";
+    aarch64-linux = fetch "linux_arm64" "sha256-dXhmRl48Uk4T4947Dwz6ZkaRkZlmcADXKt/m6d1VNe8=" "zip";
+    i686-linux = fetch "linux_386" "sha256-+B4fZ41DBe9TnIHOntBQDAvTYOckVwK5B+wwsIU6fAI=" "zip";
+    x86_64-linux = fetch "linux_amd64" "sha256-MsBSjJi7hJbS1wU3lVeywRrhGAZkoqxRb4FTg8fFN00=" "zip";
     aarch64-darwin =
-      fetch "apple_universal" "sha256-L1SZWQWjAJDZydlAttbWLS7igZNAvOmIyaUUdVbvEa8="
+      fetch "apple_universal" "sha256-RVng7huZfRRR99TLKwmmun6woSiIhM5YnaEfWgdPJr4="
         "pkg";
     x86_64-darwin = aarch64-darwin;
   };

From f36ddf89a808d27c6c38e1423ebc9eb19dcd60a4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 8 Nov 2024 04:29:33 +0100
Subject: [PATCH 15/17] python312Packages.django-oauth-toolkit: use
 pytest-cov-stub

and only expose DJANGO_SETTINGS_MODULE for tests.
---
 .../python-modules/django-oauth-toolkit/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 41265d7e99c7..30007c812b3c 100644
--- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -12,6 +12,7 @@
 
   # tests
   djangorestframework,
+  pytest-cov-stub,
   pytest-django,
   pytest-mock,
   pytestCheckHook,
@@ -29,10 +30,6 @@ buildPythonPackage rec {
     hash = "sha256-Ya0KlX+vtLXN2Fgk0Gv7KemJCUTwkaH+4GQA1ByUlBY=";
   };
 
-  postPatch = ''
-    sed -i '/cov/d' pyproject.toml
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -42,12 +39,15 @@ buildPythonPackage rec {
     requests
   ];
 
-  DJANGO_SETTINGS_MODULE = "tests.settings";
+  preCheck = ''
+    export DJANGO_SETTINGS_MODULE=tests.settings
+  '';
 
   # xdist is disabled right now because it can cause race conditions on high core machines
   # https://github.com/jazzband/django-oauth-toolkit/issues/1300
   nativeCheckInputs = [
     djangorestframework
+    pytest-cov-stub
     pytest-django
     # pytest-xdist
     pytest-mock

From 05ccba8ceef70e4e30c3952b69a9364f0c2c8a1b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 8 Nov 2024 00:35:46 +0000
Subject: [PATCH 16/17] ninja_1_11: init at 1.11.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Swift 5.8 doesn’t reliably build with Ninja 1.12, and apparently
neither do old versions of ROCm, due to a build scheduling change
breaking builds with undeclared dependencies. Upstream Swift have
pinned 1.11 for now.

Reintroducing it isn’t a good long‐term solution, but seems
like the easiest way to avoid shipping 24.11 with a broken Swift
on Darwin. The patch for 32‐bit systems has not been restored,
as Swift doesn’t support them anyway.
---
 pkgs/by-name/ni/ninja/package.nix | 25 ++++++++++++++++++-------
 pkgs/top-level/all-packages.nix   |  2 ++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ni/ninja/package.nix b/pkgs/by-name/ni/ninja/package.nix
index 23d279e362d7..744932e0c2ff 100644
--- a/pkgs/by-name/ni/ninja/package.nix
+++ b/pkgs/by-name/ni/ninja/package.nix
@@ -11,18 +11,29 @@
 , buildPackages
 , buildDocs ? true
 , nix-update-script
+, ninjaRelease ? "latest"
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ninja";
-  version = "1.12.1";
+  version = lib.removePrefix "v" finalAttrs.src.rev;
 
-  src = fetchFromGitHub {
-    owner = "ninja-build";
-    repo = "ninja";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
-  };
+  src = {
+    # TODO: Remove Ninja 1.11 as soon as possible.
+    "1.11" = fetchFromGitHub {
+      owner = "ninja-build";
+      repo = "ninja";
+      rev = "v1.11.1";
+      hash = "sha256-LvV/Fi2ARXBkfyA1paCRmLUwCh/rTyz+tGMg2/qEepI=";
+    };
+
+    latest = fetchFromGitHub {
+      owner = "ninja-build";
+      repo = "ninja";
+      rev = "v1.12.1";
+      hash = "sha256-RT5u+TDvWxG5EVQEYj931EZyrHUSAqK73OKDAascAwA=";
+    };
+  }.${ninjaRelease} or (throw "Unsupported Ninja release: ${ninjaRelease}");
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b21dc2f649b8..f4d5db1f59cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30944,6 +30944,8 @@ with pkgs;
 
   node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { };
 
+  ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
+
   ninjas2 = callPackage ../applications/audio/ninjas2 { };
 
   nootka = qt5.callPackage ../applications/audio/nootka { };

From 8dfed1b9a444dca8e41a1d0f90436664f902634e Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Fri, 8 Nov 2024 09:10:53 +0800
Subject: [PATCH 17/17] swift: Workaround Hydra darwin build problem

Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions):

```
ld: warning: directory not found for option '-L/nix/store/g9rbp9m6vs1xj4jl6b6vjb6bm8kgr107-SDKs/MacOSX10.15.sdk/usr/lib/swift'
...
ld: warning: Could not find or use auto-linked library 'swiftCompatibility56'
Undefined symbols for architecture arm64:
  "__swift_FORCE_LOAD_$_swiftCompatibility56", referenced from:
      __swift_FORCE_LOAD_$_swiftCompatibility56_$_Optimizer in libswiftCompilerModules-bootstrapping1.a(Optimizer.o)
  ...
```

Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`.

Until we find out the exact cause, follow [swift upstream][1], pin ninja to version
1.11.1.

[1]: https://github.com/swiftlang/swift/pull/72989
---
 pkgs/development/compilers/swift/compiler/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index 651c6faa566c..8e8cf798db4f 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -6,7 +6,7 @@
 , coreutils
 , gnugrep
 , perl
-, ninja
+, ninja_1_11
 , pkg-config
 , clang
 , bintools
@@ -190,6 +190,14 @@ let
     '';
   };
 
+  # https://github.com/NixOS/nixpkgs/issues/327836
+  # Fail to build with ninja 1.12 when NIX_BUILD_CORES is low (Hydra or Github Actions).
+  # Can reproduce using `nix --option cores 2 build -f . swiftPackages.swift-unwrapped`.
+  # Until we find out the exact cause, follow [swift upstream][1], pin ninja to version
+  # 1.11.1.
+  # [1]: https://github.com/swiftlang/swift/pull/72989
+  ninja = ninja_1_11;
+
 in stdenv.mkDerivation {
   pname = "swift";
   inherit (sources) version;