Merge remote-tracking branch 'origin/master' into staging-next

2024-11-25 08:23:09 +00:00 · 2024-10-27 23:56:04 -06:00 · 2024-10-27 23:56:04 -06:00 · 980dd8b4ed
commit 980dd8b4ed
parent b8ff22dcdc 1eff2edca4
46 changed files with 6681 additions and 154 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -731,6 +731,12 @@
    githubId = 79667753;
    keys = [ { fingerprint = "B0D7 2955 235F 6AB5 ACFA  1619 8C7F F5BB 1ADE F191"; } ];
  };
+  ailsa-sun = {
+    name = "Ailsa Sun";
+    email = "jjshenw@gmail.com";
+    github = "ailsa-sun";
+    githubId = 135079815;
+  };
  aimpizza = {
    email = "rickomo.us@gmail.com";
    name = "Rick Omonsky";
--- a/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/pkgs/applications/graphics/pineapple-pictures/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pineapple-pictures";
-  version = "0.8.1";
+  version = "0.8.2.1";

  src = fetchFromGitHub {
    owner = "BLumia";
    repo = "pineapple-pictures";
    rev = finalAttrs.version;
-    hash = "sha256-7X0A3tjdr8hnnovkbgIOLx5h/eWy0gkM8SEB2/bpwkQ=";
+    hash = "sha256-24VDmB0eR8h0JGqpsdN0HkRRIHLw9DIT2sM4rCvPwhE=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@ -108,13 +108,13 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "blender";
-  version = "4.2.2";
+  version = "4.2.3";

  srcs = [
    (fetchzip {
      name = "source";
      url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz";
-      hash = "sha256-wv9EwB4DXSVS5K+lb+7gU3pTrMDO/ELeV2eErivfsWU=";
+      hash = "sha256-58wgduTHGfuYohaPjNuAnLFrpXOosEYOk5gJvbxTlQk=";
    })
    (fetchgit {
      name = "assets";
--- a/pkgs/applications/networking/cluster/k8sgpt/default.nix
+++ b/pkgs/applications/networking/cluster/k8sgpt/default.nix
@ -1,33 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "k8sgpt";
-  version = "0.3.30";
-
-  src = fetchFromGitHub {
-    owner = "k8sgpt-ai";
-    repo = "k8sgpt";
-    rev = "v${version}";
-    hash = "sha256-iseyvGo9fitt8bAlbU3wF7bBLz66fijb8h35aank+0k=";
-  };
-
-  vendorHash = "sha256-YpCn7hZkMj3/dIC/ZMslTjXcumCH3LH/A7pjfJ0pUd4=";
-
-  CGO_ENABLED = 0;
-
-  ldflags = [
-    "-s" "-w"
-    "-X main.version=v${version}"
-    "-X main.commit=${src.rev}"
-    "-X main.date=1970-01-01-00:00:01"
-  ];
-
-  meta = {
-    description = "Giving Kubernetes Superpowers to everyone";
-    mainProgram = "k8sgpt";
-    homepage = "https://k8sgpt.ai";
-    changelog = "https://github.com/k8sgpt-ai/k8sgpt/releases/tag/v${version}";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ developer-guy kranurag7 ];
-  };
-}
--- a/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/pkgs/applications/networking/cluster/linkerd/edge.nix
@ -2,7 +2,7 @@

 (callPackage ./generic.nix { }) {
  channel = "edge";
-  version = "24.9.3";
-  sha256 = "1vm6f8abain3zjs3jymr62p7lk475av38pljczgb13fgnn2w6qii";
-  vendorHash = "sha256-w7TchPXGQQSWcCVf4BMvh5U8qnkctgJAl0sHL6ml/8Y=";
+  version = "24.10.3";
+  sha256 = "1xsimk3kjniy59sw56q52cmnpg1vb1l1zbaj6nrj44pl57vkp9cp";
+  vendorHash = "sha256-JVXhZjUdU1CrWzrh7INhAd3kRP/tcdsYzlre9SB9gOQ=";
 }
--- a/pkgs/by-name/as/astro-language-server/package.nix
+++ b/pkgs/by-name/as/astro-language-server/package.nix
@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "astro-language-server";
-  version = "2.15.3";
+  version = "2.15.4";

  src = fetchFromGitHub {
    owner = "withastro";
    repo = "language-tools";
    rev = "@astrojs/language-server@${finalAttrs.version}";
-    hash = "sha256-PJTcr/FIA0haatLFNHMJV24j6eK+c2DR9zpnR8aReHo=";
+    hash = "sha256-NBLUeg1WqxTXtu8eg1fihQSfm8koYAEWhfXAj/fIdC8=";
  };

  pnpmDeps = pnpm.fetchDeps {
@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
      pnpmWorkspaces
      prePnpmInstall
      ;
-    hash = "sha256-/X8ZoWK5kBPm/8clBDP+B9A5ofXnH2svmy4kMc2t5iA=";
+    hash = "sha256-tlpk+wbLjJqt37lu67p2A2RZAR1ZfnZFiYoqIQwvWPQ=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/ca/catppuccin-cursors/package.nix
+++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix
@ -1,21 +1,46 @@
-{ lib
-, stdenvNoCC
-, fetchFromGitHub
-, inkscape
-, just
-, xcursorgen
-, hyprcursor
-, xcur2png
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  inkscape,
+  just,
+  xcursorgen,
+  hyprcursor,
+  xcur2png,
+  catppuccin-whiskers,
+  python3,
+  python3Packages,
 }:
-
 let
  dimensions = {
-    palette = [ "frappe" "latte" "macchiato" "mocha" ];
-    color = [ "Blue" "Dark" "Flamingo" "Green" "Lavender" "Light" "Maroon" "Mauve" "Peach" "Pink" "Red" "Rosewater" "Sapphire" "Sky" "Teal" "Yellow" ];
+    palette = [
+      "frappe"
+      "latte"
+      "macchiato"
+      "mocha"
+    ];
+    color = [
+      "Blue"
+      "Dark"
+      "Flamingo"
+      "Green"
+      "Lavender"
+      "Light"
+      "Maroon"
+      "Mauve"
+      "Peach"
+      "Pink"
+      "Red"
+      "Rosewater"
+      "Sapphire"
+      "Sky"
+      "Teal"
+      "Yellow"
+    ];
  };
  variantName = { palette, color }: palette + color;
  variants = lib.mapCartesianProduct variantName dimensions;
-  version = "0.4.0";
+  version = "1.0.0";
 in
 stdenvNoCC.mkDerivation {
  pname = "catppuccin-cursors";
@ -25,14 +50,23 @@ stdenvNoCC.mkDerivation {
    owner = "catppuccin";
    repo = "cursors";
    rev = "v${version}";
-    hash = "sha256-VxLwZkZdV1xH4jeqtszqSnhNrgF3uamEXBLPKIc4lXE=";
+    hash = "sha256-LZ2k8i4w68VW4YFmC659iMQsQyduHJOfyL8cLlXhUHo=";
  };

-  nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ];
+  nativeBuildInputs = [
+    just
+    inkscape
+    xcursorgen
+    hyprcursor
+    xcur2png
+    catppuccin-whiskers
+    python3
+    python3Packages.pyside6
+  ];

  outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage

-  outputsToInstall = [];
+  outputsToInstall = [ ];

  buildPhase = ''
    runHook preBuild
--- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
+++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "fcitx5-mcbopomofo";
-  version = "2.7";
+  version = "2.8";

  src = fetchFromGitHub {
    owner = "openvanilla";
    repo = "fcitx5-mcbopomofo";
    rev = version;
-    hash = "sha256-7AuH/Ns5syMmcGeIPxi0KepMn2VzOnqopqKuQ2zxucc=";
+    hash = "sha256-VnAE+DIDEYAfHnHS/ufwohkUgmgjNyrCyJlA2g1p2aY=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@ -0,0 +1,96 @@
+{
+  lib,
+  fetchFromGitHub,
+  flutter,
+  keybinder3,
+  libayatana-appindicator,
+  buildGoModule,
+  makeDesktopItem,
+  copyDesktopItems,
+}:
+let
+  pname = "flclash";
+  version = "0.8.66";
+  src =
+    (fetchFromGitHub {
+      owner = "chen08209";
+      repo = "FlClash";
+      rev = "v${version}";
+      hash = "sha256-LkaAALJcP3DGXBMZ3QWLUiyT9Kr4yTxKIRqYhrW1WOw=";
+      fetchSubmodules = true;
+    }).overrideAttrs
+      (_: {
+        GIT_CONFIG_COUNT = 1;
+        GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf";
+        GIT_CONFIG_VALUE_0 = "git@github.com:";
+      });
+  libclash = buildGoModule {
+    inherit pname version src;
+    modRoot = "./core";
+    vendorHash = "sha256-K+PrLFvDHyaxf1NKzcqf0qmfQwT8rctScv1CN+TxY0M=";
+    buildPhase = ''
+      runHook preBuild
+      mkdir -p $out/lib
+      go build -ldflags="-w -s" -tags=with_gvisor -buildmode=c-shared -o $out/lib/libclash.so
+      runHook postBuild
+    '';
+  };
+in
+flutter.buildFlutterApplication {
+  inherit pname version src;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "FlClash";
+      exec = "FlClash %U";
+      icon = "FlClash";
+      genericName = "FlClash";
+      desktopName = "FlClash";
+      categories = [
+        "Network"
+      ];
+      keywords = [
+        "FlClash"
+        "Clash"
+        "ClashMeta"
+        "Proxy"
+      ];
+    })
+  ];
+
+  patchPhase = ''
+    runHook prePatch
+    substituteInPlace lib/clash/core.dart --replace-fail 'DynamicLibrary.open("libclash.so")' 'DynamicLibrary.open("${libclash}/lib/libclash.so")'
+    runHook postPatch
+  '';
+
+  preBuild = ''
+    mkdir -p ./libclash/linux/
+    cp ${libclash}/lib/libclash.so ./libclash/linux/libclash.so
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/pixmaps/
+    cp ./assets/images/icon.png $out/share/pixmaps/FlClash.png
+  '';
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    keybinder3
+    libayatana-appindicator
+  ];
+
+  meta = {
+    description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
+    homepage = "https://github.com/chen08209/FlClash";
+    mainProgram = "FlClash";
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ aucub ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/fl/flclash/pubspec.lock.json
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "gatus";
-  version = "5.12.1";
+  version = "5.13.0";

  src = fetchFromGitHub {
    owner = "TwiN";
    repo = "gatus";
    rev = "v${version}";
-    hash = "sha256-K9jEepcxfV1sAC3YKqkvDA9HHlobksJPwsAcqD3gcmQ=";
+    hash = "sha256-+wXkB6QPAXerv8WKk4f7WA44eEaiw92Z+1bqhkZk9qQ=";
  };

-  vendorHash = "sha256-jRRFj4NdxsjC9CM+Vm5+gV0ZMbz45YtGyE3FaGaGp28=";
+  vendorHash = "sha256-pM47Jy7WIS8+3mFEmPZdnyxcDjoxgdP46xuTmf4p2JM=";

  subPackages = [ "." ];

--- a/pkgs/by-name/ja/jazz2/package.nix
+++ b/pkgs/by-name/ja/jazz2/package.nix
@ -13,13 +13,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "jazz2";
-  version = "2.8.0";
+  version = "2.9.0";

  src = fetchFromGitHub {
    owner = "deathkiller";
    repo = "jazz2-native";
    rev = finalAttrs.version;
-    hash = "sha256-qJVT7WCw3nfoLbSqLFfZCI5VLOuoD/iSVfC9B+XEhyg=";
+    hash = "sha256-qkR3j22tG8Q9WGeIFauWLibpMrF3AvU0abt/6lg763U=";
  };

  patches = [ ./nocontent.patch ];
--- a/pkgs/by-name/k8/k8sgpt/package.nix
+++ b/pkgs/by-name/k8/k8sgpt/package.nix
@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "k8sgpt";
+  version = "0.3.41";
+
+  src = fetchFromGitHub {
+    owner = "k8sgpt-ai";
+    repo = "k8sgpt";
+    rev = "v${version}";
+    hash = "sha256-p53gVpFhxr60OEZSASRU5KX7TkWzYCDAvG9aQj2NFHI=";
+  };
+
+  vendorHash = "sha256-9H6E1JUbxfcx3Baithu9Jr6MpxfuKE+XWz7HrTCdxA8=";
+
+  # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED
+  CGO_ENABLED = 0;
+
+  # https://nixos.org/manual/nixpkgs/stable/#ssec-skip-go-tests
+  checkFlags = [
+    "-skip=TestActivate/trivy"
+  ];
+
+  # https://nixos.org/manual/nixpkgs/stable/#ssec-skip-go-tests
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.version=v${version}"
+    "-X main.commit=${src.rev}"
+    "-X main.date=1970-01-01-00:00:01"
+  ];
+
+  meta = {
+    description = "Giving Kubernetes Superpowers to everyone";
+    mainProgram = "k8sgpt";
+    homepage = "https://k8sgpt.ai";
+    changelog = "https://github.com/k8sgpt-ai/k8sgpt/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      developer-guy
+      kranurag7
+      mrgiles
+    ];
+  };
+}
--- a/pkgs/by-name/le/less/package.nix
+++ b/pkgs/by-name/le/less/package.nix
@ -1,17 +1,22 @@
-{ lib
-, stdenv
-, fetchurl
-, ncurses
-, pcre2
-, withSecure ? false
+{
+  lib,
+  fetchurl,
+  ncurses,
+  pcre2,
+  stdenv,
+  # Boolean options
+  withSecure ? false,
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "less";
  version = "668";

-  # Only tarballs on the website are valid releases,
-  # other versions, e.g. git tags are considered snapshots.
+  # `less` is provided by the following sources:
+  # - meta.homepage
+  # - GitHub: https://github.com/gwsw/less/
+  # The releases recommended for general consumption are only those from
+  # homepage, and only those not marked as beta.
  src = fetchurl {
    url = "https://www.greenwoodsoftware.com/less/less-${finalAttrs.version}.tar.gz";
    hash = "sha256-KBn1VWTYbVQqu+yv2C/2HoGaPuyWf6o2zT5o8VlqRLg=";
@ -22,13 +27,18 @@ stdenv.mkDerivation (finalAttrs: {
    pcre2
  ];

-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "man"
+  ];

  configureFlags = [
-    # Look for 'sysless' in /etc.
-    "--sysconfdir=/etc"
-    "--with-regex=pcre2"
-  ] ++ lib.optional withSecure "--with-secure";
+    "--sysconfdir=/etc" # Look for 'sysless' in /etc
+    (lib.withFeatureAs true "regex" "pcre2")
+    (lib.withFeature withSecure "secure")
+  ];
+
+  strictDeps = true;

  meta = {
    homepage = "https://www.greenwoodsoftware.com/less/";
@ -36,7 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
    changelog = "https://www.greenwoodsoftware.com/less/news.${finalAttrs.version}.html";
    license = lib.licenses.gpl3Plus;
    mainProgram = "less";
-    maintainers = with lib.maintainers; [ dtzWill ];
+    maintainers = with lib.maintainers; [
+      AndersonTorres
+      # not active
+      dtzWill
+    ];
    platforms = lib.platforms.unix;
  };
 })
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "namespace-cli";
-  version = "0.0.392";
+  version = "0.0.394";

  src = fetchFromGitHub {
    owner = "namespacelabs";
    repo = "foundation";
    rev = "v${version}";
-    hash = "sha256-o0/kAat8vEhVE9ut179yBpvLuMFw6bNha2qT1ddvs7E=";
+    hash = "sha256-ktXpFhE/+DmlqIaH8R6zu4Y1I7sr8NYeZP8lWeNN0bA=";
  };

