Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab2cfaf9a73d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 44ba72b5465a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 18, 2019

  1. pass-otp: 1.1.1 -> 1.2.0 

    Had to specify `BASHCOMPDIR` in `$out` to keep things pure.
    @toonn
    toonn committed Aug 18, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    dtzWill Will Dietz
    GPG key ID: EBB0EA4124809D02
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a035ec View commit details

  2. Merge pull request #66776 from toonn/pass-otp-bump 

    pass-otp: 1.1.1 -> 1.2.0
    @mmahut
    mmahut authored Aug 18, 2019
    Copy the full SHA
    44ba72b View commit details
Showing with 6 additions and 4 deletions.
  1. +6 −4 pkgs/tools/security/pass/extensions/otp.nix
10 changes: 6 additions & 4 deletions pkgs/tools/security/pass/extensions/otp.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
name = "pass-otp-${version}";
version = "1.1.1";
version = "1.2.0";

src = fetchFromGitHub {
owner = "tadfisher";
repo = "pass-otp";
rev = "v${version}";
sha256 = "0m8x5dqwcr9jim530685nsq4zn941hhl7ridmmd63b204z141rwa";
sha256 = "0cpqrf3939hcvwg7sd8055ghc8x964ilimlri16czzx188a9jx9v";
};

buildInputs = [ oathToolkit ];
@@ -19,13 +19,15 @@ stdenv.mkDerivation rec {
sed -i -e 's|OATH=\$(which oathtool)|OATH=${oathToolkit}/bin/oathtool|' otp.bash
'';

installFlags = [ "PREFIX=$(out)" ];
installFlags = [ "PREFIX=$(out)"
"BASHCOMPDIR=$(out)/share/bash-completion/completions"
];

meta = with stdenv.lib; {
description = "A pass extension for managing one-time-password (OTP) tokens";
homepage = https://github.com/tadfisher/pass-otp;
license = licenses.gpl3;
maintainers = with maintainers; [ jwiegley tadfisher ];
maintainers = with maintainers; [ jwiegley tadfisher toonn ];
platforms = platforms.unix;
};
}