Unverified Commit 8ff553ed authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-nixos

parents 63eb484a 433884f8

pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


stdenv.mkDerivation rec {

  pname = "urxvt-tabbedex";

  version = "22.32";

  version = "26.16.1";



  src = fetchFromGitHub {

    owner = "mina86";

    repo = "urxvt-tabbedex";

    rev = "v${version}";

    sha256 = "sha256-4+4iPFoy1j5xjXRM5kBauhff44Y7/ik/+ZLZ1prc+Xo=";

    sha256 = "sha256-e/t7AnP7nXkkazK6Oe6mw2Adf5wxR31/nFKeSaCpy/4";

  };



  nativeBuildInputs = [ perl ];

pkgs/applications/video/kodi/wrapper.nix

+4 −0
Original line number Diff line number Diff line
@@ -50,4 +50,8 @@ buildEnv { 
        }"

    done

  '';



  meta = {

    inherit (kodi.meta) mainProgram;

  };

}

pkgs/by-name/ca/cargo-crev/package.nix

+3 −3
Original line number Diff line number Diff line
@@ -13,16 +13,16 @@ 


rustPlatform.buildRustPackage (finalAttrs: {

  pname = "cargo-crev";

  version = "0.26.5";

  version = "0.27.1";



  src = fetchFromGitHub {

    owner = "crev-dev";

    repo = "cargo-crev";

    rev = "v${finalAttrs.version}";

    sha256 = "sha256-P6i2RvosI36rrg52kUcdrb5y4Fg0ms/mH5hcOWNgSik=";

    sha256 = "sha256-ezMpxYrJJ2zqEwCaDu2DFMwd6d/nfPVO6z2Lm4elIYE=";

  };



  cargoHash = "sha256-ZlcKnSVpMxQqstbr/VkR/iT1B0wR5qnh5VLpNpYsTRw=";

  cargoHash = "sha256-CYvvwgDZ+yAr7kLGEVZLVx7+sZUc5vu85AT5xLJBSbQ=";



  preCheck = ''

    export HOME=$(mktemp -d)

pkgs/by-name/fe/feishu-cli/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,13 +7,13 @@ 


buildGoModule (finalAttrs: {

  pname = "feishu-cli";

  version = "1.15.0";

  version = "1.18.1";



  src = fetchFromGitHub {

    owner = "riba2534";

    repo = "feishu-cli";

    tag = "v${finalAttrs.version}";

    hash = "sha256-8GIEa2P3s3sF0o4SyAjLxgHNFi5+4F19T+EsJ1d1Oik=";

    hash = "sha256-LYhBwXkkYtc9uNXOMn/lRiCInSSy0tCf0vGsuFDuJJI=";

  };



  vendorHash = "sha256-MZv772U+3+Fcanaiuhz+OCqfIsYyCG7B4iZOnEftbi8=";

pkgs/by-name/ga/gaphor/fix-dulwich-api.patch

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
From 7f4f7fcd97acef841e046191d98c900b61b78c17 Mon Sep 17 00:00:00 2001

From: Dan Yeaw <dan@yeaw.me>

Date: Sat, 4 Apr 2026 15:46:25 -0400

Subject: [PATCH] Fix dulwich porcelain API



---

 gaphor/storage/tests/fixtures.py | 6 ++++--

 1 file changed, 4 insertions(+), 2 deletions(-)



diff --git a/gaphor/storage/tests/fixtures.py b/gaphor/storage/tests/fixtures.py

index d071e4556f..4dd0c60bf1 100644

--- a/gaphor/storage/tests/fixtures.py

+++ b/gaphor/storage/tests/fixtures.py

@@ -16,11 +16,13 @@ def commit_all(message):

     main_ref = commit_all("Initial commit")

 

     porcelain.branch_create(repo, "branch")

-    porcelain.checkout_branch(repo, "branch")

+    porcelain.switch(repo, "branch")

     filename.write_text(their_text, encoding="utf-8")

     branch_oid = commit_all("Branch commit")

 

-    porcelain.checkout_branch(repo, main_ref)

+    # OID + detach=True: works when default branch is not "main" (e.g. older

+    # Dulwich uses "master"); "git merge" still runs on HEAD.

+    porcelain.switch(repo, main_ref, detach=True)

     filename.write_text(our_text, encoding="utf-8")

     commit_all("Second commit")