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

Add keysmith #88614

Merged
merged 2 commits into from Jun 5, 2020
Merged

Add keysmith #88614

merged 2 commits into from Jun 5, 2020

Conversation

@SCOTT-HAMILTON
Copy link
Contributor

@SCOTT-HAMILTON SCOTT-HAMILTON commented May 22, 2020

Motivation for this change

Needed a simple otp client, while otpgen is still in stand-by.

Things done

Successfully build, tested and added to all-packages.nix

  • 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.
@wamserma
Copy link
Contributor

@wamserma wamserma commented May 22, 2020

Your name is still missing from the maintainers list.

@SCOTT-HAMILTON
Copy link
Contributor Author

@SCOTT-HAMILTON SCOTT-HAMILTON commented May 22, 2020

Fixed

buildInputs = [ oathToolkit kirigami2 qtquickcontrols2 qtbase ];

meta = {
description = "OTP client for Plasma Mobile and Desktop.";

This comment has been minimized.

@IvarWithoutBones

IvarWithoutBones Jun 1, 2020
Contributor

This shouldn't have a period at the end, as the contributing guidelines state.

pkgs/tools/security/keysmith/default.nix Outdated Show resolved Hide resolved
@IvarWithoutBones
Copy link
Contributor

@IvarWithoutBones IvarWithoutBones commented Jun 1, 2020

6c70ff2 and 2a22446 should be squashed.

9906381 has nothing to do with keysmith itself, should lose that in the commit message.

Copy link
Contributor

@jonringer jonringer left a comment

please cleanup git history as well, should only have 2 commits:

maintainers: add shamilton
keysmith: init at 0.1
pkgs/tools/security/keysmith/default.nix Show resolved Hide resolved
pkgs/tools/security/keysmith/default.nix Show resolved Hide resolved
pkgs/tools/security/keysmith/default.nix Outdated Show resolved Hide resolved
pkgs/tools/security/keysmith/default.nix Outdated Show resolved Hide resolved
pkgs/tools/security/keysmith/default.nix Outdated Show resolved Hide resolved
pkgs/tools/security/keysmith/default.nix Outdated Show resolved Hide resolved
pkgs/tools/security/keysmith/default.nix Outdated Show resolved Hide resolved
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jun 3, 2020

Also, thanks for opening your first PR with nixpkgs :)

@SCOTT-HAMILTON
Copy link
Contributor Author

@SCOTT-HAMILTON SCOTT-HAMILTON commented Jun 3, 2020

Also, thanks for opening your first PR with nixpkgs :)

You're welcome 👍 (Even though it's my third)

@SCOTT-HAMILTON SCOTT-HAMILTON mentioned this pull request Jun 3, 2020
3 of 10 tasks complete
@SCOTT-HAMILTON
Copy link
Contributor Author

@SCOTT-HAMILTON SCOTT-HAMILTON commented Jun 3, 2020

Rebased to new branch, moved to #89413

@SCOTT-HAMILTON
Copy link
Contributor Author

@SCOTT-HAMILTON SCOTT-HAMILTON commented Jun 3, 2020

Discovered git force pushing so coming back to this thread and closing the new one.

@SCOTT-HAMILTON SCOTT-HAMILTON reopened this Jun 3, 2020
@SCOTT-HAMILTON SCOTT-HAMILTON force-pushed the SCOTT-HAMILTON:add-keysmith branch from 811e397 to d8fb6c5 Jun 3, 2020
Copy link
Contributor

@jonringer jonringer left a comment

I get issues trying to launch it:

[nix-shell:/home/jon/.cache/nixpkgs-review/pr-88614]$ ./results/keysmith/bin/org.kde.keysmith
QQmlApplicationEngine failed to load component
qrc:/main.qml:29 Type Kirigami.ApplicationWindow unavailable
file:///nix/store/8jhqa8q59r448c94yj88w2f1s1l4cmb8-kirigami2-5.68.0/lib/qt-5.12.7/qml/org/kde/kirigami.2/styles/org.kde.desktop/ApplicationWindow.qml:12 Type Base.ApplicationWindow unavailable
file:///nix/store/8jhqa8q59r448c94yj88w2f1s1l4cmb8-kirigami2-5.68.0/lib/qt-5.12.7/qml/org/kde/kirigami.2/ApplicationWindow.qml:10 module "QtGraphicalEffects" is not installed

also, do you mind adding a link:

  postInstall = ''
     ln -s $out/bin/org.kde.keysmith $out/bin/keysmith
  '';
@SCOTT-HAMILTON SCOTT-HAMILTON force-pushed the SCOTT-HAMILTON:add-keysmith branch from deb7828 to 75c2ca5 Jun 5, 2020
@SCOTT-HAMILTON
Copy link
Contributor Author

@SCOTT-HAMILTON SCOTT-HAMILTON commented Jun 5, 2020

I've wrapped the needed QT and QML ENV vars in postInstall, I think this should fix your issue (even though I couldn't reproduce it).

Scott Hamilton
@SCOTT-HAMILTON SCOTT-HAMILTON force-pushed the SCOTT-HAMILTON:add-keysmith branch from 75c2ca5 to ab19002 Jun 5, 2020
@jonringer
Copy link
Contributor

@jonringer jonringer commented Jun 5, 2020

I've wrapped the needed QT and QML ENV vars in postInstall, I think this should fix your issue (even though I couldn't reproduce it).

I don't run a DE, so I do usually have issues with quite a few KDE / Qt / GTK apps

Copy link
Contributor

@jonringer jonringer left a comment

diff LGTM
gui launches fine

[2 built, 1 copied (0.5 MiB), 0.1 MiB DL]
https://github.com/NixOS/nixpkgs/pull/88614
1 package built:
keysmith
@jonringer jonringer merged commit 79b919e into NixOS:master Jun 5, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ab19002"; rev="ab190020439c8ffdb80eedb8b62365ece62b7cd2"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ab19002"; rev="ab190020439c8ffdb80eedb8b62365ece62b7cd2"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ab19002"; rev="ab190020439c8ffdb80eedb8b62365ece62b7cd2"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ab19002"; rev="ab190020439c8ffdb80eedb8b62365ece62b7cd2"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ab19002"; rev="ab190020439c8ffdb80eedb8b62365ece62b7cd2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ab19002"; rev="ab190020439c8ffdb80eedb8b62365ece62b7cd2"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ab19002"; rev="ab190020439c8ffdb80eedb8b62365ece62b7cd2"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
keysmith, keysmith.passthru.tests on aarch64-linux Success
Details
keysmith, keysmith.passthru.tests on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
You can’t perform that action at this time.