lorri: 1.1 -> 1.1.1 #94110
Merged
lorri: 1.1 -> 1.1.1 #94110
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
|
Can you give a pointer? I have looked at the source, maybe I missed
something.
…On Wed, Jul 29, 2020 at 1:57 AM zowoq ***@***.***> wrote:
The overrideAttrs is necessary because buildRustPackage does not
allow adding outputs.
buildRustPackage does allow outputs?
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#94110 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAYB5ZWDFJMAJ6ALM6X4433R55QXJANCNFSM4PK7FOBA>
.
|
diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix
index c0f5aec1e4d..21bc7aeceec 100644
--- a/pkgs/tools/misc/lorri/default.nix
+++ b/pkgs/tools/misc/lorri/default.nix
@@ -12,7 +12,7 @@
, Security
}:
-(rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage rec {
pname = "lorri";
version = "1.1.1";
@@ -35,6 +35,8 @@
cargoSha256 = "16asbpq47f3zcv4j9rzqx9v1317qz7xjr7dxd019vpr88zyk4fi1";
doCheck = false;
+ outputs = [ "out" "man" "doc" ];
+
BUILD_REV_COUNT = src.revCount or 1;
RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {};
@@ -63,7 +65,4 @@
nixos = nixosTests.lorri;
};
};
-}).overrideAttrs (old: {
- # add man and doc outputs to put our documentation into
- outputs = old.outputs or [ "out" ] ++ [ "man" "doc" ];
-})
+} |
|
@zowoq well, but how do I know the rust build won’t add a $bin and then it breaks. |
I don't understand what this means? |
|
nvm, I was looking at the wrong definition.
…On Wed, Sep 9, 2020 at 2:57 PM zowoq ***@***.***> wrote:
@zowoq <https://github.com/zowoq> well, but how do I know the rust build
won’t add a $bin and then it breaks.
I don't understand what this means?
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#94110 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAYB5ZS74S43DNBN7BCAHLLSE53RZANCNFSM4PK7FOBA>
.
|
|
Opened #97548 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Patch release which adds a manpage.
Adding a
manand adocoutput, and copying the files to thecorresponding directories.
The
overrideAttrsis necessary becausebuildRustPackagedoes notallow adding outputs.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)cc @curiousleo