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

Merge master into staging-next

parents a01279cf 76d4d2e7
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ If you are packaging a Flutter desktop application, use [`buildFlutterApplicatio

If the upstream source is missing a `pubspec.lock` file, you'll have to vendor one and specify it using `pubspecLockFile`. If it is needed, one will be generated for you and printed when attempting to build the derivation.

The `depsListFile` must always be provided when packaging in Nixpkgs. It will be generated and printed if the derivation is attempted to be built without one. Alternatively, `autoDepsList` may be set to `true` only when outside of Nixpkgs, as it relies on import-from-derivation.

The `dart` commands run can be overridden through `pubGetScript` and `dartCompileCommand`, you can also add flags using `dartCompileFlags` or `dartJitFlags`.

Dart supports multiple [outputs types](https://dart.dev/tools/dart-compile#types-of-output), you can choose between them using `dartOutputType` (defaults to `exe`). If you want to override the binaries path or the source path they come from, you can use `dartEntryPoints`. Outputs that require a runtime will automatically be wrapped with the relevant runtime (`dartaotruntime` for `aot-snapshot`, `dart run` for `jit-snapshot` and `kernel`, `node` for `js`), this can be overridden through `dartRuntimeCommand`.
@@ -31,6 +33,7 @@ buildDartApplication rec {
  };

  pubspecLockFile = ./pubspec.lock;
  depsListFile = ./deps.json;
  vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s=";
}
```
@@ -39,9 +42,7 @@ buildDartApplication rec {

The function `buildFlutterApplication` builds Flutter applications.

The deps.json file must always be provided when packaging in Nixpkgs. It will be generated and printed if the derivation is attempted to be built without one. Alternatively, `autoDepsList` may be set to `true` when outside of Nixpkgs, as it relies on import-from-derivation.

A `pubspec.lock` file must be available. See the [Dart documentation](#ssec-dart-applications) for more details.
See the [Dart documentation](#ssec-dart-applications) for more details on required files and arguments.

```nix
{  flutter, fetchFromGitHub }:
+20 −0
Original line number Diff line number Diff line
@@ -6199,6 +6199,16 @@
    githubId = 45048741;
    name = "Alwanga Oyango";
  };
  galaxy = {
    email = "galaxy@dmc.chat";
    matrix = "@galaxy:mozilla.org";
    name = "The Galaxy";
    github = "ga1aksy";
    githubId = 148551648;
    keys = [{
      fingerprint = "48CA 3873 9E9F CA8E 76A0  835A E3DE CF85 4212 E1EA";
    }];
  };
  gal_bolle = {
    email = "florent.becker@ens-lyon.org";
    github = "FlorentBecker";
@@ -13664,6 +13674,12 @@
    githubId = 152312;
    name = "Periklis Tsirakidis";
  };
  perstark = {
    email = "perstark.se@gmail.com";
    github = "perstarkse";
    githubId = 63069986;
    name = "Per Stark";
  };
  petercommand = {
    email = "petercommand@gmail.com";
    github = "petercommand";
@@ -17883,6 +17899,10 @@
    githubId = 13155277;
    name = "Tom Houle";
  };
  tomkoid = {
    email = "tomaszierl@outlook.com";
    name = "Tomkoid";
  };
  tomodachi94 = {
    email = "tomodachi94+nixpkgs@protonmail.com";
    matrix = "@tomodachi94:matrix.org";
+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@

- [virt-manager](https://virt-manager.org/), an UI for managing virtual machines in libvirt, is now available as `programs.virt-manager`.

- [Soft Serve](https://github.com/charmbracelet/soft-serve), a tasty, self-hostable Git server for the command line. Available as [services.soft-serve](#opt-services.soft-serve.enable).

## Backward Incompatibilities {#sec-release-23.11-incompatibilities}

- `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`.
@@ -345,6 +347,8 @@

- `jq` was updated to 1.7, its [first release in 5 years](https://github.com/jqlang/jq/releases/tag/jq-1.7).

- `zfs` was updated from 2.1.x to 2.2.0, [enabling newer kernel support and adding new features](https://github.com/openzfs/zfs/releases/tag/zfs-2.2.0).

- A new option was added to the virtualisation module that enables specifying explicitly named network interfaces in QEMU VMs. The existing `virtualisation.vlans` is still supported for cases where the name of the network interface is irrelevant.

- DocBook option documentation is no longer supported, all module documentation now uses markdown.
+49 −0
Original line number Diff line number Diff line
{ config, lib, pkgs, ... }:
let
  cfg = config.services.fanout;
  mknodCmds = n: lib.lists.imap0 (i: s:
    "mknod /dev/fanout${builtins.toString i} c $MAJOR ${builtins.toString i}"
  ) (lib.lists.replicate n "");
in
{
  options.services.fanout = {
    enable = lib.mkEnableOption (lib.mdDoc "fanout");
    fanoutDevices = lib.mkOption {
      type = lib.types.int;
      default = 1;
      description = "Number of /dev/fanout devices";
    };
    bufferSize = lib.mkOption {
      type = lib.types.int;
      default = 16384;
      description = "Size of /dev/fanout buffer in bytes";
    };
  };

  config = lib.mkIf cfg.enable {
    boot.extraModulePackages = [ config.boot.kernelPackages.fanout.out ];

    boot.kernelModules = [ "fanout" ];

    boot.extraModprobeConfig = ''
      options fanout buffersize=${builtins.toString cfg.bufferSize}
    '';

    systemd.services.fanout = {
      description = "Bring up /dev/fanout devices";
      script = ''
        MAJOR=$(${pkgs.gnugrep}/bin/grep fanout /proc/devices | ${pkgs.gawk}/bin/awk '{print $1}')
        ${lib.strings.concatLines (mknodCmds cfg.fanoutDevices)}
      '';

      wantedBy = [ "multi-user.target" ];

      serviceConfig = {
        Type = "oneshot";
        User = "root";
        RemainAfterExit = "yes";
        Restart = "no";
      };
    };
  };
}
+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
  ./config/appstream.nix
  ./config/console.nix
  ./config/debug-info.nix
  ./config/fanout.nix
  ./config/fonts/fontconfig.nix
  ./config/fonts/fontdir.nix
  ./config/fonts/ghostscript.nix
@@ -730,6 +731,7 @@
  ./services/misc/signald.nix
  ./services/misc/siproxd.nix
  ./services/misc/snapper.nix
  ./services/misc/soft-serve.nix
  ./services/misc/sonarr.nix
  ./services/misc/sourcehut
  ./services/misc/spice-vdagentd.nix
Loading