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

Merge master into staging-next

parents 536833ef 1e45a236

lib/licenses.nix

+15 −0
Original line number Diff line number Diff line
@@ -877,6 +877,21 @@ in mkLicense lset) ({ 
    fullName = "Non-Profit Open Software License 3.0";

  };



  nvidiaCuda = {

    shortName = "CUDA EULA";

    fullName = "CUDA Toolkit End User License Agreement (EULA)";

    url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement";

    free = false;

  };



  nvidiaCudaRedist = {

    shortName = "CUDA EULA";

    fullName = "CUDA Toolkit End User License Agreement (EULA)";

    url = "https://docs.nvidia.com/cuda/eula/index.html#cuda-toolkit-supplement-license-agreement";

    free = false;

    redistributable = true;

  };



  obsidian = {

    fullName = "Obsidian End User Agreement";

    url = "https://obsidian.md/eula";

nixos/doc/manual/release-notes/rl-2311.section.md

+2 −0
Original line number Diff line number Diff line
@@ -497,6 +497,8 @@ The module update takes care of the new config syntax and the data itself (user 
  - `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved

    for `root` and the `wheel` group.



- `virtualisation.googleComputeImage` now provides `efi` option to support UEFI booting.



- CoreDNS can now be built with external plugins by overriding `externalPlugins` and `vendorHash` arguments like this:



  ```

nixos/modules/services/networking/trust-dns.nix

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ in 
        defaultText = "pkgs.trust-dns";

        description = mdDoc ''

          Trust-dns package to use.

          Only `bin/trust-dns` need be provided: the other trust-dns utilities (client and resolver) are not needed.

          The package must provide `meta.mainProgram` which names the server binary; any other utilities (client, resolver) are not needed.

        '';

      };

      quiet = mkOption {
@@ -135,7 +135,7 @@ in 
          flags =  (lib.optional cfg.debug "--debug") ++ (lib.optional cfg.quiet "--quiet");

          flagsStr = builtins.concatStringsSep " " flags;

        in ''

          ${cfg.package}/bin/trust-dns --config ${configFile} ${flagsStr}

          ${cfg.package}/bin/${cfg.package.meta.mainProgram} --config ${configFile} ${flagsStr}

        '';

        Type = "simple";

        Restart = "on-failure";

nixos/modules/virtualisation/google-compute-image.nix

+8 −0
Original line number Diff line number Diff line
@@ -44,10 +44,17 @@ in 
        GZIP compression level of the resulting disk image (1-9).

      '';

    };

    virtualisation.googleComputeImage.efi = mkEnableOption "EFI booting";

  };



  #### implementation

  config = {

    boot.initrd.availableKernelModules = [ "nvme" ];

    boot.loader.grub = mkIf cfg.efi {

      device = mkForce "nodev";

      efiSupport = true;

      efiInstallAsRemovable = true;

    };



    system.build.googleComputeImage = import ../../lib/make-disk-image.nix {

      name = "google-compute-image";
@@ -62,6 +69,7 @@ in 
      '';

      format = "raw";

      configFile = if cfg.configFile == null then defaultConfigFile else cfg.configFile;

      partitionTableType = if cfg.efi then "efi" else "legacy";

      inherit (cfg) diskSize;

      inherit config lib pkgs;

    };

pkgs/applications/misc/anytype/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ appimageTools.wrapType2 { 
    description = "P2P note-taking tool";

    homepage = "https://anytype.io/";

    license = licenses.unfree;

    maintainers = with maintainers; [ bbigras ];

    maintainers = with maintainers; [ ];

    platforms = [ "x86_64-linux" ];

  };

}