Merge master into staging-next

maintainers/maintainer-list.nix

@@ -15375,12 +15375,6 @@
     github = "niklaskorz";
     githubId = 590517;
   };
-  NikolaMandic = {
-    email = "nikola@mandic.email";
-    github = "NikolaMandic";
-    githubId = 4368690;
-    name = "Ratko Mladic";
-  };
   nikstur = {
     email = "nikstur@outlook.com";
     name = "nikstur";

pkgs/applications/networking/browsers/firefox/packages.nix

@@ -35,11 +35,11 @@
 
   firefox-beta = buildMozillaMach rec {
     pname = "firefox-beta";
-    version = "132.0b5";
+    version = "132.0b9";
     applicationName = "Mozilla Firefox Beta";
     src = fetchurl {
       url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "7b9b3120ce3f5918bb0a6d385b23503ff2dbd0b6171d63ce6310eca43d252537b43cc79ace326d2e29611ae4fb06d815bcaefb63c6942d00e53277deeb0eba70";
+      sha512 = "0c491e2a601d6989c10cdd757c83453e07454113dac8e4de154df04386fc0797ee5146dcdc8ca904692a6cb87246b54a4f5e93057afd20f23701abd3f61a6985";
     };
 
     meta = {
@@ -64,13 +64,13 @@
 
   firefox-devedition = buildMozillaMach rec {
     pname = "firefox-devedition";
-    version = "132.0b5";
+    version = "132.0b9";
     applicationName = "Mozilla Firefox Developer Edition";
     requireSigning = false;
     branding = "browser/branding/aurora";
     src = fetchurl {
       url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "3c2f028ae1d2ebf01a4fc341ee7f706bfdacb0c4dd2db2e3f24b42fe1e4e89f67a3827ad794c557c084a723272928264ae9e0bf67a4268078ebd8e4af1f97688";
+      sha512 = "3393bb677c6e735860ef49c837ffab10720c6eb47d6cfb6c7960267e3676c69c8293b5f7e49de3f91b6eb88fa4780300db2b2653dde1ae38d546f473bca7e34b";
     };
 
     meta = {

pkgs/applications/networking/nextcloud-client/default.nix

@@ -21,6 +21,7 @@
 , sphinx
 , sqlite
 , xdg-utils
+, qtwayland
 , wrapQtAppsHook
 }:
 
@@ -74,6 +75,7 @@ stdenv.mkDerivation rec {
     qtwebengine
     qtwebsockets
     sqlite
+    qtwayland
   ];
 
   qtWrapperArgs = [

pkgs/by-name/ap/appimageupdate/package.nix

@@ -0,0 +1,85 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt5,
+  zsync2,
+  libcpr,
+  libgcrypt,
+  libappimage,
+  argagg,
+  nlohmann_json,
+  gpgme,
+  appimageupdate-qt,
+  withQtUI ? false,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "appimageupdate";
+  version = "2.0.0-alpha-1-20230526";
+
+  src = fetchFromGitHub {
+    owner = "AppImageCommunity";
+    repo = "AppImageUpdate";
+    rev = finalAttrs.version;
+    hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
+  };
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \
+      --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' \
+      --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \
+      --replace-fail '<local dev build>' '<nixpkgs build>'
+  '';
+
+  nativeBuildInputs =
+    [
+      cmake
+      pkg-config
+    ]
+    ++ lib.optionals withQtUI [
+      qt5.wrapQtAppsHook
+    ];
+
+  buildInputs =
+    [
+      zsync2
+      libcpr
+      libgcrypt
+      libappimage
+      argagg
+      nlohmann_json
+      gpgme
+    ]
+    ++ lib.optionals withQtUI [
+      qt5.qtbase
+    ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_ZSYNC2" true)
+    (lib.cmakeBool "USE_SYSTEM_LIBAPPIMAGE" true)
+    (lib.cmakeBool "BUILD_QT_UI" withQtUI)
+  ];
+
+  dontWrapQtApps = true;
+
+  preFixup = lib.optionalString withQtUI ''
+    wrapQtApp "$out/bin/AppImageUpdate"
+  '';
+
+  passthru.tests = {
+    inherit appimageupdate-qt;
+  };
+
+  meta = {
+    description = "Update AppImages using information embedded in the AppImage itself";
+    homepage = "https://github.com/AppImageCommunity/AppImageUpdate";
+    license = lib.licenses.mit;
+    mainProgram = if withQtUI then "AppImageUpdate" else "appimageupdatetool";
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/by-name/ch/charmcraft/package.nix

@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "charmcraft";
-  version = "3.2.1";
+  version = "3.2.2";
 
   pyproject = true;
 
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "charmcraft";
     rev = "refs/tags/${version}";
-    hash = "sha256-VqJZP82OIfxPBkayq0ijXDsotgKPbo34RTMuNkLfjls=";
+    hash = "sha256-2MI2cbAohfTgbilxZcFvmxt/iVjR6zJ2o0gequB//hg=";
   };
 
   postPatch = ''

pkgs/by-name/fo/folio/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "folio";
-  version = "24.11";
+  version = "24.12";
 
   src = fetchFromGitHub {
     owner = "toolstack";
     repo = "Folio";
     rev = version;
-    hash = "sha256-55zNxZbta12T/N6ruzY+/FVlinVMYcE02C48nTQUeO4=";
+    hash = "sha256-0Aq8R+5k5LCmciRHauTvxuJWCyN3FN4sP9aEPNlMn+k=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/hy/hypridle/package.nix

@@ -9,19 +9,19 @@
   wayland-protocols,
   wayland-scanner,
   hyprlang,
-  sdbus-cpp,
+  sdbus-cpp_2,
   systemd,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hypridle";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hypridle";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4EgQyprji92cmhGaQQsw6eN6cmEkQKs0+MeD7YLgHlg=";
+    hash = "sha256-20a3pg94dyLFflbBIN+EYJ04nWfWldTfd2YmB/rcrqY=";
   };
 
   nativeBuildInputs = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     hyprlang
     hyprutils
-    sdbus-cpp
+    sdbus-cpp_2
     systemd
     wayland
     wayland-protocols

pkgs/by-name/ta/tabby/0001-nix-build-use-nix-native-llama-cpp-package.patch

@@ -1,29 +0,0 @@
-From c0152b6bbd751313be756fdcd7b3e3912567b535 Mon Sep 17 00:00:00 2001
-From: Will Owens <ghthor@gmail.com>
-Date: Fri, 1 Mar 2024 01:37:55 -0500
-Subject: [PATCH] nix-build: use nix native llama-cpp package
-
----
- crates/llama-cpp-bindings/build.rs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/crates/llama-cpp-bindings/build.rs b/crates/llama-cpp-bindings/build.rs
-index 06629ac4..aa004493 100644
---- a/crates/llama-cpp-bindings/build.rs
-+++ b/crates/llama-cpp-bindings/build.rs
-@@ -12,10 +12,10 @@ fn main() {
- 
-     println!("cargo:rerun-if-changed=include/engine.h");
-     println!("cargo:rerun-if-changed=src/engine.cc");
-+    println!("cargo:rustc-link-search=native={}", env::var("LLAMA_CPP_LIB").unwrap());
-     println!("cargo:rustc-link-lib=llama");
--    println!("cargo:rustc-link-lib=ggml_static");
-+    println!("cargo:rustc-link-lib=ggml_shared");
- 
--    build_llama_cpp();
-     build_cxx_binding();
- }
- 
--- 
-2.43.1
-

pkgs/by-name/ta/tabby/package.nix

@@ -1,28 +1,29 @@
-{ config
-, lib
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
-, stdenv
+{
+  config,
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+  stdenv,
 
-, git
-, openssl
-, pkg-config
-, protobuf
+  git,
+  openssl,
+  pkg-config,
+  protobuf,
 
-, llama-cpp
+  llama-cpp,
 
-, autoAddDriverRunpath
-, cudaSupport ? config.cudaSupport
-, cudaPackages ? { }
+  autoAddDriverRunpath,
+  cudaSupport ? config.cudaSupport,
 
-, rocmSupport ? config.rocmSupport
+  rocmSupport ? config.rocmSupport,
 
-, darwin
-, metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
+  darwin,
+  metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64,
 
   # one of [ null "cpu" "rocm" "cuda" "metal" ];
-, acceleration ? null
+  acceleration ? null,
+  versionCheckHook,
 }:
 
 let
@@ -32,8 +33,7 @@ let
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/ollama/default.nix
 
   pname = "tabby";
-  version = "0.11.1";
-
+  version = "0.18.0";
 
   availableAccelerations = flatten [
     (optional cudaSupport "cuda")
@@ -41,32 +41,49 @@ let
     (optional metalSupport "metal")
   ];
 
-  warnIfMultipleAccelerationMethods = configured: (let
-    len = builtins.length configured;
-    result = if len == 0 then "cpu" else (builtins.head configured);
-  in
-    lib.warnIf (len > 1) ''
-      building tabby with multiple acceleration methods enabled is not
-      supported; falling back to `${result}`
-    ''
-    result
-  );
+  warnIfMultipleAccelerationMethods =
+    configured:
+    (
+      let
+        len = builtins.length configured;
+        result = if len == 0 then "cpu" else (builtins.head configured);
+      in
+      lib.warnIf (len > 1) ''
+        building tabby with multiple acceleration methods enabled is not
+        supported; falling back to `${result}`
+      '' result
+    );
 
   # If user did not not override the acceleration attribute, then try to use one of
   # - nixpkgs.config.cudaSupport
   # - nixpkgs.config.rocmSupport
   # - metal if (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
   # !! warn if multiple acceleration methods are enabled and default to the first one in the list
-  featureDevice = if (builtins.isNull acceleration) then (warnIfMultipleAccelerationMethods availableAccelerations) else acceleration;
+  featureDevice =
+    if (builtins.isNull acceleration) then
+      (warnIfMultipleAccelerationMethods availableAccelerations)
+    else
+      acceleration;
 
-  warnIfNotLinux = api: (lib.warnIfNot stdenv.hostPlatform.isLinux
-    "building tabby with `${api}` is only supported on linux; falling back to cpu"
-    stdenv.hostPlatform.isLinux);
-  warnIfNotDarwinAarch64 = api: (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
-    "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu"
-    (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64));
+  warnIfNotLinux =
+    api:
+    (lib.warnIfNot stdenv.hostPlatform.isLinux
+      "building tabby with `${api}` is only supported on linux; falling back to cpu"
+      stdenv.hostPlatform.isLinux
+    );
+  warnIfNotDarwinAarch64 =
+    api:
+    (lib.warnIfNot (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
+      "building tabby with `${api}` is only supported on Darwin-aarch64; falling back to cpu"
+      (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
+    );
 
-  validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [ "cpu" "rocm" "cuda" "metal" ];
+  validAccel = lib.assertOneOf "tabby.featureDevice" featureDevice [
+    "cpu"
+    "rocm"
+    "cuda"
+    "metal"
+  ];
 
   # TODO(ghthor): there is a bug here where featureDevice could be cuda, but enableCuda is false
   #  The would result in a startup failure of the service module.
@@ -87,14 +104,21 @@ let
   };
 
   # TODO(ghthor): some of this can be removed
-  darwinBuildInputs = [ llamaccpPackage ]
-  ++ optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [
-    Foundation
-    Accelerate
-    CoreVideo
-    CoreGraphics
-  ]
-  ++ optionals enableMetal [ Metal MetalKit ]);
+  darwinBuildInputs =
+    [ llamaccpPackage ]
+    ++ optionals stdenv.hostPlatform.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        Foundation
+        Accelerate
+        CoreVideo
+        CoreGraphics
+      ]
+      ++ optionals enableMetal [
+        Metal
+        MetalKit
+      ]
+    );
 
   cudaBuildInputs = [ llamaccpPackage ];
   rocmBuildInputs = [ llamaccpPackage ];
@@ -107,55 +131,85 @@ rustPlatform.buildRustPackage {
   src = fetchFromGitHub {
     owner = "TabbyML";
     repo = "tabby";
-    rev = "v${version}";
-    hash = "sha256-OgAE526aW3mVqf6fVmBmL5/B4gH9B54QLEITQk9Kgsg=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-8clEBWAT+HI2eecOsmldgRcA58Ehq9bZT4ZwUMm494g=";
     fetchSubmodules = true;
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "apalis-0.5.1" = "sha256-hGvVuSy32lSTR5DJdiyf8q1sXbIeuLSGrtyq6m2QlUQ=";
-      "tree-sitter-c-0.20.6" = "sha256-Etl4s29YSOxiqPo4Z49N6zIYqNpIsdk/Qd0jR8jdvW4=";
-      "tree-sitter-cpp-0.20.3" = "sha256-UrQ48CoUMSHmlHzOMu22c9N4hxJtHL2ZYRabYjf5byA=";
-      "tree-sitter-solidity-0.0.3" = "sha256-b+LthCf+g19sjKeNgXZmUV0RNi94O3u0WmXfgKRpaE0=";
+      "ollama-rs-0.1.9" = "sha256-d6sKUxc8VQbRkVqMOeNFqDdKesq5k32AQShK67y2ssg=";
+      "oneshot-0.1.6" = "sha256-PmYuHuNTqToMyMHPRFDUaHUvFkVftx9ZCOBwXj+4Hc4=";
+      "ownedbytes-0.7.0" = "sha256-p0+ohtW0VLmfDTZw/LfwX2gYfuYuoOBcE+JsguK7Wn8=";
+      "sqlx-0.7.4" = "sha256-tcISzoSfOZ0jjNgGpuPPxjMxmBUPw/5FVDoALZEAHKY=";
+      "tree-sitter-c-0.21.3" = "sha256-ucbHLS2xyGo1uyKZv/K1HNXuMo4GpTY327cgdVS9F3c=";
+      "tree-sitter-cpp-0.22.1" = "sha256-3akSuQltFMF6I32HwRU08+Hcl9ojxPGk2ZuOX3gAObw=";
+      "tree-sitter-solidity-1.2.6" = "sha256-S00hdzMoIccPYBEvE092/RIMnG8YEnDGk6GJhXlr4ng=";
     };
   };
 
   # https://github.com/TabbyML/tabby/blob/v0.7.0/.github/workflows/release.yml#L39
-  cargoBuildFlags = [
-    "--release"
-    "--package" "tabby"
-  ] ++ optionals enableRocm [
-    "--features" "rocm"
-  ] ++ optionals enableCuda [
-    "--features" "cuda"
+  cargoBuildFlags =
+    [
+      # Don't need to build llama-cpp-server (included in default build)
+      "--no-default-features"
+      "--features"
+      "ee"
+      "--package"
+      "tabby"
+    ]
+    ++ optionals enableRocm [
+      "--features"
+      "rocm"
+    ]
+    ++ optionals enableCuda [
+      "--features"
+      "cuda"
+    ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
   ];
+  versionCheckProgramArg = [ "--version" ];
+  doInstallCheck = true;
 
-  OPENSSL_NO_VENDOR = 1;
+  nativeBuildInputs =
+    [
+      git
+      pkg-config
+      protobuf
+    ]
+    ++ optionals enableCuda [
+      autoAddDriverRunpath
+    ];
 
-  nativeBuildInputs = [
-    pkg-config
-    protobuf
-    git
-  ] ++ optionals enableCuda [
-    autoAddDriverRunpath
-  ];
+  buildInputs =
+    [ openssl ]
+    ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs
+    ++ optionals enableCuda cudaBuildInputs
+    ++ optionals enableRocm rocmBuildInputs;
 
-  buildInputs = [ openssl ]
-  ++ optionals stdenv.hostPlatform.isDarwin darwinBuildInputs
-  ++ optionals enableCuda cudaBuildInputs
-  ++ optionals enableRocm rocmBuildInputs
-  ;
+  postInstall = ''
+    # NOTE: Project contains a subproject for building llama-server
+    # But, we already have a derivation for this
+    ln -s ${lib.getExe' llama-cpp "llama-server"} $out/bin/llama-server
+  '';
 
-  env.LLAMA_CPP_LIB = "${lib.getLib llamaccpPackage}/lib";
-  patches = [ ./0001-nix-build-use-nix-native-llama-cpp-package.patch ];
+  env = {
+    OPENSSL_NO_VENDOR = 1;
+  };
 
   # Fails with:
   # file cannot create directory: /var/empty/local/lib64/cmake/Llama
   doCheck = false;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "^v([0-9.]+)$"
+    ];
+  };
 
   meta = with lib; {
     homepage = "https://github.com/TabbyML/tabby";

pkgs/by-name/x5/x509-limbo/package.nix

@@ -1,48 +0,0 @@
-{ lib
-, fetchFromGitHub
-, python3
-}:
-
-python3.pkgs.buildPythonPackage {
-  pname = "x509-limbo";
-  version = "unstable-2024-03-13";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "C2SP";
-    repo = "x509-limbo";
-    rev = "a04fb05cf132e1405f71c12616cf0aead829909a";
-    hash = "sha256-TA4ciHkXg/RKzcIs2bwpx7CxsQDyQMG636Rr74xPsBA=";
-  };
-
-  dependencies = with python3.pkgs; [
-    flit-core
-
-    requests
-    pydantic
-    jinja2
-    cryptography
-    pyopenssl
-    pyyaml
-    certvalidator
-    certifi
-  ];
-
-  postInstall = ''
-    mkdir -p $out/share
-    cp limbo.json $out/share/
-
-    wrapProgram $out/bin/limbo \
-      --append-flags "--limbo $out/share/limbo.json"
-  '';
-
-  meta = with lib; {
-    homepage = "https://x509-limbo.com/";
-    description = "Suite of testvectors for X.509 certificate path validation and tools for building them";
-    mainProgram = "limbo";
-
-    license = licenses.asl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ baloo ];
-  };
-}

pkgs/by-name/zs/zsync2/package.nix

@@ -0,0 +1,66 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  libgcrypt,
+  libcpr,
+  libargs,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zsync2";
+  version = "2.0.0-alpha-1-20230304";
+
+  src = fetchFromGitHub {
+    owner = "AppImageCommunity";
+    repo = "zsync2";
+    rev = finalAttrs.version;
+    hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0=";
+  };
+
+  patches = [
+    # Add missing cstdint includes
+    (fetchpatch {
+      url = "https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch";
+      hash = "sha256-iLXxD6v+pSwFKmwAEyzbYUJ3DmtpvV/DYr8kcD+t5Cg=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'VERSION "2.0.0-alpha-1"' 'VERSION "${finalAttrs.version}"' \
+      --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \
+      --replace-fail '<local dev build>' '<nixpkgs build>' \
+      --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"'
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    libgcrypt
+    libcpr
+    libargs
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "USE_SYSTEM_CPR" true)
+    (lib.cmakeBool "USE_SYSTEM_ARGS" true)
+  ];
+
+  meta = {
+    description = "Rewrite of the advanced file download/sync tool zsync";
+    homepage = "https://github.com/AppImageCommunity/zsync2";
+    license = lib.licenses.artistic2;
+    mainProgram = "zsync2";
+    maintainers = with lib.maintainers; [ aleksana ];
+    # macro only supports linux as of now
+    # src/zsclient.cpp#L460
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/development/libraries/protobuf/3.20.nix

@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic-v3.nix ({
-  version = "3.20.3";
-  sha256 = "sha256-u/1Yb8+mnDzc3OwirpGESuhjkuKPgqDAvlgo3uuzbbk=";
-} // args)

pkgs/development/libraries/protobuf/generic-v3.nix

@@ -1,59 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, autoreconfHook, zlib, gtest, buildPackages
-, version, sha256
-, ...
-}:
-
-let
-mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation {
-  pname = "protobuf";
-  inherit version;
-
-  # make sure you test also -A pythonPackages.protobuf
-  src = fetchFromGitHub {
-    owner = "protocolbuffers";
-    repo = "protobuf";
-    rev = "v${version}";
-    inherit sha256;
-  };
-
-  postPatch = ''
-    rm -rf gmock
-    cp -r ${gtest.src}/googlemock gmock
-    cp -r ${gtest.src}/googletest googletest
-    chmod -R a+w gmock
-    chmod -R a+w googletest
-    ln -s ../googletest gmock/gtest
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/google/protobuf/testing/googletest.cc \
-      --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
-  '';
-
-  nativeBuildInputs = [ autoreconfHook buildPackages.which buildPackages.stdenv.cc buildProtobuf ];
-
-  buildInputs = [ zlib ];
-  configureFlags = lib.optional (buildProtobuf != null) "--with-protoc=${buildProtobuf}/bin/protoc";
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  dontDisableStatic = true;
-
-  meta = {
-    description = "Google's data interchange format";
-    longDescription =
-      ''Protocol Buffers are a way of encoding structured data in an efficient
-        yet extensible format. Google uses Protocol Buffers for almost all of
-        its internal RPC protocols and file formats.
-      '';
-    homepage = "https://developers.google.com/protocol-buffers/";
-    license = lib.licenses.bsd3;
-    mainProgram = "protoc";
-    platforms = lib.platforms.unix;
-  };
-};
-in mkProtobufDerivation(if (stdenv.buildPlatform != stdenv.hostPlatform)
-                        then (mkProtobufDerivation null buildPackages.stdenv)
-                        else null) stdenv

pkgs/development/python-modules/inflection/default.nix

@@ -24,10 +24,7 @@ buildPythonPackage rec {
   meta = {
     homepage = "https://github.com/jpvanhal/inflection";
     description = "Port of Ruby on Rails inflector to Python";
-    maintainers = with lib.maintainers; [
-      NikolaMandic
-      ilya-kolpakov
-    ];
+    maintainers = with lib.maintainers; [ ilya-kolpakov ];
     license = lib.licenses.mit;
   };
 }

pkgs/development/python-modules/keras/default.nix

@@ -63,6 +63,6 @@ buildPythonPackage rec {
     homepage = "https://keras.io";
     changelog = "https://github.com/keras-team/keras/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ NikolaMandic ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

pkgs/development/tools/xcodes/default.nix

@@ -15,13 +15,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "xcodes";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "XcodesOrg";
     repo = "xcodes";
     rev = finalAttrs.version;
-    hash = "sha256-ARrSQ9ozM90Yg7y4WdU7jjNQ64sXHuhxZh/iNJcFfY0=";
+    hash = "sha256-vksfvrx0TqtjcOHn38Ey3P6jIFYF4CbD3SVICVFINSU=";
   };
 
   nativeBuildInputs = [ swift swiftpm makeWrapper ];

pkgs/development/tools/xcodes/generated/default.nix

@@ -5,9 +5,9 @@
     "data" = "1jf2y9dbg1qvxkkabdkihdnr1kmznq79h18j65a7iw1hljdp8hyg";
     "Foundation" = "0hcpc15v38l32qc2sh4gqj909b1f90knln9yz3mfiyf6xi7iy6q7";
     "KeychainAccess" = "0m57pq1vn5qarmlx5x4kfv0yzjylafl3ipih5p60zyfsx6k5b55l";
-    "LegibleError" = "08x5agha74chq1z5c7c5r2vasdk81pyl2k085miapd4l3jszz4fj";
+    "LegibleError" = "137hc96cqpiwsyybj2xawyfmqh7rmk1khqkiqp3616ql909mh99y";
     "Path.swift" = "05qk7kwb1254zwdxc3sjc3gprccnv9fwapmy5y6ygxjz8a6jfk83";
-    "PromiseKit" = "0vlkd4famjgbd4qs2ldi5aqg13nk77h7ddsdigyxxzgkwgxl076d";
+    "PromiseKit" = "19pkhk505pz03hqmv8h1lgm83iw5jha6j1v06fyzz0xar2ywv6vg";
     "Rainbow" = "0iv31azny668vpsjgmldgkgn9cp8i5h9rlc6w5bs8q63nwq19wb0";
     "swift-argument-parser" = "19b4pkcx4xf0iwg0nbr7wvkkbwl6h8sch848gid6l98728glmcw9";
     "SwiftSoup" = "14klizw8jhmxhxays1b1yh4bp0nbb3l4l1pj6sdnf0iqs0wladv8";

pkgs/development/tools/xcodes/generated/workspace-state.json

@@ -62,8 +62,8 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "909e9bab3ded97350b28a5ab41dd745dd8aa9710",
-            "version": "1.0.4"
+            "revision": "bc596702d7ff618c3f90ba480eeb48b3e83a2fbe",
+            "version": "1.0.6"
           },
           "name": "sourceControlCheckout"
         },
@@ -96,8 +96,8 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "1c296a8637838901d2b01e4c46875ee749506133",
-            "version": "6.8.5"
+            "revision": "8a98e31a47854d3180882c8068cc4d9381bf382d",
+            "version": "6.22.1"
           },
           "name": "sourceControlCheckout"
         },

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -1,34 +1,34 @@
 {
     "testing": {
-        "version": "6.12-rc3",
-        "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw"
+        "version": "6.12-rc4",
+        "hash": "sha256:0qr5sbpm512rlkylqmqhy644s4lmfr1igvmx8ds0mrb54h3qhkwk"
     },
     "6.1": {
-        "version": "6.1.113",
-        "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl"
+        "version": "6.1.114",
+        "hash": "sha256:0mm2392qk01p9685bv9pilmvm5591br7kxyv4d8fdyx25shf91i2"
     },
     "5.15": {
-        "version": "5.15.168",
-        "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng"
+        "version": "5.15.169",
+        "hash": "sha256:0w2k4yrfrdnywbg3lqppig41yydy9c48v3jhfyach6zx8pccc676"
     },
     "5.10": {
-        "version": "5.10.227",
-        "hash": "sha256:1hknbfxq59731zmxgig7b69lfdmgh5jdg391hapvmlrh07hrvq2j"
+        "version": "5.10.228",
+        "hash": "sha256:0wkvn49sdy9ykyz6cqdqd9yplqfhc6b255w6wc17ky182mzqvk3n"
     },
     "5.4": {
         "version": "5.4.284",
         "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp"
     },
     "6.6": {
-        "version": "6.6.57",
-        "hash": "sha256:1cxpmgbp8hhwa045gappf2wzh3kk1iw2xivsxzhvi6bgz5p45kk6"
+        "version": "6.6.58",
+        "hash": "sha256:1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7"
     },
     "6.10": {
         "version": "6.10.14",
         "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram"
     },
     "6.11": {
-        "version": "6.11.4",
-        "hash": "sha256:0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x"
+        "version": "6.11.5",
+        "hash": "sha256:01rafnqal2v96dzkabz0irymq4sc9ja00ggyv1xn7yzjnyrqa527"
     }
 }

pkgs/os-specific/linux/kernel/patches.nix

@@ -60,4 +60,14 @@
     name = "export-rt-sched-migrate";
     patch = ./export-rt-sched-migrate.patch;
   };
+
+  # Backport upstream fix for very annoying Tailscale issue
+  # FIXME: remove when merged upstream
+  netfilter-typo-fix = {
+    name = "netfilter-typo-fix";
+    patch = fetchpatch {
+      url = "https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/patch/?id=306ed1728e8438caed30332e1ab46b28c25fe3d8";
+      hash = "sha256-ZGc1xAIjf+MlV02jhIWZ4jHC742+z/WpN7RenqpU7e4=";
+    };
+  };
 }

pkgs/servers/mqtt/mosquitto/default.nix

@@ -13,7 +13,6 @@
 , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
 , systemd
 , uthash
-, fetchpatch
 , nixosTests
 }:
 
@@ -30,24 +29,15 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mosquitto";
-  version = "2.0.18";
+  version = "2.0.20";
 
   src = fetchFromGitHub {
     owner = "eclipse";
     repo = "mosquitto";
     rev = "v${version}";
-    hash = "sha256-Vs0blV2IhnlEAm0WtOartz+0vLesJfp78FNJCivRxHk=";
+    hash = "sha256-oZo6J6mxMC05jJ8RXIunOMB3kptA6FElchKlg4qmuQ8=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [
-    (fetchpatch {
-      name = "revert-cmake-shared-to-module.patch"; # See https://github.com/eclipse/mosquitto/issues/2277
-      url = "https://github.com/eclipse/mosquitto/commit/e21eaeca37196439b3e89bb8fd2eb1903ef94845.patch";
-      sha256 = "14syi2c1rks8sl2aw09my276w45yq1iasvzkqcrqwy4drdqrf069";
-      revert = true;
-    })
-  ];
-
   postPatch = ''
     for f in html manpage ; do
       substituteInPlace man/$f.xsl \

pkgs/servers/teleport/generic.nix

@@ -156,11 +156,6 @@ buildGoModule rec {
   # Reduce closure size for client machines
   outputs = [ "out" "client" ];
 
-  prePatch = ''
-    # TODO: remove after https://github.com/NixOS/nixpkgs/pull/332852 merges
-    sed -i 's/go 1.22.6/go 1.22.5/' go.mod
-  '';
-
   preBuild = ''
     cp -r ${webassets} webassets
   '' + lib.optionalString withRdpClient ''

pkgs/tools/misc/tlp/default.nix

@@ -39,6 +39,10 @@
     ./patches/0002-reintroduce-tlp-sleep-service.patch
   ];
 
+  postPatch = ''
+    substituteInPlace Makefile --replace-fail ' ?= /usr/' ' ?= /'
+  '';
+
   buildInputs = [ perl ];
   nativeBuildInputs = [ makeWrapper ];
 
@@ -55,16 +59,6 @@
     "TLP_WITH_SYSTEMD=1"
 
     "DESTDIR=${placeholder "out"}"
-    "TLP_BATD=/share/tlp/bat.d"
-    "TLP_BIN=/bin"
-    "TLP_CONFDEF=/share/tlp/defaults.conf"
-    "TLP_CONFREN=/share/tlp/rename.conf"
-    "TLP_FLIB=/share/tlp/func.d"
-    "TLP_MAN=/share/man"
-    "TLP_META=/share/metainfo"
-    "TLP_SBIN=/sbin"
-    "TLP_SHCPL=/share/bash-completion/completions"
-    "TLP_TLIB=/share/tlp"
   ];
 
   installTargets = [ "install-tlp" "install-man" ]

pkgs/tools/virtualization/guestfs-tools/default.nix

@@ -25,15 +25,16 @@
 , pkg-config
 , qemu
 , xz
+, gitUpdater
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guestfs-tools";
-  version = "1.52.0";
+  version = "1.52.2";
 
   src = fetchurl {
-    url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor version}-stable/guestfs-tools-${version}.tar.gz";
-    sha256 = "sha256-Iv0TIpcEX5CmdAbw/w7uDyoBBqXxyNz8XDlqYl/3g3Y=";
+    url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor finalAttrs.version}-stable/guestfs-tools-${finalAttrs.version}.tar.gz";
+    hash = "sha256-02khDS2NLG1QOSqswtDoqBX2Mg6sE/OiUoP9JFs4vTU=";
   };
 
   nativeBuildInputs = [
@@ -55,9 +56,7 @@ stdenv.mkDerivation rec {
   ]) ++
   (with ocamlPackages; [
     findlib
-    gettext-stub
     ocaml
-    ocaml_gettext
     ounit2
   ]);
 
@@ -107,11 +106,18 @@ stdenv.mkDerivation rec {
       --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]}
   '';
 
-  meta = with lib; {
-    description = "Extra tools for accessing and modifying virtual machine disk images";
-    license = with licenses; [ gpl2Plus lgpl21Plus ];
-    homepage = "https://libguestfs.org/";
-    maintainers = [ ];
-    platforms = platforms.linux;
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/libguestfs/guestfs-tools";
+    rev-prefix = "v";
+    odd-unstable = true;
   };
-}
+
+  meta = {
+    description = "Extra tools for accessing and modifying virtual machine disk images";
+    license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
+    homepage = "https://libguestfs.org/";
+    changelog = "https://www.libguestfs.org/guestfs-tools-release-notes-${lib.versions.majorMinor finalAttrs.version}.1.html";
+    maintainers = [ ];
+    platforms = lib.platforms.linux;
+  };
+})

pkgs/top-level/aliases.nix

@@ -1243,6 +1243,7 @@ mapAliases {
 
   ### X ###
 
+  x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22
   xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
   xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17
   xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30

pkgs/top-level/all-packages.nix

@@ -194,6 +194,8 @@ with pkgs;
 
   appimageTools = callPackage ../build-support/appimage { };
 
+  appimageupdate-qt = appimageupdate.override { withQtUI = true; };
+
   appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { };
 
   bindle = callPackage ../servers/bindle {
@@ -11158,7 +11160,9 @@ with pkgs;
 
   pingtcp = callPackage ../tools/networking/pingtcp { };
 
-  pingu = callPackage ../tools/networking/pingu { };
+  pingu = callPackage ../tools/networking/pingu {
+    buildGoModule = buildGo122Module;
+  };
 
   pinnwand = callPackage ../servers/pinnwand { };
 
@@ -12730,6 +12734,7 @@ with pkgs;
 
   inherit (callPackages ../servers/teleport {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
+    buildGoModule = buildGo122Module;
   }) teleport_15 teleport_16 teleport;
 
   telepresence = callPackage ../tools/networking/telepresence {
@@ -22589,9 +22594,6 @@ with pkgs;
       protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {
         abseil-cpp = abseil-cpp_202103;
       };
-      protobuf3_20 = callPackage ../development/libraries/protobuf/3.20.nix {
-        abseil-cpp = abseil-cpp_202103;
-      };
     })
     protobuf_28
     protobuf_27
@@ -22600,7 +22602,6 @@ with pkgs;
     protobuf_24
     protobuf_23
     protobuf_21
-    protobuf3_20
     ;
 
   protobufc = callPackage ../development/libraries/protobufc { };

pkgs/top-level/linux-kernels.nix

@@ -138,6 +138,7 @@ in {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
+        kernelPatches.netfilter-typo-fix
       ];
     };
 
@@ -146,6 +147,7 @@ in {
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
         kernelPatches.export-rt-sched-migrate
+        kernelPatches.netfilter-typo-fix
       ];
     };
 
@@ -154,6 +156,7 @@ in {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
+        kernelPatches.netfilter-typo-fix
       ];
     };
 
@@ -162,6 +165,7 @@ in {
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
         kernelPatches.export-rt-sched-migrate
+        kernelPatches.netfilter-typo-fix
       ];
     };
 
@@ -170,6 +174,7 @@ in {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
+        kernelPatches.netfilter-typo-fix
       ];
     };
 
@@ -178,6 +183,7 @@ in {
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
         kernelPatches.export-rt-sched-migrate
+        kernelPatches.netfilter-typo-fix
       ];
     };
 
@@ -194,6 +200,7 @@ in {
       kernelPatches = [
         kernelPatches.bridge_stp_helper
         kernelPatches.request_key_helper
+        kernelPatches.netfilter-typo-fix
       ];
     };
 
@@ -205,6 +212,7 @@ in {
         kernelPatches = [
           kernelPatches.bridge_stp_helper
           kernelPatches.request_key_helper
+          kernelPatches.netfilter-typo-fix
         ];
       };
       latest = packageAliases.linux_latest.kernel;

pkgs/top-level/python-packages.nix

@@ -10728,11 +10728,6 @@ self: super: with self; {
 
   proto-plus = callPackage ../development/python-modules/proto-plus { };
 
-  # Protobuf 3.x
-  protobuf3 = callPackage ../development/python-modules/protobuf/3.nix {
-    protobuf = pkgs.protobuf3_20;
-  };
-
   # Protobuf 4.x
   protobuf4 = callPackage ../development/python-modules/protobuf/4.nix {
     protobuf = pkgs.protobuf_25;