From 04101ed00401020145529b3fd22e916309635158 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sun, 16 Nov 2025 03:26:47 +0000 Subject: [PATCH 1/6] lib3270: 5.4 -> 5.5.0 - Release: https://github.com/PerryWerneck/lib3270/releases/tag/5.5.0 - Diff: https://github.com/PerryWerneck/lib3270/compare/5.4...5.5.0 --- pkgs/by-name/li/lib3270/package.nix | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/li/lib3270/package.nix b/pkgs/by-name/li/lib3270/package.nix index dad56b9ffd40..1b3d2183ef11 100644 --- a/pkgs/by-name/li/lib3270/package.nix +++ b/pkgs/by-name/li/lib3270/package.nix @@ -2,33 +2,29 @@ lib, stdenv, fetchFromGitHub, - which, pkg-config, - autoconf, - automake, - libtool, gettext, openssl, curl, + meson, + ninja, }: stdenv.mkDerivation rec { pname = "lib3270"; - version = "5.4"; + version = "5.5.0"; src = fetchFromGitHub { owner = "PerryWerneck"; repo = "lib3270"; rev = version; - hash = "sha256-w6Bg+TvSDAuZwtu/nyAIuq6pgheM5nXtfuryECfnKng="; + hash = "sha256-AGS7RkMeVKe2Ed5Aj3oHdbiGMoYGmq2Wlkcd4wSm4J8="; }; nativeBuildInputs = [ - which pkg-config - autoconf - automake - libtool + meson + ninja ]; buildInputs = [ @@ -37,15 +33,6 @@ stdenv.mkDerivation rec { curl ]; - postPatch = '' - # Patch the required version. - sed -i -e "s/20211118/19800101/" src/core/session.c - ''; - - preConfigure = '' - NOCONFIGURE=1 sh autogen.sh - ''; - enableParallelBuilding = true; meta = with lib; { From acba5bb5f507680b6c7237d1235cb4eef137c455 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sun, 16 Nov 2025 03:32:01 +0000 Subject: [PATCH 2/6] lib3270: modernise --- pkgs/by-name/li/lib3270/package.nix | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/li/lib3270/package.nix b/pkgs/by-name/li/lib3270/package.nix index 1b3d2183ef11..e3f278178f0d 100644 --- a/pkgs/by-name/li/lib3270/package.nix +++ b/pkgs/by-name/li/lib3270/package.nix @@ -1,45 +1,46 @@ { lib, stdenv, - fetchFromGitHub, - pkg-config, - gettext, - openssl, curl, + fetchFromGitHub, + gettext, meson, ninja, + openssl, + pkg-config, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lib3270"; version = "5.5.0"; src = fetchFromGitHub { owner = "PerryWerneck"; repo = "lib3270"; - rev = version; + tag = finalAttrs.version; hash = "sha256-AGS7RkMeVKe2Ed5Aj3oHdbiGMoYGmq2Wlkcd4wSm4J8="; }; nativeBuildInputs = [ - pkg-config meson ninja + pkg-config ]; buildInputs = [ + curl gettext openssl - curl ]; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "TN3270 client Library"; homepage = "https://github.com/PerryWerneck/lib3270"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.vifino ]; + changelog = "https://github.com/PerryWerneck/lib3270/blob/${finalAttrs.version}/CHANGELOG"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ vifino ]; broken = stdenv.hostPlatform.isDarwin; }; -} +}) From 819d75ced38dcde7945ed03ab1808c96bb0d0784 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sun, 16 Nov 2025 03:45:19 +0000 Subject: [PATCH 3/6] libv3270: 5.4 -> 5.5.0 Release: https://github.com/PerryWerneck/libv3270/releases/tag/5.5.0 Diff: https://github.com/PerryWerneck/libv3270/compare/5.4...5.5.0 --- pkgs/by-name/li/libv3270/package.nix | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/li/libv3270/package.nix b/pkgs/by-name/li/libv3270/package.nix index 8f5e3a8b4808..e1dcdbdf5271 100644 --- a/pkgs/by-name/li/libv3270/package.nix +++ b/pkgs/by-name/li/libv3270/package.nix @@ -2,32 +2,28 @@ lib, stdenv, fetchFromGitHub, - autoconf, - automake, - libtool, - which, pkg-config, gtk3, lib3270, + meson, + ninja, }: stdenv.mkDerivation rec { pname = "libv3270"; - version = "5.4"; + version = "5.5.0"; src = fetchFromGitHub { owner = "PerryWerneck"; repo = "libv3270"; rev = version; - hash = "sha256-Z3FvxPa1pfeECxfB5ZL6gwhkbTKFpfO3D/zLVLF+uiI="; + hash = "sha256-Cn/to1/7mH1Ygjcx12mMf52PTcz4smy/+bwWH1mbT9s="; }; nativeBuildInputs = [ - which pkg-config - autoconf - automake - libtool + meson + ninja ]; buildInputs = [ @@ -42,12 +38,6 @@ stdenv.mkDerivation rec { done ''; - preConfigure = '' - mkdir -p scripts - touch scripts/config.rpath - NOCONFIGURE=1 sh ./autogen.sh - ''; - enableParallelBuilding = true; meta = with lib; { From 69ce2fe9c57ff36b2d0005568b6a3827f106ed6f Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Sun, 16 Nov 2025 03:47:15 +0000 Subject: [PATCH 4/6] libv3270: modernise --- pkgs/by-name/li/libv3270/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/li/libv3270/package.nix b/pkgs/by-name/li/libv3270/package.nix index e1dcdbdf5271..45261e49b336 100644 --- a/pkgs/by-name/li/libv3270/package.nix +++ b/pkgs/by-name/li/libv3270/package.nix @@ -9,14 +9,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libv3270"; version = "5.5.0"; src = fetchFromGitHub { owner = "PerryWerneck"; repo = "libv3270"; - rev = version; + tag = finalAttrs.version; hash = "sha256-Cn/to1/7mH1Ygjcx12mMf52PTcz4smy/+bwWH1mbT9s="; }; @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with lib; { + meta = { description = "3270 Virtual Terminal for GTK"; homepage = "https://github.com/PerryWerneck/libv3270"; changelog = "https://github.com/PerryWerneck/libv3270/blob/master/CHANGELOG"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.vifino ]; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ vifino ]; }; -} +}) From 640acd7b1bb7dfcca7da636a32037d1e65090251 Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 18 Nov 2025 01:11:52 +0000 Subject: [PATCH 5/6] pw3270: 5.4 -> 5.5.0 Release: https://github.com/PerryWerneck/pw3270/releases/tag/5.5.0 Diff: https://github.com/PerryWerneck/pw3270/compare/5.4...5.5.0 --- pkgs/by-name/pw/pw3270/package.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix index 2c4f1a342676..566e09d29776 100644 --- a/pkgs/by-name/pw/pw3270/package.nix +++ b/pkgs/by-name/pw/pw3270/package.nix @@ -2,11 +2,7 @@ lib, stdenv, fetchFromGitHub, - which, pkg-config, - automake, - autoconf, - libtool, gtk3, libv3270, lib3270, @@ -14,27 +10,29 @@ gettext, desktop-file-utils, wrapGAppsHook3, + meson, + scour, + ninja, }: stdenv.mkDerivation rec { pname = "pw3270"; - version = "5.4"; + version = "5.5.0"; src = fetchFromGitHub { owner = "PerryWerneck"; repo = "pw3270"; rev = version; - hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g="; + hash = "sha256-thvurPyAsbcCRcanV6PwObO26LCmphdNrYYKhHDKnzE="; }; nativeBuildInputs = [ - which pkg-config - autoconf - automake - libtool desktop-file-utils wrapGAppsHook3 + meson + scour + ninja ]; buildInputs = [ @@ -52,14 +50,11 @@ stdenv.mkDerivation rec { done ''; - preConfigure = '' - NOCONFIGURE=1 sh autogen.sh - ''; - postFixup = '' # Schemas get installed to wrong directory. mkdir -p $out/share/glib-2.0 mv $out/share/gsettings-schemas/pw3270-${version}/glib-2.0/schemas $out/share/glib-2.0/ + glib-compile-schemas $out/share/glib-2.0/schemas rm -rf $out/share/gsettings-schemas ''; From 19b1e061c0b3a26bc1a40867dfcc052b711c313d Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 18 Nov 2025 01:36:12 +0000 Subject: [PATCH 6/6] pw3270: modernise --- pkgs/by-name/pw/pw3270/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/pw/pw3270/package.nix b/pkgs/by-name/pw/pw3270/package.nix index 566e09d29776..1c8652bd7029 100644 --- a/pkgs/by-name/pw/pw3270/package.nix +++ b/pkgs/by-name/pw/pw3270/package.nix @@ -15,14 +15,14 @@ ninja, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "pw3270"; version = "5.5.0"; src = fetchFromGitHub { owner = "PerryWerneck"; repo = "pw3270"; - rev = version; + tag = finalAttrs.version; hash = "sha256-thvurPyAsbcCRcanV6PwObO26LCmphdNrYYKhHDKnzE="; }; @@ -53,18 +53,19 @@ stdenv.mkDerivation rec { postFixup = '' # Schemas get installed to wrong directory. mkdir -p $out/share/glib-2.0 - mv $out/share/gsettings-schemas/pw3270-${version}/glib-2.0/schemas $out/share/glib-2.0/ + mv $out/share/gsettings-schemas/pw3270-${finalAttrs.version}/glib-2.0/schemas $out/share/glib-2.0/ glib-compile-schemas $out/share/glib-2.0/schemas rm -rf $out/share/gsettings-schemas ''; enableParallelBuilding = true; - meta = with lib; { + meta = { description = "3270 Emulator for gtk"; homepage = "https://softwarepublico.gov.br/social/pw3270/"; - license = licenses.lgpl3Plus; - maintainers = [ maintainers.vifino ]; + changelog = "https://github.com/PerryWerneck/pw3270/blob/${finalAttrs.version}/CHANGELOG"; + license = lib.licenses.lgpl3Plus; + maintainers = with lib.maintainers; [ vifino ]; mainProgram = "pw3270"; }; -} +})