diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-15 00:29:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-15 00:29:08 +0200 |
commit | d22cd376e501df3012f208488b9ff12384efffc6 (patch) | |
tree | 36a055e492f3ed56592e25f6392a159efedd57f2 | |
parent | e5e749869fea79a77eb393742e66b60eebec83c2 (diff) | |
parent | 5b494c6355c1dedd0f5f5356b857d40c311ea972 (diff) |
Merge pull request #95161 from lf-/patch-1
nix-doc: init at 0.3.3
-rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix-doc/default.nix | 29 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 37 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4660b7a1cada4..d4cff2cb5edc7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4661,6 +4661,12 @@ fingerprint = "7FE2 113A A08B 695A C8B8 DDE6 AE53 B4C2 E58E DD45"; }]; }; + lf- = { + email = "nix-maint@lfcode.ca"; + github = "lf-"; + githubId = 6652840; + name = "Jade"; + }; lheckemann = { email = "git@sphalerite.org"; github = "lheckemann"; diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix new file mode 100644 index 0000000000000..630ac6e94a9b3 --- /dev/null +++ b/pkgs/tools/package-management/nix-doc/default.nix @@ -0,0 +1,29 @@ +{ stdenv, rustPlatform, fetchFromGitHub, boost, nix, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "nix-doc"; + version = "0.3.3"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "lf-"; + repo = "nix-doc"; + sha256 = "0vd7159y5w8jjgaw51kfr3z3r50299gvw7vjchpqx3nwmdink8bh"; + }; + + doCheck = true; + buildInputs = [ boost nix ]; + + nativeBuildInputs = [ pkg-config ]; + + cargoSha256 = "1xz3qngs8p0s62dq4d46c01z3k1vvgg856767g56b13c38pzfh28"; + + meta = with stdenv.lib; { + description = "An interactive Nix documentation tool"; + longDescription = "An interactive Nix documentation tool providing a CLI for function search and a Nix plugin for docs in the REPL"; + homepage = "https://github.com/lf-/nix-doc"; + license = licenses.lgpl3; + maintainers = [ maintainers.lf- ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5e1126cb20143..4bb32179429d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26501,6 +26501,8 @@ in nixdoc = callPackage ../tools/nix/nixdoc {}; + nix-doc = callPackage ../tools/package-management/nix-doc { }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; |