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

Merge master into staging-next

parents a905b1d8 42bad2f3

maintainers/team-list.nix

+11 −1
Original line number Diff line number Diff line
@@ -387,6 +387,17 @@ with lib.maintainers; 
    shortName = "dotnet";

  };



  electron = {

    members = [

      tomasajt

      yayayayaka

      teutat3s

    ];

    scope = "Maintainers of electron packages";

    shortName = "electron";

    enableFeatureFreezePing = true;

  };



  emacs = {

    members = [

      AndersonTorres
@@ -651,7 +662,6 @@ with lib.maintainers; 


  jitsi = {

    members = [

      cleeyv

      novmar

      ryantm

      lassulus

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

+4 −3
Original line number Diff line number Diff line
@@ -322,8 +322,8 @@ in 
          "vector"

          "vchord"

        ];

        sqlFile =

          pkgs.writeText "immich-pgvectors-setup.sql" ''

        sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" (

          ''

            ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}

            ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}

            ALTER SCHEMA public OWNER TO ${cfg.database.user};
@@ -331,7 +331,8 @@ in 
          + lib.optionalString cfg.database.enableVectors ''

            ALTER SCHEMA vectors OWNER TO ${cfg.database.user};

            GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};

          '';

          ''

        );

      in

      [

        ''

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

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

          name = "vscode-java-pack";

          publisher = "vscjava";

          version = "0.30.2";

          hash = "sha256-uC3hf2OjncMqTRc9KTfrVvTwZOoPT0QXX7HCBTdblnQ=";

          version = "0.30.3";

          hash = "sha256-O6Elqkaf2oTpPxWIctrgD1NrDhkeOaCNKuRI4VFhmZ8=";

        };

        meta = {

          description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more";

pkgs/applications/networking/cluster/terraform-providers/providers.json

+98 −98

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/by-name/an/ansible-doctor/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,14 +8,14 @@ 


python3Packages.buildPythonApplication rec {

  pname = "ansible-doctor";

  version = "7.2.1";

  version = "7.3.0";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "thegeeklab";

    repo = "ansible-doctor";

    tag = "v${version}";

    hash = "sha256-2cJ1wV3hqoqSvLq3c7/J5nh1GTTcj9sexRhX3hfPoTc=";

    hash = "sha256-4Mep9JA4I5zCciglK/yn4Jxu0EIjHi7WUWeKlLcVcP8=";

  };



  build-system = with python3Packages; [