Skip to content

Commit

Permalink
lorri: 1.1 -> 1.1.1
Browse files Browse the repository at this point in the history
Patch release which adds a manpage.

Adding a `man` and a `doc` output, and copying the files to the
corresponding directories.

The `overrideAttrs` is necessary because `buildRustPackage` does not
allow adding outputs.
  • Loading branch information
Profpatsch committed Aug 4, 2020
1 parent b8151a4 commit d5fee0a
Showing 1 changed file with 19 additions and 5 deletions.
24 changes: 19 additions & 5 deletions pkgs/tools/misc/lorri/default.nix
Expand Up @@ -12,9 +12,9 @@
, Security
}:

rustPlatform.buildRustPackage rec {
(rustPlatform.buildRustPackage rec {
pname = "lorri";
version = "1.1";
version = "1.1.1";

meta = with stdenv.lib; {
description = "Your project's nix-env";
Expand All @@ -28,8 +28,8 @@ rustPlatform.buildRustPackage rec {
repo = pname;
# Run `eval $(nix-build -A lorri.updater)` after updating the revision!
# ALSO don’t forget to update the cargoSha256!
rev = "93d93013217cd9aa09d2bd316d6c3abf827a6601";
sha256 = "0wbkx8hmikngfp6fp0y65yla22f3k0jszq8a6pas80q0b33llwm5";
rev = "05ea21170a18800e83b3dcf1e3d347f83a9fa992";
sha256 = "1lgig5q1anmmmc1i1qnbx8rd8mqvm5csgnlaxlj4l4rxjmgiv06n";
};

cargoSha256 = "1nz1g1r94i81b728y0c5szfvxfkz9bqry3xag22alrhjhlc66kpp";
Expand All @@ -42,6 +42,17 @@ rustPlatform.buildRustPackage rec {
buildInputs =
stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ];

# copy the docs to the $man and $doc outputs
postInstall = ''
install -Dm644 lorri.1 $man/share/man/man1/lorri.1
install -Dm644 -t $doc/share/doc/lorri/ \
README.md \
CONTRIBUTING.md \
LICENSE \
MAINTAINERS.md
cp -r contrib/ $doc/share/doc/lorri/contrib
'';

passthru = {
updater = writers.writeBash "copy-runtime-nix.sh" ''
set -euo pipefail
Expand All @@ -52,4 +63,7 @@ rustPlatform.buildRustPackage rec {
nixos = nixosTests.lorri;
};
};
}
}).overrideAttrs (old: {
# add man and doc outputs to put our documentation into
outputs = old.outputs or [ "out" ] ++ [ "man" "doc" ];
})

0 comments on commit d5fee0a

Please sign in to comment.