From dc047d18bb78ed96eb3ba10df321674cc22bc8de Mon Sep 17 00:00:00 2001 From: Kimmo Suominen Date: Mon, 16 Jan 2023 09:33:53 +0200 Subject: [PATCH 1/2] maintainers: add suominen --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 6199f4b6ccf8..3016e298f6d0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13565,6 +13565,12 @@ githubId = 16734772; name = "Sumner Evans"; }; + suominen = { + email = "kimmo@suominen.com"; + github = "suominen"; + githubId = 1939855; + name = "Kimmo Suominen"; + }; superbo = { email = "supernbo@gmail.com"; github = "SuperBo"; From c98d09461e3781b633d0c1edca51d5cddced6c0b Mon Sep 17 00:00:00 2001 From: Kimmo Suominen Date: Sun, 15 Jan 2023 11:33:23 +0200 Subject: [PATCH 2/2] colorless: init at 109 --- pkgs/tools/misc/colorless/default.nix | 47 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 49 insertions(+) create mode 100644 pkgs/tools/misc/colorless/default.nix diff --git a/pkgs/tools/misc/colorless/default.nix b/pkgs/tools/misc/colorless/default.nix new file mode 100644 index 000000000000..46e4745172ff --- /dev/null +++ b/pkgs/tools/misc/colorless/default.nix @@ -0,0 +1,47 @@ +{ lib +, fetchurl +, stdenvNoCC +, coreutils +, bash +, binSh ? "${bash}/bin/bash" +, gnused +, less +}: + +stdenvNoCC.mkDerivation rec { + pname = "colorless"; + version = "109"; + + src = fetchurl { + url = "http://software.kimmo.suominen.com/${pname}-${version}.tar.gz"; + sha256 = "039a140fa11cf153cc4d03e4f753b7ff142cab88ff116b7600ccf9edee81927c"; + }; + + makeFlags = [ + "TOOLPATH=${lib.makeBinPath [ coreutils gnused less ]}" + "PREFIX=$(out)" + "SHELL=${binSh}" + ]; + + preInstall = '' + mkdir -p $out/bin $out/share/man/man1 + ''; + + postInstall = '' + install -Dm644 -t $out/share/doc/colorless LICENSE README.md + ''; + + strictDeps = true; + + meta = with lib; { + homepage = "https://kimmo.suominen.com/sw/colorless"; + description = "Enable colorised command output and pipe it to less"; + longDescription = '' + colorless is a wrapper that enables colorised output of commands and + pipes the output to less(1). + ''; + license = licenses.bsd2; + maintainers = with maintainers; [ suominen ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1034c5c363c..ada27250ac35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1341,6 +1341,8 @@ with pkgs; clematis = callPackage ../tools/misc/clematis { }; + colorless = callPackage ../tools/misc/colorless { }; + cope = callPackage ../tools/misc/cope { }; ejson2env = callPackage ../tools/admin/ejson2env { };