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

neomutt: use mime.types from mime_types #31791

Merged
merged 1 commit into from Nov 20, 2017
Merged

Conversation

peterhoeg
Copy link
Member

Motivation for this change

The mime.types file shipped with neomutt is pretty basic so we use the one from
apache instead as it vastly improves the handling of attachments.

The format is the same, so we simply copy it in place.

Cc: @cstrahan @erikryb @jfrankenau @vrthra

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.

@jtojnar
Copy link
Contributor

jtojnar commented Nov 18, 2017

Maybe we could use Gentoo’s list like Arch does: https://www.archlinux.org/packages/extra/any/mime-types/

@flokli
Copy link
Contributor

flokli commented Nov 18, 2017

Also more in favor of using the list from Gentoo :-)

@peterhoeg peterhoeg changed the title neomutt: use mime.types from apache neomutt: use mime.types from mime_types Nov 19, 2017
@peterhoeg
Copy link
Member Author

Ask and you shall receive! Now uses 1b594f0 instead of apache.

@flokli
Copy link
Contributor

flokli commented Nov 19, 2017

yay!

The mime.types file shipped with neomutt is pretty basic so we use the one put
together by Gentoo from a dedicated mime-types derivation as it vastly improves
the handling of attachments.
@grahamc
Copy link
Member

grahamc commented Nov 20, 2017

@GrahamcOfBorg build neomutt

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

gzipping man pages under /nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/share/man/
stripping (with flags -S) in /nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/lib  /nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/bin
patching script interpreter paths in /nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027
/nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/lib/neomutt/smime_keys: interpreter directive changed from " /usr/bin/perl -w" to "/nix/store/34r0w11jh1kgnvdlqnnk5h2vnm0qmnl3-perl-5.24.3/bin/perl -w"
/nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/share/doc/neomutt/keybase/decrypt.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/share/doc/neomutt/keybase/install.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/share/doc/neomutt/keybase/pgpdecrypt.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/share/doc/neomutt/keybase/pgpverify.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027/share/doc/neomutt/keybase/verify.sh: interpreter directive changed from "/bin/sh" to "/nix/store/hh833qm6lgb6cgr7z9vxkb72wikr4wwz-bash-4.4-p12/bin/sh"
/nix/store/pd7knkwml4ghpqpk3am1i57kml1rj8gm-neomutt-20171027

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

stripping (with flags -S) in /nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/lib  /nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/bin 
patching script interpreter paths in /nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027
/nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/share/doc/neomutt/keybase/pgpverify.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/share/doc/neomutt/keybase/decrypt.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/share/doc/neomutt/keybase/install.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/share/doc/neomutt/keybase/pgpdecrypt.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/share/doc/neomutt/keybase/verify.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4ada72n7785wwazv42fhsnxjvilaa3aj-bash-4.4-p12/bin/sh"
/nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027/lib/neomutt/smime_keys: interpreter directive changed from " /usr/bin/perl -w" to "/nix/store/5myxkd61lv6bd6hchk6zln42qikzxqza-perl-5.24.3/bin/perl -w"
checking for references to /tmp/nix-build-neomutt-20171027.drv-0 in /nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027...
/nix/store/74mk8l2gbphfxn55nmpj7l4y595mn1ml-neomutt-20171027

@grahamc grahamc merged commit 6a83ee4 into NixOS:master Nov 20, 2017
@peterhoeg peterhoeg deleted the f/neomutt branch November 20, 2017 01:11
@peterhoeg peterhoeg restored the f/neomutt branch November 20, 2017 03:01
@peterhoeg peterhoeg deleted the f/neomutt branch February 15, 2018 14:39
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

5 participants