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

meshlab: 2020.03 -> 2020.07 #94579

Merged
merged 1 commit into from Sep 4, 2020
Merged

meshlab: 2020.03 -> 2020.07 #94579

merged 1 commit into from Sep 4, 2020

Conversation

tfmoraes
Copy link
Contributor

@tfmoraes tfmoraes commented Aug 2, 2020 •
edited

Motivation for this change

Update to the last version.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from viric August 2, 2020 23:38
@tfmoraes
Copy link
Contributor Author

tfmoraes commented Aug 2, 2020

Result of nixpkgs-review pr 94579 1

1 package built:
- meshlab

@tfmoraes
Copy link
Contributor Author

tfmoraes commented Sep 3, 2020 

❯ nix-shell -p nixpkgs-review --run "nixpkgs-review pr 94579"                                                                                        
these paths will be fetched (0.08 MiB download, 0.40 MiB unpacked):
  /nix/store/f2psh8ldz2a1svicp2a1l20x38ik1qj2-nixpkgs-review-2.3.1
  /nix/store/y8fkm1p4s3al9p29kxargz30h1hkjlwj-bash-interactive-4.4-p23-dev
copying path '/nix/store/y8fkm1p4s3al9p29kxargz30h1hkjlwj-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...
copying path '/nix/store/f2psh8ldz2a1svicp2a1l20x38ik1qj2-nixpkgs-review-2.3.1' from 'https://cache.nixos.org'...
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/94579/head:refs/nixpkgs-review/1
remote: Enumerating objects: 1435, done.
remote: Counting objects: 100% (1435/1435), done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 2581 (delta 1428), reused 1426 (delta 1426), pack-reused 1146
Receiving objects: 100% (2581/2581), 1.22 MiB | 1.47 MiB/s, done.
Resolving deltas: 100% (1879/1879), completed with 726 local objects.
From https://github.com/NixOS/nixpkgs
   f2e3b797500..8272eff97ae  master               -> refs/nixpkgs-review/0
 + 9a94a78c778...8f8f6f2a464 refs/pull/94579/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /home/thiago/.cache/nixpkgs-review/pr-94579-4/nixpkgs 8272eff97ae2a874800ba7bbe730e0924cbaca1c
Preparing worktree (detached HEAD 8272eff97ae)
HEAD is now at 8272eff97ae Merge pull request #96269 from deviant/remove-quilt-series
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-94579-4/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 8f8f6f2a4641cdcc710887aaf66928ae70b8396c
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-94579-4/nixpkgs -qaP --xml --out-path --show-trace --meta
1 package updated:
meshlab (2020.03 → 2020.07)

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/thiago/.cache/nixpkgs-review/pr-94579-4/build.nix
[2 built, 278 copied (1293.0 MiB), 293.2 MiB DL]
https://github.com/NixOS/nixpkgs/pull/94579
1 package built:
meshlab

$ nix-shell /home/thiago/.cache/nixpkgs-review/pr-94579-4/shell.nix
these paths will be fetched (0.51 MiB download, 2.47 MiB unpacked):
  /nix/store/469ka5i7apwb6bndlmvvjvdqp7pwxvrs-bash-interactive-4.4-p23-dev
  /nix/store/730pf29v2hvr5r3sh5xqrg5md8xn8ixr-bash-interactive-4.4-p23-info
  /nix/store/lg9km6zld8k4lv43sj1hczk430q4x6j7-bash-interactive-4.4-p23-doc
  /nix/store/x6krp9hzsqgfwdic4i5ywxziwadsghlf-bash-interactive-4.4-p23-man
copying path '/nix/store/lg9km6zld8k4lv43sj1hczk430q4x6j7-bash-interactive-4.4-p23-doc' from 'https://cache.nixos.org'...
copying path '/nix/store/730pf29v2hvr5r3sh5xqrg5md8xn8ixr-bash-interactive-4.4-p23-info' from 'https://cache.nixos.org'...
copying path '/nix/store/x6krp9hzsqgfwdic4i5ywxziwadsghlf-bash-interactive-4.4-p23-man' from 'https://cache.nixos.org'...
copying path '/nix/store/469ka5i7apwb6bndlmvvjvdqp7pwxvrs-bash-interactive-4.4-p23-dev' from 'https://cache.nixos.org'...

@risicle
Copy link
Contributor

risicle commented Sep 3, 2020

Are you not able to source this patch from somewhere on the web with fetchpatch? These days we try our utmost to keep patches out of the nixpkgs tree.

@tfmoraes
Copy link
Contributor Author

tfmoraes commented Sep 3, 2020

Are you not able to source this patch from somewhere on the web with fetchpatch? These days we try our utmost to keep patches out of the nixpkgs tree.

Done!

risicle
risicle approved these changes Sep 4, 2020
View reviewed changes
Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the git tag, WFM

@risicle risicle merged commit 712f366 into NixOS:master Sep 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@risicle risicle risicle approved these changes

@viric viric Awaiting requested review from viric

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
2 participants
@tfmoraes @risicle