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

buildRustPackage: fix regex for separating lib and bin #48020

Merged
merged 1 commit into from Oct 10, 2018
Merged

buildRustPackage: fix regex for separating lib and bin #48020

merged 1 commit into from Oct 10, 2018

Conversation

erictapen
Copy link
Member

@erictapen erictapen commented Oct 7, 2018 •
edited

E.g. after #47709, exa was wrongly put into /lib, as it matches .*.a but not .*\.a.

I tested, that exa now is being put into /bin as it should.

Should be backported to release-18.09, or maybe staging-18.09, as this will trigger a lot of rebuilds.

  • 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.

@erictapen
buildRustPackage: fix regex for separating lib and bin
64d0676 
E.g. exa was wrongly put into /lib, as it matches

  .*.a

but not

  .*\.a
timokau
timokau approved these changes Oct 7, 2018
View reviewed changes
Copy link
Member

@timokau timokau left a comment

Choose a reason for hiding this comment

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

Seems reasonable to me, but I don't feel comfortable merging a change to the core rust infrastructure myself.

@Ma27
Copy link
Member

Ma27 commented Oct 10, 2018 •
edited

as this affects 18.09 as well, is it possible to backport this as soon as this commit can go from staging to master?

Already noted in the PR.

@timokau
Copy link
Member

timokau commented Oct 10, 2018

@et4te @andir could you take a look?

@et4te
Copy link
Contributor

et4te commented Oct 10, 2018

I tested this with a package that produces .so / .a and it seems to work so I'm happy with it.

@timokau
Copy link
Member

timokau commented Oct 10, 2018

Thank you for the fix @erictapen :)

@timokau timokau merged commit 1aff3da into NixOS:staging Oct 10, 2018
@timokau
Copy link
Member

timokau commented Oct 10, 2018

Backport in 5647e9a (I hope the staging-18.09 branch is still used post release).

@erictapen erictapen deleted the 47709-fix-regex branch October 10, 2018 18:35
@tazjin
Copy link
Member

tazjin commented Oct 14, 2018

@timokau I think this backport hasn't made it into 18.09 yet - are you sure it'll trickle through from the staging branch? (the installation of exa for example is currently broken on stable)

@erictapen erictapen mentioned this pull request Oct 15, 2018
Closed
@erictapen
Copy link
Member Author

IIRC the PR was already built in https://hydra.nixos.org/eval/1483497, so it just needs to be merged into release-18.09?

@xeji
Copy link
Contributor

xeji commented Oct 16, 2018

Building this fix alone isn't enough. It causes a mass rebuild. We need to wait for the mass rebuild to finish and see if all dependent packages still build. We typically bundle several mass rebuilding changes on staging-18.09 and merge them into release-18.09 when the rebuilds are done and everything looks ok. This may take some time because staging-18.09 has low build priority, and the results need to be reviewed first.

@timokau
Copy link
Member

timokau commented Oct 16, 2018

@tazjin as @xeji explained I cherry-picked this fix in to staging-18.09, not release-18.09 and it may take some time to trickle through.

@andir andir mentioned this pull request Oct 30, 2018
Closed
9 tasks
@erictapen
Copy link
Member Author

This just made it into nixos-18.09.

@erictapen
Copy link
Member Author

Correction: the commit is in nixos-18.09, but it got reverted in 3d63c05.

@FRidh could you elaborate on what kind of failures occured after the merge? I wonder wether they correspond to this PR. Maybe, the stuff affected by this PR was already built by Hydra and we can cherry-pick it safely on release-18.09?

@FRidh
Copy link
Member

FRidh commented Nov 18, 2018

A range of failures. I suggest tracking down the corresponding Hydra evaluation.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timokau timokau timokau approved these changes

Assignees
No one assigned
Labels
6.topic: rust 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@erictapen @Ma27 @timokau @et4te @tazjin @xeji @FRidh @GrahamcOfBorg