Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

oathToolkit: 2.6.2 -> 2.6.6 #120610

Merged
merged 1 commit into from Apr 27, 2021
Merged

oathToolkit: 2.6.2 -> 2.6.6 #120610

merged 1 commit into from Apr 27, 2021

Conversation

schnusch
Copy link
Contributor

@schnusch schnusch commented Apr 25, 2021

Motivation for this change

oath-toolkit-2.6.2 is quite out of date, especially oathtool's syntax to read keys from files is missing.

By building the tarball from https://savannah.nongnu.org/projects/oath-toolkit/ instead of https://gitlab.com/oath-toolkit/oath-toolkit all the changes do not seem necessary anymore.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dotlambda dotlambda added the 9.needs: maintainer Package or module needs active maintainers label Apr 25, 2021
pkgs/tools/security/oath-toolkit/default.nix Outdated Show resolved Hide resolved
pkgs/tools/security/oath-toolkit/default.nix Outdated Show resolved Hide resolved
@dotlambda
Copy link
Member

@schnusch Do you wanna be a maintainer for this package?

@dotlambda dotlambda changed the title oath-toolkit: 2.6.2 -> 2.6.6 oathToolkit: 2.6.2 -> 2.6.6 Apr 25, 2021
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit message should be oathToolkit: 2.6.2 -> 2.6.6 since that's what the attribute is called.

Comment on lines 3 to 7
let
securityDependency =
if stdenv.isDarwin then xmlsec
else pam;

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
let
securityDependency =
if stdenv.isDarwin then xmlsec
else pam;


let
securityDependency =
if stdenv.isDarwin then xmlsec
else pam;

in stdenv.mkDerivation {
name = "oath-toolkit-2.6.2";
in stdenv.mkDerivation rec {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
in stdenv.mkDerivation rec {
stdenv.mkDerivation rec {

printf "gdoc_MANS =\ngdoc_TEXINFOS =\n" > libpskc/man/Makefile.gdoc
touch ChangeLog
'';
buildInputs = [ securityDependency ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
buildInputs = [ securityDependency ];
buildInputs = [ (if stdenv.isDarwin then xmlsec else pam) ];

@dotlambda
Copy link
Member

@SuperSandro2000 That really doesn't make a difference.

@SuperSandro2000
Copy link
Member

It removes a variable which is not required because first I thought securityDepedency is a packageand missing in inputs.

Also the beauty of nix of that syntactic changes don't change anything about the package.

@dotlambda dotlambda merged commit cf9bf19 into NixOS:master Apr 27, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants