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

intltool-debian-patch - fix "error: cannot download perl-5.22.patch f… #41611

Merged
merged 1 commit into from Jun 7, 2018
Merged

intltool-debian-patch - fix "error: cannot download perl-5.22.patch f… #41611

merged 1 commit into from Jun 7, 2018

Conversation

ookhoi
Copy link
Contributor

@ookhoi ookhoi commented Jun 7, 2018

…rom any mirror"

Motivation for this change

following nixos-unstable-small: error: cannot download perl-5.22.patch from any mirror

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.

@ookhoi
Copy link
Contributor Author

ookhoi commented Jun 7, 2018

patch source: https://sources.debian.org/patches/intltool/

@matthewbauer
Copy link
Member

@GrahamcOfBorg build intltool

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: intltool

Partial log (click to expand)

make[1]: Leaving directory '/build/intltool-0.51.0'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/4mhwss6g0sgcvqqi61dcglb37kh68l18-intltool-0.51.0
gzipping man pages under /nix/store/4mhwss6g0sgcvqqi61dcglb37kh68l18-intltool-0.51.0/share/man/
strip is /nix/store/qg2agrqkf240s656d207zqhipl0bc2id-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/4mhwss6g0sgcvqqi61dcglb37kh68l18-intltool-0.51.0/bin
patching script interpreter paths in /nix/store/4mhwss6g0sgcvqqi61dcglb37kh68l18-intltool-0.51.0
/nix/store/4mhwss6g0sgcvqqi61dcglb37kh68l18-intltool-0.51.0/bin/intltoolize: interpreter directive changed from " /bin/sh" to "/nix/store/9rv2bzx7jz6wjbaxij5qq580qvzksj4i-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/4mhwss6g0sgcvqqi61dcglb37kh68l18-intltool-0.51.0...
/nix/store/4mhwss6g0sgcvqqi61dcglb37kh68l18-intltool-0.51.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: intltool

Partial log (click to expand)

make[1]: Leaving directory '/build/intltool-0.51.0'
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/x4rsvw93lf3gisp4jwfsjjjhi7kjvq2c-intltool-0.51.0
gzipping man pages under /nix/store/x4rsvw93lf3gisp4jwfsjjjhi7kjvq2c-intltool-0.51.0/share/man/
strip is /nix/store/21ymadblbmsbb2bk4q7gl4kjasp8zmgd-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/x4rsvw93lf3gisp4jwfsjjjhi7kjvq2c-intltool-0.51.0/bin
patching script interpreter paths in /nix/store/x4rsvw93lf3gisp4jwfsjjjhi7kjvq2c-intltool-0.51.0
/nix/store/x4rsvw93lf3gisp4jwfsjjjhi7kjvq2c-intltool-0.51.0/bin/intltoolize: interpreter directive changed from " /bin/sh" to "/nix/store/qckzjk3406va7h6s40cy9s75z2w715rq-bash-4.4-p19/bin/sh"
checking for references to /build in /nix/store/x4rsvw93lf3gisp4jwfsjjjhi7kjvq2c-intltool-0.51.0...
/nix/store/x4rsvw93lf3gisp4jwfsjjjhi7kjvq2c-intltool-0.51.0

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: intltool

Partial log (click to expand)

 /nix/store/yrlzm8nkyzs5bwy7dhb1vhfzx936p6zn-coreutils-8.29/bin/install -c -m 644 Makefile.in.in '/nix/store/0hcxyqx9knn5hhz4j3603h8cgdbxhfcn-intltool-0.51.0/share/intltool'
make[2]: Leaving directory '/private/tmp/nix-build-intltool-0.51.0.drv-0/intltool-0.51.0'
make[1]: Leaving directory '/private/tmp/nix-build-intltool-0.51.0.drv-0/intltool-0.51.0'
post-installation fixup
gzipping man pages under /nix/store/0hcxyqx9knn5hhz4j3603h8cgdbxhfcn-intltool-0.51.0/share/man/
strip is /nix/store/yyak5sjv68n9vdgnkd2cb5djk1l9sqj5-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/0hcxyqx9knn5hhz4j3603h8cgdbxhfcn-intltool-0.51.0/bin
patching script interpreter paths in /nix/store/0hcxyqx9knn5hhz4j3603h8cgdbxhfcn-intltool-0.51.0
/nix/store/0hcxyqx9knn5hhz4j3603h8cgdbxhfcn-intltool-0.51.0/bin/intltoolize: interpreter directive changed from " /bin/sh" to "/nix/store/9gghkkqhn6v7dvpf2319qvrxkkw03vwr-bash-4.4-p19/bin/sh"
/nix/store/0hcxyqx9knn5hhz4j3603h8cgdbxhfcn-intltool-0.51.0

@matthewbauer matthewbauer merged commit eceff79 into NixOS:master Jun 7, 2018
@ookhoi ookhoi deleted the intltool-debian-patch branch June 7, 2018 14:22
@xeji
Copy link
Contributor

xeji commented Jun 9, 2018

sources.debian.org is not under version control and should not be used with fetchpatch since debian removes these files eventually.

The original patch and the new version introduced here can both be found in the new Debian GitLab repo :
https://salsa.debian.org/gnome-team/intltool/commit/c71cd13604433d2f1dbac73de01268ab95f8b89e
and https://salsa.debian.org/gnome-team/intltool/commit/261b1e3026bf4e7782ef887bcdb54b6016beb955

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants