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

Merge staging-next into staging

parents 2b1aa3b7 6b95c918

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -18663,6 +18663,11 @@ 
    githubId = 50854675;

    name = "Nelson Jeppesen";

  };

  nemin = {

    name = "Nemin";

    github = "Nemin32";

    githubId = 2953293;

  };

  neosimsim = {

    email = "me@abn.sh";

    github = "neosimsim";

nixos/modules/services/misc/gitlab.nix

+2 −1
Original line number Diff line number Diff line
@@ -1626,7 +1626,8 @@ in 
        nodejs

        gnupg



        "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq-${cfg.packages.gitlab.rubyEnv.gems.sidekiq.version}"

        # We currently use the bundled sidekiq, if we use upstream sidekiq again, this needs to include the version

        "${cfg.packages.gitlab}/share/gitlab/vendor/gems/sidekiq"



        # Needed for GitLab project imports

        gnutar

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

+6 −3
Original line number Diff line number Diff line
@@ -293,9 +293,6 @@ let 
        ) "'dbtableprefix' => '${toString c.dbtableprefix}',"}

        ${lib.optionalString (c.dbpassFile != null) "'dbpassword' => nix_read_secret('dbpass'),"}

        'dbtype' => '${c.dbtype}',

        ${lib.concatStringsSep "\n" (

          lib.mapAttrsToList (name: credential: "'${name}' => nix_read_secret('${name}'),") cfg.secrets

        )}

        ${objectstoreConfig}

      ];
@@ -304,6 +301,12 @@ let 
        "impossible: this should never happen (decoding generated settings file %s failed)"

      ));



      $CONFIG = array_replace_recursive($CONFIG, [

        ${lib.concatStringsSep "\n" (

          lib.mapAttrsToList (name: credential: "'${name}' => nix_read_secret('${name}'),") cfg.secrets

        )}

      ]);



      ${lib.optionalString (cfg.secretFile != null) ''

        $CONFIG = array_replace_recursive($CONFIG, nix_read_secret_and_decode_json_file('secret_file'));

      ''}

nixos/modules/virtualisation/oci-containers.nix

+1 −1
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ let 
        ExecStartPre = [ "${preStartScript}/bin/pre-start" ];

        TimeoutStartSec = 0;

        TimeoutStopSec = 120;

        Restart = "always";

        Restart = "on-failure";

      }

      // optionalAttrs (cfg.backend == "podman") {

        Environment = "PODMAN_SYSTEMD_UNIT=%n";

pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { 
  mktplcRef = {

    name = "claude-code";

    publisher = "anthropic";

    version = "2.1.25";

    hash = "sha256-9x9wDngiHfjUHTsUEraF7pUjbHlmcT7VotiPV9bPwIo=";

    version = "2.1.34";

    hash = "sha256-qCvgb2fs0t3hlI36egvlZYem8CzUKIAipaEZOumDtWk=";

  };



  postInstall = ''