From 76711376297401a6cfaea0b42a849a058296ecce Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 24 Aug 2024 10:06:05 -0300 Subject: [PATCH 1/5] mawk: migrate to by-name --- .../text/mawk/default.nix => by-name/ma/mawk/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/text/mawk/default.nix => by-name/ma/mawk/package.nix} (100%) diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/by-name/ma/mawk/package.nix similarity index 100% rename from pkgs/tools/text/mawk/default.nix rename to pkgs/by-name/ma/mawk/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 004007fb0b72..e867add95b36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10211,8 +10211,6 @@ with pkgs; mars-mips = callPackage ../development/tools/mars-mips { }; - mawk = callPackage ../tools/text/mawk { }; - mb2md = callPackage ../tools/text/mb2md { }; mbuffer = callPackage ../tools/misc/mbuffer { }; From 225156651315638104af9ba764dcf823a8b182fd Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 24 Aug 2024 10:16:32 -0300 Subject: [PATCH 2/5] mawk: rework - finalAttrs design pattern - get rid of nested with - nixfmt-rfc-style --- pkgs/by-name/ma/mawk/package.nix | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix index 700b20c2178c..ce9c776b5c1d 100644 --- a/pkgs/by-name/ma/mawk/package.nix +++ b/pkgs/by-name/ma/mawk/package.nix @@ -1,25 +1,31 @@ -{ lib, stdenv, fetchurl, buildPackages }: +{ + lib, + buildPackages, + fetchurl, + stdenv, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mawk"; version = "1.3.4-20240622"; src = fetchurl { urls = [ - "ftp://ftp.invisible-island.net/mawk/mawk-${version}.tgz" - "https://invisible-mirror.net/archives/mawk/mawk-${version}.tgz" + "https://invisible-mirror.net/archives/mawk/mawk-${finalAttrs.version}.tgz" + "ftp://ftp.invisible-island.net/mawk/mawk-${finalAttrs.version}.tgz" ]; - sha256 = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U="; + hash = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; - meta = with lib; { - description = "Interpreter for the AWK Programming Language"; - mainProgram = "mawk"; + meta = { homepage = "https://invisible-island.net/mawk/mawk.html"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ ehmry ]; - platforms = with platforms; unix; + changelog = "https://invisible-island.net/mawk/CHANGES"; + description = "Interpreter for the AWK Programming Language"; + license = lib.licenses.gpl2Only; + mainProgram = "mawk"; + maintainers = with lib.maintainers; [ ehmry ]; + platforms = lib.platforms.unix; }; -} +}) From c012e3eb24d6f59f6c46917f951f9f909a2997dc Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 24 Aug 2024 10:44:26 -0300 Subject: [PATCH 3/5] mawk: add test version --- pkgs/by-name/ma/mawk/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix index ce9c776b5c1d..e80c75a9f66e 100644 --- a/pkgs/by-name/ma/mawk/package.nix +++ b/pkgs/by-name/ma/mawk/package.nix @@ -3,6 +3,7 @@ buildPackages, fetchurl, stdenv, + testers, }: stdenv.mkDerivation (finalAttrs: { @@ -19,6 +20,13 @@ stdenv.mkDerivation (finalAttrs: { depsBuildBuild = [ buildPackages.stdenv.cc ]; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "mawk -W version"; + }; + }; + meta = { homepage = "https://invisible-island.net/mawk/mawk.html"; changelog = "https://invisible-island.net/mawk/CHANGES"; From 9aace02bfa360202f680ce1358538fe00a7e0fa4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 24 Aug 2024 10:33:59 -0300 Subject: [PATCH 4/5] mawk: 1.3.4-20240622 -> 1.3.4-20240819 --- pkgs/by-name/ma/mawk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix index e80c75a9f66e..f189ba5f035c 100644 --- a/pkgs/by-name/ma/mawk/package.nix +++ b/pkgs/by-name/ma/mawk/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "mawk"; - version = "1.3.4-20240622"; + version = "1.3.4-20240819"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/mawk/mawk-${finalAttrs.version}.tgz" "ftp://ftp.invisible-island.net/mawk/mawk-${finalAttrs.version}.tgz" ]; - hash = "sha256-TpF+h6ep+692mVeEpLC13A3ZVLl30JgwMPePagexp2U="; + hash = "sha256-bh/ejuetilwVOCMWhj/WtMbSP6t4HdWrAXf/o+6arlw="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From bca63da59402d10ba33ec8be14759f86cf6e5835 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 24 Aug 2024 10:59:58 -0300 Subject: [PATCH 5/5] mawk: add update script --- pkgs/by-name/ma/mawk/package.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix index f189ba5f035c..482d6940c7c8 100644 --- a/pkgs/by-name/ma/mawk/package.nix +++ b/pkgs/by-name/ma/mawk/package.nix @@ -1,6 +1,7 @@ { lib, buildPackages, + directoryListingUpdater, fetchurl, stdenv, testers, @@ -25,6 +26,10 @@ stdenv.mkDerivation (finalAttrs: { package = finalAttrs.finalPackage; command = "mawk -W version"; }; + updateScript = directoryListingUpdater { + inherit (finalAttrs) pname version; + url = "https://invisible-island.net/archives/mawk/"; + }; }; meta = {