Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ee2463cd71ec
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4d0a22db7f60
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 3, 2018

  1. nixos: Sets channel and version for 18.09

    @samueldr
    samueldr committed Sep 3, 2018
    Copy the full SHA
    0d8c216 View commit details

  2. nixos/release.nix: fix eval of closures 

    missing parentheses

cc: @samueldr
    @xeji
    xeji committed Sep 3, 2018
    Copy the full SHA
    4d0a22d View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 nixos/modules/misc/version.nix
  2. +1 −1 nixos/release.nix
2 changes: 1 addition & 1 deletion nixos/modules/misc/version.nix
View file
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ in
defaultChannel = mkOption {
internal = true;
type = types.str;
default = https://nixos.org/channels/nixos-unstable;
default = https://nixos.org/channels/nixos-18.09;
description = "Default NixOS channel to which the root user is subscribed.";
};

2 changes: 1 addition & 1 deletion nixos/release.nix
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ let

version = fileContents ../.version;
versionSuffix =
(if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
(if stableBranch then "." else "beta") + "${toString (nixpkgs.revCount - 151577)}.${nixpkgs.shortRev}";

importTest = fn: args: system: import fn ({
inherit system;