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

[20.03] brave: 1.1.23 -> 1.3.118 #80766

Merged
merged 3 commits into from Feb 22, 2020
Merged

[20.03] brave: 1.1.23 -> 1.3.118 #80766

merged 3 commits into from Feb 22, 2020

Conversation

samueldr
Copy link
Member

Motivation for this change

Backport of #80592 to 20.03 (next stable).

Once this is successfully eval'd by ofborg this is good to be merged. I prefer going for a full eval since I squashed two commits together, and cherry-picked a maintainer file changed.

Things done
  • [ x] Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@samueldr samueldr changed the base branch from master to nixos-20.03 February 22, 2020 01:18
@samueldr
Copy link
Member Author

Sorry y'all pinged people, forgot to change the branch when opening the PR.

@samueldr samueldr changed the base branch from nixos-20.03 to release-20.03 February 22, 2020 01:19
@worldofpeace
Copy link
Contributor

worldofpeace commented Feb 22, 2020 •
edited

@samueldr You also need 2f0614b

@JeffLabonte
Copy link
Contributor

@samueldr Thank you for opening this PR!

@samueldr
Copy link
Member Author

samueldr commented Feb 22, 2020 •
edited

good catch @worldofpeace, that's why I opened it as a PR, I knew it was likely I forgot one of these bits when doing the quick backport.

Uh, I mean, I wanted to see if ofborg would catch the issue, if you see what I mean, and it sure did. ;)

@JeffLabonte @samueldr
maintainers: add jefflabonte
c42cf79 
(cherry picked from commit 2f0614b)
@JeffLabonte @samueldr
brave: add jefflabonte to maintainer list
27ac376 
(cherry picked from commit 9a4a2eb)
@JeffLabonte @samueldr
brave: 1.1.23 -> 1.3.118
9045186 
(cherry picked from commit fa560fb)
(cherry picked from commit 9018faa)
@vcunat vcunat merged commit 4655c9d into NixOS:release-20.03 Feb 22, 2020
@samueldr samueldr deleted the 20.03/brave branch February 22, 2020 14:31
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
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@samueldr @worldofpeace @JeffLabonte @vcunat