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

atom, atom-beta: fixed #42730 #42769

Merged
merged 1 commit into from Jul 5, 2018
Merged

Conversation

Synthetica9
Copy link
Member

Swithed atom to use gtk3 instead of 2.
Fixed channel detection in the atom startup script.

Motivation for this change
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.

Swithed atom to use gtk3 instead of 2.
Fixed channel detection in the atom startup script.
@Synthetica9
Copy link
Member Author

@szeck87 Could you check if this fixes your problem?

@stevenzeck
Copy link

I'm out of town without my laptop until later tonight, I'll check it then.

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: atom, atom-beta

Partial log (click to expand)


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

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


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: atom, atom-beta

Partial log (click to expand)

/nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0/share/atom/resources/app/apm/node_modules/open/vendor/xdg-open: interpreter directive changed from "/bin/sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
/nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0/share/atom/resources/app/apm/node_modules/ajv/scripts/prepare-tests: interpreter directive changed from "/usr/bin/env sh" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/sh"
/nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0/share/atom/resources/app/apm/node_modules/ajv/scripts/travis-gh-pages: interpreter directive changed from "/usr/bin/env bash" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash"
/nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0/bin/.atom-wrapped: interpreter directive changed from "/bin/bash" to "/nix/store/8zkg9ac4s4alzyf4a8kfrig1j73z66dw-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0...
cannot find section .dynamic
file /nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0/share/atom/atom had a PT_GNU_STACK program header, converted
file /nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0/share/atom/resources/app/apm/bin/node had a PT_GNU_STACK program header, converted
/nix/store/xcb1a8y3naarfga51yh3ackz1hzf2f6x-atom-1.28.0
/nix/store/yxi3ynllf5cvjh61cmb1gad98q6ky2vi-atom-beta-1.29.0-beta0

@stevenzeck
Copy link

@Synthetica9 how do I add a channel to Nix pointing to this change to test out?

@Synthetica9
Copy link
Member Author

Assuming you have already cloned the nixpkgs repo:

git remote add synthetica https://github.com/Synthetica9/nixpkgs
git fetch synthetica
git checkout synthetica/atom-fix-42730
nix-build . -A atom -A atom-beta 

hmu if you need any more help

@stevenzeck
Copy link

stevenzeck commented Jun 30, 2018

OK, I'm not sure if the problem is fixed, or if I didn't build it properly, or if there is some other cause of this error. https://travis-ci.org/szeck87/atom-beautify/jobs/398692985

@Synthetica9
Copy link
Member Author

This seems to be a different error, with the problem being that nix-build only builds the derivation, but doesn't make it available in PATH. If you want that, you'd do:

git clone https://github.com/NixOS/nixpkgs.git && cd nixpkgs && git remote add synthetica https://github.com/Synthetica9/nixpkgs && git fetch synthetica && git checkout synthetica/atom-fix-42730 && nix-env -I . -i atom atom-beta

@stevenzeck
Copy link

stevenzeck commented Jul 2, 2018

OK, that got me past that error. But either it didn't build atom and atom-beta from the repository or this fix didn't work: https://travis-ci.org/szeck87/atom-beautify/jobs/399155559 and https://travis-ci.org/szeck87/atom-beautify/jobs/399155556

@stevenzeck
Copy link

@Synthetica9 I have a Docker container running Travis to help debug. Let me know what to look for.

@stevenzeck
Copy link

@Synthetica9 I ran Travis using an ugly hack (curl'ing your changed files right into default.nix and env.nix under the .nix-defexpr directory) and it seems to work. nix-env -I . -i atom atom-beta still seemed to install from unstable and not from the cloned repo.

@xeji
Copy link
Contributor

xeji commented Jul 4, 2018

Is this ready to merge?

@Synthetica9
Copy link
Member Author

@xeji Yeah, I believe so.

@xeji xeji merged commit dfd30c6 into NixOS:master Jul 5, 2018
@stevenzeck
Copy link

stevenzeck commented Jul 5, 2018

@xeji not sure what happened with the last build, but unstable looks to be based from 8d48824.

@xeji
Copy link
Contributor

xeji commented Jul 5, 2018

@szeck87 the nixos-unstable channel lags behind master because it only advances if a defined set of tests succeed on Hydra, see: https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents

The last evaluation with all tests passed was https://hydra.nixos.org/build/76782747 , three days ago.
Right now other failures are blocking the channel. Please be patient, or install the latest version from your own clone of master 😄

@stevenzeck
Copy link

@xeji I understand, but the commit it's using now is from 25 days ago. Is it looking from the 6/24 release? https://nixos.org/channels/nixpkgs-unstable

@xeji
Copy link
Contributor

xeji commented Jul 5, 2018

I see. Looks like the mirror lags behind the git channel. Don't know why. Opened #43077 .

@ghost ghost mentioned this pull request Jul 11, 2018
9 tasks
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

4 participants