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

palemoon: 27.1.1 -> 27.2.1 #24402

Merged
merged 1 commit into from Mar 28, 2017
Merged

Conversation

calvertvl
Copy link
Contributor

Motivation for this change

Version bump.

Also a bit of whitespace cleanup, and refactoring to use release tags.

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

@calvertvl, thanks for your PR! By analyzing the history of the files in this pull request, we identified @rnhmjoj and @bjornfor to be potential reviewers.


src = fetchFromGitHub {
name = "palemoon-src";
owner = "MoonchildProductions";
repo = "Pale-Moon";
rev = "a35936746069e6591181eb67e5f9ea094938bae5";
rev = version + "_Release";
sha256 = "0hns5993dh93brwz3z4xp1zp8n90x1hajxylv17zybpysax64jsk";
Copy link
Contributor

Choose a reason for hiding this comment

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

won't this bit break?

Copy link
Contributor

Choose a reason for hiding this comment

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

No, it's fine. See how the release are tagged: https://github.com/MoonchildProductions/Pale-Moon/releases

Copy link
Contributor

Choose a reason for hiding this comment

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

@rnhmjoj i meant the unchanged content hash making it confuse wrt the fixed output derivation

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The version+"_Release" bit builds the tag name; these can be used when fetching from git.

It's also a bit more obvious than just using a hash.

@rnhmjoj
Copy link
Contributor

rnhmjoj commented Mar 28, 2017

While you are at it can you fix the desktop entry?
I forgot to add

mkdir -p $out/share/applications
cp ${desktopItem}/share/applications/* $out/share/applications

to the install phase.

Also adding fix for desktop entry.
@calvertvl
Copy link
Contributor Author

Pushed the updated version, with the desktop entry fix from @rnhmjoj; it actually picks up the correct version of the source code this time.

@7c6f434c 7c6f434c merged commit 91cc357 into NixOS:master Mar 28, 2017
@calvertvl calvertvl deleted the update-palemoon-27_2_1 branch March 28, 2017 17:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants