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

Merge master into staging-nixos

parents db023774 fbf3d09c
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -11111,6 +11111,12 @@
    githubId = 7481521;
    name = "Balázs Lengyel";
  };
  ilai-deutel = {
    github = "ilai-deutel";
    githubId = 10098207;
    name = "Ilaï Deutel";
    keys = [ { fingerprint = "1025 8841 8FF7 E165 6964  90A2 06E8 A973 4948 08A2"; } ];
  };
  ilarvne = {
    email = "ilarvne@proton.me";
    github = "ilarvne";
@@ -14433,6 +14439,11 @@
    githubId = 629430;
    keys = [ { fingerprint = "2843 750C B1AB E256 94BE  40E2 D843 D30B 42CA 0E2D"; } ];
  };
  kulczwoj = {
    name = "Wojciech Kulczycki";
    github = "kulczwoj";
    githubId = 58049191;
  };
  KunyaKud = {
    name = "KunyaKud";
    email = "wafuu@posteo.net";
+5 −7
Original line number Diff line number Diff line
{ lib, ... }:
let
  name = "continuwuity";
  user = "alice";
  pass = "my-secret-password";
in
{
  inherit name;
@@ -12,8 +14,7 @@ in
        settings.global = {
          server_name = name;
          address = [ "0.0.0.0" ];
          allow_registration = true;
          yes_i_am_very_very_sure_i_want_an_open_registration_server_prone_to_abuse = true;
          admin_execute = [ "users create ${user} ${pass}" ];
        };
        extraEnvironment.RUST_BACKTRACE = "yes";
      };
@@ -30,13 +31,10 @@ in

            async def main() -> None:
                # Connect to continuwuity
                client = nio.AsyncClient("http://continuwuity:6167", "alice")

                # Register as user alice
                response = await client.register("alice", "my-secret-password")
                client = nio.AsyncClient("http://continuwuity:6167", "${user}")

                # Log in as user alice
                response = await client.login("my-secret-password")
                response = await client.login("${pass}")

                # Create a new room
                response = await client.room_create(federate=False)
+21 −0
Original line number Diff line number Diff line
{
  lib,
  vscode-utils,
}:

vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "packaging";
    publisher = "claui";
    version = "0.2.5";
    hash = "sha256-WGs00Q1oa8Nz9dpKn3iZSjrhR0VKUwJWPGdm+wWtoxs=";
  };
  meta = {
    changelog = "https://github.com/claui/vscode-packaging/releases";
    description = "Visual Studio Code extension for PKGBUILDs in the Arch User Repository (AUR)";
    downloadPage = "https://marketplace.visualstudio.com/items?itemName=claui.packaging";
    homepage = "https://github.com/claui/vscode-packaging";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ ilai-deutel ];
  };
}
+4 −0
Original line number Diff line number Diff line
@@ -989,6 +989,8 @@ let
        };
      };

      claui.packaging = callPackage ./claui.packaging { };

      cmschuetz12.wal = buildVscodeMarketplaceExtension {
        mktplcRef = {
          name = "wal";
@@ -2516,6 +2518,8 @@ let
        };
      };

      jjk.jjk = callPackage ./jjk.jjk { };

      jkillian.custom-local-formatters = buildVscodeMarketplaceExtension {
        mktplcRef = {
          publisher = "jkillian";
+21 −0
Original line number Diff line number Diff line
{
  lib,
  vscode-utils,
}:

vscode-utils.buildVscodeMarketplaceExtension {
  mktplcRef = {
    name = "jjk";
    publisher = "jjk";
    version = "0.8.1";
    hash = "sha256-2JUn6wkWgZKZzhitQy6v9R/rCNLrt7DBtt59707hp6c=";
  };
  meta = {
    changelog = "https://github.com/keanemind/jjk/releases";
    description = "Visual Studio Code extension for the Jujutsu (jj) version control system";
    downloadPage = "https://marketplace.visualstudio.com/items?itemName=jjk.jjk";
    homepage = "https://github.com/keanemind/jjk";
    license = lib.licenses.mit;
    maintainers = with lib.maintainers; [ ilai-deutel ];
  };
}
Loading