-  vendorHash = "sha256-XO/Fj66w17zLJIQHv6F6czReqtqyCORAgCRtjwRaTbo=";
+  vendorHash = "sha256-E9RhELIGOjFa+gDinl4xDR3ckTtdFLqVoAT0HQoI38I=";

  subPackages = ["cmd/nsc" "cmd/ns" "cmd/docker-credential-nsc"];

--- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
+++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@ -7,7 +7,7 @@

 let
  bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
-  version = "0.92.0";
+  version = "0.93.0";
 in
 stdenv.mkDerivation {
  pname = "nwjs-ffmpeg-prebuilt";
@ -16,8 +16,8 @@ stdenv.mkDerivation {
  src =
    let
      hashes = {
-        "x64" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I=";
-        "ia32" = "sha256-0Y0m9wGZGqH78LTPSWw+OCTvxd6kmIjuYzSaepwt9/I=";
+        "x64" = "sha256-8FcoZ9pN/FKun3QuoFSKKreKCfj8tp2IgkRiDajT5ms=";
+        "ia32" = "sha256-8FcoZ9pN/FKun3QuoFSKKreKCfj8tp2IgkRiDajT5ms=";
      };
    in
    fetchurl {
--- a/pkgs/by-name/op/opnborg/package.nix
+++ b/pkgs/by-name/op/opnborg/package.nix
@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
  pname = "opnborg";
-  version = "0.1.18";
+  version = "0.1.24";

  src = fetchFromGitHub {
    owner = "paepckehh";
    repo = "opnborg";
    rev = "v${version}";
-    hash = "sha256-eRJLdrNspkdpb24Bz7GjvcC+1iwRVXyG6Rjqf3fGkZY=";
+    hash = "sha256-lJPu1Ixx1BUWrZ+h6AuxLyVMScKAmcp+sK2duOxC9e0=";
  };

  vendorHash = "sha256-REXJryUcu+/AdVx1aK0nJ98Wq/EdhrZqL24kC1wK6mc=";
--- a/pkgs/by-name/re/readarr/package.nix
+++ b/pkgs/by-name/re/readarr/package.nix
@ -8,13 +8,13 @@ let
    x86_64-darwin = "x64";
  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
  hash = {
-    x64-linux_hash = "sha256-qvq4Ivv9AKIljEwdMMKWjy5vZnZ4LPd0gxUUIHcEP7E=";
-    arm64-linux_hash = "sha256-MNJOIDNT+3ZZP7sTnTdiDFG+Q+42dUvEj6pGZ3LLS/4=";
-    x64-osx_hash = "sha256-DKPllZhtebuOfYrJVfhxfhPcoXSnozD2VM6+NP3azus=";
+    x64-linux_hash = "sha256-oEdO9V9QLPXkZh+QUyVjlMY21iFT1p8i2DoPWpR3Qlg=";
+    arm64-linux_hash = "sha256-SjLCyo2Oc8SMll1crTyH/TPf7jx5Lul6zmbVy7m3LcM=";
+    x64-osx_hash = "sha256-vMpLDGoBLDk11EafFhEg/k1/9xiv873WWuUv1UrNxIo=";
  }."${arch}-${os}_hash";
 in stdenv.mkDerivation rec {
  pname = "readarr";
-  version = "0.3.32.2587";
+  version = "0.4.1.2648";

  src = fetchurl {
    url = "https://github.com/Readarr/Readarr/releases/download/v${version}/Readarr.develop.${version}.${os}-core-${arch}.tar.gz";
@ -41,11 +41,11 @@ in stdenv.mkDerivation rec {
    tests.smoke-test = nixosTests.readarr;
  };

-  meta = with lib; {
+  meta = {
    description = "Usenet/BitTorrent ebook downloader";
    homepage = "https://readarr.com";
-    license = licenses.gpl3;
-    maintainers = [ maintainers.jocelynthode ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ jocelynthode devusb ];
    mainProgram = "Readarr";
    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
--- a/pkgs/by-name/re/readarr/update.sh
+++ b/pkgs/by-name/re/readarr/update.sh
@ -17,15 +17,15 @@ updateHash()
    hash=$(nix-prefetch-url --type sha256 $url)
    sriHash="$(nix hash to-sri --type sha256 $hash)"

-    sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/default.nix"
+    sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$sriHash\";|g" "$dirname/package.nix"
 }

 updateVersion()
 {
-    sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/default.nix"
+    sed -i "s/version = \"[0-9.]*\";/version = \"$1\";/g" "$dirname/package.nix"
 }

-currentVersion=$(cd $dirname && nix eval --raw -f ../../.. readarr.version)
+currentVersion=$(cd $dirname && nix eval --raw -f ../../../.. readarr.version)

 # We cannot use the latest releases as in the past Readarr released old version with v2.0 and then went back to 0.1
 latestTag=$(curl https://api.github.com/repos/Readarr/Readarr/releases | jq -r ".[0].tag_name")
--- a/pkgs/by-name/so/sonusmix/Cargo.lock
+++ b/pkgs/by-name/so/sonusmix/Cargo.lock
--- a/pkgs/by-name/so/sonusmix/package.nix
+++ b/pkgs/by-name/so/sonusmix/package.nix
@ -0,0 +1,54 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitea,
+  pkg-config,
+  glib,
+  gtk4,
+  pipewire,
+  dbus,
+  wrapGAppsHook4,
+  autoPatchelfHook,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "sonusmix";
+  version = "0.1.1";
+  doCheck = false;
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "sonusmix";
+    repo = "sonusmix";
+    rev = "v${version}";
+    hash = "sha256-vqbYJuErghSsvkFccLFUYuf1Dsg17tCBhF4/NLcba/E=";
+  };
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "libspa-0.8.0" = "sha256-R68TkFbzDFA/8Btcar+0omUErLyBMm4fsmQlCvfqR9o=";
+    };
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+    wrapGAppsHook4
+    autoPatchelfHook
+  ];
+
+  buildInputs = [
+    glib
+    gtk4
+    pipewire
+    dbus
+  ];
+
+  meta = {
+    description = "Next-gen Pipewire audio routing tool";
+    homepage = "https://codeberg.org/sonusmix/sonusmix";
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ aucub ];
+    platforms = lib.platforms.linux;
+  };
+}
--- a/pkgs/by-name/un/universal-android-debloater/package.nix
+++ b/pkgs/by-name/un/universal-android-debloater/package.nix
@ -1,31 +1,33 @@
-{ android-tools
-, clang
-, expat
-, fetchFromGitHub
-, fontconfig
-, freetype
-, lib
-, libglvnd
-, libxkbcommon
-, wayland
-, makeWrapper
-, mold
-, pkg-config
-, rustPlatform
-, xorg
+{
+  android-tools,
+  clang,
+  expat,
+  fetchFromGitHub,
+  fontconfig,
+  freetype,
+  lib,
+  libglvnd,
+  libxkbcommon,
+  wayland,
+  makeWrapper,
+  mold,
+  pkg-config,
+  rustPlatform,
+  xorg,
 }:
+
 rustPlatform.buildRustPackage rec {
  pname = "universal-android-debloater";
-  version = "1.0.3";
+  version = "1.1.0";

  src = fetchFromGitHub {
    owner = "Universal-Debloater-Alliance";
    repo = "universal-android-debloater-next-generation";
    rev = "v${version}";
-    hash = "sha256-yiCl6inPFveMO4IA2NwwpEmbRSmrZBeZR+eiKzGj6a0=";
+    hash = "sha256-o54gwFl2x0/nE1hiE5F8D18vQSNCKU9Oxiq8RA+yOoE=";
  };

-  cargoHash = "sha256-HqyOslcr3pwDvpZ8CNbAy2W5jGhWGWoe/rutq0leNaY=";
+  cargoHash = "sha256-Zm0zC9GZ2IsjVp5Phd38UAiBH8n0O/i56CEURBUapAg=";

  buildInputs = [
    expat
@ -49,17 +51,29 @@ rustPlatform.buildRustPackage rec {

  postInstall = ''
    wrapProgram $out/bin/uad-ng \
-      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ fontconfig freetype libglvnd libxkbcommon wayland xorg.libX11 xorg.libXcursor xorg.libXi xorg.libXrandr ]} \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          fontconfig
+          freetype
+          libglvnd
+          libxkbcommon
+          wayland
+          xorg.libX11
+          xorg.libXcursor
+          xorg.libXi
+          xorg.libXrandr
+        ]
+      } \
      --suffix PATH : ${lib.makeBinPath [ android-tools ]}
  '';

-  meta = with lib; {
+  meta = {
    description = "Tool to debloat non-rooted Android devices";
    changelog = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/blob/${src.rev}/CHANGELOG.md";
    homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
    mainProgram = "uad-ng";
-    maintainers = with maintainers; [ lavafroth ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ lavafroth ];
+    platforms = lib.platforms.linux;
  };
 }
--- a/pkgs/by-name/wp/wprs/Cargo.lock
+++ b/pkgs/by-name/wp/wprs/Cargo.lock
--- a/pkgs/by-name/wp/wprs/package.nix
+++ b/pkgs/by-name/wp/wprs/package.nix
@ -0,0 +1,54 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libxkbcommon,
+  python3,
+  python3Packages,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "wprs";
+  version = "0-unstable-2024-10-22";
+
+  src = fetchFromGitHub {
+    owner = "wayland-transpositor";
+    repo = "wprs";
+    rev = "6b993332c55568e66961b52bb6285e76d97d50df";
+    hash = "sha256-WrPr9b1r8As4Y5c+QCOYnHvY9x145+pL4OSmrGsYDpk=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libxkbcommon
+    python3
+    python3Packages.psutil
+
+  ];
+
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+
+    outputHashes = {
+      "divbuf-0.3.2-pre" = "sha256-xV0RWT4xu/LTVUGQSrafOgJ+X7FlnH7Cz6KreKSlCjw=";
+      "smithay-0.3.0" = "sha256-lqAJACmkJ6Ap/zRGjJjwJbQOynUPPhXAApHS60jYLxo=";
+      "smithay-client-toolkit-0.19.1" = "sha256-Sw/eM5rjaKVVFaEYaYj09jsxaLZTpD2IdQGpr/o0Fpc=";
+    };
+  };
+
+  preFixup = ''
+    cp  wprs "$out/bin/wprs"
+  '';
+
+  meta = with lib; {
+    description = "rootless remote desktop access for remote Wayland";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ mksafavi ];
+    platforms = [ "x86_64-linux" ]; # The aarch64-linux support is not implemented in upstream yet. Also, the darwin platform is not supported as it requires wayland.
+    homepage = "https://github.com/wayland-transpositor/wprs";
+    mainProgram = "wprs";
+  };
+}
--- a/pkgs/development/libraries/grilo-plugins/default.nix
+++ b/pkgs/development/libraries/grilo-plugins/default.nix
@ -6,6 +6,7 @@
 , pkg-config
 , gettext
 , gperf
+, glib
 , sqlite
 , libarchive
 , libdmapsharing
@ -52,6 +53,12 @@ stdenv.mkDerivation rec {
    })
  ];

+  strictDeps = true;
+
+  depsBuildBuild = [
+    pkg-config
+  ];
+
  nativeBuildInputs = [
    meson
    ninja
@ -59,6 +66,7 @@ stdenv.mkDerivation rec {
    gettext
    itstool
    gperf # for lua-factory
+    glib # glib-compile-resources
  ];

  buildInputs = [
--- a/pkgs/development/python-modules/django-auth-ldap/default.nix
+++ b/pkgs/development/python-modules/django-auth-ldap/default.nix
@ -52,6 +52,6 @@ buildPythonPackage rec {
    homepage = "https://github.com/django-auth-ldap/django-auth-ldap";
    license = licenses.bsd2;
    maintainers = with maintainers; [ mmai ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
  };
 }
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@ -45,6 +45,11 @@ buildPythonPackage rec {
    numpy
  ];

+  pythonRelaxDeps = [
+    # Boto @ 1.35 has outstripped the version requirement
+    "boto3"
+  ];
+
  nativeCheckInputs = [
    langchain-standard-tests
    pytest-asyncio
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@ -34,14 +34,14 @@

 buildPythonPackage rec {
  pname = "langchain-core";
-  version = "0.3.7";
+  version = "0.3.12";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "langchain-ai";
    repo = "langchain";
    rev = "refs/tags/langchain-core==${version}";
-    hash = "sha256-s2tqBJpWJNy0SnHWt0RQowmRbBD+7zqFEeDuFrUzr2U=";
+    hash = "sha256-WWzEIP/JirA4btYVy4+U7PSg6S8VnkZqxPLgLriWbTY=";
  };

  sourceRoot = "${src.name}/libs/core";
@ -119,6 +119,15 @@ buildPythonPackage rec {
      # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
      "test_chat_prompt_template_variable_names"
      "test_create_model_v2"
+
+      # Comparison with magic strings
+      "test_prompt_with_chat_model"
+      "test_prompt_with_chat_model_async"
+      "test_prompt_with_llm"
+      "test_prompt_with_llm_parser"
+      "test_prompt_with_llm_and_async_lambda"
+      "test_prompt_with_chat_model_and_parser"
+      "test_combining_sequences"
    ]
    ++ lib.optionals stdenv.hostPlatform.isDarwin [
      # Langchain-core the following tests due to the test comparing execution time with magic values.
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@ -42,14 +42,14 @@

 buildPythonPackage rec {
  pname = "langchain";
-  version = "0.3.1";
+  version = "0.3.4";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "langchain-ai";
    repo = "langchain";
    rev = "refs/tags/langchain==${version}";
-    hash = "sha256-Zg+9ZwzTDKCyfz4T/tVIGfRUUmkE939hocxSWpFRngQ=";
+    hash = "sha256-MRpXR4nQDobzofhzkU5Y2OiEsi+VdjCcF/vcxcG/144=";
  };

  sourceRoot = "${src.name}/libs/langchain";
--- a/pkgs/development/tools/extism-cli/default.nix
+++ b/pkgs/development/tools/extism-cli/default.nix
@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "extism-cli";
-  version = "1.5.4";
+  version = "1.6.0";

  src = fetchFromGitHub {
    owner = "extism";
    repo = "cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-zC03cvvotRIiW4IiVTwffgMYLDrCp72pgMJHoJk5L0Q=";
+    hash = "sha256-FAnPyhCc1R6Xk195hTfO16WVtYVB6RPp7Ih7+uyRy2s=";
  };

-  vendorHash = "sha256-n4Ue2TSG0zbC2uqXiNakqWQjxhbOgXnC2Y7EKP2BM8Q=";
+  vendorHash = "sha256-w8XqHirHfswhlBH/oSrDKLyGdbaiFjQGEZcMH+WVLYo=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/development/tools/rust/cargo-udeps/default.nix
+++ b/pkgs/development/tools/rust/cargo-udeps/default.nix
@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-udeps";
-  version = "0.1.50";
+  version = "0.1.52";

  src = fetchFromGitHub {
    owner = "est31";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-SU9SX+Z03CnJAuR1RCdSuU5Q+lxqAbqJY4SA83Ezj8M=";
+    sha256 = "sha256-ArFQaQQU6lOT5wS9vxC+hCYpDWaq7D1DbQhjGzPQEjo=";
  };

-  cargoHash = "sha256-HWJt9WaSKVJDcUEOgi0Zai3k44KyQqs+ckTAZfZyibA=";
+  cargoHash = "sha256-fRTOhZVehGBwQcJQM/GWmLgfaDK7aJFYz772MPYhkn4=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/development/tools/sd-local/default.nix
+++ b/pkgs/development/tools/sd-local/default.nix
@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "sd-local";
-  version = "1.0.54";
+  version = "1.0.55";

  src = fetchFromGitHub {
    owner = "screwdriver-cd";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-2R/TVKCj3abUtrzzMW907GCC1H+lxTmg4J1kHHztE8I=";
+    sha256 = "sha256-b8gv2iPk6LGTfHk67NXSlA637nHY2UjX25uLaIA6E/g=";
  };

  vendorHash = "sha256-rAFfyMlnhDrb+f04S9+hNygXPaoG9mheQMxaJtXxBVw=";
--- a/pkgs/kde/third-party/karousel/default.nix
+++ b/pkgs/kde/third-party/karousel/default.nix
@ -10,13 +10,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "karousel";
-  version = "0.9.4";
+  version = "0.10";

  src = fetchFromGitHub {
    owner = "peterfajdiga";
    repo = "karousel";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-L6N1TCvc9AoTTJrAnO68lbSZq8M668BHAU7ynNzoTn8=";
+    hash = "sha256-lI3VaCd4eYhWbnYLEIeFiB88SWjd/DF8CUGFmxEXDXo=";
  };

  postPatch = ''
--- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix
+++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "intel-compute-runtime";
-  version = "24.35.30872.22";
+  version = "24.39.31294.12";

  src = fetchFromGitHub {
    owner = "intel";
    repo = "compute-runtime";
    rev = version;
-    hash = "sha256-OI1pyH6g4U6FI2zE63oU9y8e39VgZUO0tSIOsOOon88=";
+    hash = "sha256-7GNtAo20DgxAxYSPt6Nh92nuuaS9tzsQGH+sLnsvBKU=";
  };

  nativeBuildInputs = [ cmake pkg-config ];
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@ -12,13 +12,13 @@
 buildHomeAssistantComponent rec {
  owner = "al-one";
  domain = "xiaomi_miot";
-  version = "0.7.20";
+  version = "0.7.21";

  src = fetchFromGitHub {
    owner = "al-one";
    repo = "hass-xiaomi-miot";
    rev = "v${version}";
-    hash = "sha256-wR5N6a+g4TE9cRv1k4zExCWiui7ZHwK54j0oUxnhcR0=";
+    hash = "sha256-5MYA5MejQAANyjVqhqZtaIEQEs1K/aOx+1n+L9TmNmY=";
  };

  propagatedBuildInputs = [
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@ -11,6 +11,7 @@
 , expat
 , fdk_aac
 , ffmpeg-headless
+, ffmpeg_6-headless
 , geoip
 , libbsd
 , libiconv
@ -991,7 +992,7 @@ let self = {
      '';
    };

-    inputs = [ ffmpeg-headless fdk_aac openssl libxml2 libiconv ];
+    inputs = [ ffmpeg_6-headless fdk_aac openssl libxml2 libiconv ];

    meta = with lib; {
      description = "VOD packager";
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@ -24,6 +24,7 @@ let
        "out"
        "webapps"
      ];
+
      installPhase = ''
        mkdir $out
        mv * $out
@ -67,4 +68,9 @@ in
    version = "10.1.30";
    hash = "sha256-jeWoCPPcdirOZ5SM2Q0TJ7EWgWYiBE3IdQ8EIH35Ci4=";
  };
+
+  tomcat11 = common {
+    version = "11.0.0";
+    hash = "sha256-0MoxmvNJg49ZAJqcXtNwnwI0QgEFnbwm3OQxPulpzSA=";
+  };
 }
--- a/pkgs/servers/owntracks-recorder/default.nix
+++ b/pkgs/servers/owntracks-recorder/default.nix
@ -16,13 +16,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "owntracks-recorder";
-  version = "0.9.8";
+  version = "0.9.9";

  src = fetchFromGitHub {
    owner = "owntracks";
    repo = "recorder";
    rev = finalAttrs.version;
-    hash = "sha256-h+hjcaa+Ooa8gErjzfX+p+S24fbnCOtjfliFWVj73dI=";
+    hash = "sha256-6oCWzTiQgpp75xojd2ZFsrg+Kd5/gex1BPQVOWHfMuk=";
  };

  nativeBuildInputs = [
--- a/pkgs/test/build-environment-info/default.nix
+++ b/pkgs/test/build-environment-info/default.nix
@ -0,0 +1,11 @@
+{ runCommand }:
+
+# Prints information about the state of the build environment for
+# assistance debugging Hydra. Feel free to add anything you would find
+# useful to this.
+runCommand "build-environment-info" { } ''
+  ulimit -a
+
+  # Always fail so that this job can easily be restarted.
+  exit 1
+''
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@ -185,4 +185,6 @@ with pkgs;
  replaceVars = recurseIntoAttrs (callPackage ./replace-vars { });

  substitute = recurseIntoAttrs (callPackage ./substitute { });
+
+  build-environment-info = callPackage ./build-environment-info { };
 }
--- a/pkgs/tools/admin/swapspace/default.nix
+++ b/pkgs/tools/admin/swapspace/default.nix
@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, util-linux }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, installShellFiles, util-linux, binlore, swapspace }:

 stdenv.mkDerivation rec {
  pname = "swapspace";
@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
    install --mode=444 -D 'swapspace.service' "$out/etc/systemd/system/swapspace.service"
  '';

+  # Nothing in swapspace --help or swapspace’s man page mentions
+  # anything about swapspace executing its arguments.
+  passthru.binlore.out = binlore.synthesize swapspace ''
+    execer cannot bin/swapspace
+  '';
+
  meta = with lib; {
    description = "Dynamic swap manager for Linux";
    homepage = "https://github.com/Tookmund/Swapspace";
--- a/pkgs/tools/backup/restic/default.nix
+++ b/pkgs/tools/backup/restic/default.nix
@ -3,13 +3,13 @@

 buildGoModule rec {
  pname = "restic";
-  version = "0.17.1";
+  version = "0.17.2";

  src = fetchFromGitHub {
    owner = "restic";
    repo = "restic";
    rev = "v${version}";
-    hash = "sha256-/kgZgHmIxZkkmLyR246CcU+8wAekuK8SruY5GBLxJXI=";
+    hash = "sha256-CNQUqhFnuxoZpkVKyp/tDEfX91R8kjC2R41o2HA9eaM=";
  };

  patches = [
--- a/pkgs/tools/graphics/xcur2png/default.nix
+++ b/pkgs/tools/graphics/xcur2png/default.nix
@ -28,6 +28,13 @@ stdenv.mkDerivation rec {
      url = "https://github.com/eworm-de/xcur2png/commit/aa035462d950fab35d322cb87fd2f0d702251e82.patch";
      hash = "sha256-hlmJ/bcDSl1ADs0jp+JrAgAaMzielUSRVPad+plnSZg=";
    })
+
+    # fix gcc-14-build:
+    #   https://github.com/eworm-de/xcur2png/pull/4
+    (fetchpatch {
+      url = "https://github.com/eworm-de/xcur2png/commit/6fb03957aba8aebc3dc98a479fff9cddf85b9e7b.patch";
+      hash = "sha256-COG4/MKfBAwQU5FqZeqEE4jJT4XII7AQ6ayRSuFcUmY=";
+    })
  ];

  nativeBuildInputs = [
--- a/pkgs/tools/text/opencc/default.nix
+++ b/pkgs/tools/text/opencc/default.nix
@ -11,13 +11,13 @@

 stdenv.mkDerivation rec {
  pname = "opencc";
-  version = "1.1.8";
+  version = "1.1.9";

  src = fetchFromGitHub {
    owner = "BYVoid";
    repo = "OpenCC";
    rev = "ver.${version}";
-    sha256 = "sha256-JKudwA2C7gHihjPnsqPq5i7X8TvG8yQYZEG5f/xu3yo=";
+    sha256 = "sha256-JBTegQs9ALp4LdKKYMNp9GYEgqR9O8IkX6LqatvaTic=";
  };

  nativeBuildInputs =
--- a/pkgs/tools/typesetting/lowdown/default.nix
+++ b/pkgs/tools/typesetting/lowdown/default.nix
@ -8,13 +8,13 @@

 stdenv.mkDerivation rec {
  pname = "lowdown${lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed"}";
-  version = "1.1.2";
+  version = "1.2.0";

  outputs = [ "out" "lib" "dev" "man" ];

  src = fetchurl {
    url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz";
-    hash = "sha512-KHQi5NpMU6Kw4Ij+BoGE52aU0vIP1pgMhjnBAUdMh6GV/xHCxfTXJduqh9bSfVMeOim08aZSIM7iq1io0VS8LA==";
+    hash = "sha512-D50eoU95ref2Q6jfRCktgiL8j7143Kuv3RxUWbzBZl9aWjyh0nKnjgl709dMM/YQwCl9PDnmYHhYH6J3ULsnXg==";
  };

  nativeBuildInputs = [ which dieHook ]
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -11624,8 +11624,6 @@ with pkgs;

  react-native-debugger = callPackage ../development/tools/react-native-debugger { };

-  readarr = callPackage ../servers/readarr { };
-
  read-edid = callPackage ../os-specific/linux/read-edid { };

  readstat = callPackage ../applications/science/math/readstat { };
@ -25141,7 +25139,10 @@ with pkgs;

  inherit (callPackages ../servers/http/tomcat { })
    tomcat9
-    tomcat10;
+    tomcat10
+    tomcat11;
+
+  tomcat = tomcat11;

  tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { };

@ -30398,8 +30399,6 @@ with pkgs;

  kubevpn = callPackage ../applications/networking/cluster/kubevpn { };

-  k8sgpt = callPackage ../applications/networking/cluster/k8sgpt { };
-
  k9s = callPackage ../applications/networking/cluster/k9s { };

  kubecm = callPackage ../applications/networking/cluster/kubecm { };