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: f55ce7b5057f
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: ec06c041e664
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 23, 2019

  1. Update flake.nix

    @edolstra
    edolstra committed Oct 23, 2019
    Copy the full SHA
    ec06c04 View commit details
Showing with 36 additions and 36 deletions.
  1. +24 −24 flake.lock
  2. +12 −12 flake.nix
48 changes: 24 additions & 24 deletions flake.lock
View file

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

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

description = "The nixos.org homepage";

inputs.nixpkgsStable.uri = "nixpkgs/release-19.03";
inputs.nixpkgsStable.uri = "nixpkgs/release-19.09";
inputs.nixpkgsUnstable.uri = "nixpkgs/master";

outputs = { self, nixpkgsUnstable, nixpkgsStable, nix, hydra }:
with import nixpkgsStable { system = "x86_64-linux"; };
rec {

checks.build = defaultPackage;
checks.x86_64-linux.build = defaultPackage.x86_64-linux;

# Generate a JSON file listing the packages in Nixpkgs.
lib.nixpkgsToJSON = { src }: runCommand "nixpkgs-json"
@@ -27,7 +27,7 @@
gzip -k $out/packages.json
'';

packages = {
packages.x86_64-linux = {

nixosOptions = (import (nixpkgsStable + "/nixos/release.nix") {
nixpkgs = nixpkgsStable;
@@ -72,15 +72,15 @@
'';

makeFlags =
[ "NIX_MANUAL_IN=${nix.defaultPackage}/share/doc/nix/manual"
[ "NIX_MANUAL_IN=${nix.defaultPackage.x86_64-linux}/share/doc/nix/manual"
"NIXOS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixosManual}"
"NIXPKGS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixpkgsManual}"
"NIXOPS_MANUAL_IN=${nixpkgsStable.legacyPackages.nixops}/share/doc/nixops"
"HYDRA_MANUAL_IN=${hydra.defaultPackage}/share/doc/hydra"
"NIXPKGS_STABLE=${packages.stablePackagesList}"
"NIXPKGS_UNSTABLE=${packages.unstablePackagesList}"
"NIXOS_OPTIONS=${packages.nixosOptions}/share/doc/nixos/options.json"
"PACKAGES_EXPLORER=${packages.packagesExplorer}/bundle.js"
"NIXOPS_MANUAL_IN=${nixpkgsStable.legacyPackages.x86_64-linux.nixops}/share/doc/nixops"
"HYDRA_MANUAL_IN=${hydra.defaultPackage.x86_64-linux}/share/doc/hydra"
"NIXPKGS_STABLE=${packages.x86_64-linux.stablePackagesList}"
"NIXPKGS_UNSTABLE=${packages.x86_64-linux.unstablePackagesList}"
"NIXOS_OPTIONS=${packages.x86_64-linux.nixosOptions}/share/doc/nixos/options.json"
"PACKAGES_EXPLORER=${packages.x86_64-linux.packagesExplorer}/bundle.js"
];

installPhase = ''
@@ -92,7 +92,7 @@

};

defaultPackage = packages.homepage;
defaultPackage.x86_64-linux = packages.x86_64-linux.homepage;

nixosConfigurations.container = nixpkgsStable.lib.nixosSystem {
system = "x86_64-linux";
@@ -104,7 +104,7 @@
services.httpd = {
enable = true;
adminAddr = "admin@example.org";
documentRoot = self.packages.homepage;
documentRoot = self.packages.x86_64-linux.homepage;
extraConfig = ''
# Serve the package/option databases as automatically
# decompressed JSON.