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.

Sign up for GitHub

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

virtualgl: revert PR #49185 #49611

Merged
merged 1 commit into from Nov 1, 2018
Merged

virtualgl: revert PR #49185 #49611

merged 1 commit into from Nov 1, 2018

Conversation

markuskowa
Copy link
Member

Motivation for this change

/bin/sh was replaced with bash in vglrun (#49185)
It turns out this this was unnecessary.

CC @Mic92

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.

@c0bw3b
Copy link
Contributor

c0bw3b commented Nov 1, 2018

Also cc @xeji who backported the initial PR

@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: virtualgl

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 aarch64-linux (full log)

Attempted: virtualgl

Partial log (click to expand)

  /nix/store/ivl1xlzmjkllm0p08mg83pxz3d6v9f6x-fltk-1.3.4
  /nix/store/m146f8kmb7xa3rs1h8j41yf9bpvvcbf9-freeglut-3.0.0-dev
  /nix/store/m18x06hkrd1c45s2g44s8q11447fvnyc-freeglut-3.0.0
copying path '/nix/store/hd90w3q65b0p1g9fsr066fxxs9z3j7w9-libGLU-combined' from 'https://cache.nixos.org'...
copying path '/nix/store/m18x06hkrd1c45s2g44s8q11447fvnyc-freeglut-3.0.0' from 'https://cache.nixos.org'...
copying path '/nix/store/m146f8kmb7xa3rs1h8j41yf9bpvvcbf9-freeglut-3.0.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/ivl1xlzmjkllm0p08mg83pxz3d6v9f6x-fltk-1.3.4' from 'https://cache.nixos.org'...
copying path '/nix/store/491ghd0zjacilm7sj0shfd3k0wgar8im-virtualgl-lib-2.5.2' from 'https://cache.nixos.org'...
copying path '/nix/store/4f46ff7yfb9nw6mf6zvcfnj0kls0ygl9-virtualgl-2.5.2' from 'https://cache.nixos.org'...
/nix/store/4f46ff7yfb9nw6mf6zvcfnj0kls0ygl9-virtualgl-2.5.2

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: virtualgl

Partial log (click to expand)

copying path '/nix/store/wd89cg0i0wpxjyiazfblylwhz1scacn4-libXft-2.3.2-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/za1a9p9kkds5bwng0xldivvin7p88q85-mesa-noglu-18.2.2-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/3ak76wvfx1ypapajc82x8gw4vac862m8-xlibs-wrapper' from 'https://cache.nixos.org'...
copying path '/nix/store/xlkjv0y2idm1mcyycyn1wc9lx89ri7g5-libGL-1.0.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/7vkqs4f03yg49ck6ni8flayg0lsi9szi-glu-9.0.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/49y683ykjmk81xlb5dw17lkffknv9vqx-libGLU-combined' from 'https://cache.nixos.org'...
copying path '/nix/store/n5awshh3f58075w9rrjz7d8r57lw09yv-fltk-1.3.4' from 'https://cache.nixos.org'...
copying path '/nix/store/nw0jm0bjrpfszzavd2pqyxwb9y54mjcc-virtualgl-lib-2.5.2' from 'https://cache.nixos.org'...
copying path '/nix/store/xpjywcp5qxwwgmi55bmcac5sx7s9if0a-virtualgl-2.5.2' from 'https://cache.nixos.org'...
/nix/store/xpjywcp5qxwwgmi55bmcac5sx7s9if0a-virtualgl-2.5.2

@xeji
Copy link
Contributor

xeji commented Nov 1, 2018

@markuskowa can you please use git revert -e efd3f8b57ff instead to revert the original commit? The reference makes it easier to track changes.

@markuskowa
Copy link
Member Author

@xeji OK, does that also work for a revert on 18.09?

@xeji
Copy link
Contributor

xeji commented Nov 1, 2018

For 18.09 you don't backport the revert but git revert -e the backported commit and push directly to 18.09 without a PR. But let me do that since I did the backport.

@markuskowa
Copy link
Member Author

Ok, thanks!

@xeji xeji merged commit a1d4a77 into NixOS:master Nov 1, 2018
xeji added a commit that referenced this pull request Nov 1, 2018
@xeji
Revert "virtualgl-lib: fix broken startup script (#49185)"
394ca68 
This reverts commit c341f56.

See #49611.
@xeji
Copy link
Contributor

xeji commented Nov 1, 2018

Reverted on 18.09 in 394ca68

@markuskowa markuskowa deleted the rev-virtualgl branch November 1, 2018 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@markuskowa @c0bw3b @GrahamcOfBorg @xeji