Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f3b8060

Browse files
committedApr 20, 2020
Decouple build nixpkgs from released nixpkgs
The eager update to use 20.03 to *build* the flake accidentally made the site use the 20.03 manual. This change allows us to move forward the infrastructure of the site in preparation for a release, without actually using that version's manual. Additionally, it's not much of an issue, the list of AMIs could have been using the wrong list (of an unreleased branch), though as it requires manual involvement of the team it wouldn't have been an issue. Fixes #400.
1 parent 4e1f211 commit f3b8060

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed
 

‎flake.lock

+19-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

+10-6
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@
33

44
description = "The nixos.org homepage";
55

6+
# This is used to build the site.
67
inputs.nixpkgs.url = "nixpkgs/nixos-20.03";
8+
9+
# These are used for the manuals, and release artifacts
10+
inputs.released-nixpkgs.url = "nixpkgs/release-19.09";
711
inputs.nix-pills = { url = "github:NixOS/nix-pills"; flake = false; };
812

9-
outputs = { self, nixpkgs, nix-pills }:
13+
outputs = { self, nixpkgs, released-nixpkgs, nix-pills }:
1014
with import nixpkgs { system = "x86_64-linux"; };
1115
rec {
1216

@@ -18,7 +22,7 @@
1822

1923
nixosAmis = writeText "ec2-amis.json"
2024
(builtins.toJSON (
21-
import (nixpkgs + "/nixos/modules/virtualisation/ec2-amis.nix")));
25+
import (released-nixpkgs + "/nixos/modules/virtualisation/ec2-amis.nix")));
2226

2327
nixPills = import nix-pills {
2428
inherit pkgs;
@@ -58,8 +62,8 @@
5862

5963
makeFlags =
6064
[ "NIX_MANUAL_IN=${nix.doc}/share/doc/nix/manual"
61-
"NIXOS_MANUAL_IN=${nixpkgs.htmlDocs.nixosManual}"
62-
"NIXPKGS_MANUAL_IN=${nixpkgs.htmlDocs.nixpkgsManual}"
65+
"NIXOS_MANUAL_IN=${released-nixpkgs.htmlDocs.nixosManual}"
66+
"NIXPKGS_MANUAL_IN=${released-nixpkgs.htmlDocs.nixpkgsManual}"
6367
"NIXOS_AMIS=${packages.x86_64-linux.nixosAmis}"
6468
"PACKAGES_EXPLORER=${packages.x86_64-linux.packagesExplorer}/bundle.js"
6569
"NIX_PILLS_MANUAL_IN=${packages.x86_64-linux.nixPills}/share/doc/nix-pills"
@@ -72,8 +76,8 @@
7276

7377
shellHook = ''
7478
export NIX_MANUAL_IN="${nix.doc}/share/doc/nix/manual"
75-
export NIXOS_MANUAL_IN="${nixpkgs.htmlDocs.nixosManual}"
76-
export NIXPKGS_MANUAL_IN="${nixpkgs.htmlDocs.nixpkgsManual}"
79+
export NIXOS_MANUAL_IN="${released-nixpkgs.htmlDocs.nixosManual}"
80+
export NIXPKGS_MANUAL_IN="${released-nixpkgs.htmlDocs.nixpkgsManual}"
7781
export NIXOS_AMIS="${packages.x86_64-linux.nixosAmis}"
7882
export PACKAGES_EXPLORER="${packages.x86_64-linux.packagesExplorer}/bundle.js"
7983
export NIX_PILLS_MANUAL_IN="${packages.x86_64-linux.nixPills}/share/doc/nix-pills"

0 commit comments

Comments
 (0)
Please sign in to comment.