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

Merge master into staging-next

parents f8160538 30ce319f

nixos/modules/tasks/network-interfaces.nix

+2 −0
Original line number Diff line number Diff line
@@ -1396,6 +1396,8 @@ in 
      "net.ipv4.conf.all.forwarding" = mkDefault (any (i: i.proxyARP) interfaces);

      "net.ipv6.conf.all.disable_ipv6" = mkDefault (!cfg.enableIPv6);

      "net.ipv6.conf.default.disable_ipv6" = mkDefault (!cfg.enableIPv6);

      # allow all users to do ICMP echo requests (ping)

      "net.ipv4.ping_group_range" = mkDefault "0 2147483647";

      # networkmanager falls back to "/proc/sys/net/ipv6/conf/default/use_tempaddr"

      "net.ipv6.conf.default.use_tempaddr" = tempaddrValues.${cfg.tempAddresses}.sysctl;

    } // listToAttrs (forEach interfaces

pkgs/applications/editors/xed-editor/default.nix

+10 −0
Original line number Diff line number Diff line 
{ stdenv

, lib

, fetchFromGitHub

, fetchpatch

, libxml2

, libpeas

, glib
@@ -28,6 +29,15 @@ stdenv.mkDerivation rec { 
    sha256 = "sha256-IpUBB7Viwc/nRfwzFllRiWoOmUxRZzS2BcxyM7W3oHI=";

  };



  patches = [

    # Fix missing include for libxml2 2.12

    # https://github.com/linuxmint/xed/pull/611

    (fetchpatch {

      url = "https://github.com/linuxmint/xed/commit/28cb2e8136c1bfe90faf5f2341bde66156990778.patch";

      hash = "sha256-AqIb7Jj19SF3tIriPwn1JeB7niCmPbBsLE4ch2AX7fk=";

    })

  ];



  nativeBuildInputs = [

    meson

    pkg-config

pkgs/applications/emulators/blink/default.nix

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: { 
    })

  ];



  # Do not include --enable-static and --disable-shared flags during static compilation

  dontAddStaticConfigureFlags = true;



  # Don't add --build and --host flags as they are not supported

  configurePlatforms = lib.optionals stdenv.hostPlatform.isStatic [ ];



  # ./configure script expects --static not standard --enable-static

  configureFlags = lib.optional stdenv.hostPlatform.isStatic "--static";



  # 'make check' requires internet connection

  doCheck = true;

  checkTarget = "test";

pkgs/applications/misc/blender/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -38,11 +38,11 @@ let 
in

stdenv.mkDerivation (finalAttrs: rec {

  pname = "blender";

  version = "4.0.1";

  version = "4.0.2";



  src = fetchurl {

    url = "https://download.blender.org/source/${pname}-${version}.tar.xz";

    hash = "sha256-/jLU0noX5RxhQ+26G16nGFylm65Lzfm9s11oCWCC43Q=";

    hash = "sha256-qqDnKdp1kc+/RXcq92NFl32qp7EaCvNdmPkxPiRgd6M=";

  };



  patches = [

pkgs/applications/misc/corectrl/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 


stdenv.mkDerivation rec{

  pname = "corectrl";

  version = "1.3.6";

  version = "1.3.8";



  src = fetchFromGitLab {

    owner = "corectrl";

    repo = "corectrl";

    rev = "v${version}";

    sha256 = "sha256-a8cLtmv9nLtvN9o/aIwveTAT36XmTN1j85ZxVGIXO6E=";

    sha256 = "sha256-lc6yWzJiSzGKMzJIpgOtirJONsh49vXWDWrhLV/erwQ=";

  };

  patches = [

    ./polkit-dir.patch