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

treewide: simplify some dependency cycles #43627

Merged
merged 2 commits into from Jul 18, 2018

Conversation

oxij
Copy link
Member

@oxij oxij commented Jul 16, 2018

Yet another followup to #39464.

@oxij oxij requested a review from FRidh as a code owner July 16, 2018 17:24
propagatedBuildInputs = [ attrs coverage ] ++ lib.optional (!isPy3k) [ enum34 ];

checkInputs = [ pytest pytest_xdist flaky mock ];
Copy link
Member

Choose a reason for hiding this comment

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

unnecessary change

@oxij
Copy link
Member Author

oxij commented Jul 16, 2018 via email

@orivej
Copy link
Contributor

orivej commented Jul 16, 2018

@GrahamcOfBorg eval

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: glib, libffi

Partial log (click to expand)

these paths will be fetched (0.02 MiB download, 0.04 MiB unpacked):
  /nix/store/9659ffz01appc8k4fw4bjdk4jckgl6bf-libffi-3.2.1
copying path '/nix/store/9659ffz01appc8k4fw4bjdk4jckgl6bf-libffi-3.2.1' from 'https://cache.nixos.org'...
/nix/store/4fabv5pnkp0gd4l3k416v9k89vk3wi74-glib-2.56.0
/nix/store/9659ffz01appc8k4fw4bjdk4jckgl6bf-libffi-3.2.1

Copy link
Contributor

@orivej orivej left a comment

Choose a reason for hiding this comment

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

/cc @vcunat @domenkozar
glib-tested was a part of release.nix until it was removed in c21f936, probably due to mysterious Nix failures on Hydra. Its build has not been failing since then.

doCheck = true;
libffi = libffi.override { doCheck = true; };
# dependency cycle
libffi = libffi.override { doCheck = false; };
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this override necessary? I can instantiate glib without it.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: glib, libffi

Partial log (click to expand)

patching script interpreter paths in /nix/store/p7s70nlz0sr296kx393pr4mxfif8snj3-glib-2.56.0-dev
/nix/store/p7s70nlz0sr296kx393pr4mxfif8snj3-glib-2.56.0-dev/bin/glib-gettextize: interpreter directive changed from " /bin/sh" to "/nix/store/xlv8nwq2cbxm2yancb3yk3424ziyb91q-bash-4.4-p23/bin/sh"
/nix/store/p7s70nlz0sr296kx393pr4mxfif8snj3-glib-2.56.0-dev/bin/gdbus-codegen: interpreter directive changed from "/usr/bin/env /nix/store/85f7frkl9amv34wsblmasklhh0s38xra-python-2.7.15/bin/python" to "/nix/store/85f7frkl9amv34wsblmasklhh0s38xra-python-2.7.15/bin/python"
checking for references to /build in /nix/store/p7s70nlz0sr296kx393pr4mxfif8snj3-glib-2.56.0-dev...
shrinking RPATHs of ELF executables and libraries in /nix/store/6703j1rsbns97n50r60rh4cmlx2g2waa-glib-2.56.0-devdoc
strip is /nix/store/h0nc84ybvb8g724fwysvcghh1675wjli-binutils-2.30/bin/strip
patching script interpreter paths in /nix/store/6703j1rsbns97n50r60rh4cmlx2g2waa-glib-2.56.0-devdoc
checking for references to /build in /nix/store/6703j1rsbns97n50r60rh4cmlx2g2waa-glib-2.56.0-devdoc...
/nix/store/vs1c6v8f6c1vn0jjb5lq0skcgg41fz7s-glib-2.56.0
/nix/store/s2ppffrlrbv71fmczm08xyghkzk699as-libffi-3.2.1

@oxij
Copy link
Member Author

oxij commented Jul 16, 2018 via email

@oxij
Copy link
Member Author

oxij commented Jul 16, 2018 via email

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: libffi

Partial log (click to expand)

/nix/store/s2ppffrlrbv71fmczm08xyghkzk699as-libffi-3.2.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: libffi

Partial log (click to expand)

these paths will be fetched (0.02 MiB download, 0.04 MiB unpacked):
  /nix/store/9659ffz01appc8k4fw4bjdk4jckgl6bf-libffi-3.2.1
copying path '/nix/store/9659ffz01appc8k4fw4bjdk4jckgl6bf-libffi-3.2.1' from 'https://cache.nixos.org'...
/nix/store/9659ffz01appc8k4fw4bjdk4jckgl6bf-libffi-3.2.1

@oxij
Copy link
Member Author

oxij commented Jul 17, 2018

@GrahamcOfBorg build python2Packages.pytest python2Packages.hypothesis

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: python2Packages.pytest, python2Packages.hypothesis

Partial log (click to expand)

these paths will be fetched (0.26 MiB download, 1.80 MiB unpacked):
  /nix/store/23i6m85rr562rla0xgvv8lz3ykjny3fw-python2.7-hypothesis-3.45.2
copying path '/nix/store/23i6m85rr562rla0xgvv8lz3ykjny3fw-python2.7-hypothesis-3.45.2' from 'https://cache.nixos.org'...
/nix/store/xqpifc0fr195m5xw8q59zg1d9ci4z515-python2.7-pytest-3.6.2
/nix/store/23i6m85rr562rla0xgvv8lz3ykjny3fw-python2.7-hypothesis-3.45.2

@oxij
Copy link
Member Author

oxij commented Jul 18, 2018 via email

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: python2Packages.pytest, python2Packages.hypothesis

Partial log (click to expand)

test_can_generate_interval_endpoints[-1.0-0.0] passed 1 out of the required 1 times. Success!
test_can_generate_interval_endpoints[-2.22507385851e-308-2.22507385851e-308] passed 1 out of the required 1 times. Success!
test_half_bounded_generates_endpoint passed 1 out of the required 1 times. Success!
test_can_find_unique_lists_of_non_set_order passed 1 out of the required 1 times. Success!

===End Flaky Test Report===

================== 1856 passed, 3 skipped in 1817.34 seconds ===================
/nix/store/vzj89gvgd3b385qhvzyxh4x5yi3nwil5-python2.7-pytest-3.6.2
/nix/store/28k2apc0nlaxn62c3v8a8yc8acliia05-python2.7-hypothesis-3.45.2

@matthewbauer matthewbauer merged commit c0beb48 into NixOS:staging Jul 18, 2018
@LnL7
Copy link
Member

LnL7 commented Jul 21, 2018

FYI. This broke the darwin stdenv.

@matthewbauer
Copy link
Member

Ok. Unless there is an alternative fix available we can just do doCheck ? !stdenv.isDarwin, correct? That would restore old behavior until we can figure out what is going on.

@LnL7
Copy link
Member

LnL7 commented Jul 21, 2018

Yeah, I'm testing to see if there are any other problems.

@oxij oxij deleted the tree/simplify-depcycles branch November 18, 2018 08:58
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

6 participants