googleAuthenticator: 1.0 -> 1.03 #21491
Conversation
|
@aneeshusa, thanks for your PR! By analyzing the history of the files in this pull request, we identified @viric, @rbvermaa and @edolstra to be potential reviewers. |
|
|
||
| preConfigure = '' | ||
| sed -i 's|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|' google-authenticator.c | ||
| sed -i "s|libqrencode.so.3|$qrencode/lib/libqrencode.so.3|" src/google-authenticator.c |
There was a problem hiding this comment.
why this change? I'm not sure $qrencode will work there, like that?
There was a problem hiding this comment.
I like to use environment variables where possible over Nix antiquotations. Here it doesn't make a difference. However, with version and other values that can't be overriden easily, it makes it easier to call updateAttrs since the old value of e.g. version isn't baked into the various shell snippets.
There was a problem hiding this comment.
Yes, but qrencode isn't an environment variable here.
set -u before this errors:
/nix/store/gqkczsmhc596isabbl5p2dw1i5rmwqks-stdenv/setup: line 70: qrencode: unbound variable
|
|
||
| preConfigure = '' | ||
| sed -i 's|libqrencode.so.3|${qrencode}/lib/libqrencode.so.3|' google-authenticator.c | ||
| sed -i "s|libqrencode.so.3|$qrencode/lib/libqrencode.so.3|" src/google-authenticator.c |
There was a problem hiding this comment.
Yes, but qrencode isn't an environment variable here.
set -u before this errors:
/nix/store/gqkczsmhc596isabbl5p2dw1i5rmwqks-stdenv/setup: line 70: qrencode: unbound variable
aneeshusa
force-pushed
the
upgrade-google-authenticator-to-1.03
branch
from
be5e679
to
15762a8
Compare
|
@grahamc I've fixed that, guess I wasn't thinking so straight at 4:30 AM :) |
|
Merged in 652a870 thank you! |
Motivation for this change
A new release (version 1.03) of google-authenticator-libpam has been cut; this is a follow up from #19603.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)