Skip to content

Comments

utils.bash: revert #93560 for darwin, unblocks channels#97296

Merged
FRidh merged 1 commit intoNixOS:staging-nextfrom
FRidh:utils-bash
Sep 6, 2020
Merged

utils.bash: revert #93560 for darwin, unblocks channels#97296
FRidh merged 1 commit intoNixOS:staging-nextfrom
FRidh:utils-bash

Conversation

@FRidh
Copy link
Member

@FRidh FRidh commented Sep 6, 2020 •
edited
Loading

Temporary fix. We definitely do not want to have two separate
implementations.

Motivation for this change
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
utils.bash: revert NixOS#93560 for darwin, unblocks channels
48264ee 
Temporary fix. We definitely do not want to have two separate
implementations.
@FRidh FRidh requested a review from Ericson2314 as a code owner September 6, 2020 16:01
@FRidh FRidh mentioned this pull request Sep 6, 2020
Merged
10 tasks
@FRidh
Copy link
Member Author

FRidh commented Sep 6, 2020

Alternative is to just revert and do a whole rebuild again.

@FRidh FRidh merged commit 08eb704 into NixOS:staging-next Sep 6, 2020
@FRidh FRidh deleted the utils-bash branch September 6, 2020 16:14
@FRidh
Copy link
Member Author

FRidh commented Sep 6, 2020

Revert of this along with the faulty commit is in staging as e560459. We should not forget to backport that to 20.09.

vcunat referenced this pull request Sep 6, 2020
@sikmir @FRidh
cmake: fix CMAKE_FIND_FRAMEWORK
3106c30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pbogdan pbogdan Awaiting requested review from pbogdan

@twhitehead twhitehead Awaiting requested review from twhitehead

@vcunat vcunat Awaiting requested review from vcunat

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@FRidh