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

Merge master into staging-next

parents ffa8788c 0c9de795

pkgs/applications/emulators/mame/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -39,14 +39,14 @@ let 
in

stdenv.mkDerivation rec {

  pname = "mame";

  version = "0.251";

  version = "0.252";

  srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;



  src = fetchFromGitHub {

    owner = "mamedev";

    repo = "mame";

    rev = "mame${srcVersion}";

    hash = "sha256-x+QV4gunnERBHyYB2fXJ2LvMv437Z2omvk+fYkmZfqA=";

    hash = "sha256-snef00pTbukiLQp8eAMfuIqNV3l0wP1+KlpFnS3iKFg=";

  };



  outputs = [ "out" "tools" ];

pkgs/applications/misc/slstatus/default.nix

+15 −5
Original line number Diff line number Diff line 
{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }:

{ lib

, stdenv

, fetchgit

, pkg-config

, writeText

, libX11

, libXau

, libXdmcp

, conf ? null

, patches ? []

}:



stdenv.mkDerivation rec {

  pname = "slstatus";
@@ -11,14 +21,14 @@ stdenv.mkDerivation rec { 
  };



  configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf);

  preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h";

  preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h" + ''

    makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC)

  '';



  inherit patches;



  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ libX11 ];



  makeFlags = [ "CC:=$(CC)" ];

  buildInputs = [ libX11 libXau libXdmcp];



  installFlags = [ "PREFIX=$(out)" ];

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

+3 −3
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ 


buildGoModule rec {

  pname = "istioctl";

  version = "1.17.0";

  version = "1.17.1";



  src = fetchFromGitHub {

    owner = "istio";

    repo = "istio";

    rev = version;

    sha256 = "sha256-cMpFf+VTTH8d1KpvbUoB2pJYPp3FHhRthut8tjTEZtc=";

    sha256 = "sha256-6YoznN/wqgmNzBV0ukySwSQvnF4qQeH52uXlEgZTpig=";

  };

  vendorHash = "sha256-C8UyfVCCkLAU9/qY9Kcv8TKKfG3rLNzu8mfi23O18rU=";

  vendorHash = "sha256-9A4Du5expdbFKFIrcPTADyRINhiPpsboqsbszg638LY=";



  nativeBuildInputs = [ installShellFiles ];

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

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


buildGoModule rec {

  pname = "popeye";

  version = "0.10.1";

  version = "0.11.1";



  src = fetchFromGitHub {

    rev = "v${version}";

    owner = "derailed";

    repo = "popeye";

    sha256 = "sha256-GETCwj9T1D6paG56LT/N2YkISE7UBpt/femwvHyHHJE=";

    sha256 = "sha256-A1jUlEgjBoiN+NYwpyW/1eYzkCK3UuPID++fu+zGvzk=";

  };



  ldflags = [
@@ -17,7 +17,7 @@ buildGoModule rec { 
    "-X github.com/derailed/popeye/cmd.commit=${version}"

  ];



  vendorSha256 = "sha256-ZRDcZbaoGJ8jgSwMXTTcWSv/4dlOoTNcuj/bN4QYHNE=";

  vendorHash = "sha256-MEsChBBn0mixgJ7pzRoqAqup75b/mVv6k3OMmzgyLC4=";



  doInstallCheck = true;

  installCheckPhase = ''

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

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


buildGoModule rec {

  pname = "talosctl";

  version = "1.3.4";

  version = "1.3.5";



  src = fetchFromGitHub {

    owner = "siderolabs";

    repo = "talos";

    rev = "v${version}";

    hash = "sha256-bgwSkI5XxtPhm4XrDPUhOErHawkLf34tFsw5SkQrm74=";

    hash = "sha256-LXAQSz39dtfSN6ks6UYJtXiTjcVz/a+f+JIsgC3MXic=";

  };



  vendorHash = "sha256-hkfzn9wOc7W0CIs72Cn3qZ5iFrDAffSFa4BnRt6fsF8=";

  vendorHash = "sha256-ctkeEGrh8tzWvEsVhcc2Cl3rAMkYQtcxD1b27ux1QDM=";



  ldflags = [ "-s" "-w" ];