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: fixes #36581

Merged
merged 2 commits into from Mar 9, 2018
Merged

darwin: fixes #36581

merged 2 commits into from Mar 9, 2018

Conversation

matthewbauer
Copy link
Member

Motivation for this change

ZHF fixes

/cc @LnL7

see issue #36454

@GrahamcOfBorg GrahamcOfBorg added the 6.topic: darwin Running or building packages on Darwin label Mar 8, 2018
LnL7
LnL7 approved these changes Mar 8, 2018
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -12273,7 +12273,9 @@ with pkgs;
knot-dns = callPackage ../servers/dns/knot-dns { };
knot-resolver = callPackage ../servers/dns/knot-resolver {
# TODO: vimNox after it gets fixed on Darwin or something lighter
hexdump = if stdenv.isLinux then utillinux.bin else vim/*xxd*/;
hexdump = if stdenv.isLinux then utillinux.bin
Copy link
Member

Choose a reason for hiding this comment

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

perhaps we should make this an actual top-level alias?

Copy link
Member Author

Choose a reason for hiding this comment

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

👍 for this. I believe it would work fine to just move this to top-level.

Oddly enough "vim" doesn't actually provide hexdump anymore (did it ever?). We do have an "xxd" derivation as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

I think some of the bitcoin derivations also need hexdump

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, maybe this build falls back to xxd or something.

pkgs/os-specific/darwin/apple-source-releases/shell_cmds/default.nix
substituteInPlace shell_cmds.xcodeproj/project.pbxproj \
--replace "FCBA168714A146D000AA698B /* PBXTargetDependency */," "" \
--replace "FCBA165914A146D000AA698B /* PBXTargetDependency */," "" \
--replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," ""
--replace "FCBA169514A146D000AA698B /* PBXTargetDependency */," "" \
--replace "FCBA165514A146D000AA698B /* PBXTargetDependency */," ""
Copy link
Member

Choose a reason for hiding this comment

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

Nice! Could you also take a look at network_cmds?

LnL7
LnL7 reviewed Mar 8, 2018
View reviewed changes
pkgs/applications/misc/apvlv/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
'';

license = licenses.lgpl2;
platforms = platforms.unix;
platforms = platforms.linux;
Copy link
Member

Choose a reason for hiding this comment

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

hexdump wasn't enough to get this working?

Copy link
Member Author

Choose a reason for hiding this comment

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

Nope, it breaks on "gdk/gdkx.h" file not found. Looks like it's since been fixed but no release has come out: naihe2010/apvlv@6848252

Copy link
Member

Choose a reason for hiding this comment

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

hmm, maybe I'm confusing it with another package then. 😄

@matthewbauer matthewbauer changed the title darwin: disable broken packages darwin: fixes Mar 9, 2018
@matthewbauer
Copy link
Member Author

Fixed network_cmds. Should be ready to merge.

@LnL7
Copy link
Member

LnL7 commented Mar 9, 2018

@GrahamcOfBorg build darwin.shell_cmds darwin.network_cmds

@GrahamcOfBorg
Copy link

Failure on x86_64-linux (full log)

Partial log (click to expand)

Package ‘shell_cmds-osx-10.11.6’ in /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/builder-1-gustav.ewr1.nix.ci/pkgs/os-specific/darwin/apple-source-releases/default.nix:147 is not supported on ‘x86_64-linux’, refusing to evaluate.

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

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

@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Partial log (click to expand)

Package ‘shell_cmds-osx-10.11.6’ in /var/lib/gc-of-borg/nix-test-rs-12/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-aarch64-community-12/pkgs/os-specific/darwin/apple-source-releases/default.nix:147 is not supported on ‘aarch64-linux’, refusing to evaluate.

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

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

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Partial log (click to expand)


** BUILD SUCCEEDED **
installing
post-installation fixup
gzipping man pages under /nix/store/44ki16ccfv4bkrkn1m6gmymjq3zaai35-network_cmds-osx-10.11.6/share/man/
strip is /nix/store/4sdh09gmvl15cy0zb6i7mbvxh5syz206-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/44ki16ccfv4bkrkn1m6gmymjq3zaai35-network_cmds-osx-10.11.6/bin
patching script interpreter paths in /nix/store/44ki16ccfv4bkrkn1m6gmymjq3zaai35-network_cmds-osx-10.11.6
/nix/store/dlg66nl4rhnw9i5rlfz2v344sqcscjgr-shell_cmds-osx-10.11.6
/nix/store/44ki16ccfv4bkrkn1m6gmymjq3zaai35-network_cmds-osx-10.11.6

@LnL7 LnL7 merged commit 43be4eb into NixOS:master Mar 9, 2018
@jfrankenau jfrankenau mentioned this pull request Mar 12, 2018
Merged
8 tasks
@matthewbauer matthewbauer deleted the darwin-fixes branch February 22, 2019 04:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@LnL7 LnL7 LnL7 approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 8.has: clean-up 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
3 participants
@matthewbauer @LnL7 @GrahamcOfBorg