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

nitrokey-app: 0.5.1 -> 0.6.3 #24219

Merged
merged 2 commits into from Apr 14, 2017
Merged

nitrokey-app: 0.5.1 -> 0.6.3 #24219

merged 2 commits into from Apr 14, 2017

Conversation

KaiHa
Copy link
Contributor

@KaiHa KaiHa commented Mar 22, 2017

Motivation for this change

Update to latest upstream version.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.


src = fetchFromGitHub {
owner = "Nitrokey";
repo = "nitrokey-app";
rev = "v${version}";
sha256 = "0acb2502r3wa0mry6h8sz1k16zaa4bgnhxwxqd1vd1y42xc6g9bw";
sha256 = "1l5l4lwxmyd3jrafw19g12sfc42nd43sv7h7i4krqxnkk6gfx11q";
};

buildInputs = [
Copy link
Contributor

Choose a reason for hiding this comment

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

cmake, pkgconfig should be in nativeBuildInputs

Copy link
Contributor

Choose a reason for hiding this comment

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

Remove stdenv.lib from license and maintainer and add it to meta like meta = with stdenv.lib; {
instead of writing it multiple times.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, just curious, wouldn't it be some what simpler instead of using a patch to use substituteInPlace since there isn't that many changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed the issues you mentioned, thanks for pointing out.

I keep the patches for now. But I will keep in mind your recommendation and will reexamine my decision when updating to the next upstream version.

@KaiHa
Copy link
Contributor Author

KaiHa commented Apr 14, 2017

Is there anything that prevents this change from being merged? @ndowens

@ndowens ndowens merged commit 91d2dc0 into NixOS:master Apr 14, 2017
@KaiHa KaiHa deleted the nitrokey-app-0.6.3 branch October 31, 2020 16:24
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

2 participants