From 5eee84537197f12e976d3d38744d88936b3f7bf8 Mon Sep 17 00:00:00 2001 From: Thomas Le Duc Date: Mon, 19 Dec 2022 07:30:55 +0100 Subject: [PATCH 1/2] maintainers: add thled --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d51ea84e9efb..34ce4313bdd1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13906,6 +13906,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; + thled = { + name = "Thomas Le Duc"; + email = "dev@tleduc.de"; + github = "thled"; + githubId = 28220902; + }; thyol = { name = "thyol"; email = "thyol@pm.me"; From 1e72eb2712011bdcd7fe75f597c7b54a5643934a Mon Sep 17 00:00:00 2001 From: Thomas Le Duc Date: Mon, 19 Dec 2022 07:31:08 +0100 Subject: [PATCH 2/2] uair: init at 0.4.0 --- pkgs/tools/misc/uair/default.nix | 37 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/misc/uair/default.nix diff --git a/pkgs/tools/misc/uair/default.nix b/pkgs/tools/misc/uair/default.nix new file mode 100644 index 000000000000..cdada5e4697f --- /dev/null +++ b/pkgs/tools/misc/uair/default.nix @@ -0,0 +1,37 @@ +{ fetchFromGitHub +, installShellFiles +, lib +, rustPlatform +, scdoc +}: + +rustPlatform.buildRustPackage rec { + pname = "uair"; + version = "v0.4.0"; + + src = fetchFromGitHub { + owner = "metent"; + repo = pname; + rev = version; + hash = "sha256-xGPc371Dfo455rnfacXVDgC9SXU5s8jqw4ttSCBqWyk="; + }; + + cargoHash = "sha256-tHcMR8ExIlzYZzacBYyyk2d5by20jG4ihM0yU0K6Xhg="; + + nativeBuildInputs = [ installShellFiles scdoc ]; + + preFixup = '' + scdoc < docs/uair.1.scd > docs/uair.1 + scdoc < docs/uair.5.scd > docs/uair.5 + scdoc < docs/uairctl.1.scd > docs/uairctl.1 + + installManPage docs/*.[1-9] + ''; + + meta = with lib; { + description = "An extensible pomodoro timer"; + homepage = "https://github.com/metent/uair"; + license = licenses.mit; + maintainers = with maintainers; [ thled ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04e089876ce6..7c3cd0f0d7dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12498,6 +12498,8 @@ with pkgs; ua = callPackage ../tools/networking/ua { }; + uair = callPackage ../tools/misc/uair { }; + ubidump = python3Packages.callPackage ../tools/filesystems/ubidump { }; ubridge = callPackage ../tools/networking/ubridge { };