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

palemoon: 27.5.0 -> 27.6.0 #31319

Merged
merged 1 commit into from Nov 6, 2017
Merged

palemoon: 27.5.0 -> 27.6.0 #31319

merged 1 commit into from Nov 6, 2017

Conversation

JamesTheAwesomeDude
Copy link
Contributor

Motivation for this change

Keeping my daily driver up to date

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.

Posting from built browser:
screenshot_2017-11-06_08-33-46

@JamesTheAwesomeDude
Copy link
Contributor Author

JamesTheAwesomeDude commented Nov 6, 2017 •
edited

Might it be worth it to step up the build sandbox size on Travis CI?

I might theorize that the 2GiB build zone is leading to the Fatal error…No space left on device causing these builds to fail. Pale Moon is a pretty huge browser.

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 6, 2017

Travis here is just a quick check for 'obvious' failures but we don't rely entirely on it.

Could you please squash your 2 commits into one? So that nixpkgs master branch will get a single jump from 27.5.0 to 27.6.0 without the intermediate RC1.

palemoon: 27.5.0 -> 27.6.0
880a636 
Version bump because apparently Moonchild published 27.6.0_Release
@JamesTheAwesomeDude
Copy link
Contributor Author

JamesTheAwesomeDude commented Nov 6, 2017 •
edited

Looking at the commit history, it looks like it's most likely going to just get squashed into a single commit "by" the merger, titled Merge pull request #31319 from JamesTheAwesomeDude/palemoon regardless of whether I do it in one—or even more—commits.

(But, I'm squashing it anyway. Here ya go.)

@NeQuissimus NeQuissimus merged commit 6fe43f4 into NixOS:master Nov 6, 2017
@NeQuissimus
Copy link
Member

By default, GitHub will not squash (it is an option, though), it will create a merge commit as well as pull in all your commits. So it's generally nicer to have a clean PR.

Do we need this in 17.09 as well?

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 6, 2017

Thanks. :)

I just tested it and it builds properly

$ nix-shell -p nox --run "nox-review pr 31319"
[...]
stripping (with flags -S) in /nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib  /nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/bin
patching script interpreter paths in /nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib/palemoon-devel-27.6.0/sdk/bin/typelib.py: interpreter directive changed from "/usr/bin/env python" to "/nix/store/q8f04fmkqannjw16p25mg2c2s13fkb95-python-2.7.14/bin/python"
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib/palemoon-devel-27.6.0/sdk/bin/run-mozilla.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4sp0sc2wxas7213x59smrwhliqmhc5yk-bash-4.4-p12/bin/sh"
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib/palemoon-devel-27.6.0/sdk/bin/xpt.py: interpreter directive changed from "/usr/bin/env python" to "/nix/store/q8f04fmkqannjw16p25mg2c2s13fkb95-python-2.7.14/bin/python"
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib/palemoon-devel-27.6.0/sdk/bin/nspr-config: interpreter directive changed from "/bin/sh" to "/nix/store/4sp0sc2wxas7213x59smrwhliqmhc5yk-bash-4.4-p12/bin/sh"
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib/palemoon-devel-27.6.0/sdk/bin/xpidl.py: interpreter directive changed from "/usr/bin/env python" to "/nix/store/q8f04fmkqannjw16p25mg2c2s13fkb95-python-2.7.14/bin/python"
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib/palemoon-devel-27.6.0/sdk/bin/header.py: interpreter directive changed from "/usr/bin/env python" to "/nix/store/q8f04fmkqannjw16p25mg2c2s13fkb95-python-2.7.14/bin/python"
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/lib/palemoon-27.6.0/run-mozilla.sh: interpreter directive changed from "/bin/sh" to "/nix/store/4sp0sc2wxas7213x59smrwhliqmhc5yk-bash-4.4-p12/bin/sh"
checking for references to /tmp/nix-build-palemoon-27.6.0.drv-0 in /nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0...
/nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0
Result in /run/user/1000/nox-review-0mlumjkc
total 0
lrwxrwxrwx 1 renaud users 59  6 nov.  19:27 result -> /nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0

$ /nix/store/1kaf8gakw6yhs9bdif196ay31c2zalwz-palemoon-27.6.0/bin/palemoon --version
Moonchild Productions Pale Moon 27.6.0

LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@JamesTheAwesomeDude @c0bw3b @NeQuissimus