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

Merge staging-next into staging

parents 43701e2b 3997afd3

maintainers/maintainer-list.nix

+6 −0
Original line number Diff line number Diff line
@@ -12586,6 +12586,12 @@ 
    githubId = 2486026;

    name = "Luca Fulchir";

  };

  lukts30 = {

    email = "llukas21307@gmail.com";

    github = "lukts30";

    githubId = 24390575;

    name = "lukts30";

  };

  luleyleo = {

    email = "git@leopoldluley.de";

    github = "luleyleo";

pkgs/applications/blockchains/clightning/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
, automake

, gettext

, libtool

, lowdown

, lowdown-unsandboxed

, protobuf

, unzip

, which
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec { 
  # when building on darwin we need cctools to provide the correct libtool

  # as libwally-core detects the host as darwin and tries to add the -static

  # option to libtool, also we have to add the modified gsed package.

  nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ]

  nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown-unsandboxed protobuf py3 unzip which ]

    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ];



  buildInputs = [ gmp libsodium sqlite zlib jq ];

pkgs/by-name/br/bruno/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ let 
in

buildNpmPackage' rec {

  pname = "bruno";

  version = "1.30.1";

  version = "1.32.1";



  src = fetchFromGitHub {

    owner = "usebruno";

    repo = "bruno";

    rev = "v${version}";

    hash = "sha256-9dH79ytqkZcdgUMbTa32VHKr2dHiNsJu6GawDtRsJx0=";

    hash = "sha256-n/3zNS3aME7ZSoJ7TQ7gqVod469g7PGTsLcdNIwB09Y=";



    postFetch = ''

      ${lib.getExe npm-lockfile-fix} $out/package-lock.json

pkgs/by-name/ce/certspotter/package.nix

+2 −2
Original line number Diff line number Diff line 
{ lib

, fetchFromGitHub

, buildGoModule

, lowdown

, lowdown-unsandboxed

}:



buildGoModule rec {
@@ -19,7 +19,7 @@ buildGoModule rec { 


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



  nativeBuildInputs = [ lowdown ];

  nativeBuildInputs = [ lowdown-unsandboxed ];



  postInstall = ''

    cd man

pkgs/by-name/li/libcaca/package.nix

+4 −0
Original line number Diff line number Diff line
@@ -39,6 +39,10 @@ stdenv.mkDerivation rec { 


  configureFlags = [

    (if x11Support then "--enable-x11" else "--disable-x11")

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    # Suppresses a build failure building Cocoa support due to accessing private ivar `_running`,

    # which no longer available.

    (lib.enableFeature false "cocoa")

  ];



  env.NIX_CFLAGS_COMPILE = lib.optionalString (!x11Support) "-DX_DISPLAY_MISSING";