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

p7zip: fix src URL for debian gitlab move #41769

Merged
merged 1 commit into from Jun 9, 2018
Merged

p7zip: fix src URL for debian gitlab move #41769

merged 1 commit into from Jun 9, 2018

Conversation

bhipple
Copy link
Contributor

@bhipple bhipple commented Jun 9, 2018 •
edited

Another broken URL related to: #39927

Note that the patch file has legitimately changed, because ~4 months ago Debian
replaced their CVE security fix with a newer version that fixes some additional
bugs: https://salsa.debian.org/debian/p7zip/commit/d6fd3b37345489ec2907fcf70aabf0c754f5371f

Things done
  • 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/)
  • Fits CONTRIBUTING.md.

@bhipple
p7zip: fix src URL for debian gitlab move
50a0570 
Another broken URL related to: NixOS#39927

Note that the patch file has legitimately changed, because ~4 months ago Debian
replaced their CVE security fix with a newer version that fixes some additional
bugs: https://salsa.debian.org/debian/p7zip/commit/d6fd3b37345489ec2907fcf70aabf0c754f5371f
@bhipple
Copy link
Contributor Author

bhipple commented Jun 9, 2018

@GrahamcOfBorg build p7zip

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: p7zip

Partial log (click to expand)

shrinking /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/lib/p7zip/7za
gzipping man pages under /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/share/man/
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/lib  /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin
patching script interpreter paths in /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin/7z: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin/7zr: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin/7za: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02...
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: p7zip

Partial log (click to expand)

shrinking /nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02/lib/p7zip/7za
gzipping man pages under /nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02/share/man/
strip is /nix/store/qg2agrqkf240s656d207zqhipl0bc2id-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02/lib  /nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02/bin
patching script interpreter paths in /nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02
/nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02/bin/7z: interpreter directive changed from " /bin/sh" to "/nix/store/9rv2bzx7jz6wjbaxij5qq580qvzksj4i-bash-4.4-p19/bin/sh"
/nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02/bin/7zr: interpreter directive changed from " /bin/sh" to "/nix/store/9rv2bzx7jz6wjbaxij5qq580qvzksj4i-bash-4.4-p19/bin/sh"
/nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02/bin/7za: interpreter directive changed from " /bin/sh" to "/nix/store/9rv2bzx7jz6wjbaxij5qq580qvzksj4i-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02...
/nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: p7zip

Partial log (click to expand)

/nix/store/yn4xz56x77qi5abdyk9x2v54if0rjaw4-p7zip-16.02

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: p7zip

Partial log (click to expand)

shrinking /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/lib/p7zip/Codecs/Rar.so
gzipping man pages under /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/share/man/
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/lib  /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin
patching script interpreter paths in /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin/7za: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin/7zr: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02/bin/7z: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02...
/nix/store/lmrps6in8vkbc55s3cfrgmg5fq3fbmwj-p7zip-16.02

@orivej orivej merged commit e20abf8 into NixOS:master Jun 9, 2018
vcunat pushed a commit that referenced this pull request Jun 10, 2018
@bhipple @vcunat
p7zip: fix src URL for debian gitlab move (#41769)
08d245e 
Another broken URL related to: #39927

Note that the patch file has legitimately changed, because ~4 months ago Debian
replaced their CVE security fix with a newer version that fixes some additional
bugs: https://salsa.debian.org/debian/p7zip/commit/d6fd3b37345489ec2907fcf70aabf0c754f5371f

(cherry picked from commit e20abf8)
bhipple added a commit to bhipple/nixpkgs that referenced this pull request Aug 16, 2018
@bhipple
p7zip: vendor debian patches
0c11968 
A few months ago I moved these patches to the new debian alsa instance [1], but
it looks like their `sha256`s on the tag at the remote have changed again.

It doesn't appear that debian's source remote is stable in the way we need it to
be; let's just vendor the patches to avoid future issues.

[1] NixOS#41769
@bhipple bhipple mentioned this pull request Aug 16, 2018
Merged
9 tasks
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
10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@bhipple @GrahamcOfBorg @orivej