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

patchutils: fix and 0.3.3 -> 0.3.4 #38618

Closed
wants to merge 2 commits into from
Closed

patchutils: fix and 0.3.3 -> 0.3.4 #38618

wants to merge 2 commits into from

Conversation

plesiv
Copy link

@plesiv plesiv commented Apr 8, 2018

Motivation for this change
  • patchutils binaries using perl (e.g. splitdiff) were broken before this change
  • according to repology patchutils version is lagging behind the versions in other distros
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/) NOTE fixcvsdiff hangs, but that's that's broken in upstreamn in upstream
  • Fits CONTRIBUTING.md.

@plesiv plesiv changed the title Patchutils patchutils: fix and 0.3.3 -> 0.3.4 Apr 8, 2018
@Mic92
Copy link
Member

Mic92 commented Apr 8, 2018 •
edited

Please re-open this pull request against the staging git branch, since it causes stdenv rebuilds on macOS.

@plesiv plesiv changed the base branch from master to staging April 9, 2018 09:49
Zoran Plesivčak added 2 commits April 9, 2018 10:49
patchutils: fix build
56bbea7 
Perl needs to be present during the build, otherwise perl binaries end
up having bash as the interpreter in the shebang.
patchutils: 0.3.3 -> 0.3.4
ce2d762 
Changes from the removed patch are contained in the [commit][1], which
is included in the [version 0.3.4][2].

[1]: twaugh/patchutils@5898795
[2]: twaugh/patchutils@0.3.3...0.3.4
@dezgeg
Copy link
Contributor

dezgeg commented Apr 9, 2018

Note that this has been attempted before but reverted because it breaks stuff: plesiv@814772e#diff-72c9cc0fb6f081e0d88ee8dcd9306fcb

So I think in order to update this, we need to make a patchutils_0_3_3 referring to the old version and have fetchpatch use it.

@samueldr
Copy link
Member

samueldr commented Aug 8, 2018

Any updates here? #25154 was closed without (imo) proper resolution.

@dezgeg
Copy link
Contributor

dezgeg commented Aug 8, 2018

Nope, the choices are still:

  • Keep a patchutils_0_3_3 for fetchpatch
  • Rewrite fetchpatch to not use patchutils

@bobvanderlinden bobvanderlinden mentioned this pull request Apr 13, 2019
Merged
10 tasks
@vcunat
Copy link
Member

vcunat commented May 12, 2019

The first bullet merged: #59422

@vcunat vcunat closed this May 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
8.has: package (update) 10.rebuild-darwin: 1-10 10.rebuild-darwin-stdenv 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@plesiv @Mic92 @dezgeg @samueldr @vcunat @infinisil @GrahamcOfBorg @Janik-Haag