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

nixUnstable: add util-linuxMinimal to nativeBuildInputs; skip flakey test #117295

Merged
merged 2 commits into from
Mar 24, 2021

Conversation

cole-h
Copy link
Member

@cole-h cole-h commented Mar 22, 2021

Fixes an issue in tests where they can fail with ../common.sh: line 92: unshare: command not found.

Motivation for this change

Similar to #114602, but is more in-line with what happens upstream: uses util-linuxMinimal rather than util-linux, and places it in buildInputs rather than nativeBuildInputs.

EDIT: Upstream is trending towards moving it into nativeBuildInputs, and we want to see if this unblocks channels, so I moved it to nativeBuildInputs.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

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

LGTM, builds for me locally.

@r-rmcgibbo
Copy link

r-rmcgibbo commented Mar 22, 2021

Result of nixpkgs-review pr 117295 at e9eab75 run on aarch64-linux 1

5 packages built successfully:
  • hydra-unstable
  • nix-direnv
  • nix-update
  • nixFlakes (nixUnstable)
  • nixpkgs-review
2 suggestions:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/package-management/nix/default.nix:205:16:

        |
    205 |     patches = [(
        |                ^
    
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/package-management/nix/default.nix:68:17:

       |
    68 |                 ./aws-sdk-cpp-TransferManager-ContentEncoding.patch
       |                 ^
    

Result of nixpkgs-review pr 117295 at e9eab75 run on x86_64-linux 1

5 packages built successfully:
  • hydra-unstable
  • nix-direnv
  • nix-update
  • nixFlakes (nixUnstable)
  • nixpkgs-review
2 suggestions:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/package-management/nix/default.nix:205:16:

        |
    205 |     patches = [(
        |                ^
    
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/tools/package-management/nix/default.nix:68:17:

       |
    68 |                 ./aws-sdk-cpp-TransferManager-ContentEncoding.patch
       |                 ^
    

@SuperSandro2000

This comment has been minimized.

@cole-h cole-h added the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Mar 23, 2021
@cole-h
Copy link
Member Author

cole-h commented Mar 23, 2021

Waiting on the outcome of NixOS/nix#4659.

Fixes an issue in tests where they can fail with `../common.sh: line 92:
unshare: command not found`.
@cole-h cole-h force-pushed the nixUnstable-util-linux branch 2 times, most recently from 429948b to 1143d07 Compare March 24, 2021 19:01
@cole-h cole-h changed the title nixUnstable: add util-linuxMinimal to buildInputs nixUnstable: add util-linuxMinimal to nativeBuildInputs Mar 24, 2021
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 117295 run on x86_64-linux 1

5 packages built:
  • hydra-unstable
  • nix-direnv
  • nix-update
  • nixFlakes (nixUnstable)
  • nixpkgs-review

@cole-h
Copy link
Member Author

cole-h commented Mar 24, 2021

We want to unblock channels, so I'm going to merge as soon as this is green. If this is actually blocking, then we want this in ASAP to prepare for upcoming security bumps. If it isn't, we'll need to disable the flakey test until upstream can figure out why this is happening.

EDIT: Since we want to unblock, I'm also adding a commit that will skip the flakey test until we know how to fix it (especially since ofborg has now failed with the same issue).

@cole-h cole-h removed the 2.status: wait-for-upstream Waiting for upstream fix (or their other action). label Mar 24, 2021
@cole-h cole-h changed the title nixUnstable: add util-linuxMinimal to nativeBuildInputs nixUnstable: add util-linuxMinimal to nativeBuildInputs; skip flakey test Mar 24, 2021
@cole-h cole-h merged commit 1d3f053 into NixOS:master Mar 24, 2021
@cole-h cole-h deleted the nixUnstable-util-linux branch March 24, 2021 20:24
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.

5 participants