Unverified Commit 92d53105 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents f2b767ea d01b5ff5

doc/languages-frameworks/index.md

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ dotnet.section.md 
emscripten.section.md

gnome.section.md

go.section.md

gradle.section.md

hare.section.md

haskell.section.md

hy.section.md

lib/licenses.nix

+7 −0
Original line number Diff line number Diff line
@@ -554,6 +554,13 @@ lib.mapAttrs mkLicense ({ 
    redistributable = true;

  };



  fsl11Asl20 = {

    fullName = "Functional Source License, Version 1.1, Apache 2.0 Future License";

    url = "https://fsl.software/FSL-1.1-Apache-2.0.template.md";

    free = false;

    redistributable = true;

  };



  ftl = {

    spdxId = "FTL";

    fullName = "Freetype Project License";

maintainers/maintainer-list.nix

+25 −0
Original line number Diff line number Diff line
@@ -4386,6 +4386,12 @@ 














    keys = [ { fingerprint = "BBED 1B08 8CED 7F95 8917 FBE8 5004 F0FA D051 576D"; } ];















  };













  cyewashish = {













    name = "Cyewashish";













    email = "wawashish@cyekaivy.dev";













    github = "cyewashish";













    githubId = 180875322;













  };















  cynerd = {















    name = "Karel Kočí";















    email = "cynerd@email.cz";










@@ -9083,6 +9089,12 @@













    githubId = 13622947;















    keys = [ { fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; } ];















  };













  istoph = {













    email = "chr@istoph.de";













    name = "Christoph Hüffelmann";













    github = "istoph";













    githubId = 114227790;













  };















  ius = {















    email = "j.de.gram@gmail.com";















    name = "Joerie de Gram";










@@ -20618,6 +20630,12 @@













    githubId = 27386;















    name = "Milan Svoboda";















  };













  textshell = {













    email = "textshell@uchuujin.de";













    github = "textshell";













    githubId = 6579711;













    name = "Martin Hostettler";













  };















  tfc = {















    email = "jacek@galowicz.de";















    matrix = "@jonge:ukvly.org";










@@ -21404,6 +21422,13 @@













    githubId = 563054;















    name = "Thomas Tuegel";















  };













  tudbut = {













    name = "Daniella Hennig";













    email = "nixpkgs@mail.tudbut.de";













    matrix = "@tudbut:matrix.tudbut.de";













    github = "tudbut";













    githubId = 48156391;













  };















  tu-maurice = {















    email = "valentin.gehrke+nixpkgs@zom.bi";















    github = "tu-maurice";

































nixos/modules/services/misc/open-webui.nix



+12
−0






























Original line number
Diff line number
Diff line








@@ -60,6 +60,17 @@ in













        '';















      };





























      environmentFile = lib.mkOption {













        description = ''













          Environment file to be passed to the systemd service.













          Useful for passing secrets to the service to prevent them from being













          world-readable in the Nix store.













        '';













        type = lib.types.nullOr lib.types.path;













        default = null;













        example = "/var/lib/secrets/openWebuiSecrets";













      };





























      openFirewall = lib.mkOption {















        type = types.bool;















        default = false;









@@ -86,6 +97,7 @@ in





























      serviceConfig = {















        ExecStart = "${lib.getExe cfg.package} serve --host ${cfg.host} --port ${toString cfg.port}";













        EnvironmentFile = lib.optional (cfg.environmentFile != null) cfg.environmentFile;















        WorkingDirectory = cfg.stateDir;















        StateDirectory = "open-webui";















        RuntimeDirectory = "open-webui";

































nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix



+2
−1






























Original line number
Diff line number
Diff line








@@ -216,7 +216,7 @@ in {













    consoleMode = mkOption {















      default = "keep";





























      type = types.enum [ "0" "1" "2" "auto" "max" "keep" ];













      type = types.enum [ "0" "1" "2" "5" "auto" "max" "keep" ];































      description = ''















        The resolution of the console. The following values are valid:









@@ -224,6 +224,7 @@ in {













        - `"0"`: Standard UEFI 80x25 mode















        - `"1"`: 80x50 mode, not supported by all devices















        - `"2"`: The first non-standard mode provided by the device firmware, if any













        - `"5"`: Applicable for SteamDeck where this mode represent horizontal mode















        - `"auto"`: Pick a suitable mode automatically using heuristics















        - `"max"`: Pick the highest-numbered available mode















        - `"keep"`: Keep the mode selected by firmware (the default)