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

Update shell.nix (fixes Mac) #562

Merged
merged 2 commits into from
Dec 3, 2021
Merged

Conversation

nshalman
Copy link
Member

@nshalman nshalman commented Dec 2, 2021

Description

Update shell.nix

Why is this needed

nix-shell was broken on Mac:

tink $ nix-shell
this derivation will be built:
  /nix/store/4qb68dq0paaqrkiv7c4m1kikkxvk4sk3-nixfmt-0.4.0.drv
building '/nix/store/4qb68dq0paaqrkiv7c4m1kikkxvk4sk3-nixfmt-0.4.0.drv'...
setupCompilerEnvironmentPhase
Build with /nix/store/88242sfskrw2mxv2pr4608nwccpw5q41-ghc-8.8.4.
unpacking sources
unpacking source archive /nix/store/l50bqw5ac3vzm9fmqijkxga7hjcnvd5p-nixfmt-0.4.0.tar.gz
source root is nixfmt-0.4.0
setting SOURCE_DATE_EPOCH to timestamp 1000000000 of file nixfmt-0.4.0/src/Nixfmt/Util.hs
patching sources
Replace Cabal file with edited version from mirror://hackage/nixfmt-0.4.0/revision/1.cabal.
Run jailbreak-cabal to lift version restrictions on build inputs.
compileBuildDriverPhase
setupCompileFlags: -package-db=/private/tmp/nix-build-nixfmt-0.4.0.drv-0/setup-package.conf.d -j12 -threaded -rtsopts
[1 of 1] Compiling Main             ( /nix/store/4mdp8nhyfddh7bllbi7xszz7k9955n79-Setup.hs, /private/tmp/nix-build-nixfmt-0.4.0.drv-0/Main.o )
Linking Setup ...
ld: file not found: /usr/lib/system/libcache.dylib for architecture x86_64
clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
`cc' failed in phase `Linker'. (Exit code: 1)
error: builder for '/nix/store/4qb68dq0paaqrkiv7c4m1kikkxvk4sk3-nixfmt-0.4.0.drv' failed with exit code 1

How Has This Been Tested?

  • CI
  • nix-shell on both Mac and Linux

How are existing users impacted? What migration steps/scripts do we need?

N/A

Checklist:

I have:

  • updated the documentation and/or roadmap (if required)
  • added unit or e2e tests
  • provided instructions on how to upgrade

@codecov
Copy link

codecov bot commented Dec 2, 2021

Codecov Report

Merging #562 (9f73ef7) into main (058a1c9) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #562   +/-   ##
=======================================
  Coverage   34.76%   34.76%           
=======================================
  Files          44       44           
  Lines        3348     3348           
=======================================
  Hits         1164     1164           
  Misses       2085     2085           
  Partials       99       99           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 058a1c9...9f73ef7. Read the comment docs.

@nshalman nshalman self-assigned this Dec 2, 2021
@nshalman nshalman added the kind/bug Categorizes issue or PR as related to a bug. label Dec 2, 2021
@nshalman nshalman marked this pull request as draft December 2, 2021 15:28
@mmlb
Copy link
Contributor

mmlb commented Dec 2, 2021

Can you provide some more detail wrt what was broken please (in the commit message). I wonder if maybe applicable to other repos too.

Also clean up a lint error in .golanci.yml

Signed-off-by: Nahum Shalman <[email protected]>
@nshalman nshalman marked this pull request as ready for review December 2, 2021 20:26
@nshalman nshalman requested a review from mmlb December 2, 2021 20:28
@nshalman
Copy link
Member Author

nshalman commented Dec 3, 2021

Can you provide some more detail wrt what was broken please (in the commit message). I wonder if maybe applicable to other repos too.

Updated in the description.

Copy link
Member

@jacobweinstock jacobweinstock left a comment

Choose a reason for hiding this comment

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

/lgtm

@mmlb mmlb added the ready-to-merge Signal to Mergify to merge the PR. label Dec 3, 2021
@mergify mergify bot merged commit 64200ed into tinkerbell:main Dec 3, 2021
@nshalman nshalman deleted the update-nix branch December 3, 2021 16:24
@displague displague added this to the 0.7.0 milestone Aug 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Categorizes issue or PR as related to a bug. ready-to-merge Signal to Mergify to merge the PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants