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

multimc: 0.5.1 -> 0.6.1 #35221

Merged
merged 3 commits into from Feb 20, 2018
Merged

multimc: 0.5.1 -> 0.6.1 #35221

merged 3 commits into from Feb 20, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Feb 20, 2018

This seems to work properly,
however I'd appreciate feedback from someone with an account and such
before calling this good

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@dtzWill
multimc: 0.5.1 -> 0.6.1
4327b9d 
Fetch dependencies as git submodules:
* Replaces need to manually track + fetch libnbtplusplus source
* upstream relies on a forked version of quazip so we can't use ours

Fixes NixOS#35189.
@dtzWill
multimc: simplify a bit
e2ceb06
@dtzWill dtzWill mentioned this pull request Feb 20, 2018
Closed
@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

�[31;1merror:�[0m while evaluating the attribute 'buildInputs' of the derivation 'multimc-0.6.1' at �[1m/var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
while evaluating the attribute 'buildInputs' of the derivation 'openjdk-8u172b02' at �[1m/var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
while evaluating the attribute 'buildCommand' of the derivation 'openjdk-bootstrap' at �[1m/var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
No bootstrap for system

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘multimc-0.6.1’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/games/multimc/default.nix:25 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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.

NeQuissimus
NeQuissimus reviewed Feb 20, 2018
View reviewed changes
pkgs/games/multimc/default.nix Outdated
@@ -1,46 +1,23 @@
{ stdenv, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase, quazip }:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you need quazip here anymore

pkgs/games/multimc/default.nix
sha256 = "0wmlnwcq3gxrbmc53j96aa64pp1kmnlxiifhzngcb5kfmbbc8a20";
rev = version;
sha256 = "0glsf4vfir8w24bpinf3cx2ninrcp7hpq9cl463wl78dvqfg47kx";
fetchSubmodules = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 Pretty sure this is what solved the issue I was having :D

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Partial log (click to expand)

shrinking /nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1/bin/.MultiMC-wrapped
shrinking /nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1/bin/libMultiMC_gui.so
shrinking /nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1/bin/libMultiMC_unpack200.so
strip is /nix/store/adidfx4pa7vmvby0gjqqmiwg2x49yr27-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1/bin 
patching script interpreter paths in /nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1
/nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1/MultiMC: interpreter directive changed from "/bin/bash" to "/nix/store/fcxliihmhm2ak9z4890gk0qw63zsbrcx-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-multimc-0.6.1.drv-0 in /nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1...
postPatchMkspecs
/nix/store/qcgsf2g4lnyq0xcf42y807kbrz25pmhg-multimc-0.6.1

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

�[31;1merror:�[0m while evaluating the attribute 'buildInputs' of the derivation 'multimc-0.6.1' at �[1m/var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
while evaluating the attribute 'buildInputs' of the derivation 'openjdk-8u172b02' at �[1m/var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
while evaluating the attribute 'buildCommand' of the derivation 'openjdk-bootstrap' at �[1m/var/lib/gc-of-borg/nix-test-rs-2/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-2/pkgs/stdenv/generic/make-derivation.nix�[0m:148:11:
No bootstrap for system

@GrahamcOfBorg
Copy link

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘multimc-0.6.1’ in /private/var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/lnl7-mac/pkgs/games/multimc/default.nix:26 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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

Partial log (click to expand)

shrinking /nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1/bin/.MultiMC-wrapped
shrinking /nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1/bin/libMultiMC_gui.so
shrinking /nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1/bin/libMultiMC_unpack200.so
strip is /nix/store/adidfx4pa7vmvby0gjqqmiwg2x49yr27-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1/bin 
patching script interpreter paths in /nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1
/nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1/MultiMC: interpreter directive changed from "/bin/bash" to "/nix/store/fcxliihmhm2ak9z4890gk0qw63zsbrcx-bash-4.4-p12/bin/bash"
checking for references to /tmp/nix-build-multimc-0.6.1.drv-0 in /nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1...
postPatchMkspecs
/nix/store/zdy39fw6vzcql57279brzk3fw2msr210-multimc-0.6.1

@dtzWill dtzWill merged commit 6e7adad into NixOS:master Feb 20, 2018
@dtzWill dtzWill deleted the update/multimc-0.6.1 branch February 20, 2018 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NeQuissimus NeQuissimus NeQuissimus approved these changes

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
3 participants
@dtzWill @GrahamcOfBorg @NeQuissimus