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

darwin.trash: f68ad25a -> 0.9.1 #43361

Merged
merged 1 commit into from Jul 11, 2018
Merged

darwin.trash: f68ad25a -> 0.9.1 #43361

merged 1 commit into from Jul 11, 2018

Conversation

jbaum98
Copy link
Contributor

@jbaum98 jbaum98 commented Jul 11, 2018

Motivation for this change

Update darwin.trash to 0.9.1.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Jul 11, 2018
matthewbauer
matthewbauer approved these changes Jul 11, 2018
View reviewed changes
Copy link
Member

@matthewbauer matthewbauer left a comment

Choose a reason for hiding this comment

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

Looks okay!

One thing I would be interested in is why that ./trash.diff is needed? It seems to disable i686 builds. IIRC we should support that in Nixpkgs (although it doesn't really make sense in Nix).

@jbaum98
Copy link
Contributor Author

jbaum98 commented Jul 11, 2018

I don't quite understand why, but without that the linker fails:

ld: warning: ignoring file /nix/store/q819d3vjz7vswpvkrfa9gck3ys8rmvcj-Libsystem-osx-10.11.6/lib/crt1.10.6.o, file was built for x86_64 which is not the architecture being linked (i386): /nix/store/q819d3vjz7vswpvkrfa9gck3ys8rmvcj-Libsystem-osx-10.11.6/lib/crt1.10.6.o
ld: warning: ignoring file /nix/store/q819d3vjz7vswpvkrfa9gck3ys8rmvcj-Libsystem-osx-10.11.6/lib/libSystem.dylib, file was built for x86_64 which is not the architecture being linked (i386): /nix/store/q819d3vjz7vswpvkrfa9gck3ys8rmvcj-Libsystem-osx-10.11.6/lib/libSystem.dylib
ld: warning: ignoring file /nix/store/ckq71kkymh1ji2b44xn80wmr7fmi6wr5-clang-wrapper-5.0.2/resource-root/lib/darwin/libclang_rt.osx.a, missing required architecture i386 in file /nix/store/ckq71kkymh1ji2b44xn80wmr7fmi6wr5-clang-wrapper-5.0.2/resource-root/lib/darwin/libclang_rt.osx.a (2 slices)
Undefined symbols for architecture i386:
  "___stack_chk_fail", referenced from:
      _main in trash-153700.o
      _listTrashContents in trash-153700.o
      _VerbosePrintf in trash-153700.o
      _promptForChar in trash-153700.o
      _Printf in HGCLIUtils-a2b4cf.o
      _PrintfErr in HGCLIUtils-a2b4cf.o
      _sizeOfDirectoryFSRef in fileSize-14a841.o
      ...
  "___stack_chk_guard", referenced from:
      _main in trash-153700.o
      _listTrashContents in trash-153700.o
      _VerbosePrintf in trash-153700.o
      _promptForChar in trash-153700.o
      _Printf in HGCLIUtils-a2b4cf.o
      _PrintfErr in HGCLIUtils-a2b4cf.o
      _sizeOfDirectoryFSRef in fileSize-14a841.o
      ...
      _main in trash-153700.o
      _listTrashContents in trash-153700.o
      _VerbosePrintf in trash-153700.o
      _promptForChar in trash-153700.o
      _Printf in HGCLIUtils-a2b4cf.o
      _PrintfErr in HGCLIUtils-a2b4cf.o
      _sizeOfDirectoryFSRef in fileSize-14a841.o
      ...
      _main in trash-153700.o
      _listTrashContents in trash-153700.o
      _VerbosePrintf in trash-153700.o
      _promptForChar in trash-153700.o
      _Printf in HGCLIUtils-a2b4cf.o
      _PrintfErr in HGCLIUtils-a2b4cf.o
      _sizeOfDirectoryFSRef in fileSize-14a841.o
      ...
  "___stdinp", referenced from:
      _promptForChar in trash-153700.o
  "___tolower", referenced from:
      _promptForChar in trash-153700.o
  "_basename", referenced from:
      _main in trash-153700.o
  "_exit", referenced from:
      _main in trash-153700.o
  "_free", referenced from:
      _promptForChar in trash-153700.o
  "_getcwd", referenced from:
      _main in trash-153700.o
  "_getline", referenced from:
      _promptForChar in trash-153700.o
  "_getopt$UNIX2003", referenced from:
      _main in trash-153700.o
  "_getuid", referenced from:
      _main in trash-153700.o
  "_memcpy", referenced from:
      _main in trash-153700.o
      _sizeOfFolder in fileSize-14a841.o
  "_optind", referenced from:
      _main in trash-153700.o
  "_printf", referenced from:
      _promptForChar in trash-153700.o
  "_putchar", referenced from:
      _promptForChar in trash-153700.o
  "_strchr", referenced from:
      _promptForChar in trash-153700.o
  "_strlen", referenced from:
      _promptForChar in trash-153700.o
  "start", referenced from:
     implicit entry/start for main executable
ld: symbol(s) not found for architecture i386
clang-5.0: error: linker command failed with exit code 1 (use -v to see invocation)

@matthewbauer
Copy link
Member

Oh yes - forgot that we only use the x86_64 version of Libsystem.

@xeji
Copy link
Contributor

xeji commented Jul 11, 2018

@GrahamcOfBorg build darwin.trash

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: darwin.trash

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: darwin.trash

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: darwin.trash

Partial log (click to expand)


---- Generating manpage from POD file:
======================================
pod2man --section=1 --center="trash" --date="2018-07-11" trash.pod > trash.1
installing
post-installation fixup
gzipping man pages under /nix/store/0r03n3k552rimvdy19wpk8br6mxfwn3n-trash-0.9.1/share/man/
strip is /nix/store/7ddbq63v97nk8gkbf7gcsfmby37h6gbl-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/0r03n3k552rimvdy19wpk8br6mxfwn3n-trash-0.9.1/bin
patching script interpreter paths in /nix/store/0r03n3k552rimvdy19wpk8br6mxfwn3n-trash-0.9.1

@xeji xeji merged commit 1dd67f1 into NixOS:master Jul 11, 2018
@jbaum98 jbaum98 deleted the trash-0.9.1 branch July 11, 2018 19:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthewbauer matthewbauer matthewbauer approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jbaum98 @matthewbauer @xeji @GrahamcOfBorg