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

pam: Remove crossAttrs #40538

Merged
merged 1 commit into from May 15, 2018
Merged

pam: Remove crossAttrs #40538

merged 1 commit into from May 15, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

Backport of #40537. I like to backport trivial cross fixes.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Ericson2314
pam: Remove crossAttrs
29b62e0 
It turns out none of this stuff is needed. The docs aren't evenly built
properly anyways so the build trivially succeeds either way, due to what
looks like upstream misunderstanding automake. If I try to build the
docs manually in a cross shell (before and after this change), there's a
make rule error such that some HTML files aren't even attempted to be
built and then a copy fails.

Even if this was all fixed, these been a good number of cross fixes
upstream getting them to use CC_FOR_BUILD and other good stuff, so I
doubt such hacks would be needed.

Progress towards NixOS#40531 and NixOS#33302.
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

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

Partial log (click to expand)


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 aarch64-linux (full log)

Attempted: pam

Partial log (click to expand)

/nix/store/n209i777l6bwl052q1fsl7d8k62gkx2q-linux-pam-1.3.0

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: pam

Partial log (click to expand)

/nix/store/367ldm9q7cwc82698kdq438n53fbpz4c-linux-pam-1.3.0

@Ericson2314 Ericson2314 merged commit f952058 into NixOS:release-18.03 May 15, 2018
@Ericson2314 Ericson2314 deleted the linux-pam-cross branch May 15, 2018 02:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Ericson2314 @GrahamcOfBorg