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

lua5.1: fix broken source fetch (#40748 backport) #46202

Merged
merged 1 commit into from
Sep 6, 2018
Merged

lua5.1: fix broken source fetch (#40748 backport) #46202

merged 1 commit into from
Sep 6, 2018

Conversation

candeira
Copy link
Contributor

@candeira candeira commented Sep 6, 2018

No description provided.

@bhipple @candeira
lua5.1: fix broken source fetch (NixOS#40748)
b8dfa96 
The upstream src URL for the patch appears to no longer exist. Per discussion in
NixOS#39927, the upstream URL is not stable,
so this commit inlines the patch in the nixpkgs src tree.

(cherry picked from commit 17f5001)
vcunat
vcunat approved these changes Sep 6, 2018
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

I don't expect most people would notice, due to cache.nixos.org

copying path '/nix/store/1d15qk8k5ysb4xc7z4m4d72jh05nji2r-CVE-2014-5461.patch' from 'https://cache.nixos.org'...

@vcunat vcunat merged commit b8dfa96 into NixOS:release-18.03 Sep 6, 2018
vcunat added a commit that referenced this pull request Sep 6, 2018
@vcunat
Merge #46202: lua5.1: fix broken source fetch
5f654f8
@vcunat vcunat mentioned this pull request Sep 6, 2018
Open
@candeira candeira deleted the release-18.03-fix-lua branch September 7, 2018 07:28
@candeira
Copy link
Contributor Author

candeira commented Sep 7, 2018

Hi @vcunat, thanks for merging. If you don't mind, I'd like to understand something.

I don't expect most people would notice, due to cache.nixos.org
copying path '/nix/store/1d15qk8k5ysb4xc7z4m4d72jh05nji2r-CVE-2014-5461.patch' from 'https://cache.nixos.org'...

Would that be before or after the present patch? Because before, it was being downloaded from an external resource.

The reason for the patch: when I installed Calibre by adding it to my configuration.nix and rebuilding , the rebuild triggered a compilation, which failed early at the lua patch fetch. As you can imagine from the PR, I run vanilla 18.03.

When I then rebuilt the system pointing at my pckgs tree (release18.03 plus the lua patch), the rebuild took approx 32h on my i7 laptop.

So my guess is that the cache situation you point out is post-17f50018c0ca87e196882c0ba4aee68703e3fcf0

@vcunat
Copy link
Member

vcunat commented Sep 7, 2018 •
edited
Loading

No, that's before this PR. You can see that from the name of the patch. calibre is also fully cached on the current 18.03 channel version.

@candeira
Copy link
Contributor Author

Thanks.

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

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@candeira @vcunat @GrahamcOfBorg @bhipple