Skip to content

Revert "nixos/lib/make-options-doc: generate options.xml from options…#150623

Closed
sternenseemann wants to merge 1 commit intoNixOS:masterfrom
sternenseemann:revert-147265
Closed

Revert "nixos/lib/make-options-doc: generate options.xml from options…#150623
sternenseemann wants to merge 1 commit intoNixOS:masterfrom
sternenseemann:revert-147265

Conversation

@sternenseemann
Copy link
Member

@sternenseemann sternenseemann commented Dec 14, 2021

….json"

This reverts commit 027f7e1.

Reason for revert: ${pkgs.nix}/bin/nix-instantiate --store dummy://
doesn't work if pkgs.nix == pkgs.nix_2_3 which makes it impossible to
build a NixOS system configuration with Nix 2.3 at the moment. Keeping
Nix 2.3 compatibility on master is still important.

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

….json"

This reverts commit 027f7e1.

Reason for revert: `${pkgs.nix}/bin/nix-instantiate --store dummy://`
doesn't work if `pkgs.nix == pkgs.nix_2_3` which makes it impossible to
build a NixOS system configuration with Nix 2.3 at the moment. Keeping
Nix 2.3 compatibility on master is still important.
@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Dec 14, 2021
@sternenseemann
Copy link
Member Author

cc @pennae @infinisil @jtojnar

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Dec 14, 2021
@pennae
Copy link
Contributor

pennae commented Dec 14, 2021

can be fixed without revert: #150631

@infinisil
Copy link
Member

Fixed with @pennae's PR

@infinisil infinisil closed this Dec 14, 2021
@sternenseemann sternenseemann deleted the revert-147265 branch December 14, 2021 11:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants