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.

Sign up for GitHub

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

Jump to bottom

pass: Fix dependencies on Darwin #45495

Merged
merged 1 commit into from Aug 23, 2018
Merged

pass: Fix dependencies on Darwin #45495

merged 1 commit into from Aug 23, 2018

Conversation

danieldk
Copy link
Contributor

password-store on Darwin does not pass unit tests in sandboxed
builds:

  • 'openssl base64' is used on Darwin to compute base64. Add openssl
    to the environment of pass.
  • t0200-edit-tests.sh tests 'pass edit', which uses hdid on Darwin.
    However hdid is not available in the sandbox.
Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

xeji
xeji reviewed Aug 23, 2018
View reviewed changes
pkgs/tools/security/pass/default.nix Outdated
@@ -1,6 +1,7 @@
{ stdenv, lib, pkgs, fetchurl, buildEnv
, coreutils, gnused, getopt, git, tree, gnupg, which, procps, qrencode
, makeWrapper
, openssl ? stdenv.isDarwin
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't make sense, it defines a boolean as default value for the openssl argument - which is a derivation, not a boolean. Just openssl should be fine.

Copy link
Contributor Author

@danieldk danieldk Aug 23, 2018 •
edited

Choose a reason for hiding this comment

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

Ah, I see, thanks for the comment! I will fix this.

@danieldk
pass: Fix dependencies on Darwin
c9c3663 
password-store on Darwin does not pass unit tests in sandboxed
builds:

- 'openssl base64' is used on Darwin to compute base64. Add openssl
  to the environment of pass.
- t0200-edit-tests.sh tests 'pass edit', which uses hdid on Darwin.
  However hdid is not available in the sandbox.
@Mic92
Copy link
Member

Mic92 commented Aug 23, 2018

@GrahamcOfBorg build pass

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: pass

Partial log (click to expand)

  /nix/store/pj942j76qj97pir1k06wcvi0lbwphwyh-pass-extensions-env
  /nix/store/xi8ir8jl58h9fakzis8rawj91kl4w5bs-password-store-1.7.3
copying path '/nix/store/pj942j76qj97pir1k06wcvi0lbwphwyh-pass-extensions-env' from 'https://cache.nixos.org'...
copying path '/nix/store/39g9p6r533sscc7igywbi251fzrsn0ww-dmenu-4.8' from 'https://cache.nixos.org'...
copying path '/nix/store/f7vrf4a2zw5ddlmaca7hgj5liw5i38g6-qrencode-4.0.2' from 'https://cache.nixos.org'...
copying path '/nix/store/lb3fqnskif90q2vpdfm17jxfn9n8qi3w-tree-1.7.0' from 'https://cache.nixos.org'...
copying path '/nix/store/gmz9x8c9i680yfkh9fxqs81zp7rqd75c-xclip-0.13' from 'https://cache.nixos.org'...
copying path '/nix/store/nvsnza07891iri4d183r48vm95fjk7s8-xdotool-3.20160805.1' from 'https://cache.nixos.org'...
copying path '/nix/store/xi8ir8jl58h9fakzis8rawj91kl4w5bs-password-store-1.7.3' from 'https://cache.nixos.org'...
/nix/store/xi8ir8jl58h9fakzis8rawj91kl4w5bs-password-store-1.7.3

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: pass

Partial log (click to expand)

# passed all 14 test(s)
1..14
ok 1 - Make sure grep prints normal lines
ok 2 - Test passing the "-i" option to grep
# passed all 2 test(s)
1..2
ok 1 - Make sure find resolves correct files
# passed all 1 test(s)
1..1
/nix/store/b6yx7b23rmczk45ymwh5bfnv7ikp9hvf-password-store-1.7.3

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: pass

Partial log (click to expand)

copying path '/nix/store/ppkgd6f742l17ax694vsnbvqmyv6zjxj-cairo-1.15.12' from 'https://cache.nixos.org'...
copying path '/nix/store/kvznziygw2fi17whyb297gngd7aqf22h-xclip-0.13' from 'https://cache.nixos.org'...
copying path '/nix/store/6i2ll7cvqh75ha90yn1rp0lm17yhalvz-xdotool-3.20160805.1' from 'https://cache.nixos.org'...
copying path '/nix/store/kzsrw07a4x3sivm80msgd30g8xp4wwqr-cups-2.2.6-lib' from 'https://cache.nixos.org'...
copying path '/nix/store/l8ivddgqzgylvrivgaja58nk2fjmbn97-pango-1.42.1' from 'https://cache.nixos.org'...
copying path '/nix/store/1a98rf1lffkkjphld7p6bs1nf1c6fy28-gtk+-2.24.32' from 'https://cache.nixos.org'...
copying path '/nix/store/70wlg23bvyl8vy1gghmdnirk428b2fa7-pinentry-1.1.0' from 'https://cache.nixos.org'...
copying path '/nix/store/qzl9r3zrj45wi8wwn1c9y03yd7mangxs-gnupg-2.2.9' from 'https://cache.nixos.org'...
copying path '/nix/store/f04yx04cqf9c4a180javih9cfhvlaz0m-password-store-1.7.3' from 'https://cache.nixos.org'...
/nix/store/f04yx04cqf9c4a180javih9cfhvlaz0m-password-store-1.7.3

@Mic92 Mic92 merged commit 8834b28 into NixOS:master Aug 23, 2018
@danieldk danieldk deleted the pass-darwin branch September 5, 2018 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@xeji xeji xeji left review comments

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@danieldk @Mic92 @GrahamcOfBorg @xeji