Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 997f68247363
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c9e696906d37
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 20, 2020

  1. 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 for a while.

This change allows us to move forward the infrastructure of the site
in preparation for a release, without actually using that version's
manual. This accidental use of an unreleased release should not happen
anymore.

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.
    @samueldr @worldofpeace
    samueldr authored and worldofpeace committed Apr 20, 2020
    Copy the full SHA
    51408cf View commit details

  2. nixos-release.tt: 20.03

    @worldofpeace
    worldofpeace committed Apr 20, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c9e6969 View commit details
Showing with 31 additions and 9 deletions.
  1. +19 −1 flake.lock
  2. +10 −6 flake.nix
  3. +1 −1 nixos-release.tt
  4. +1 −1 update.sh
20 changes: 19 additions & 1 deletion flake.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 10 additions & 6 deletions flake.nix
View file
Original file line number Diff line number Diff line change
@@ -3,10 +3,14 @@

description = "The nixos.org homepage";

# This is used to build the site.
inputs.nixpkgs.url = "nixpkgs/nixos-20.03";

# These are used for the manuals, and release artifacts
inputs.released-nixpkgs.url = "nixpkgs/nixos-20.03";
inputs.nix-pills = { url = "github:NixOS/nix-pills"; flake = false; };

outputs = { self, nixpkgs, nix-pills }:
outputs = { self, nixpkgs, released-nixpkgs, nix-pills }:
with import nixpkgs { system = "x86_64-linux"; };
rec {

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

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

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

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

shellHook = ''
export NIX_MANUAL_IN="${nix.doc}/share/doc/nix/manual"
export NIXOS_MANUAL_IN="${nixpkgs.htmlDocs.nixosManual}"
export NIXPKGS_MANUAL_IN="${nixpkgs.htmlDocs.nixpkgsManual}"
export NIXOS_MANUAL_IN="${released-nixpkgs.htmlDocs.nixosManual}"
export NIXPKGS_MANUAL_IN="${released-nixpkgs.htmlDocs.nixpkgsManual}"
export NIXOS_AMIS="${packages.x86_64-linux.nixosAmis}"
export PACKAGES_EXPLORER="${packages.x86_64-linux.packagesExplorer}/bundle.js"
export NIX_PILLS_MANUAL_IN="${packages.x86_64-linux.nixPills}/share/doc/nix-pills"
2 changes: 1 addition & 1 deletion nixos-release.tt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[%- latestNixOSSeries = "19.09"; -%]
[%- latestNixOSSeries = "20.03"; -%]
2 changes: 1 addition & 1 deletion update.sh
View file
Original file line number Diff line number Diff line change
@@ -2,4 +2,4 @@

UPDATE=1 nix run nixpkgs#gnumake nixpkgs#curl -c make update --keep-going || true

nix flake update --update-input nixpkgsStable || true
nix flake update --update-input released-nixpkgs || true