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

Jump to bottom

[20.03] backport yed updates #101239

Merged
merged 2 commits into from Oct 31, 2020
Merged

[20.03] backport yed updates #101239

merged 2 commits into from Oct 31, 2020

Conversation

matthiasbeyer
Copy link
Contributor

Motivation for this change

yed does not build on 20.03 due to


builder for '/nix/store/ysgcm7y0m861bk6ncpb1rvp7jmvl848j-source.drv' failed with exit code 1; last 10 log lines:
  100 29261  100 29261    0     0   111k      0 --:--:-- --:--:-- --:--:--  111k
  unpacking source archive /build/yEd-3.19.1.1.zip
  [/build/yEd-3.19.1.1.zip]
    End-of-central-directory signature not found.  Either this file is not
    a zipfile, or it constitutes one disk of a multi-part archive.  In the
    latter case the central directory and zipfile comment will be found on
    the last disk(s) of this archive.
  unzip:  cannot find zipfile directory in one of /build/yEd-3.19.1.1.zip or
          /build/yEd-3.19.1.1.zip.zip, and cannot find /build/yEd-3.19.1.1.zip.ZIP, period.
  do not know how to unpack source archive /build/yEd-3.19.1.1.zip
cannot build derivation '/nix/store/g0j9kvrq06jaqy6vbqij7jackvdqij5s-yEd-3.19.1.1.drv': 1 dependencies couldn't be built

And I hope this fixes the issue.

Things done

git cherry-pick -x -s ...

@abbradar (pkg maintainer)

r-ryantm and others added 2 commits October 21, 2020 09:47
@r-ryantm @matthiasbeyer
yed: 3.19.1.1 -> 3.20
674b4dd 
(cherry picked from commit 0e0995d)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@Maxwell-lt @matthiasbeyer
yed: 3.20 -> 3.20.1
680cf57 
(cherry picked from commit d3a2be1)
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
@ofborg ofborg bot requested a review from abbradar October 21, 2020 08:03
@worldofpeace worldofpeace changed the base branch from nixos-20.03 to release-20.03 October 31, 2020 18:37
worldofpeace
worldofpeace approved these changes Oct 31, 2020
View reviewed changes
Copy link
Contributor

@worldofpeace worldofpeace 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 locally

@worldofpeace worldofpeace merged commit 5c52210 into NixOS:release-20.03 Oct 31, 2020
@matthiasbeyer matthiasbeyer deleted the nixos-20.03-backport-yed branch October 31, 2020 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@worldofpeace worldofpeace worldofpeace approved these changes

@abbradar abbradar Awaiting requested review from abbradar

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@matthiasbeyer @worldofpeace @r-ryantm @Maxwell-lt