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

toybox: 0.8.3 -> 0.8.4 #104037

Merged
merged 1 commit into from Dec 1, 2020
Merged

toybox: 0.8.3 -> 0.8.4 #104037

merged 1 commit into from Dec 1, 2020

Conversation

kampka
Copy link
Contributor

@kampka kampka commented Nov 17, 2020

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.

@kampka
Copy link
Contributor Author

kampka commented Nov 17, 2020

@ofborg build toybox

@ofborg ofborg bot requested a review from hhm0 November 17, 2020 09:51
@SuperSandro2000
Copy link
Member

Fails to build on darwin with:

building
build flags: SHELL=/nix/store/k89nm2jva0qmvd970f84wq2iq1iwm9bs-bash-4.4-p23/bin/bash PREFIX=\$\(out\)/bin
scripts/make.sh
Generate headers from toys/*/*.c...
generated/newtoys.h Library probe...........
Make generated/config.h from .config.
generated/flags.h generated/globals.h generated/tags.h generated/help.h
Compile toybox...............lib/portability.c:474:10: warning: unused variable 'offset' [-Wunused-variable]
  int i, offset;
         ^
1 warning generated.
.............................................toys/posix/cp.c:329:30: error: implicit declaration of function 'utimensat' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
      if (fdout == AT_FDCWD) utimensat(cfd, catch, times, AT_SYMLINK_NOFOLLOW);
                             ^
toys/posix/cp.c:329:30: note: did you mean 'utimes'?
/nix/store/i09q4si3r6ad3iblrdjxfmvl8bks6amg-Libsystem-osx-10.12.6/include/sys/time.h:202:5: note: 'utimes' declared here
int     utimes(const char *, const struct timeval *);
        ^
toys/posix/cp.c:330:12: error: implicit declaration of function 'futimens' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
      else futimens(fdout, times);
           ^
toys/posix/cp.c:330:12: note: did you mean 'futimes'?
/nix/store/i09q4si3r6ad3iblrdjxfmvl8bks6amg-Libsystem-osx-10.12.6/include/sys/time.h:190:5: note: 'futimes' declared here
int     futimes(int, const struct timeval *);
        ^
2 errors generated.
toys/posix/cpio.c:215:15: error: implicit declaration of function 'utimensat' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
        err = utimensat(AT_FDCWD, name, times, AT_SYMLINK_NOFOLLOW);
              ^
toys/posix/cpio.c:215:15: note: did you mean 'utimes'?
/nix/store/i09q4si3r6ad3iblrdjxfmvl8bks6amg-Libsystem-osx-10.12.6/include/sys/time.h:202:5: note: 'utimes' declared here
int     utimes(const char *, const struct timeval *);
        ^
1 error generated.
..make: *** [Makefile:17: toybox] Error 1

@kampka
Copy link
Contributor Author

kampka commented Nov 23, 2020

@SuperSandro2000 sorry, I cannot debug Darwin issues, but looking at the toybox code, the errors in question have been present in the codebase for up to six years now.

Maybe someone from @NixOS/darwin-maintainers can take a look at this?

@r-burns
Copy link
Contributor

r-burns commented Nov 23, 2020

futimes/utimensat require the 10.13 SDK. Should probably not block this update since the SDK update is long pending and this has been broken for a while :/ #101229

@SuperSandro2000
Copy link
Member

futimes/utimensat require the 10.13 SDK. Should probably not block this update since the SDK update is long pending and this has been broken for a while :/ #101229

I should start to work on that again.

@kampka
Copy link
Contributor Author

kampka commented Nov 24, 2020

@SuperSandro2000 @r-burns so, any of you guys feel like approving this? :)
It looks like @hhm0 has not been active in the Nix* community for some time now ...

r-burns
r-burns approved these changes Nov 24, 2020
View reviewed changes
Copy link
Contributor

@r-burns r-burns left a comment

Choose a reason for hiding this comment

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

Just stopped by to give my 2¢ but I suppose I can give a review too :)

Result of nixpkgs-review pr 104037 1 on x86_64 (non-NixOS) linux

1 package built:
  • toybox

Basic toys (echo, cat, printf, sleep, arch, ps) pass sanity checks

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Nov 26, 2020 •
edited

@SuperSandro2000 sorry, I cannot debug Darwin issues, but looking at the toybox code, the errors in question have been present in the codebase for up to six years now.

Maybe someone from @NixOS/darwin-maintainers can take a look at this?

Can you please mark it as broken on darwin? Then I merge it.

broken = stdenv.isDarwin;

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 104037 run on x86_64-linux 1

1 package built:
  • toybox

@kampka
Copy link
Contributor Author

kampka commented Nov 26, 2020

Can you please mark it as broken on darwin? Then I merge it.

broken = stdenv.isDarwin;

done

@kampka
Copy link
Contributor Author

kampka commented Nov 30, 2020

@SuperSandro2000

Can you please mark it as broken on darwin? Then I merge it.

How about it? :)

@SuperSandro2000 SuperSandro2000 merged commit 040f43d into NixOS:master Dec 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@r-burns r-burns r-burns approved these changes

@hhm0 hhm0 Awaiting requested review from hhm0

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 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
3 participants
@kampka @SuperSandro2000 @r-burns