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

Merge master into staging-next

parents 79a47b86 546f356d

nixos/tests/isso.nix

+1 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, ... }: {

  name = "isso";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ asbachb ];

    maintainers = [ ];

  };



  nodes.machine = { config, pkgs, ... }: {

nixos/tests/soapui.nix

+1 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, ... }: {

  name = "soapui";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ asbachb ];

    maintainers = [ ];

  };



  nodes.machine = { config, pkgs, ... }: {

nixos/tests/tuxguitar.nix

+1 −1
Original line number Diff line number Diff line 
import ./make-test-python.nix ({ pkgs, ... }: {

  name = "tuxguitar";

  meta = with pkgs.lib.maintainers; {

    maintainers = [ asbachb ];

    maintainers = [ ];

  };



  nodes.machine = { config, pkgs, ... }: {

pkgs/applications/blockchains/lndhub-go/default.nix

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


buildGoModule rec {

  pname = "lndhub-go";

  version = "0.12.0";

  version = "0.13.0";



  src = fetchFromGitHub {

    owner = "getAlby";

    repo = "lndhub.go";

    rev = "${version}";

    sha256 = "sha256-bwwypqaqlO+T/8ppKIHqGSzVerhQVl7YHrORyrpaa2w=";

    sha256 = "sha256-ZyqE6xFNsOwTBbLLn14jwNp9UkagTRgAQS+SEl+POaY=";

  };



  vendorSha256 = "sha256-AiRbUSgMoU8nTzis/7H9HRW2/xZxXFf39JipRbukeiA=";

  vendorHash = "sha256-Wsejz/vYaT/maN7dYcrXPTXg30jZaldaslXbHcgHlRs=";



  doCheck = false; # tests require networking

pkgs/applications/editors/netbeans/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ stdenv.mkDerivation { 
      binaryBytecode

      binaryNativeCode

    ];

    maintainers = with lib.maintainers; [ sander rszibele asbachb ];

    maintainers = with lib.maintainers; [ sander rszibele ];

    platforms = lib.platforms.unix;

  };

}