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

Merge master into staging-nixos

parents fb9cf1df fbe0c0e4

doc/release-notes/rl-2511.section.md

+3 −0
Original line number Diff line number Diff line
@@ -306,6 +306,9 @@ 
- `jellyfin` was updated to `10.11.x`, which includes heavy backend changes.

  Make sure to backup your data and configuration directories

  and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/).

  **Important:** make sure you're running Jellyfin version `10.10.7` before upgrading,

  and beware that the migration may take several hours depending on your library size and state.

  The process must not be interrupted.



- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.

nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ runTest ( 
              logLevel = "debug";

            };

            extraAppsEnable = true;

            extraApps.notify_push = config.services.nextcloud.package.packages.apps.notify_push;

            # This test also validates that we can use an "external" database

            database.createLocally = false;

            config = {

nixos/tests/nextcloud/with-postgresql-and-redis.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ runTest ( 
            };

            extraAppsEnable = true;

            extraApps = with config.services.nextcloud.package.packages.apps; {

              inherit notify_push notes;

              inherit notes;

            };

            settings.trusted_proxies = [ "::1" ];

          };

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

0 → 100644
+23 −0
Original line number Diff line number Diff line 
{

  lib,

  vscode-utils,

}:



vscode-utils.buildVscodeMarketplaceExtension {

  mktplcRef = {

    name = "vscode-augment";

    publisher = "augment";

    version = "0.603.0";

    hash = "sha256-1CBZnBTu03iubIcIrUvCKeN6RtjKO3NUEXggdXTAwM8=";

  };



  meta = {

    changelog = "https://marketplace.visualstudio.com/items/augment.vscode-augment/changelog";

    description = "AI-powered coding assistant for VSCode";

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

    homepage = "https://augmentcode.com/";

    license = lib.licenses.unfree;

    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];

    maintainers = [ lib.maintainers.matteopacini ];

  };

}

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

+4 −2
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ let 
        };

      };



      augment.vscode-augment = callPackage ./augment.vscode-augment { };



      azdavis.millet = callPackage ./azdavis.millet { };



      b4dm4n.vscode-nixpkgs-fmt = callPackage ./b4dm4n.vscode-nixpkgs-fmt { };
@@ -4512,8 +4514,8 @@ let 
        mktplcRef = {

          name = "tabnine-vscode";

          publisher = "tabnine";

          version = "3.320.0";

          hash = "sha256-CFkLAMSMWGSHQwD0diSTn3z+U95Y4uCSnHNMTOj+iAo=";

          version = "3.320.4";

          hash = "sha256-ZuJX2ybmBDya0eCvIYx90JcGweHLiWanr72xItQpSXY=";

        };

        meta = {

          license = lib.licenses.mit;