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

urbit: 0.4.5 -> 0.6.0 #45041

Merged
merged 1 commit into from Aug 15, 2018
Merged

urbit: 0.4.5 -> 0.6.0 #45041

merged 1 commit into from Aug 15, 2018

Conversation

bsima
Copy link
Contributor

@bsima bsima commented Aug 14, 2018

Motivation for this change

Updated to latest released version, verified working with the latest network breach.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@timokau
Copy link
Member

timokau commented Aug 15, 2018

@GrahamcOfBorg build urbit

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: urbit

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: urbit

Partial log (click to expand)

wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: urbit

Partial log (click to expand)

wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type
wrong ELF type

@timokau
Copy link
Member

timokau commented Aug 15, 2018

Great first contribution, I couldn't find a single thing to complain about 😄 Keep up the good work!

@timokau timokau merged commit 6aa0b61 into NixOS:release-18.03 Aug 15, 2018
@timokau
Copy link
Member

timokau commented Aug 15, 2018

I just noticed that this PR was based on release-18.03. It should have been based on master.

release-18.03 is a release support branch. Only minor package updates and bugfixes should be pushed there. master is the "rolling release" branch from which the next release will be cut.

I'll fix this for you, no big deal. I should have paid more attention before merging. Just remember it next time :)

@bsima
Copy link
Contributor Author

bsima commented Aug 15, 2018 via email

@timokau
Copy link
Member

timokau commented Aug 15, 2018

For now I have just reverted the commit on 18.03. I wouldn't expect conflicts with master, but if you say they're there I guess I'm expecting wrong. It would be easiest for me if you would open a new PR with the updated based on master (ping me on that one). Otherwise I'll do it myself when I have the time.

@samueldr
Copy link
Member

samueldr commented Aug 15, 2018

@timokau maybe this message slipped under the cracks earlier today

[09:45:43] <samueldr> timokau[m]: urbit is already 0.6.0 on master it looks like; this feels more like an issue with how the user attempted the backport
[09:46:23] <samueldr> as for whether this was fine to backport, rules are still fuzzy :/

Current master has 0.6.0 already

@bsima was it your intention to backport 0.6.0 to 18.03?

@bsima
Copy link
Contributor Author

bsima commented Aug 15, 2018 via email

@timokau
Copy link
Member

timokau commented Aug 15, 2018

@samueldr oh yeah I missed that, thanks for repeating it here.

@bsima basically for backporting the rule number 1 is to not break anything. The releases should be stable. So the api should not have any backwards incompatible changes and you should be reasonable sure to not break any reverse dependencies.

@timokau
Copy link
Member

timokau commented Aug 15, 2018

With semver a good rule of thumb is to backport only patch releases. Of course that goes out of the window with 0.x versions.

@bsima
Copy link
Contributor Author

bsima commented Aug 15, 2018 via email

@timokau
Copy link
Member

timokau commented Aug 15, 2018

For the record, urbit-0.6.0 does work on NixOS 18.03

Yes, the point of the release branches is just that users can run their system in everyday use and make security updates without worrying about breaking their system or having backwards incompatible changes in their software :)

If you want the latest software (breakage included), you can change to the nixos-unstable channel. The option I choose is to have the os based on stable, but also install some packages from unstable. nix makes that possible. See "How can I install a package from unstable while remaining on the stable channel?" here.

@timokau
Copy link
Member

timokau commented Aug 15, 2018

Anyways, thank you for upstreaming your efforts, I hope this will be one PR of many :)

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

5 participants