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

Merge master into staging-next

parents dcc4e141 23959be5

pkgs/applications/audio/diopser/default.nix

+9 −1
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config

{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config

, libjack2, alsa-lib, freetype, libX11, libXrandr, libXinerama, libXext, libXcursor

}:
@@ -38,6 +38,14 @@ in stdenv.mkDerivation rec { 
    sha256 = "06y1h895yxh44gp4vxzrna59lf7nlfw7aacd3kk4l1g56jhy9pdx";

  };



  patches = [

    (fetchpatch {

      name = "fix-gcc-11-build.patch";

      url = "https://github.com/robbert-vdh/diopser/commit/a7284439bd4e23455132e7806a214f9db12efae9.patch";

      hash = "sha256-r3yxhnhPUQ47srhfAKeurpe2xyEBdSvqIbgqs9/6gD4=";

    })

  ];



  postUnpack = ''

    (

      cd "$sourceRoot"

pkgs/applications/blockchains/erigon/default.nix

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


let

  pname = "erigon";

  version = "2.54.0";

  version = "2.55.1";

in

buildGoModule {

  inherit pname version;
@@ -11,11 +11,11 @@ buildGoModule { 
    owner = "ledgerwatch";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-1kgbIg/3SvVT83UfwAYUixs1RQk4PP1quiOcI1mzbZ0=";

    hash = "sha256-ttBJIx2QR3H5JFyquoGwZpWwT10r7X7GnGE4uEzuRZA=";

    fetchSubmodules = true;

  };



  vendorHash = "sha256-Gr9mrME8/ZDxp2ORKessNhfguklDf+jC4RSpzLOSBhQ=";

  vendorHash = "sha256-QLuWxec1gwMnVo0Zw8z4Ef8vzxc4xFpLL/TT986Sljo=";

  proxyVendor = true;



  # Build errors in mdbx when format hardening is enabled:

pkgs/applications/editors/howl/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec { 
    description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface";

    license = licenses.mit;

    maintainers = with maintainers; [ pacien ];

    mainProgram = "howl";



    # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively

    platforms = [ "i686-linux" "x86_64-linux" ];

pkgs/applications/graphics/gscan2pdf/default.nix

+1 −0
Original line number Diff line number Diff line
@@ -153,5 +153,6 @@ perlPackages.buildPerlPackage rec { 
    homepage = "https://gscan2pdf.sourceforge.net/";

    license = licenses.gpl3;

    maintainers = with maintainers; [ pacien ];

    mainProgram = "gscan2pdf";

  };

}

pkgs/applications/misc/jigdo/sizewidth.patch

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
diff --git i/src/mkimage.cc w/src/mkimage.cc

index 02e65b1..b263796 100755

--- i/src/mkimage.cc

+++ w/src/mkimage.cc

@@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& file, MD5Sum* md) const {

 //______________________________________________________________________

 

 namespace {

-  const int SIZE_WIDTH = 12;

+  const int MKIMAGE_SIZE_WIDTH = 12;

 }

 

 ostream& JigdoDesc::ImageInfo::put(ostream& s) const {

-  s << "image-info  " << setw(SIZE_WIDTH) << size() << "              "

+  s << "image-info  " << setw(MKIMAGE_SIZE_WIDTH) << size() << "              "

     << md5() << ' ' << blockLength() << '\n';

   return s;

 }

 ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {

-  s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '

-    << setw(SIZE_WIDTH) << size() << '\n';

+  s << "in-template " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '

+    << setw(MKIMAGE_SIZE_WIDTH) << size() << '\n';

   return s;

 }

 ostream& JigdoDesc::MatchedFile::put(ostream& s) const {

-  s << "need-file   " << setw(SIZE_WIDTH) << offset() << ' '

-    << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';

+  s << "need-file   " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '

+    << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';

   return s;

 }

 ostream& JigdoDesc::WrittenFile::put(ostream& s) const {

-  s << "have-file   " << setw(SIZE_WIDTH) << offset() << ' '

-    << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';

+  s << "have-file   " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '

+    << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';

   return s;

 }