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

geckodriver: 0.22.0 -> 0.26.0 #77802

Merged
merged 1 commit into from Jan 16, 2020
Merged

Conversation

arcnmx
Copy link
Member

@arcnmx arcnmx commented Jan 16, 2020

Closes #76464 (see there for some discussion regarding what happened to the source)

Motivation for this change

0.22.0 is well over a year old.

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.

src = let
# Source revisions are noted alongside the binary releases:
# https://github.com/mozilla/geckodriver/releases
rev = "e9783a644016aa9b317887076618425586730d73";
Copy link
Member

Choose a reason for hiding this comment

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

I think it would be cleaner to just inline this.

Copy link
Member Author

Choose a reason for hiding this comment

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

Somewhat strongly disagree, but can do.

Copy link
Member

Choose a reason for hiding this comment

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

If you strongly disagree, feel free to leave it as you like. :)

Copy link
Member Author

Choose a reason for hiding this comment

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

shrug I'm not invested either way :p

url = "https://hg.mozilla.org/mozilla-central/archive/${rev}.zip/testing";
sha256 = "0m86hqyq1jrr49jkc8mnlmx4bdq281hyxhcrrzacyv20nlqwvd8v";
}).overrideAttrs (_: {
unpackCmd = "unzip $curSrc";
Copy link
Member

Choose a reason for hiding this comment

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

Why is this required?

Copy link
Member Author

Choose a reason for hiding this comment

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

There might be a better way to do this? This is here because unpack phases choose the command based on file extension and fetchzip as far as I know doesn't provide a way to change the filename.

Copy link
Member

Choose a reason for hiding this comment

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

How about

unpackPhase = ''
  unzip $src
'';

With a comment about why the normal unpackPhase doesn’t work?

Copy link
Member

Choose a reason for hiding this comment

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

If you prefer it as you have it now that’s also fine.

Copy link
Member Author

Choose a reason for hiding this comment

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

I'm not sure if that will work? fetchzip explicitly calls unpackFile as part of postFetch, but it makes sense to add a comment regarding why it's there.

Copy link
Member

Choose a reason for hiding this comment

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

Looks like you’re right. :(

@alyssais alyssais merged commit 19e37ed into NixOS:master Jan 16, 2020
@arcnmx arcnmx deleted the geckodriver-0.26 branch January 17, 2020 01:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

geckodriver update to 0.26
2 participants