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

Backport revert of utils.bash #97574

Merged
merged 2 commits into from Sep 12, 2020
Merged

Backport revert of utils.bash #97574

merged 2 commits into from Sep 12, 2020

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Sep 9, 2020 •
edited

Motivation for this change

A change was made to utils.bash that caused trouble. To avoid rebuilding x84_64-linux, a copy of the old version of the file was introduced for darwin to unblock. Afterwards, this hack along with the faulty commit was reverted. Now, we revert that on 20.09 as well.

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.

@FRidh
Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper"
21adab4 
Follow up to the revert in e560459.

This reverts commit 1936b11.

(cherry picked from commit 5ceea57)
@FRidh
Revert "utils.bash: revert NixOS#93560 for darwin, unblocks channels"
3410f04 
Revert the hack and the original faulty commit.

This reverts commit 48264ee.

Revert "Purity checking should accept $TMP and not just /tmp"

This reverts commit fb777be.

(cherry picked from commit e560459)
@FRidh FRidh added this to the 20.09 milestone Sep 9, 2020
@FRidh FRidh added this to To Do in 20.09 Blockers via automation Sep 9, 2020
@FRidh FRidh merged commit 1ff85d4 into NixOS:staging-20.09 Sep 12, 2020
20.09 Blockers automation moved this from To Do to Done Sep 12, 2020
@worldofpeace worldofpeace added this to In progress in 20.09 Blockers via automation Oct 5, 2020
@worldofpeace worldofpeace removed this from Done in 20.09 Blockers Oct 5, 2020
@worldofpeace worldofpeace moved this from In progress to Done in 20.09 Blockers Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zaninime zaninime zaninime approved these changes

@worldofpeace worldofpeace worldofpeace approved these changes

@twhitehead twhitehead Awaiting requested review from twhitehead

@vcunat vcunat Awaiting requested review from vcunat

@jonringer jonringer Awaiting requested review from jonringer

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 is a code owner

@davidtwco davidtwco Awaiting requested review from davidtwco

@Lucus16 Lucus16 Awaiting requested review from Lucus16

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@Synthetica9 Synthetica9 Awaiting requested review from Synthetica9

@peti peti Awaiting requested review from peti

@veprbl veprbl Awaiting requested review from veprbl

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv
Projects
No open projects
20.09 Blockers
  
Done
Milestone
20.09
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@FRidh @zaninime @worldofpeace