Merge master into staging-next

2026-10-02 04:50:21 +00:00 · 2026-08-03 07:09:13 +00:00
parent 2a5de9960d a87ccb2409
commit 364522b357
21 changed files with 69 additions and 71 deletions
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4852,8 +4852,8 @@ let
        mktplcRef = {
          name = "emacs-mcx";
          publisher = "tuttieee";
-          version = "0.111.0";
-          hash = "sha256-3z4B1NBQD3hbGcwWpS48bXuUAN1jVlSRLF0PDKGJH3A=";
+          version = "0.111.1";
+          hash = "sha256-+0wIC/7xbun2Wf8wePU6NSR9UMNd0RvLz6UdAM3X5Y4=";
        };
        meta = {
          changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md";
--- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "windows-ai-studio";
    publisher = "ms-windows-ai-studio";
-    version = "1.6.5";
-    hash = "sha256-cKI2LTojwUaC4nrBhqtffx4kAIwGZBS+gTK6X2PE/PE=";
+    version = "1.6.6";
+    hash = "sha256-3eG6OIjCLBYgP0bweyZGv9OUiKN1xQa3ufdt3JUq9FQ=";
  };

  meta = {
--- a/pkgs/applications/emulators/libretro/cores/picodrive.nix
+++ b/pkgs/applications/emulators/libretro/cores/picodrive.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "picodrive";
-  version = "0-unstable-2026-07-23";
+  version = "0-unstable-2026-07-29";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "picodrive";
-    rev = "78a662e3135871a6c657d5e61900f6704152e594";
-    hash = "sha256-3+x1ILIUq+/nwfUGXweNIq3PFTAaP56/6G+dX4dEZ/Y=";
+    rev = "6248b51ffbe212ce441de023ccea6b10fa4d7082";
+    hash = "sha256-jiP6/MqLOl5/+CU/cUgKNpXxUtianOkEV1GQHQS+AAw=";
    fetchSubmodules = true;
  };

--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@@ -9,13 +9,13 @@

 buildGoModule (finalAttrs: {
  pname = "atlas";
-  version = "1.2.3";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "ariga";
    repo = "atlas";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Ox/EgTSz0ONEJqLyiJsvpgUNfHyV2rQYXrIAImDwrLo=";
+    hash = "sha256-4zn/+xdcWzgB5SVZQ6tHBowrf33pvcKr1775MVcDQSc=";
  };

  modRoot = "cmd/atlas";
--- a/pkgs/by-name/ck/ckan/package.nix
+++ b/pkgs/by-name/ck/ckan/package.nix
@@ -4,8 +4,6 @@
  fetchurl,
  makeWrapper,
  mono,
-  gtk2,
-  curl,
  imagemagick,
  copyDesktopItems,
  makeDesktopItem,
@@ -36,11 +34,6 @@ stdenv.mkDerivation rec {

  buildInputs = [ mono ];

-  libraries = lib.makeLibraryPath [
-    gtk2
-    curl
-  ];
-
  dontBuild = true;

  installPhase = ''
@@ -51,8 +44,7 @@ stdenv.mkDerivation rec {
    done
    install -m 644 -D $src $out/bin/ckan.exe
    makeWrapper ${mono}/bin/mono $out/bin/ckan \
-      --add-flags $out/bin/ckan.exe \
-      --set LD_LIBRARY_PATH $libraries
+      --add-flags $out/bin/ckan.exe
    runHook postInstall
  '';

--- a/pkgs/by-name/go/golds/package.nix
+++ b/pkgs/by-name/go/golds/package.nix
@@ -8,13 +8,13 @@

 buildGoModule (finalAttrs: {
  pname = "golds";
-  version = "0.8.4";
+  version = "0.8.5";

  src = fetchFromGitHub {
    owner = "go101";
    repo = "golds";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Jt0Q6Ie1HSqRs4+zlmNOXlSMXfWu0nSIOjglduq4FUE=";
+    hash = "sha256-WYjNvpNT5vuiHqo6TWE+uhptG4fke3eaKkJbeNIwwoU=";
  };

  # nixpkgs is not using the go distpack archive and missing a VERSION file in the source
--- a/pkgs/by-name/ko/komodo/package.nix
+++ b/pkgs/by-name/ko/komodo/package.nix
@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "komodo";
-  version = "2.2.0";
+  version = "2.3.1";

  src = fetchFromGitHub {
    owner = "moghtech";
    repo = "komodo";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Hw0JD4e/ODK19M/bZtX9foCu5c79XA8Jgv2fleltdLs=";
+    hash = "sha256-nEST1Mp/WJJ+GtsC9cX10w3thywe3dHNrQV5iLPXMIQ=";
  };

-  cargoHash = "sha256-b/AgQBmS1QfP+BOCT4xL8majVKobig5M2YJhGuXMToc=";
+  cargoHash = "sha256-krFHWiHgdBL2jIr0YsBrNG4+NaaoaSVf6q65jWiQGsg=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,17 +1,17 @@
 {
-  "version": "3.237.0",
+  "version": "3.243.0",
  "assets": {
    "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.237.0/mirrord_linux_x86_64",
-      "hash": "sha256-dxZKf1uLKIyMT+Li4N1VsVbqE2GyAcaFk8rv4KUz1bI="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.243.0/mirrord_linux_x86_64",
+      "hash": "sha256-v3w6D26/EkvmUgx2k85SMyIHy5EGuAcVFTiqiGDRKQg="
    },
    "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.237.0/mirrord_linux_aarch64",
-      "hash": "sha256-+/UrxpUaFZoQDdcNRgMrTgBVQetlVg9HghcccfJymro="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.243.0/mirrord_linux_aarch64",
+      "hash": "sha256-kWCApwaMbxVKpNsnZ52AHWJ6DwWsMu5tqIZAjlwmthw="
    },
    "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.237.0/mirrord_mac_universal",
-      "hash": "sha256-EIxUSodBjgcPfACHND2l7pqbtXUzfjGSLPZyoF8A9Ss="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.243.0/mirrord_mac_universal",
+      "hash": "sha256-oLP8hCNh3rmyS2A/RtIRjfUSTxmfyS1n+vK/tgnBasw="
    }
  }
 }
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,13 +6,13 @@

 buildNpmPackage rec {
  pname = "netbird-dashboard";
-  version = "2.90.8";
+  version = "2.90.9";

  src = fetchFromGitHub {
    owner = "netbirdio";
    repo = "dashboard";
    rev = "v${version}";
-    hash = "sha256-783g44brRVBU7b4YAaZ6Qk3RVf5zHKmN1eYU2Oe1aGo=";
+    hash = "sha256-cDA1Tbw3yiaeYHN9Pnbz1vxxCK45W6V7k3Bh/Lz/VLA=";
  };

  npmDepsHash = "sha256-A6zXrOPdxLepi7XPn67YsY673iFOAgJqCEynn4SYco8=";
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -73,13 +73,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "netbird-${componentName}";
-  version = "0.76.0";
+  version = "0.76.1";

  src = fetchFromGitHub {
    owner = "netbirdio";
    repo = "netbird";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-gICLAHmsn5Ylrm4tGaOQNr9ieuaSf3jt2KLDFrd08c0=";
+    hash = "sha256-gxcb1CQ2f8g8wYEt1z2rvJrcoXy2k7pSSMaLmfqmISc=";
  };

  overrideModAttrs = final: prev: {
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitHub,
+  config,
  meson,
  ninja,
  cmocka,
@@ -18,21 +19,28 @@
  pkg-config,
  readline,
  sqlite,
-  autoAwaySupport ? true,
+
+  # Read from config.profanity, falling back to true
+  autoAwaySupport ? config.profanity.autoAwaySupport or true,
  libxscrnsaver,
  libx11,
-  notifySupport ? true,
+
+  notifySupport ? config.profanity.notifySupport or true,
  libnotify,
  gdk-pixbuf,
-  omemoSupport ? true,
+
+  omemoSupport ? config.profanity.omemoSupport or true,
  libsignal-protocol-c,
  libgcrypt,
  qrencode,
-  pgpSupport ? true,
+
+  pgpSupport ? config.profanity.pgpSupport or true,
  gpgme,
-  pythonPluginSupport ? true,
+
+  pythonPluginSupport ? config.profanity.pythonPluginSupport or true,
  python3,
-  traySupport ? true,
+
+  traySupport ? config.profanity.traySupport or true,
  gtk3,
  otrSupport ? true,
  libotr,
@@ -48,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
  src = fetchFromGitHub {
    owner = "profanity-im";
    repo = "profanity";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
    hash = "sha256-rPiYzG5KvJyKt7b99AImmO6wTYxZPFcf/6Xhz8SrgIo=";
  };

--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -34,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    presetdir=$out/share/starship/presets/
    mkdir -p $presetdir
    cp docs/public/presets/toml/*.toml $presetdir
+    install -Dm644 .github/config-schema.json $out/share/starship/config-schema.json
  ''
  + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
    let
@@ -55,8 +56,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
    writableTmpDirAsHomeHook
  ];

-  passthru.tests = {
-    inherit (nixosTests) starship;
+  passthru = {
+    jsonschema = {
+      config = "${finalAttrs.finalPackage}/share/starship/config-schema.json";
+    };
+    tests = {
+      inherit (nixosTests) starship;
+    };
  };

  meta = {
--- a/pkgs/by-name/tl/tlsx/package.nix
+++ b/pkgs/by-name/tl/tlsx/package.nix
@@ -6,16 +6,16 @@

 buildGoModule (finalAttrs: {
  pname = "tlsx";
-  version = "1.2.2";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "tlsx";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-kS1X14+LJHar0p2nH+EUqtqVrWRG8yMXVaINNkAwhd8=";
+    hash = "sha256-3klBmWQfp8PLF4/8bZjHCk+4hiUXX3E+izIfDG2FMfU=";
  };

-  vendorHash = "sha256-gWDSBjrTsRShihc/jun5lL1cauJU45qaND0IL17pqn8=";
+  vendorHash = "sha256-5zqiA4Aoc5qjxXf8q+IzJqycSv49hJfynAVQ5Yomrro=";

  ldflags = [
    "-s"
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -20,7 +20,7 @@

 let
  pname = "typora";
-  version = "1.13.6";
+  version = "1.14.8";

  passthru = {
    sources = {
@@ -29,21 +29,21 @@ let
          "https://download.typora.io/linux/typora_${version}_amd64.deb"
          "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
        ];
-        hash = "sha256-EwVqMinvC26R5ULDGiiONwS3sH3GBJ/sPr2pnqfQR5s=";
+        hash = "sha256-mfnGSAlWeLq7bas6SQKgWLLJXY1xM9CIA+iIf464z0U=";
      };
      aarch64-linux = fetchurl {
        urls = [
          "https://download.typora.io/linux/typora_${version}_arm64.deb"
          "https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb"
        ];
-        hash = "sha256-3/eS9xAC7+V55grhHPLU/9+JefkXgIyKlEh3vRkqZUo=";
+        hash = "sha256-FsV0u9CXf6FdEeKqJZlpNjvGOv1pDNYD3J4neKpD0pw=";
      };
      aarch64-darwin = fetchurl {
        urls = [
          "https://download.typora.io/mac/Typora-${version}.dmg"
          "https://downloads.typoraio.cn/mac/Typora-${version}.dmg"
        ];
-        hash = "sha256-kXnzhuu3ItF9mV0x+v7+hbYNCOo1DAfIzYMHwAL+LHM=";
+        hash = "sha256-XVXfmKTsKuougrBaecJWatP4g93bl0p8xEUzbjf4374=";
      };
    };
    updateScript = ./update.sh;
--- a/pkgs/by-name/up/uptime-kuma/package.nix
+++ b/pkgs/by-name/up/uptime-kuma/package.nix
@@ -9,16 +9,16 @@

 buildNpmPackage (finalAttrs: {
  pname = "uptime-kuma";
-  version = "2.4.0";
+  version = "2.5.0";

  src = fetchFromGitHub {
    owner = "louislam";
    repo = "uptime-kuma";
    tag = finalAttrs.version;
-    hash = "sha256-iqkf9/UAQOnSA+nncK/fmjbqZpIQeUmigI/78m5qKrM=";
+    hash = "sha256-C9XBPhCQNU5y2C9svsieiC0FTMdW9sJQI2OeiCjqte8=";
  };

-  npmDepsHash = "sha256-chvykBfnARLto+Il9gumm6UTRSTPPBjg5pj4yGFiOcg=";
+  npmDepsHash = "sha256-qe8qK0bWYFyzClrMNAXdxuqrBIn14Xf3oN40ch1cqnY=";

  patches = [
    # Fixes the permissions of the database being not set correctly
--- a/pkgs/by-name/va/vale/styles.nix
+++ b/pkgs/by-name/va/vale/styles.nix
@@ -94,12 +94,12 @@ in

  microsoft = buildStyle rec {
    name = "Microsoft";
-    version = "0.14.2";
+    version = "0.15.0";
    src = fetchFromGitHub {
      owner = "errata-ai";
      repo = "Microsoft";
      rev = "v${version}";
-      hash = "sha256-Sie4bBeKPOFOJhgd+mLbiz4vG+xpKL0LnwnRQHzOw+Q=";
+      hash = "sha256-S3FPe6XR6DRjJ6Cn/Jcy211MV9KWXJvZ02tpMHjwlOY=";
    };
    meta = {
      description = "Vale-compatible implementation of the Microsoft Writing Style Guide";
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "aioamazondevices";
-  version = "14.2.0";
+  version = "14.2.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "chemelli74";
    repo = "aioamazondevices";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-KP1Rc+8c5RNTtCmuNjbjVhNEElwMKOGvumdWF+BIn0I=";
+    hash = "sha256-/odlNQg1buiZkcpWaDzSKo5mfJVdow/dD/gyef6NOOo=";
  };

  build-system = [ poetry-core ];
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -17,14 +17,14 @@

 buildPythonPackage (finalAttrs: {
  pname = "pyportainer";
-  version = "1.0.42";
+  version = "1.0.43";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "erwindouna";
    repo = "pyportainer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-Mnn9cpTei7dJCPomON0XskvNDSEb+XP9tMihoN7vS8E=";
+    hash = "sha256-KE/qXqExL7eYSZZz3+4SQNAmia8N63eZnOITQkcgzfQ=";
  };

  build-system = [ hatchling ];
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -18,7 +18,7 @@ in
 buildLinux (
  args
  // rec {
-    version = "7.1.4";
+    version = "7.1.5";
    pname = "linux-zen";
    modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
    isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
      owner = "zen-kernel";
      repo = "zen-kernel";
      rev = "v${version}-${suffix}";
-      sha256 = "1k27xhzd390krk60kay6cabl0jlpb26m6cwvdh3r8izbwgx1r0ig";
+      sha256 = "11d3c2hx2py6fy6qj0dqk2w392m144wjrfg5ldfh93x9mp4ffhjd";
    };

    # This is based on the following source:
--- a/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/volkswagencarnet/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
  owner = "robinostlund";
  domain = "volkswagencarnet";
-  version = "5.4.11";
+  version = "5.4.12";

  src = fetchFromGitHub {
    owner = "robinostlund";
    repo = "homeassistant-volkswagencarnet";
    tag = "v${version}";
-    hash = "sha256-soSTa6FYnNpzsl5goKS9xcSnubiXXUUGOJ3tDgbFDc8=";
+    hash = "sha256-LtNyzWTyROXYcki/hhExD77Ah6Ka8G8zVLxV4RP0Z1w=";
  };

  postPatch = ''
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9212,14 +9212,6 @@ with pkgs;

  inherit (pidginPackages) pidgin;

-  # perhaps there are better apps for this task? It's how I had configured my previous system.
-  # And I don't want to rewrite all rules
-  profanity = callPackage ../applications/networking/instant-messengers/profanity (
-    {
-    }
-    // (config.profanity or { })
-  );
-
  puredata-with-plugins =
    plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };