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

Merge master into staging-next

parents a3e2b0de 3d7bde2f

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -16856,6 +16856,12 @@ 
    github = "samalws";

    githubId = 20981725;

  };

  samasaur = {

    name = "Samasaur";

    email = "sam@samasaur.com";

    github = "Samasaur1";

    githubId = 30577766;

  };

  samb96 = {

    email = "samb96@gmail.com";

    github = "samb96";

nixos/modules/services/development/lorri.nix

+1 −2
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ in { 
      serviceConfig = {

        ExecStart = "${cfg.package}/bin/lorri daemon";

        PrivateTmp = true;

        ProtectSystem = "strict";

        ProtectHome = "read-only";

        ProtectSystem = "full";

        Restart = "on-failure";

      };

    };

pkgs/applications/audio/ft2-clone/default.nix

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


stdenv.mkDerivation rec {

  pname = "ft2-clone";

  version = "1.75";

  version = "1.76";



  src = fetchFromGitHub {

    owner = "8bitbubsy";

    repo = "ft2-clone";

    rev = "v${version}";

    hash = "sha256-K+RUsRr19fc0E9VhZWIawxkGXCTwqXl3a13pRiRxDPg=";

    hash = "sha256-oVQ1B7rYZX2kHTY8jVVm3rkOLx499kiEvhkv2V94W9k=";

  };



  nativeBuildInputs = [ cmake ];

pkgs/applications/blockchains/lnd/default.nix

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


buildGoModule rec {

  pname = "lnd";

  version = "0.17.3-beta";

  version = "0.17.4-beta";



  src = fetchFromGitHub {

    owner = "lightningnetwork";

    repo = "lnd";

    rev = "v${version}";

    hash = "sha256-JZ+DhFIDMRDDeW6YNeUy/pQt+IbFyZiiqFn4//S2Oao=";

    hash = "sha256-O6cGK4UMKrZpYqtghjjqqLBStLG5GEi/Q5liR557I8s=";

  };



  vendorHash = "sha256-lvysD9/26OoPCKBOGu/R95x1UKvhcLtn17bQLPT4ofM=";

  vendorHash = "sha256-eaQmM5bfsUmzTiUALX543VBQRJK+TqW2i28npwSrn3Q=";



  subPackages = [ "cmd/lncli" "cmd/lnd" ];

pkgs/applications/editors/emacs/sources.nix

+1 −1
Original line number Diff line number Diff line
@@ -53,10 +53,10 @@ let 
      maintainers = with lib.maintainers; [

        AndersonTorres

        adisbladis

        atemu

        jwiegley

        lovek323

        matthewbauer

        # atemu for issues relating to Macport

      ];

      platforms = {

        "mainline" = lib.platforms.all;