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

Jump to bottom

emacs-mac: 26.1 -> 26.2 #59741

Merged
merged 1 commit into from Apr 16, 2019
Merged

emacs-mac: 26.1 -> 26.2 #59741

merged 1 commit into from Apr 16, 2019

Conversation

matthewbauer
Copy link
Member

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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@adisbladis
Copy link
Member

@GrahamcOfBorg build emacsMacport

@adisbladis
Copy link
Member

LGTM! (assuming it's tested)

@infinisil
Copy link
Member 

curl: (7) Failed to connect to ftp.math.s.chiba-u.ac.jp port 21: Operation timed out
error: cannot download emacs-26.2-mac-7.6.tar.gz from any mirror
builder for '/nix/store/fa229zspj22y9p7gspxgsyz99gg7bj03-emacs-26.2-mac-7.6.tar.gz.drv' failed with exit code 1
cannot build derivation '/nix/store/vp2kafs7agm9j6r30k6vj8vqzsj5fkbf-emacs-mac-26.2-7.6.drv': 1 dependencies couldn't be built
error: build of '/nix/store/vp2kafs7agm9j6r30k6vj8vqzsj5fkbf-emacs-mac-26.2-7.6.drv' failed

@adisbladis
Copy link
Member

adisbladis commented Apr 16, 2019 •
edited

This seems to be the same emacs macport: https://bitbucket.org/mituharu/emacs-mac/
We might want to switch to bitbucket as our upstream, should be more stable.

@matthewbauer
Copy link
Member Author

This seems to be the same emacs macport: https://bitbucket.org/mituharu/emacs-mac/
We might want to switch to bitbucket as our upstream, should be more stable.

The Bitbucket has some differences from the tar ball release. I get this error when trying https://bitbucket.org/mituharu/emacs-mac/get/emacs-26.2-mac-7.6.tar.gz:

setting SOURCE_DATE_EPOCH to timestamp 1555222666 of file emacs-26.2/test/src/xml-tests.el
patching sources
applying patch /nix/store/5c40xq6xbh7sii2rfxabhliqdslsdcfz-clean-env.patch
patching file src/Makefile.in
Hunk #1 succeeded at 542 (offset 7 lines).
/nix/store/zxlhxc5bfzl8h2x9jvg9wjpwikanngv6-stdenv-darwin/setup: line 105: patch-mac: No such file or directory
builder for '/nix/store/c7ff5ml24snl0y8h2s5qsdy0mbdnyg4w-emacs-mac-26.2-7.6.drv' failed with exit code 1

@adisbladis
Copy link
Member

@matthewbauer Ok, then lets assume the failure is temporary and retry the build in a few hours.

@adisbladis
Copy link
Member

@GrahamcOfBorg build emacsMacport

@adisbladis adisbladis merged commit 4c4ad72 into NixOS:master Apr 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisbladis adisbladis adisbladis approved these changes

@veprbl veprbl veprbl approved these changes

@jwiegley jwiegley Awaiting requested review from jwiegley

Assignees
No one assigned
Labels
6.topic: emacs 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@matthewbauer @adisbladis @infinisil @veprbl @GrahamcOfBorg