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

wine: 3.0.2 -> 3.0.3, 3.17 -> 3.18 #46738

Merged
merged 4 commits into from Oct 13, 2018
Merged

wine: 3.0.2 -> 3.0.3, 3.17 -> 3.18 #46738

merged 4 commits into from Oct 13, 2018

Conversation

ikervagyok
Copy link
Contributor

haven't built anything, as i'm limited by my laptops capabilities.

@mkaito
Copy link
Contributor

mkaito commented Sep 22, 2018

I'm generally not a very big fan of multiple changes in a single commit, even if they are somewhat related.

ofborg seems to think it's alright, but let me try building this myself.

@mkaito
Copy link
Contributor

mkaito commented Sep 22, 2018

These build and execute correctly on my machine. The maintaners can make a call on whether or not this should be split into multiple commits or not, given that these 3 version bumps do not depend on one another whatsoever.

@ikervagyok
Copy link
Contributor Author

built fine on my machine and sc2 runs - will split them up over the next day or two

@matthewbauer
Copy link
Member

@GrahamcOfBorg build wine winetricks

@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: wine, winetricks

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

Unexpected error: command failed with exit code 1 on aarch64-linux (full log)

Attempted: wine, winetricks

Partial log (click to expand)

copying path '/nix/store/nf09xw7dabk9rn4dvmagcfb3qfk7wjqm-stdenv-linux' from 'https://cache.nixos.org'...
copying path '/nix/store/1fscfhi7dprvjsp25nzaq20cndrvyf5z-mesa-noglu-18.1.7-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/vnh6gwarr4xjvcn2xn2cs3cjaxbn38ha-mesa-noglu-18.1.7-osmesa' from 'https://cache.nixos.org'...
copying path '/nix/store/9q80il62q0i6jp9l5zjj0hfxzz90cqk1-libGL-1.0.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/bd8k4cg5gjzh3fiqbzmmngd8gxjxg38d-cairo-1.15.12-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/37m47bmb4nd2p49sqdcabfwym25dnf24-glu-9.0.0-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/gfkqy8sjpb9fx4fmnylj3jly2r17xavw-libGLU-combined' from 'https://cache.nixos.org'...
copying path '/nix/store/c1vi21kywf2n6691vlmivp3rrd24z1d0-pango-1.42.4-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/k8sy18xzbayfk4dlk7b99gdbr258lbyj-gtk+3-3.22.30-dev' from 'https://cache.nixos.org'...
error: a 'i686-linux' is required to build '/nix/store/42sjq3pa6qlndbfx2xg8wqgl2bgf000p-wine-3.0.3.drv', but I am a 'aarch64-linux'

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: wine, winetricks

Partial log (click to expand)

install -d /nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815/share/bash-completion/completions
install -m 644 src/winetricks.bash-completion /nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815/share/bash-completion/completions/winetricks
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815
gzipping man pages under /nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815/share/man/
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815/bin
patching script interpreter paths in /nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815
/nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815/bin/winetricks: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/whlfp0n94j9gpi7c1iacnmbr0xwz8m6r-winetricks-20180815...

@ikervagyok
Copy link
Contributor Author

@matthewbauer: i'll update wine{Unstable,Staging} to 3.17, please wait a few hours before pulling

@ikervagyok
Copy link
Contributor Author

wine 3.17 staging built fine and runs on my laptop

@ikervagyok ikervagyok changed the title wine: 3.0.2 -> 3.0.3, wineUnstable: 3.14 -> 3.16, winetricks: 20180603 -> 20180815 wine: 3.0.2 -> 3.0.3, wineUnstable: 3.14 -> 3.17, winetricks: 20180603 -> 20180815 Oct 1, 2018
@ikervagyok ikervagyok changed the title wine: 3.0.2 -> 3.0.3, wineUnstable: 3.14 -> 3.17, winetricks: 20180603 -> 20180815 wine: 3.0.2 -> 3.0.3, winetricks: 20180603 -> 20180815 Oct 5, 2018
@ikervagyok ikervagyok changed the title wine: 3.0.2 -> 3.0.3, winetricks: 20180603 -> 20180815 wine: 3.0.2 -> 3.0.3, 3.17 -> 3.18 Oct 13, 2018
@ikervagyok
Copy link
Contributor Author

@matthewbauer new version added, compiles fine on my machine and can run at least notepad.

@lukateras lukateras merged commit 60593ff into NixOS:master Oct 13, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ralith Ralith Ralith left review comments

@lukateras lukateras lukateras approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ikervagyok @mkaito @matthewbauer @GrahamcOfBorg @Ralith @lukateras