mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 13:40:28 +03:00
Merge master into staging-next
This commit is contained in:
commit
43a5de6cbb
67 changed files with 1554 additions and 5755 deletions
|
@ -30,8 +30,8 @@ import ../make-test-python.nix (
|
|||
in
|
||||
{
|
||||
name = "mjolnir";
|
||||
meta = with pkgs.lib; {
|
||||
maintainers = teams.matrix.members;
|
||||
meta = {
|
||||
inherit (pkgs.mjolnir.meta) maintainers;
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
|
|
@ -2,8 +2,8 @@ import ../make-test-python.nix (
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
name = "matrix-synapse-workers";
|
||||
meta = with pkgs.lib; {
|
||||
maintainers = teams.matrix.members;
|
||||
meta = {
|
||||
inherit (pkgs.matrix-synapse.meta) maintainers;
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
|
|
@ -54,8 +54,8 @@ import ../make-test-python.nix (
|
|||
{
|
||||
|
||||
name = "matrix-synapse";
|
||||
meta = with pkgs.lib; {
|
||||
maintainers = teams.matrix.members;
|
||||
meta = {
|
||||
inherit (pkgs.matrix-synapse.meta) maintainers;
|
||||
};
|
||||
|
||||
nodes = {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue