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

mailutils: 2.2 -> 3.2 #27580

Closed
wants to merge 5 commits into from
Closed

mailutils: 2.2 -> 3.2 #27580

wants to merge 5 commits into from

Conversation

orivej
Copy link
Contributor

@orivej orivej commented Jul 23, 2017

Motivation for this change

Fixes #27475. (Probably leaves #21008 open.)

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 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.

@mention-bot
Copy link

@orivej, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vrthra, @nckx and @fpletz to be potential reviewers.

@orivej orivej mentioned this pull request Jul 23, 2017
Closed
Mic92
Mic92 reviewed Jul 23, 2017
View reviewed changes
pkgs/tools/networking/mailutils/default.nix Outdated
++ stdenv.lib.optional doCheck dejagnu;
preCheck = ''
# Add missing files.
cp ${./readmsg-tests}/* readmsg/tests/
Copy link
Member

Choose a reason for hiding this comment

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

Where these files added later to upstream?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They have always been in the upstream repository, but they are missing from the released archive! I copied this fix from http://data.gpo.zugaina.org/gentoo/net-mail/mailutils/mailutils-3.2.ebuild

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We could use repository snapshot which contains these files: http://git.savannah.gnu.org/cgit/mailutils.git/snapshot/mailutils-release-3.2.tar.gz

Copy link
Member

Choose a reason for hiding this comment

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

Ok, then please switch to the other url.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It turned out to be more involved. Bootstrapping the build requires a git checkout (and wget, and rsync), so I used fetchgit and added additional dependencies to run ./bootstrap.

@globin
Copy link
Member

globin commented Jul 23, 2017

This fails with sandboxing turned on. I'll have a look if I can fix this right away.

@Mic92 the patch didn't apply, I added an excludes param to fetchpatch.

@orivej
Copy link
Contributor Author

orivej commented Jul 23, 2017

I tested with sandboxing.

A travis job suddenly failed with fetchgit hash mismatch: https://travis-ci.org/NixOS/nixpkgs/jobs/256661069 . It used to pass, and fetchgit arguments have not changed. I don't know how this is possible.

Mic92
Mic92 reviewed Jul 23, 2017
View reviewed changes
pkgs/tools/networking/mailutils/default.nix Outdated
@@ -29,7 +29,8 @@ stdenv.mkDerivation rec {
patches = [
(fetchpatch {
url = "http://git.gnu.org.ua/cgit/mailutils.git/patch/?id=afbb33cf9ff750e93a9a4c1f51a3b62d584f056e";
sha256 = "1w72ymxlkqj2y3gqd2r27g79hxw7xa6j790shsg9i5jhhz3vknjx";
sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db";
Copy link
Member

Choose a reason for hiding this comment

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

Sorry I only compared commit hash.

@orivej orivej mentioned this pull request Jul 23, 2017
Merged
8 tasks
@orivej
Copy link
Contributor Author

orivej commented Jul 23, 2017

It seems that making git checkout work is too much effort. I'd prefer to return to the first commit in this pull request, but download the patch and missing files from gentoo repository: #27595

@clefru
Copy link
Contributor

clefru commented Jul 24, 2017

FYI this builds fine for me locally. (Don't have much more to test than building unfortunately). Thanks for the fix, orivej!

@globin globin self-assigned this Jul 26, 2017
@globin
Copy link
Member

globin commented Jul 26, 2017 •
edited
Loading

Superseded by #27595

@globin globin closed this Jul 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

Assignees

@globin globin

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@orivej @mention-bot @globin @clefru @Mic92