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

simgrid: 3.11.1 -> 3.15 #24915

Closed
wants to merge 1 commit into from
Closed

Conversation

Sophia-Gold
Copy link
Contributor

Motivation for this change

Version 3.11.1 was no longer compatible with the SimGrid documentation.

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

@Sophia-Gold, thanks for your PR! By analyzing the history of the files in this pull request, we identified @7c6f434c, @bjornfor and @Fuuzetsu to be potential reviewers.

@zraexy
Copy link
Member

zraexy commented Apr 15, 2017

Per CONTRIBUTING.md commit messages should be formatted:
(pkg-name | service-name): (from -> to | init at version | refactor | etc)
In this case it should be:
simgrid: 3.11.1 -> 3.15

@Sophia-Gold Sophia-Gold changed the title Upgraded to Version 3.15 simgrid: 3.11.1 -> 3.15 Apr 15, 2017
@7c6f434c
Copy link
Member

I think you changed the PR title instead of the commit message

@7c6f434c
Copy link
Member

Also, in general such updates should be submitted against master first

@Sophia-Gold
Copy link
Contributor Author

Apologies. I neglected to create a new branch after checking out the master and therefore decided to make this commit through the GUI, which explains some of the oddness. I'm not sure how to amend the message now, if that's even preferable.

@7c6f434c 7c6f434c closed this Apr 15, 2017
@7c6f434c
Copy link
Member

Cherry-picked into master and release-17.03

@Sophia-Gold
Copy link
Contributor Author

Thank you.

@7c6f434c
Copy link
Member

Command-line git commit --amend does work from this state, I guess it would be possible to pull the PR branch, amend it and force-push. We have a complicated workflow in terms of initially recommending using channels for installation and branch tops for contributions.

@7c6f434c
Copy link
Member

Thanks for the update.

vcunat added a commit that referenced this pull request Apr 16, 2017
vcunat added a commit that referenced this pull request Apr 16, 2017
@vcunat
Copy link
Member

vcunat commented Apr 16, 2017

For reference, sandboxed builds got broken by this, but it should be OK now.

@Sophia-Gold
Copy link
Contributor Author

That's odd. I built it on NixOS with a local path and got none of these errors. Glad to hear they're resolved, though.

@7c6f434c
Copy link
Member

Well, look at the fix — you probably have a global /usr/bin/env which can be accessed unless sandboxing is used. Well, you can enable sandboxing by default on your system if you prefer (purer/more reproducible builds, somewhat longer initialisation of a build with many dependencies)

@Sophia-Gold
Copy link
Contributor Author

Got it. Next time I'll enable sandboxing when testing a new package.

@vcunat
Copy link
Member

vcunat commented Apr 16, 2017

Most contributors use sandboxing all the time, I think. There's just a split-second penalty per derivation, so that's totally worth it for me.

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.

None yet

6 participants