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

electron*: refactor 4+ to common expression, add 7 and 8, updates #79192

Merged
merged 2 commits into from Feb 5, 2020
Merged

electron*: refactor 4+ to common expression, add 7 and 8, updates #79192

merged 2 commits into from Feb 5, 2020

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 3, 2020 •
edited by worldofpeace

Motivation for this change

Fixes #76267

Wanted to add electron_7, duplication and updating was a pain,
so put together a rewrite to make maintaining these easier.

Notes
  • print-hashes.nix uses upstream-provided SHA256SUMS file
  • electron_4: 4.2.8 -> 4.2.12
  • electron_5: 5.0.8 -> 5.0.13
  • electron_6: 6.0.1 -> 6.1.7
  • electron_7:: init at 7.1.10

FWIW:
electron_4 previously did not include at-spi2-core, only at-spi2-atk.
Both are now included, matching other versions for a slightly simpler
expression.

Things done
  • 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.

worldofpeace
worldofpeace reviewed Feb 4, 2020
View reviewed changes
pkgs/development/tools/electron/print-hashes.sh Outdated
@@ -19,11 +19,15 @@ SYSTEMS=(
[x86_64-darwin]=darwin-x64
)

hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null|tail -n1)"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null|tail -n1)"
hashfile="$(nix-prefetch-url --print-path "https://github.com/electron/electron/releases/download/v${VERSION}/SHASUMS256.txt" 2>/dev/null| tail -n1)"

@worldofpeace
Copy link
Contributor

@dtzWill Can you please remove unsupported versions?

@dtzWill dtzWill changed the title electron*: refactor 4+ to common expression, add 7, updates electron*: refactor 4+ to common expression, add 7 and 8, updates Feb 4, 2020
@dtzWill
Copy link
Member Author

dtzWill commented Feb 4, 2020

Maybe a follow-up PR?

I'm not sure I'm up to quality-control/testing everything using electron (which currently defaults to 4, unsupported)-- especially since apparently moving away from 3 broke things folks care about-- hence packaging it too (and likely why we have multiple versions packaged anyway?).

Also, added electron_8! 😁

@worldofpeace
Copy link
Contributor

worldofpeace commented Feb 4, 2020 •
edited

Maybe a follow-up PR?

I'm not sure I'm up to quality-control/testing everything using electron (which currently defaults to 4, unsupported)-- especially since apparently moving away from 3 broke things folks care about-- hence packaging it too (and likely why we have multiple versions packaged anyway?).

Also, added electron_8! grin

Ugh, I did forget about this. I've handled the prior electron updates, it's a bit of a pain having to test the consumers per upgrades/seeing what electron versions they should be using. Yep, we have that as a followup.

@dtzWill @worldofpeace
electron*: refactor 4+ to common expression, add 7, updates
8e8285d 
* print-hashes.nix uses upstream-provided SHA256SUMS file
* electron_4: 4.2.8 -> 4.2.12
* electron_5: 5.0.8 -> 5.0.13
* electron_6: 6.0.1 -> 6.1.7
* electron_7:: init at 7.1.10

FWIW:
electron_4 previously did not include at-spi2-core, only at-spi2-atk.
Both are now included, matching other versions for a slightly simpler
expression.
@dtzWill @worldofpeace
electron_8: init at 8.0.0
ed8c639
@worldofpeace worldofpeace force-pushed the feature/electron-refactor-and-7 branch from 1696829 to ed8c639 Compare February 5, 2020 15:21
@worldofpeace worldofpeace merged commit 5e329ff into NixOS:master Feb 5, 2020
@worldofpeace
Copy link
Contributor

Thanks @dtzWill, this is mine and your's todo lists now 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@manveru manveru Awaiting requested review from manveru

@travisbhartwell travisbhartwell Awaiting requested review from travisbhartwell

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Update all electron versions
2 participants
@dtzWill @worldofpeace