pw3270, lib3270, libv3270: 5.4 -> 5.5.0 (#462751)

pkgs/by-name/li/lib3270/package.nix

@@ -1,58 +1,46 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
-  which,
-  pkg-config,
-  autoconf,
-  automake,
-  libtool,
-  gettext,
-  openssl,
   curl,
+  fetchFromGitHub,
+  gettext,
+  meson,
+  ninja,
+  openssl,
+  pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lib3270";
-  version = "5.4";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "lib3270";
-    rev = version;
-    hash = "sha256-w6Bg+TvSDAuZwtu/nyAIuq6pgheM5nXtfuryECfnKng=";
+    tag = finalAttrs.version;
+    hash = "sha256-AGS7RkMeVKe2Ed5Aj3oHdbiGMoYGmq2Wlkcd4wSm4J8=";
   };
 
   nativeBuildInputs = [
-    which
+    meson
+    ninja
     pkg-config
-    autoconf
-    automake
-    libtool
   ];
 
   buildInputs = [
+    curl
     gettext
     openssl
-    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; {
+  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;
   };
-}
+})

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 {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libv3270";
-  version = "5.4";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "libv3270";
-    rev = version;
-    hash = "sha256-Z3FvxPa1pfeECxfB5ZL6gwhkbTKFpfO3D/zLVLF+uiI=";
+    tag = finalAttrs.version;
+    hash = "sha256-Cn/to1/7mH1Ygjcx12mMf52PTcz4smy/+bwWH1mbT9s=";
   };
 
   nativeBuildInputs = [
-    which
     pkg-config
-    autoconf
-    automake
-    libtool
+    meson
+    ninja
   ];
 
   buildInputs = [
@@ -42,19 +38,13 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  preConfigure = ''
-    mkdir -p scripts
-    touch scripts/config.rpath
-    NOCONFIGURE=1 sh ./autogen.sh
-  '';
-
   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 ];
   };
-}
+})

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 {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pw3270";
-  version = "5.4";
+  version = "5.5.0";
 
   src = fetchFromGitHub {
     owner = "PerryWerneck";
     repo = "pw3270";
-    rev = version;
-    hash = "sha256-Nk/OUqrWngKgb1D1Wi8q5ygKtvuRKUPhPQaLvWi1Z4g=";
+    tag = finalAttrs.version;
+    hash = "sha256-thvurPyAsbcCRcanV6PwObO26LCmphdNrYYKhHDKnzE=";
   };
 
   nativeBuildInputs = [
-    which
     pkg-config
-    autoconf
-    automake
-    libtool
     desktop-file-utils
     wrapGAppsHook3
+    meson
+    scour
+    ninja
   ];
 
   buildInputs = [
@@ -52,24 +50,22 @@ 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/
+    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";
   };
-}
+})