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

Revert msize related commits #147180

Merged
merged 6 commits into from
Nov 24, 2021
Merged

Revert msize related commits #147180

merged 6 commits into from
Nov 24, 2021

Conversation

Artturin
Copy link
Member

@Artturin Artturin commented Nov 23, 2021 •
edited
Loading

This reverts commits .....

Motivation for this change

See https://github.com/NixOS/nixpkgs/pulls?q=msize

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Nov 23, 2021
@Artturin
Copy link
Member Author

Artturin commented Nov 23, 2021 •
edited
Loading

even with these msize commits reverted it gets "stuck" on
time nix build ".#nixosTests.installer.simple"

vm-test-run-installer-simple> machine # copying channel...

might be this bug NixOS/nix#5304

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Nov 23, 2021
@Artturin
Copy link
Member Author

Artturin commented Nov 23, 2021 •
edited
Loading

time nix build ".#nixosTests.installer.simple"

on master
10m 53s

with the revert commits in this pr
10m 56s

git revert --no-commit d1c3a49fdd110aee082467af8e9ae8213613971e 471183f245c3dd85221f5821d570d4fb84c52d5a e2ab6321ed156e0bc9479c118c80db691bff935a ecf388e90b68e1437e124a02a4a7c44f71eaf342

these 2 commits reverted on master
60c5230
03e8e58

5m 48s

git revert --no-commit 03e8e5848be209ddffa968ebe9de4dafb76bbf4e 60c52309689d7a9260035b66e7a7f29f2b92880e

the most time is still spent on vm-test-run-installer-simple> machine # copying channel...

@Artturin Artturin requested review from dasJ, roberth and vcunat November 23, 2021 22:07
@Artturin Artturin merged commit c4851c0 into NixOS:master Nov 24, 2021
@Artturin Artturin deleted the revertmsize1 branch November 24, 2021 00:33
@github-actions github-actions bot mentioned this pull request Nov 24, 2021
Merged
1 task
@github-actions
Copy link
Contributor

Successfully created backport PR #147212 for release-21.11.

@github-actions
Copy link
Contributor

The process '/usr/bin/git' failed with exit code 1

@Artturin Artturin mentioned this pull request Nov 25, 2021
Merged
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dasJ dasJ Awaiting requested review from dasJ

@roberth roberth Awaiting requested review from roberth

@vcunat vcunat Awaiting requested review from vcunat

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Artturin