nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 01:13:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #285118 from felixalbrigtsen/bump-netsurf

Browse Source 
Update netsurf.browser and netsurf.lib*, fix on darwin
This commit is contained in:
Weijia Wang 2024-02-15 21:04:19 +01:00 committed by GitHub
commit dfc912ed88
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/graphics/imv/default.nix
View File

@ -16,7 +16,8 @@
, libxkbcommon
, libGLU
, wayland
, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libnsgif" "libheif" ]
# "libnsgif" is disabled until https://todo.sr.ht/~exec64/imv/55 is solved
, withBackends ? [ "freeimage" "libtiff" "libjpeg" "libpng" "librsvg" "libheif" ]
, freeimage
, libtiff
, libjpeg_turbo

22
pkgs/applications/networking/browsers/netsurf/browser.nix
View File

@ -5,12 +5,14 @@
, check
, curl
, expat
, gperf
, gtk2
, gtk3
, libXcursor
, libXrandr
, libidn
, libjpeg
, libjxl
, libpng
, libwebp
, libxml2
@ -44,11 +46,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf";
version = "3.10";
version = "3.11";
src = fetchurl {
url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz";
hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
hash = "sha256-wopiau/uQo0FOxP4i1xECSIkWXZSLRLq8TfP0y0gHLI=";
};
nativeBuildInputs = [
@ -63,10 +65,12 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [
check
curl
gperf
libXcursor
libXrandr
libidn
libjpeg
libjxl
libpng
libwebp
libxml2
@ -103,8 +107,20 @@ stdenv.mkDerivation (finalAttrs: {
env.NIX_CFLAGS_COMPILE = "-fcommon";
env.CFLAGS = lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE";
patchPhase = lib.optionalString stdenv.cc.isClang ''
runHook prePatch
substituteInPlace Makefile \
--replace-warn '--trace' '-t' \
--replace-warn '-Wimplicit-fallthrough=3' '-Wimplicit-fallthrough'
runHook postPatch
'';
preConfigure = ''
cat <<EOF > Makefile.conf
cat <<EOF > Makefile.config
override NETSURF_GTK_RES_PATH := $out/share/
override NETSURF_USE_GRESOURCE := YES
EOF

6
pkgs/applications/networking/browsers/netsurf/libcss.nix
View File

@ -10,11 +10,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libcss";
version = "0.9.1";
version = "0.9.2";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libcss-${finalAttrs.version}-src.tar.gz";
hash = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
hash = "sha256-LfIVu+w01R1gwaBLAbLfTV0Y9RDx86evS4DN21ZxFU4=";
};
nativeBuildInputs = [ pkg-config ];
@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-fallthrough"
"-Wno-error=maybe-uninitialized"
"-Wno-error=${if stdenv.cc.isGNU then "maybe-uninitialized" else "uninitialized"}"
];
meta = {

4
pkgs/applications/networking/browsers/netsurf/libdom.nix
View File

@ -11,11 +11,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libdom";
version = "0.4.1";
version = "0.4.2";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz";
hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
hash = "sha256-0F5FrxZUcBTCsKOuzzZw+hPUGfUFs/X8esihSR/DDzw=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/applications/networking/browsers/netsurf/libhubbub.nix
View File

@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchurl
, gperf
, perl
, pkg-config
, buildsystem
@ -9,16 +10,17 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libhubbub";
version = "0.3.7";
version = "0.3.8";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libhubbub-${finalAttrs.version}-src.tar.gz";
hash = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
hash = "sha256-isHm9fPUjAUUHVk5FxlTQpDFnNAp78JJ60/brBAs1aU=";
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [
gperf
perl
buildsystem
libparserutils

4
pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libnsbmp";
version = "0.1.6";
version = "0.1.7";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libnsbmp-${finalAttrs.version}-src.tar.gz";
hash = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
hash = "sha256-VAenaCoSK6qqWhW1BSkOLTffVME8Xt70sJ0SyGLYIpM=";
};
nativeBuildInputs = [ pkg-config ];

4
pkgs/applications/networking/browsers/netsurf/libnsgif.nix
View File

@ -8,11 +8,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libnsgif";
version = "0.2.1";
version = "1.0.0";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libnsgif-${finalAttrs.version}-src.tar.gz";
hash = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
hash = "sha256-YBTIQvYUVNL1oPgkPXqNe96bfaPM/cotNGx8CyxMBhs=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

4
pkgs/applications/networking/browsers/netsurf/libnsutils.nix
View File

@ -7,11 +7,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libnsutils";
version = "0.1.0";
version = "0.1.1";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libnsutils-${finalAttrs.version}-src.tar.gz";
hash = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
hash = "sha256-VpS0Um5FjtAAQTzmAnWJy+EKJXp+zwZaAUIdxymd6pI=";
};
nativeBuildInputs = [ pkg-config ];

6
pkgs/applications/networking/browsers/netsurf/libparserutils.nix
View File

@ -3,20 +3,22 @@
, fetchurl
, perl
, buildsystem
, iconv
}:
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libparserutils";
version = "0.2.4";
version = "0.2.5";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libparserutils-${finalAttrs.version}-src.tar.gz";
hash = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g=";
hash = "sha256-MX7VxxjxeSe1chl0uuXeMsP9bQVdsTGtMbQxKgMu0Tk=";
};
buildInputs = [
perl
buildsystem
iconv
];
makeFlags = [

4
pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
View File

@ -12,11 +12,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-libsvgtiny";
version = "0.1.7";
version = "0.1.8";
src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/libsvgtiny-${finalAttrs.version}-src.tar.gz";
hash = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
hash = "sha256-w1cifwLoP7KnaxK5ARkaCCIp2x8Ac2Lo8xx1RRDCoBw=";
};
nativeBuildInputs = [