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

Merge master into staging-next

parents 200da171 29662380

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

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ 
- `binwalk` was updated to 3.1.0, which has been rewritten in rust. The python module is no longer available.

  See the release notes of [3.1.0](https://github.com/ReFirmLabs/binwalk/releases/tag/v3.1.0) for more information.



- `pkgs.nextcloud28` has been removed since it's out of support upstream.

- `pkgs.nextcloud28` and `pkgs.nextcloud29` have been removed since they are out of support upstream.



- `centrifugo` was updated to v6, which uses a new config format. See [upstream documentation](https://centrifugal.dev/docs/getting-started/migration_v6) for migration.

nixos/doc/manual/release-notes/rl-2505.section.md

+1 −1
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ 


- [Zoxide](https://github.com/ajeetdsouza/zoxide), a smarter cd command, inspired by z and autojump. Available as [programs.zoxide](options.html#opt-programs.zoxide.enable)



- [victorialogs][https://docs.victoriametrics.com/victorialogs/], log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable)

- [victorialogs](https://docs.victoriametrics.com/victorialogs/), log database from VictoriaMetrics. Available as [services.victorialogs](#opt-services.victorialogs.enable)



- [gokapi](https://github.com/Forceu/Gokapi), Lightweight selfhosted Firefox Send alternative without public upload. AWS S3 supported. Available with [services.gokapi](options.html#opt-services.gokapi.enable)

nixos/modules/installer/tools/nix-fallback-paths.nix

+6 −6
Original line number Diff line number Diff line 
{

  x86_64-linux = "/nix/store/ppvbj1hzk77il5wd5g6q5ibyyd4jsnrl-nix-2.28.1";

  i686-linux = "/nix/store/5lb00s5p37715jh8y9nw6ihdjlzrs2bq-nix-2.28.1";

  aarch64-linux = "/nix/store/2zy7z2ablw09s0fj511x6d6za2vswv09-nix-2.28.1";

  riscv64-linux = "/nix/store/m4fw1gfzx7z3lp2pra1x1bajjb5d4fvi-nix-riscv64-unknown-linux-gnu-2.28.1";

  x86_64-darwin = "/nix/store/yi9ysd086218v1k1i16ilkmnkavgrxsi-nix-2.28.1";

  aarch64-darwin = "/nix/store/v4g8bccvg56b8y4r93c6w1f8125qs3cm-nix-2.28.1";

  x86_64-linux = "/nix/store/pzwdmrz94mya45m1jnsf294c0g3cwy9m-nix-2.28.2";

  i686-linux = "/nix/store/vzqxry2dwq9nzr2y0jk1q7qv3ygv14m1-nix-2.28.2";

  aarch64-linux = "/nix/store/52zak9psh00w8c8iz8x0ny33in5wwr83-nix-2.28.2";

  riscv64-linux = "/nix/store/rkggav1j9wb55zc8jsl1vg81s831aqj8-nix-riscv64-unknown-linux-gnu-2.28.2";

  x86_64-darwin = "/nix/store/afwsvhzqf936zx5v4i7ynqah2qhq7qyj-nix-2.28.2";

  aarch64-darwin = "/nix/store/djcysgb0pgrigaqfnmraviv6nix786zi-nix-2.28.2";

}

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

+9 −6
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ let 
            'class' => '\\OC\\Files\\ObjectStore\\S3',

            'arguments' => [

              'bucket' => '${s3.bucket}',

              'autocreate' => ${boolToString s3.autocreate},

              'verify_bucket_exists' => ${boolToString s3.verify_bucket_exists},

              'key' => '${s3.key}',

              'secret' => nix_read_secret('s3_secret'),

              ${optionalString (s3.hostname != null) "'hostname' => '${s3.hostname}',"}
@@ -344,6 +344,10 @@ in 
      [ "services" "nextcloud" "extraOptions" ]

      [ "services" "nextcloud" "settings" ]

    )

    (mkRenamedOptionModule

      [ "services" "nextcloud" "config" "objectstore" "s3" "autocreate" ]

      [ "services" "nextcloud" "config" "objectstore" "s3" "verify_bucket_exists" ]

    )

  ];



  options.services.nextcloud = {
@@ -420,7 +424,6 @@ in 
      type = types.package;

      description = "Which package to use for the Nextcloud instance.";

      relatedPackages = [

        "nextcloud29"

        "nextcloud30"

        "nextcloud31"

      ];
@@ -654,10 +657,11 @@ in 
              The name of the S3 bucket.

            '';

          };

          autocreate = mkOption {

          verify_bucket_exists = mkOption {

            type = types.bool;

            default = true;

            description = ''

              Create the objectstore if it does not exist.

              Create the objectstore bucket if it does not exist.

            '';

          };

          key = mkOption {
@@ -1041,8 +1045,7 @@ in 
            nextcloud31

        );



      services.nextcloud.phpPackage =

        if versionOlder cfg.package.version "29" then pkgs.php82 else pkgs.php83;

      services.nextcloud.phpPackage = pkgs.php83;



      services.nextcloud.phpOptions = mkMerge [

        (mapAttrs (const mkOptionDefault) defaultPHPSettings)

nixos/release.nix

+0 −26
Original line number Diff line number Diff line
@@ -339,32 +339,6 @@ rec { 


  );



  # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test

  # automatic sizing without blocking the channel.

  amazonImageAutomaticSize = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (

    system:



    with import ./.. { inherit system; };



    hydraJob (

      (import lib/eval-config.nix {

        inherit system;

        modules = [

          configuration

          versionModule

          ./maintainers/scripts/ec2/amazon-image.nix

          (

            { ... }:

            {

              virtualisation.diskSize = "auto";

            }

          )

        ];

      }).config.system.build.amazonImage

    )



  );



  # An image that can be imported into incus and used for container creation

  incusContainerImage =

    forMatchingSystems