pass-otp: 1.0.0 -> 1.1.0 #36308
Merged
pass-otp: 1.0.0 -> 1.1.0 #36308
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
Mic92
reviewed
Mar 4, 2018
| @@ -5,8 +5,8 @@ stdenv.mkDerivation { | |||
| src = fetchFromGitHub { | |||
| owner = "tadfisher"; | |||
| repo = "pass-otp"; | |||
| rev = "f2feb3082324a91089782af9b7fbb71d34aa213d"; | |||
| sha256 = "0iklvcfgw1320dggdr02lq3bc7xvnd2934l1w9kkjpbsfmhs955c"; | |||
| rev = "9edb479405156f5712dd101661b86bd599904e8d"; | |||
There was a problem hiding this comment.
Please release tags here: v1.1.0: https://github.com/tadfisher/pass-otp/releases
There was a problem hiding this comment.
Version should be also part of the name.
|
@GrahamcOfBorg build pass-otp |
|
Success on x86_64-linux (full log) Partial log (click to expand)
|
|
Success on x86_64-darwin (full log) Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Partial log (click to expand)
|
|
How is this extension supposed to work? https://github.com/tadfisher/pass-otp says {
environment.systemPackages = [ pkgs.pass-otp ];
}But just adding that line doesn't work (for me) because that won't make the Maybe --- a/pkgs/tools/security/pass-otp/default.nix
+++ b/pkgs/tools/security/pass-otp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pass, fetchFromGitHub, oathToolkit }:
+{ stdenv, fetchFromGitHub, oathToolkit }:
stdenv.mkDerivation rec {
name = "pass-otp-${version}";
version = "1.1.0";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1cgj4zc8fq88n3h6c0vkv9i5al785mdprpgpbv5m22dz9p1wqvbb";
};
- buildInputs = [ pass oathToolkit ];
+ buildInputs = [ oathToolkit ];
patchPhase = ''
sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash
diff --git a/tv/5pkgs/simple/pass/default.nix b/tv/5pkgs/simple/pass/default.nix
index ad2afa8e..3b692808 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -2,6 +2,8 @@
, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
, makeWrapper
+, pass-otp
+
, xclip ? null, xdotool ? null, dmenu ? null
, x11Support ? !stdenv.isDarwin
, tombPluginSupport ? false, tomb
@@ -56,6 +58,14 @@ in stdenv.mkDerivation rec {
popd
'') plugins)}
+ ln -s \
+ ${pass-otp}/lib/password-store/extensions/otp.bash \
+ $out/lib/password-store/extensions/
+
+ ln -s \
+ ${pass-otp}/share/man/man1/pass-otp.1.gz \
+ $out/share/man/man1/
+
# Install Emacs Mode. NOTE: We can't install the necessary
# dependencies (s.el and f.el) here. The user has to do this
# himself.Alternatively (This question should probably be an issue at https://github.com/tadfisher/pass-otp, but then the above diff wouldn't make sense.) |
8 tasks
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.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)