colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #283809 from r-ryantm/auto-update/poco

Browse Source 
poco: 1.12.5p2 -> 1.13.2
This commit is contained in:
Robert Scott 2024-04-01 21:28:57 +01:00 committed by GitHub
commit 0333eeba32
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/browsers/litebrowser/default.nix
View File

@ -12,13 +12,13 @@
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "litebrowser"; pname = "litebrowser";
version = "unstable-2022-10-31"; version = "unstable-2024-02-25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "litehtml"; owner = "litehtml";
repo = "litebrowser-linux"; repo = "litebrowser-linux";
rev = "4654f8fb2d5e2deba7ac6223b6639341bd3b7eba"; rev = "8130cf50af90e07d201d43b934b5a57f7ed4e68d";
hash = "sha256-SvW1AOxLBLKqa+/2u2Zn+/t33ZzQHmqlcLRl6z0rK9U="; hash = "sha256-L/pd4VypDfjLKfh+HLpc4um+POWGzGa4OOttudwJxyk=";
fetchSubmodules = true; # litehtml submodule fetchSubmodules = true; # litehtml submodule
}; };
@ -46,6 +46,7 @@ stdenv.mkDerivation {
''; '';
meta = with lib; { meta = with lib; {
broken = stdenv.cc.isClang; # https://github.com/litehtml/litebrowser-linux/issues/19
description = "A simple browser based on the litehtml engine"; description = "A simple browser based on the litehtml engine";
mainProgram = "litebrowser"; mainProgram = "litebrowser";
homepage = "https://github.com/litehtml/litebrowser-linux"; homepage = "https://github.com/litehtml/litebrowser-linux";

4
pkgs/development/libraries/poco/default.nix
View File

@ -3,12 +3,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "poco"; pname = "poco";
version = "1.12.5p2"; version = "1.13.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pocoproject"; owner = "pocoproject";
repo = "poco"; repo = "poco";
sha256 = "sha256-UAseNOC9n+OooDl4E67qcndJ02fAgmp2d8Ii/IyPvhg="; sha256 = "sha256-GcwkGiui9j9RzMQyEEmqq8dxWzKpv5xWxJgvJpSMdbw=";
rev = "poco-${version}-release"; rev = "poco-${version}-release";
}; };

9
pkgs/tools/graphics/sanjuuni/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pkg-config , pkg-config
, ffmpeg , ffmpeg
, poco , poco
@ -19,6 +20,14 @@ stdenv.mkDerivation rec {
sha256 = "sha256-wgtyrik4Z5AXd8MHkiMuxMpGh/xcEtNqivyhvL68aac="; sha256 = "sha256-wgtyrik4Z5AXd8MHkiMuxMpGh/xcEtNqivyhvL68aac=";
}; };
patches = [
(fetchpatch {
name = "build-with-cxx17.patch";
url = "https://github.com/MCJack123/sanjuuni/commit/f2164bc18935bcf63ee5b0a82087bc91f7fd258d.patch";
hash = "sha256-ZmP+AmUV7fcIFqSA6e56Nt6u03leE9PX36g2z0nLswo=";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
]; ];