Skip to content

Revert "nixos: doc: implement related packages in the manual"#33006

Merged
grahamc merged 1 commit intomasterfrom
revert-32424-nixos/related-packages
Dec 23, 2017
Merged

Revert "nixos: doc: implement related packages in the manual"#33006
grahamc merged 1 commit intomasterfrom
revert-32424-nixos/related-packages

Conversation

@grahamc
Copy link
Member

@grahamc grahamc commented Dec 23, 2017

Reverts #32424

I'm not sure why exactly, but this is causing problems after merging that ofborg didn't catch prior to merging:

$ HOME=/homeless-shelter NIX_PATH=nixpkgs=$(pwd) nix-instantiate ./nixos/release.nix -A manual --option restrict-eval true --option build-timeout 1800 --argstr system x86_64-linux --show-trace
...
Package ‘xen-4.5.5’ in /home/grahamc/projects/nixpkgs/pkgs/applications/virtualization/xen/generic.nix:226 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.

@oxij I like the work and didn't want to revert it, but it wasn't clear to me how to fix it. Can you try again?

@grahamc grahamc requested review from edolstra and nbp as code owners December 23, 2017 12:20
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 23, 2017
@grahamc grahamc merged commit 02a8c43 into master Dec 23, 2017
@grahamc grahamc deleted the revert-32424-nixos/related-packages branch December 23, 2017 12:35
@oxij
Copy link
Member

oxij commented Dec 23, 2017 via email

@grahamc
Copy link
Member Author

grahamc commented Dec 23, 2017

It did help, maybe merge master in to your branch and try again?

@oxij
Copy link
Member

oxij commented Dec 23, 2017 via email

@oxij
Copy link
Member

oxij commented Dec 23, 2017 via email

@grahamc
Copy link
Member Author

grahamc commented Dec 23, 2017

The issue as I understand it is the manual must build for all supported systems in the release.nix:

, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]

the manual is built from a config:

manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);

and buildFromConfig builds it for every supportedSystem:

buildFromConfig = module: sel: forAllSystems (system: hydraJob (sel (import ./lib/eval-config.nix {

where forAllSystems iterates over each supportedSystem.

Perhaps one way to handle this in the doc generation code is to handle an unsupported system and skip the package, but I don't know the best way. Out of my league too. Maybe @vcunat could provide some guidance on this.

@oxij
Copy link
Member

oxij commented Dec 23, 2017 via email

@oxij
Copy link
Member

oxij commented Dec 25, 2017 via email

@oxij
Copy link
Member

oxij commented Dec 25, 2017 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants