From 8f135db3d4c2c9c0d37df34160a11e373ee250ad Mon Sep 17 00:00:00 2001 From: HI Date: Tue, 23 Nov 2021 17:25:39 +0100 Subject: [PATCH 1/2] maintainers: add drzoidberg --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3cb4c652e180..120739a7d5bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3084,6 +3084,12 @@ fingerprint = "85F3 72DF 4AF3 EF13 ED34 72A3 0AAF 2901 E804 0715"; }]; }; + drzoidberg = { + email = "jakob@mast3rsoft.com"; + github = "jakobneufeld"; + githubId = 24791219; + name = "Jakob Neufeld"; + }; dschrempf = { name = "Dominik Schrempf"; email = "dominik.schrempf@gmail.com"; From c9a4c5e03289d4221933b51cd05a847845829bdc Mon Sep 17 00:00:00 2001 From: HI Date: Mon, 22 Nov 2021 18:15:31 +0100 Subject: [PATCH 2/2] nux: init at 0.1.4 nux: init at 0.1.4 Fixed blah vlah nux: init at 0.1.4 nix init at 0.1.4 --- pkgs/tools/misc/nux/default.nix | 35 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/nux/default.nix diff --git a/pkgs/tools/misc/nux/default.nix b/pkgs/tools/misc/nux/default.nix new file mode 100644 index 000000000000..d3f26d850e5f --- /dev/null +++ b/pkgs/tools/misc/nux/default.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, asciidoctor +, installShellFiles +}: + +rustPlatform.buildRustPackage rec { + pname = "nux"; + version = "0.1.4"; + + src = fetchFromGitHub { + owner = "NuxPackage"; + repo = pname; + rev = version; + sha256 = "sha256-k3HRaWN8/MTZRGWBxI8RRK0tcSYBbSLs3vHkUdLGTc8"; + }; + + cargoSha256 = "sha256-wfUr3dcdALMEgJ6CaXhK4Gqk6xflCnov9tELA63drV4="; + + preFixup = '' + installManPage $releaseDir/build/nux-*/out/nux.1 + installShellCompletion $releaseDir/build/nux-*/out/nux.{bash,fish} + installShellCompletion $releaseDir/build/nux-*/out/_nux + + ''; + nativeBuildInputs = [ asciidoctor installShellFiles ]; + + meta = with lib; { + description = "A wrapper over the nix cli"; + homepage = "https://github.com/NuxPackage/nux"; + license = with licenses; [ gpl3 ]; + maintainers = with maintainers; [ drzoidberg ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b36f2f8da7f6..770f21d7a2a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30330,6 +30330,8 @@ with pkgs; nexuiz = callPackage ../games/nexuiz { }; + nux = callPackage ../tools/misc/nux { }; + ninvaders = callPackage ../games/ninvaders { }; njam = callPackage ../games/njam { };