Merge master into staging-next

2026-10-03 13:30:36 +00:00 · 2026-10-03 06:17:39 +00:00
parent f8de178c07 cb01d0b57f
commit bee0a98281
14 changed files with 76 additions and 33 deletions
--- a/pkgs/by-name/ac/actual-server/package.nix
+++ b/pkgs/by-name/ac/actual-server/package.nix
@@ -6,22 +6,22 @@
  git,
  jq,
  makeBinaryWrapper,
-  nodejs_22,
+  nodejs_24,
  python3,
  xcbuild,
  yarn-berry_4,
  nixosTests,
 }:
 let
-  nodejs = nodejs_22;
+  nodejs = nodejs_24;
  yarn-berry = yarn-berry_4.override { inherit nodejs; };
-  version = "26.9.0";
+  version = "26.10.0";
  src = fetchFromGitHub {
    name = "actualbudget-actual-source";
    owner = "actualbudget";
    repo = "actual";
    tag = "v${version}";
-    hash = "sha256-dUuCLG3u3Wg5/IRF24JuZ/ysdWva1Du3tiZfUwyFA54=";
+    hash = "sha256-jBh6mrYVVX7dNz5rv/VO766ezIuwBmXbtRSKgUOkahc=";
  };
  translations = fetchFromGitHub {
    name = "actualbudget-translations-source";
@@ -29,8 +29,8 @@ let
    repo = "translations";
    # Note to updaters: this repo is not tagged, so just update this to the Git
    # tip at the time the update is performed.
-    rev = "a76613b91248f6eb0e76aecfa6b9b7dcc1909f94";
-    hash = "sha256-oP0DCjI9MTscZAsdktnjGLeONv7huaSpnArf/Lq/TAw=";
+    rev = "1d3585a06ae3ad8b2833667234317ae149c3c008";
+    hash = "sha256-e/NN5u4h5m5sO/xPLC9oO0Q5tXH+Irm3lmUheVdf+N0=";
  };

 in
@@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: {
  missingHashes = ./missing-hashes.json;
  offlineCache = yarn-berry.fetchYarnBerryDeps {
    inherit (finalAttrs) src missingHashes;
-    hash = "sha256-CMNchystIhRLJJUqITL4gLOtxTJFmhUTWRgy+jMBrX4=";
+    hash = "sha256-NYjJeQWeDsLsEme/gIkZzgwWaqpQNSfLeYgZHaPTuH8=";
  };

  pname = "actual-server";
--- a/pkgs/by-name/do/docfx/package.nix
+++ b/pkgs/by-name/do/docfx/package.nix
@@ -6,12 +6,12 @@

 buildDotnetGlobalTool {
  pname = "docfx";
-  version = "2.80.1";
+  version = "2.81.0";

  dotnet-sdk = dotnetCorePackages.sdk_8_0;
  dotnet-runtime = dotnetCorePackages.runtime_8_0;

-  nugetHash = "sha256-v9cfkqa+GNiLyBVK+asQSHpbju5TzkcE35xZ3/QkFig=";
+  nugetHash = "sha256-9AQN5UUVVgchNLx8wqXB0GKZGi3sqf0hEaXISGCtPD4=";

  meta = {
    description = "Build your technical documentation site with docfx, with landing pages, markdown, API reference docs for .NET, REST API and more";
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -9,16 +9,16 @@

 buildGoModule (finalAttrs: {
  pname = "eksctl";
-  version = "0.230.0";
+  version = "0.231.0";

  src = fetchFromGitHub {
    owner = "eksctl-io";
    repo = "eksctl";
    rev = finalAttrs.version;
-    hash = "sha256-slyLgQ01m1iZs10auYBgmc2x+A2UhwEX65RDBdCAWkc=";
+    hash = "sha256-+YVLF4ORRzKK5c0kZDN6YFFg7ZebKGDB+LXckOzPjpU=";
  };

-  vendorHash = "sha256-XGLxHXwoL768wnpXoM5Hz+TTGH+zdWLbiAUqNT6Zmrk=";
+  vendorHash = "sha256-cWggtB2pv3RM67O9K/wDLczkU5SZrwGc0LJQ5emDptc=";

  doCheck = false;

--- a/pkgs/by-name/el/elfdeps/package.nix
+++ b/pkgs/by-name/el/elfdeps/package.nix
@@ -7,19 +7,19 @@

 python3Packages.buildPythonApplication (finalAttrs: {
  pname = "elfdeps";
-  version = "0.2.0";
+  version = "0.4.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "python-wheel-build";
    repo = "elfdeps";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-5CrxVmtZcBYBMXw7o58CpFopYFgXD4W/S42aow1z1Xw=";
+    tag = finalAttrs.version;
+    hash = "sha256-mQAFU87OEA4ZjfsOAnSFaoOIez7dss3x35fTDdTnm10=";
  };

  build-system = with python3Packages; [
-    setuptools
-    setuptools-scm
+    hatch-vcs
+    hatchling
  ];

  dependencies = [ python3Packages.pyelftools ];
--- a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
+++ b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix
@@ -47,7 +47,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "fastfetch-unwrapped";
-  version = "2.68.1";
+  version = "2.69.0";

  strictDeps = true;
  __structuredAttrs = true;
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "fastfetch-cli";
    repo = "fastfetch";
    tag = finalAttrs.version;
-    hash = "sha256-dRzkKWs3wKy2TzyUmqdsok+xfA5SpICOEE6gQ2sIntk=";
+    hash = "sha256-osfQZEP6t3TdwlO+0agD8fU2z1UECJWLF+WPovwEk64=";
  };

  outputs = [
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
  pname = "qownnotes";
  appname = "QOwnNotes";
-  version = "26.9.9";
+  version = "26.10.0";

  src = fetchurl {
    url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-WtpB9VxTA+nF3r6EYorxT0kiB9nj3zGczQL1O2mu0vc=";
+    hash = "sha256-RtWspTbUrk3vkN+ZQKp8XACL8d9EEzVX/w3uaLvgsxg=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/re/readium/package.nix
+++ b/pkgs/by-name/re/readium/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "readium";
+  version = "0.10.1";
+  __structuredAttrs = true;
+  __darwinAllowLocalNetworking = true;
+
+  src = fetchFromGitHub {
+    owner = "readium";
+    repo = "cli";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1MavPoM84W2mA5wKpxJkfoHLAsiTXapc1aRZ+jnnXvs=";
+  };
+
+  vendorHash = "sha256-7hWl7OPqFuEhnIn1oBI8kMcXwkhqTLkOV/NBQUoqqSQ=";
+
+  ldflags = [ "-X=github.com/readium/cli/internal/version.Version=v${finalAttrs.version}" ];
+
+  postInstall = ''
+    mv $out/bin/cmd $out/bin/readium
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
+    description = "CLI utility with support for a wide range of commands for ebooks, comics and audiobooks";
+    homepage = "https://github.com/readium/cli/";
+    changelog = "https://github.com/readium/cli/blob/develop/CHANGELOG.MD";
+    license = lib.licenses.bsd3;
+    mainProgram = "readium";
+    maintainers = with lib.maintainers; [ CodeF53 ];
+  };
+})
--- a/pkgs/by-name/ru/rustdesk/package.nix
+++ b/pkgs/by-name/ru/rustdesk/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    repo = "rustdesk";
    tag = finalAttrs.version;
    fetchSubmodules = true;
-    hash = "sha256-xuIUWxicsqCJoKRvIDy0YISCHK3qolf1nWS3XMAM3PM=";
+    hash = "sha256-1xa7X+swBIb8Lz3c6m8SeNZAiJWNCUpw+UbdSsMkeSk=";
  };

  cargoHash = "sha256-Ym4USlB1NJO0bm0cr2l/yZhoUBfxtd2uTkkjrR7iD3o=";
--- a/pkgs/by-name/vi/vikunja/desktop.nix
+++ b/pkgs/by-name/vi/vikunja/desktop.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
      ;
    pnpm = pnpm_10;
    fetcherVersion = 4;
-    hash = "sha256-RpME/0lU8i+D8erEkTfA0cXrEs8LRZvNdfU8e3X366Y=";
+    hash = "sha256-Th37DOkG/vQcyrzKDMplruiMhH4AlGF6UdXtGJTC96c=";
  };

  env = {
--- a/pkgs/by-name/vi/vikunja/frontend.nix
+++ b/pkgs/by-name/vi/vikunja/frontend.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
      ;
    pnpm = pnpm_10;
    fetcherVersion = 3;
-    hash = "sha256-aQWTzJZU6NJrZxuoCeQDJjujPq+niixmFvqtPdWS4wk=";
+    hash = "sha256-CmJLUNEri41a8pQBC+YLqczkxueT4sp1mHkw2M/TL30=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/vi/vikunja/package.nix
+++ b/pkgs/by-name/vi/vikunja/package.nix
@@ -27,13 +27,13 @@ let
 in
 buildGoModule (finalAttrs: {
  pname = "vikunja";
-  version = "2.6.0";
+  version = "2.7.0";

  src = fetchFromGitHub {
    owner = "go-vikunja";
    repo = "vikunja";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-Xh1ozUTOVqywk0i8xQWkG/bPRgPH9EABjRW8p4do1mE=";
+    hash = "sha256-Gy6LRbD6LfWjKwuzj+EBAiSkZluChFVC4qhZgQbeZc8=";
  };

  nativeBuildInputs =
@@ -54,7 +54,7 @@ buildGoModule (finalAttrs: {
      writableTmpDirAsHomeHook
    ];

-  vendorHash = "sha256-R6M5UyF10pIdoAvjWnS6Dqe/U6LTxmS6OwRTgmxfU4g=";
+  vendorHash = "sha256-NLtp+2QyfS06W/Puuo5MEqalpLc9NodoPqtDJPBbOH4=";

  frontend = callPackage ./frontend.nix {
    inherit (finalAttrs) src version;
@@ -76,6 +76,8 @@ buildGoModule (finalAttrs: {
    # These tests require a full config with public URL and CORS enabled.
    ${skipTest 1 "TestCreateOrganizationMap" "pkg/modules/migration/trello/trello_test.go"}
    ${skipTest 1 "TestTaskAttachmentUploadSize" "pkg/webtests/task_attachment_upload_test.go"}
+    # filesystem walk incompatible with trimpath
+    rm pkg/web/error_codes_test.go
  '';

  buildPhase = ''
--- a/pkgs/by-name/vi/vikunja/veans.nix
+++ b/pkgs/by-name/vi/vikunja/veans.nix
@@ -17,7 +17,7 @@ buildGoModule (finalAttrs: {

  modRoot = "veans";

-  vendorHash = "sha256-ac2M7wNlOn6ku8sn/rZmPCSGPodw88ufR8tr1lh54II=";
+  vendorHash = "sha256-cCRPfJDZXIlufMg3SkqtI7Hb5Dphu2Eofxuls3eSS+Q=";

  env.CGO_ENABLED = 0;

--- a/pkgs/by-name/xo/xournalpp/package.nix
+++ b/pkgs/by-name/xo/xournalpp/package.nix
@@ -31,13 +31,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "xournalpp";
-  version = "1.3.7";
+  version = "1.3.8";

  src = fetchFromGitHub {
    owner = "xournalpp";
    repo = "xournalpp";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-CvuHgZ824jLF/L0/PAnbT4RXFLV+Uh2RJ30DA4PEEbE=";
+    hash = "sha256-IQxWLKxcJOncDSzei18+CzE8RJ4b6bcUBS5iXmE4sQw=";
  };

  nativeBuildInputs = [
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -83,11 +83,13 @@ let
          patchShebangs tools
          patchShebangs scripts
        ''
-        # This warning got removed in
-        # https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=cba90ce82064ad1e6d25f20d8eaa940bd2fc97ed
+        # dtc 1.8 removed the `graph_child_address` check and added the
+        # `node_name_not_empty` error. This now rejects binman's
+        # "@<name>-SEQ" template nodes. Upstream has yet to update
+        # binman, so we use this workaround for now.
        + ''
          for f in scripts/Makefile.lib dts/upstream/Makefile; do
-            substituteInPlace "$f" --replace-fail -Wno-graph_child_address ""
+            substituteInPlace "$f" --replace-fail -Wno-graph_child_address -Eno-node_name_not_empty
          done
        '';