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

msmtp: install docs and examples #31769

Merged
merged 2 commits into from Nov 17, 2017
Merged

msmtp: install docs and examples #31769

merged 2 commits into from Nov 17, 2017

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Nov 17, 2017 •
edited by grahamc

Motivation for this change
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
    • 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/)
  • Fits CONTRIBUTING.md.

grahamc
grahamc reviewed Nov 17, 2017
View reviewed changes
pkgs/applications/networking/msmtp/default.nix Outdated
@@ -30,6 +31,10 @@ in stdenv.mkDerivation rec {
stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];

postInstall = ''
install -d $out/share/doc/${pname}
install -Dm644 doc/*.example $out/share/doc/${pname}
cp -r scripts/{find_alias,msmtpqueue,msmtpq,set_sendmail} $out/share/doc/${pname}
Copy link
Member

Choose a reason for hiding this comment

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

Should we copy in to a scripts dir?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Just $out/scripts? Fine for me too…

@grahamc
Copy link
Member

grahamc commented Nov 17, 2017

@GrahamcOfBorg build msmtp

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 17, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-linux

/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/share/doc/msmtp/msmtpq/msmtpq: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/share/doc/msmtp/msmtpq/msmtp-queue: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/share/doc/msmtp/set_sendmail/set_sendmail.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/share/doc/msmtp/msmtpqueue/msmtp-runqueue.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/share/doc/msmtp/msmtpqueue/msmtp-listqueue.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/share/doc/msmtp/msmtpqueue/msmtp-enqueue.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/bin/msmtpq: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6/bin/msmtp-queue: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-msmtp-1.6.6.drv-0 in /nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6...
/nix/store/2gsriw92gx23pihlnfg46v6vgaz491af-msmtp-1.6.6

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 17, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Success for system: x86_64-darwin

patching script interpreter paths in /nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/bin/msmtpq: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/bin/msmtp-queue: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/share/doc/msmtp/msmtpq/msmtpq: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/share/doc/msmtp/msmtpq/msmtp-queue: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/share/doc/msmtp/set_sendmail/set_sendmail.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/share/doc/msmtp/msmtpqueue/msmtp-listqueue.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/share/doc/msmtp/msmtpqueue/msmtp-enqueue.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6/share/doc/msmtp/msmtpqueue/msmtp-runqueue.sh: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/bash"
/nix/store/ppzp8qy2vgpdy3yk5fmvbdjqdkj3458b-msmtp-1.6.6

@grahamc
Copy link
Member

grahamc commented Nov 17, 2017

@GrahamcOfBorg build msmtp

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 17, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

Merge failed

GrahamcOfBorg
GrahamcOfBorg reviewed Nov 17, 2017
View reviewed changes
Copy link

@GrahamcOfBorg GrahamcOfBorg left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-linux

Merge failed

@flokli
Copy link
Contributor Author

flokli commented Nov 17, 2017

will rebase

@grahamc
Copy link
Member

grahamc commented Nov 17, 2017

I think this is a bug in the builder, not an issue with rebasing :(

@flokli
Copy link
Contributor Author

flokli commented Nov 17, 2017

Went through successful now. Whatever ;-)

@Mic92 Mic92 merged commit 7c737cb into NixOS:master Nov 17, 2017
@flokli flokli deleted the msmtp-examples branch November 17, 2017 16:37
orivej added a commit that referenced this pull request Nov 17, 2017
@orivej
Merge branch 'master' into staging
1161741 
* master: (28 commits)
  go_1_9: skip flaky TestWaitGroupMisuse2
  erlangR18: fix patch hashes with fetchpatch
  xml2: replace dead links
  nixos/pam: fix docs about path to u2f_keys file
  cinelerra: add a note about parallel building
  msmtp: install docs and examples (#31769)
  kernel: Fix out-of-tree modules on aarch64
  nixos/tests/acme: update terms of service to fix test
  gixy: init at 0.1.8
  pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules
  mono: init at 4.8
  wal-g: fix license so not to break evaluation
  wal-g: init at 0.1.2
  maintainers: add backuitist
  nixos/prometheus: Correct documentation for external_labels
  spidermonkey: replace broken links
  vagrant: removed custom rake gem
  vagrant: 2.0.0 -> 2.0.1
  nixos/prometheus: add external_labels option
  nixos/prometheus: add scrape_configs.honor_labels
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@grahamc grahamc grahamc left review comments

@GrahamcOfBorg GrahamcOfBorg GrahamcOfBorg left review comments

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@flokli @grahamc @GrahamcOfBorg @Mic92