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

Merge master into staging-next

parents 99b39acf 1af0258a

lib/modules.nix

+5 −3
Original line number Diff line number Diff line
@@ -1582,7 +1582,7 @@ let 
  # mkDefault properties of the previous option.

  #

  mkAliasDefinitions = mkAliasAndWrapDefinitions id;

  mkAliasAndWrapDefinitions = wrap: option: mkAliasIfDef option (wrap (mkMerge option.definitions));

  mkAliasAndWrapDefinitions = wrap: option: mkIf option.isDefined (wrap (mkMerge option.definitions));



  # Similar to mkAliasAndWrapDefinitions but copies over the priority from the

  # option as well.
@@ -1594,9 +1594,11 @@ let 
      prio = option.highestPrio or defaultOverridePriority;

      defsWithPrio = map (mkOverride prio) option.definitions;

    in

    mkAliasIfDef option (wrap (mkMerge defsWithPrio));

    mkIf option.isDefined (wrap (mkMerge defsWithPrio));



  mkAliasIfDef = option: mkIf (isOption option && option.isDefined);

  mkAliasIfDef =

    lib.warn "Usage of 'mkAliasIfDef' has been deprecated. Use 'mkIf option.isDefined' instead."

      (option: mkIf option.isDefined);



  /**

    Compatibility.

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -7704,6 +7704,13 @@ 
    githubId = 103082;

    name = "Ed Brindley";

  };

  eleina = {

    email = "ellie@eleina.dev";

    github = "eleinah";

    githubId = 129979592;

    name = "Eleina Mironia";

    keys = [ { fingerprint = "0A86 5F49 90B1 569C B849  5070 2EF4 8A29 49D6 5978"; } ];

  };

  eleonora = {

    email = "leonsch@protonmail.com";

    github = "42LoCo42";

pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix

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

    name = "amazon-q-vscode";

    publisher = "AmazonWebServices";

    version = "1.112.0";

    hash = "sha256-iuyET7vCZCyldfNuognB6fLDurJzg7XsRme6BjDCQzU=";

    version = "2.0.0";

    hash = "sha256-XK0xCwvG5HBqTrERRkjpzbZCiAiK54d9vOt0Na3fzRI=";

  };



  meta = {

pkgs/applications/editors/vscode/extensions/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2293,8 +2293,8 @@ let 
        mktplcRef = {

          name = "vscode-vibrancy-continued";

          publisher = "illixion";

          version = "1.1.65";

          hash = "sha256-0DUKDBhabh8vOgPw5p6ZFavRLIuy4vPgOfAa6fLtJRA=";

          version = "1.1.73";

          hash = "sha256-hQKkqZi8fQoxVzgpg/JE4zPFR+ldi5eBYpgiqbx7OXo=";

        };

        meta = {

          downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";

pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix

+5 −5
Original line number Diff line number Diff line
@@ -12,26 +12,26 @@ vscode-utils.buildVscodeMarketplaceExtension { 
      sources = {

        "x86_64-linux" = {

          arch = "linux-x64";

          hash = "sha256-tG2PUESSzOs5jEPD7Wgtee832pOTOLkxxV/FP7Md6k8=";

          hash = "sha256-XeNdr1nWK4aYTBEgAu3hXotmrDJ31ocg+w4870TuEGA=";

        };

        "x86_64-darwin" = {

          arch = "darwin-x64";

          hash = "sha256-CqgMcb03eA+orz0rmKoSi5qtQXAN/MzrmogGQGV2yzw=";

          hash = "sha256-yC8fBgj8lHR3y7OWUshWYNpn6fgp2SeKLv9WXxhVP0A=";

        };

        "aarch64-linux" = {

          arch = "linux-arm64";

          hash = "sha256-kDv8t9COz8sWRH9FlrhrDC9UqGBXD7F0IMaWCbZYwBk=";

          hash = "sha256-O/SoqC0pNnbNdXylAj0rlKyr7qaJNivw6xhecKFk7JU=";

        };

        "aarch64-darwin" = {

          arch = "darwin-arm64";

          hash = "sha256-S27qkOYs3arqa68raX+0itOywnlQZAIjxD93GCEjKhs=";

          hash = "sha256-pwdTllSB4IXDoyFuo2XxZjkS8lnIjp7AwgggBkjv3Y0=";

        };

      };

    in

    {

      publisher = "kilocode";

      name = "Kilo-Code";

      version = "7.0.51";

      version = "7.1.22";

    }

    // sources.${stdenv.hostPlatform.system}

      or (throw "Unsupported system ${stdenv.hostPlatform.system}");