From 6abc77ca5ceef471ecdf94afe58e62b2466bfe4a Mon Sep 17 00:00:00 2001 From: Vonixxx Date: Fri, 17 Nov 2023 08:59:48 +0100 Subject: [PATCH 1/2] maintainers: add vonixxx --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4a75aed9a611..0ed72341625f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18961,6 +18961,12 @@ githubId = 3413119; name = "Vonfry"; }; + vonixxx = { + email = "vonixxx@tuta.io"; + github = "vonixxx"; + githubId = 144771550; + name = "Luca Uricariu"; + }; votava = { email = "votava@gmail.com"; github = "janvotava"; From 38fe5aa511994eaa3c695b96f5851793ccaa62e3 Mon Sep 17 00:00:00 2001 From: Vonixxx Date: Fri, 17 Nov 2023 09:05:40 +0100 Subject: [PATCH 2/2] when: init at 1.1.45 when: init at 1.1.46 incorporated suggestions when: init at 1.1.46 incorporated changes fixed stdenv incorporated changes incorporated changes incorporated changes incorporated changes fixed trailing whitespace --- pkgs/by-name/wh/when/package.nix | 44 ++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/wh/when/package.nix diff --git a/pkgs/by-name/wh/when/package.nix b/pkgs/by-name/wh/when/package.nix new file mode 100644 index 000000000000..65fe306f447f --- /dev/null +++ b/pkgs/by-name/wh/when/package.nix @@ -0,0 +1,44 @@ +{ lib +, stdenvNoCC +, perl +, installShellFiles +, fetchFromBitbucket +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "when"; + version = "1.1.45"; + + src = fetchFromBitbucket { + repo = "when"; + owner = "ben-crowell"; + rev = finalAttrs.version; + hash = "sha256-+ggYjY6/aTUrdvREn0TTQ4Pu/VR4QTjflDaicRXuOMs="; + }; + + buildInputs = [ perl ]; + + nativeBuildInputs = [ installShellFiles ]; + + postBuild = '' + pod2man $src/when when.1 + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 when $out/bin/when + installManPage when.1 + + runHook postInstall + ''; + + meta = with lib; { + description = "An extremely simple personal calendar program"; + homepage = "https://www.lightandmatter.com/when/when.html"; + license = licenses.gpl2Only; + mainProgram = "when"; + maintainers = with maintainers; [ vonixxx ]; + platforms = platforms.all; + }; +})