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

fakechroot: 2.19 -> 2.20.1, prefer patch and official source over "fork" #62698

Merged
merged 1 commit into from Jul 13, 2019
Merged

fakechroot: 2.19 -> 2.20.1, prefer patch and official source over "fork" #62698

merged 1 commit into from Jul 13, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 4, 2019

Motivation for this change

The most immediate motivation for the source/patch reworking is to
upgrade the tree without needing to provide an updated version
with the fix and the upgrade as well.

Naturally the patch won't necessarily apply to all future versions,
but that's easy enough to check and happily appears to have no trouble
with this upgrade.

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 nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@dtzWill
fakechroot: 2.19 -> 2.20.1, prefer patch and official source over "fork"
95f13ee 
The most immediate motivation for the source/patch reworking is to
upgrade the tree without needing to provide an updated version
with the fix and the upgrade as well.

Naturally the patch won't necessarily apply to all future versions,
but that's easy enough to check and happily appears to have no trouble
with this upgrade.
@ofborg ofborg bot requested a review from offlinehacker June 4, 2019 23:28
@gloaming
Copy link
Contributor 

$ nix-review pr 62698
$ git fetch --force https://github.com/NixOS/nixpkgs master:refs/nix-review/0 pull/62698/head:refs/nix-review/1
$ git worktree add /home/craig/.cache/nix-review/pr-62698-1/nixpkgs 95395fbf549908e8fe59922653e9dadd4da4792e
Preparing worktree (detached HEAD 95395fbf549)
HEAD is now at 95395fbf549 saml2aws: 2.10.0 -> 2.15.0
$ git merge --no-commit 95f13ee4ea58025dad92fa29e8254ea345de344a
Automatic merge went well; stopped before committing as requested
$ nix build --no-link --keep-going --max-jobs 16 --option build-use-sandbox true -f /home/craig/.cache/nix-review/pr-62698-1/build.nix
https://github.com/NixOS/nixpkgs/pull/62698
2 package were build:
fakechroot udocker

$ nix-shell /home/craig/.cache/nix-review/pr-62698-1/shell.nix
$ results/fakechroot/bin/fakechroot
$ chroot /nix /store/gdp9kr2jy4ghk2p8qmddfv6flbg34mkl-coreutils-8.31/bin/echo test
test

I didn't test udocker.

/nix/store/w0l4plmm57cvi8b1lm6zqdbg38hkflxf-udocker-1.1.3         291273944
/nix/store/lvs27xcjqccg7fnpvx7ksjzy8k85pjck-udocker-1.1.3         291273944

/nix/store/kssz602djl2xyjvyzaa3r9k9cxy87yal-fakechroot-2.19        86045328
/nix/store/rc0svilp3lnrpnl2fmizf53i16w05gpf-fakechroot-2.20.1      88761136

LGTM
@offlinehacker

@offlinehacker offlinehacker merged commit 1ad6989 into NixOS:master Jul 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@offlinehacker offlinehacker offlinehacker approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@dtzWill @gloaming @offlinehacker