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

Merge master into staging-next

parents d88a0894 4efff34e
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ code, while others choose not to.

In Nix, there are multiple approaches to building a Composer-based project.

One such method is the `php.buildComposerProject` helper function, which serves
One such method is the `php.buildComposerProject2` helper function, which serves
as a wrapper around `mkDerivation`.

Using this function, you can build a PHP project that includes both a
@@ -249,19 +249,19 @@ To customize the PHP version, you can specify the `php` attribute. Similarly, if
you wish to modify the Composer version, use the `composer` attribute. It is
important to note that both attributes should be of the `derivation` type.

Here's an example of working code example using `php.buildComposerProject`:
Here's an example of working code example using `php.buildComposerProject2`:

```nix
{ php, fetchFromGitHub }:

php.buildComposerProject (finalAttrs: {
php.buildComposerProject2 (finalAttrs: {
  pname = "php-app";
  version = "1.0.0";

  src = fetchFromGitHub {
    owner = "git-owner";
    repo = "git-repo";
    rev = finalAttrs.version;
    tag = finalAttrs.version;
    hash = "sha256-VcQRSss2dssfkJ+iUb5qT+FJ10GHiFDzySigcmuVI+8=";
  };

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@

- `cassandra_3_0` and `cassandra_3_11` have been removed as they have reached end-of-life. Please update to `cassandra_4`. See the [changelog](https://github.com/apache/cassandra/blob/cassandra-4.0.17/NEWS.txt) for more information about the upgrade process.

- `mariadb_105` has been removed as it has reached end-of-life in 2025-06. Please update to `mariadb_106`.

- NetBox was updated to `>= 4.2.0`. Have a look at the breaking changes
  of the [4.1 release](https://github.com/netbox-community/netbox/releases/tag/v4.1.0)
  and the [4.2 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
+11 −0
Original line number Diff line number Diff line
@@ -2129,6 +2129,11 @@
    githubId = 11493130;
    name = "Asbjørn Olling";
  };
  aschleck = {
    name = "April Schleck";
    github = "aschleck";
    githubId = 115766;
  };
  ascii17 = {
    name = "Allen Conlon";
    email = "software@conlon.dev";
@@ -12835,6 +12840,12 @@
    githubId = 1915;
    name = "Asherah Connor";
  };
  kiyotoko = {
    email = "karl.zschiebsch@gmail.com";
    github = "Kiyotoko";
    githubId = 49951907;
    name = "Karl Zschiebsch";
  };
  kjeremy = {
    email = "kjeremy@gmail.com";
    name = "Jeremy Kolb";
+9 −7
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ in

      enable = lib.mkEnableOption "Maddy, a free an open source mail server";

      package = lib.mkPackageOption pkgs "maddy" { };

      user = lib.mkOption {
        default = "maddy";
        type = with lib.types; uniq str;
@@ -386,7 +388,7 @@ in

    systemd = {

      packages = [ pkgs.maddy ];
      packages = [ cfg.package ];
      services = {
        maddy = {
          serviceConfig = {
@@ -402,16 +404,16 @@ in
          script = ''
            ${lib.optionalString (cfg.ensureAccounts != [ ]) ''
              ${lib.concatMapStrings (account: ''
                if ! ${pkgs.maddy}/bin/maddyctl imap-acct list | grep "${account}"; then
                  ${pkgs.maddy}/bin/maddyctl imap-acct create ${account}
                if ! ${cfg.package}/bin/maddyctl imap-acct list | grep "${account}"; then
                  ${cfg.package}/bin/maddyctl imap-acct create ${account}
                fi
              '') cfg.ensureAccounts}
            ''}
            ${lib.optionalString (cfg.ensureCredentials != { }) ''
              ${lib.concatStringsSep "\n" (
                lib.mapAttrsToList (name: cfg: ''
                  if ! ${pkgs.maddy}/bin/maddyctl creds list | grep "${name}"; then
                    ${pkgs.maddy}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg cfg.passwordFile}) ${name}
                lib.mapAttrsToList (name: credentials: ''
                  if ! ${cfg.package}/bin/maddyctl creds list | grep "${name}"; then
                    ${cfg.package}/bin/maddyctl creds create --password $(cat ${lib.escapeShellArg credentials.passwordFile}) ${name}
                  fi
                '') cfg.ensureCredentials
              )}
@@ -486,7 +488,7 @@ in
    };

    environment.systemPackages = [
      pkgs.maddy
      cfg.package
    ];
  };
}
+2 −2
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ in
      environment = env;

      path = with pkgs; [
        nodejs_18
        nodejs_20
        yarn
        ffmpeg-headless
        openssl
@@ -945,7 +945,7 @@ in
      })
      (lib.attrsets.setAttrByPath
        [ cfg.user "packages" ]
        [ peertubeEnv pkgs.nodejs_18 pkgs.yarn pkgs.ffmpeg-headless ]
        [ peertubeEnv pkgs.nodejs_20 pkgs.yarn pkgs.ffmpeg-headless ]
      )
      (lib.mkIf cfg.redis.enableUnixSocket {
        ${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];
Loading