w3m: 0.5.3+git20230121 → 0.5.4; add toastal to maintainers (#430585)

authored by philiptaron.tngl.sh and committed by GitHub 3d9e6dd9 e528959d

+26 -21
+26 -21
pkgs/by-name/w3/w3m/package.nix
··· 1 1 { 2 2 lib, 3 3 stdenv, 4 - fetchFromGitHub, 4 + fetchFromSourcehut, 5 5 fetchpatch, 6 6 ncurses, 7 7 boehmgc, ··· 38 38 ''; 39 39 }; 40 40 in 41 - stdenv.mkDerivation rec { 41 + stdenv.mkDerivation (finalAttrs: { 42 42 pname = "w3m"; 43 - version = "0.5.3+git20230121"; 43 + version = "0.5.4"; 44 44 45 - src = fetchFromGitHub { 46 - owner = "tats"; 45 + src = fetchFromSourcehut { 46 + owner = "~rkta"; 47 47 repo = "w3m"; 48 - rev = "v${version}"; 49 - hash = "sha256-upb5lWqhC1jRegzTncIz5e21v4Pw912FyVn217HucFs="; 48 + tag = "v${finalAttrs.version}"; 49 + hash = "sha256-A11vHFiyotFncqWRiljRJbHO1wEzmWTEh1DOel803q4="; 50 50 }; 51 51 52 - NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lsocket -lnsl"; 52 + env = { 53 + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isSunOS "-lsocket -lnsl"; 54 + 55 + # we must set these so that the generated files (e.g. w3mhelp.cgi) contain 56 + # the correct paths. 57 + PERL = "${perl}/bin/perl"; 58 + MAN = "${man}/bin/man"; 53 59 54 - # we must set these so that the generated files (e.g. w3mhelp.cgi) contain 55 - # the correct paths. 56 - PERL = "${perl}/bin/perl"; 57 - MAN = "${man}/bin/man"; 60 + # for w3mimgdisplay 61 + # see: https://bbs.archlinux.org/viewtopic.php?id=196093 62 + LIBS = lib.optionalString x11Support "-lX11"; 63 + }; 58 64 59 65 makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; 60 66 ··· 113 119 114 120 enableParallelBuilding = false; 115 121 116 - # for w3mimgdisplay 117 - # see: https://bbs.archlinux.org/viewtopic.php?id=196093 118 - LIBS = lib.optionalString x11Support "-lX11"; 119 - 120 122 passthru.tests.version = testers.testVersion { 121 - inherit version; 123 + inherit (finalAttrs) version; 122 124 package = w3m; 123 125 command = "w3m -version"; 124 126 }; 125 127 126 128 meta = { 127 - homepage = "https://w3m.sourceforge.net/"; 128 - changelog = "https://github.com/tats/w3m/blob/v${version}/ChangeLog"; 129 + homepage = "https://git.sr.ht/~rkta/w3m"; 130 + changelog = "https://git.sr.ht/~rkta/w3m/tree/v${finalAttrs.version}/item/NEWS"; 129 131 description = "Text-mode web browser"; 130 - maintainers = with lib.maintainers; [ anthonyroussel ]; 132 + maintainers = with lib.maintainers; [ 133 + anthonyroussel 134 + toastal 135 + ]; 131 136 platforms = lib.platforms.unix; 132 137 license = lib.licenses.mit; 133 138 mainProgram = "w3m"; 134 139 }; 135 - } 140 + })