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

Merge master into staging-next

parents e7f95ba9 725db349

doc/languages-frameworks/beam.section.md

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ Here is how your `default.nix` file would look for a phoenix project. 
with import <nixpkgs> { };



let

  # beam.interpreters.erlang_23 is available if you need a particular version

  # beam.interpreters.erlang_26 is available if you need a particular version

  packages = beam.packagesWith beam.interpreters.erlang;



  pname = "your_project";

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -18390,7 +18390,7 @@ 
  };

  weathercold = {

    name = "Weathercold";

    email = "weathercold.scr@gmail.com";

    email = "weathercold.scr@proton.me";

    matrix = "@weathercold:matrix.org";

    github = "Weathercold";

    githubId = 49368953;

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

+2 −3
Original line number Diff line number Diff line 
{ config, lib, pkgs, ... }:



let

  cfg = config.services.trust-dns;

  toml = pkgs.formats.toml { };
@@ -55,7 +54,7 @@ in 
        defaultText = "pkgs.trust-dns";

        description = mdDoc ''

          Trust-dns package to use.

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

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

        '';

      };

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

          flagsStr = builtins.concatStringsSep " " flags;

        in ''

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

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

        '';

        Type = "simple";

        Restart = "on-failure";

pkgs/applications/misc/calibre/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ stdenv.mkDerivation (finalAttrs: { 
    license = if unrarSupport

              then lib.licenses.unfreeRedistributable

              else lib.licenses.gpl3Plus;

    maintainers = with lib.maintainers; [ pSub AndersonTorres ];

    maintainers = with lib.maintainers; [ pSub ];

    platforms = lib.platforms.unix;

    broken = stdenv.isDarwin;

  };

pkgs/applications/networking/cluster/kubeone/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ 


buildGoModule rec {

  pname = "kubeone";

  version = "1.6.2";

  version = "1.7.0";



  src = fetchFromGitHub {

    owner = "kubermatic";

    repo = "kubeone";

    rev = "v${version}";

    hash = "sha256-dLpe3C1gMnEyajJFPawDlTchYKA8cAy2QUAae6+7QBQ=";

    hash = "sha256-izUjiRQAdTpdk86s1lQwLfpHy4eJo3mGAgTwWfGkNAQ=";

  };



  vendorHash = "sha256-aCRrf/E4UVL6PwUPRRzLjD+MzL8gcNJrc2IgKKyIIHI=";

  vendorHash = "sha256-AFyvTv1uVeq2KtRG6VToTBnX+8tHorDZPSturJhsrG4=";



  ldflags = [

    "-s"