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

Merge master into staging-next

parents 99c02daf 07ffd4bf

ci/github-script/labels.js

+40 −0
Original line number Diff line number Diff line
@@ -20,6 +20,46 @@ module.exports = async ({ github, context, core, dry }) => { 
      })

    ).data



    // When the same change has already been merged to the target branch, a PR will still be

    // open and display the same changes - but will not actually have any effect. This causes

    // strange CI behavior, because the diff of the merge-commit is empty, no rebuilds will

    // be detected, no maintainers pinged.

    // We can just check the temporary merge commit, and if it's empty the PR can safely be

    // closed - there are no further changes.

    if (pull_request.merge_commit_sha) {

      const commit = (

        await github.rest.repos.getCommit({

          ...context.repo,

          ref: pull_request.merge_commit_sha,

        })

      ).data



      if (commit.files.length === 0) {

        const body = [

          `The diff for the temporary merge commit ${pull_request.merge_commit_sha} is empty.`,

          'The changes in this PR have almost certainly already been merged to the target branch.',

        ].join('\n')



        core.info(`PR #${item.number}: closed`)



        if (!dry) {

          await github.rest.issues.createComment({

            ...context.repo,

            issue_number: pull_number,

            body,

          })



          await github.rest.pulls.update({

            ...context.repo,

            pull_number,

            state: 'closed',

          })

        }



        return {}

      }

    }



    const reviews = await github.paginate(github.rest.pulls.listReviews, {

      ...context.repo,

      pull_number,

nixos/modules/services/web-apps/immich.nix

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ in 
          lib.mapAttrsToListRecursive (attrPath: _: ''

            tmp="$(mktemp)"

            ${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \

              '${attrPathToIndex attrPath} = $secret' /run/immich/config.json > "$tmp"

              '${attrPathToIndex attrPath} = ($secret | rtrimstr("\n"))' /run/immich/config.json > "$tmp"

            mv "$tmp" /run/immich/config.json

          '') cfg.secretSettings

        )

pkgs/by-name/az/azure-cli/extensions-manual.nix

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ 


  containerapp = mkAzExtension rec {

    pname = "containerapp";

    version = "1.2.0b3";

    version = "1.2.0b4";

    url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl";

    hash = "sha256-UK7fbWI7NoW8sBo3OEafXX3DolFNQXhFDMHUoE1h/qA=";

    hash = "sha256-v2Mu46qVpDKjGARgGkKzQm5QcK4Msj4XgdgWZwI8fS0=";

    description = "Microsoft Azure Command-Line Tools Containerapp Extension";

    propagatedBuildInputs = with python3Packages; [

      docker

pkgs/by-name/db/dbgate/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -8,25 +8,25 @@ 


let

  pname = "dbgate";

  version = "6.6.4";

  version = "6.6.5";

  src =

    fetchurl

      {

        aarch64-linux = {

          url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";

          hash = "sha256-pwG+muAEVmyIK9eiCrydZ0glxPK5FGl7b3ps/8xeFgE=";

          hash = "sha256-DIlFERRnNdh6VzApYNDoiUb78lESfE2RTgmEsffJ5EI=";

        };

        x86_64-linux = {

          url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";

          hash = "sha256-4xsxYbVbbfxJ70CaB3z/reRoPgBom/XX6/YfT30uDpY=";

          hash = "sha256-xn6KhD08K57T9kWy7AHvIar22zGXV+6/geK3dGIxKhk=";

        };

        x86_64-darwin = {

          url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";

          hash = "sha256-plG9n/JtPmyUcJoP4kcAttKpzpT7ytt2M82CT0zZ4tA=";

          hash = "sha256-ycThFJ+f6NOWI97KyqgMES2Y2ZZ1aBkggBe6Z50Vhjs=";

        };

        aarch64-darwin = {

          url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";

          hash = "sha256-cId3K8m+XRlYHD4NyjSEyFR6c4Yvk6UzGAkdHt0bQUs=";

          hash = "sha256-bE16GScBk9a32k49P9WuT4fymscdY2AyP9k29UsN8HY=";

        };

      }

      .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");

pkgs/by-name/eq/equicord/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { 
  # the Equicord repository. Dates as tags (and automatic releases) were the compromise

  # we came to with upstream. Please do not change the version schema (e.g., to semver)

  # unless upstream changes the tag schema from dates.

  version = "2025-10-12";

  version = "2025-10-18";



  src = fetchFromGitHub {

    owner = "Equicord";

    repo = "Equicord";

    tag = "${finalAttrs.version}";

    hash = "sha256-SH8zRLBmglsSFAg0kNmab2BV+Hx2ZCl/wd3KptUWezY=";

    hash = "sha256-OTndJGxnr7Laf7So0vmSP+8OuyFDVV4xXi8tkuSR3U0=";

  };



  pnpmDeps = pnpm_10.fetchDeps {