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/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4e7d08cd97bb
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dd73ab00923a
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on May 14, 2018

  1. nixos/tests: prevent stateVersion warnings in eval 

    ... introduced by 1f0b692
continuation of 88fa50c
    @xeji
    xeji committed May 14, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dd73ab0 View commit details
2 changes: 2 additions & 0 deletions nixos/modules/installer/cd-dvd/installation-cd-base.nix
View file
Original file line number Diff line number Diff line change
@@ -31,4 +31,6 @@ with lib;

# Allow the user to log in as root without a password.
users.extraUsers.root.initialHashedPassword = "";

system.nixos.stateVersion = mkDefault "18.03";
}
1 change: 1 addition & 0 deletions nixos/modules/installer/virtualbox-demo.nix
View file
Original file line number Diff line number Diff line change
@@ -21,4 +21,5 @@ with lib;
services.xserver.videoDrivers = mkOverride 40 [ "virtualbox" "vmware" "cirrus" "vesa" "modesetting" ];

powerManagement.enable = false;
system.nixos.stateVersion = mkDefault "18.03";
}
1 change: 1 addition & 0 deletions nixos/release.nix
View file
Original file line number Diff line number Diff line change
@@ -198,6 +198,7 @@ in rec {
modules = singleton ({ config, pkgs, ... }:
{ fileSystems."/".device = mkDefault "/dev/sda1";
boot.loader.grub.device = mkDefault "/dev/sda";
system.nixos.stateVersion = mkDefault "18.03";
});
}).config.system.build.toplevel;
preferLocalBuild = true;
4 changes: 3 additions & 1 deletion nixos/tests/containers-imperative.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,9 @@ import ./make-test.nix ({ pkgs, ...} : {
emptyContainer = import ../lib/eval-config.nix {
inherit (config.nixpkgs.localSystem) system;
modules = lib.singleton {
containers.foo.config = {};
containers.foo.config = {
system.nixos.stateVersion = "18.03";
};
};
};
in [ pkgs.stdenv emptyContainer.config.containers.foo.path pkgs.libxslt ];
1 change: 1 addition & 0 deletions nixos/tests/containers-ipv4.nix
View file
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
services.httpd.adminAddr = "foo@example.org";
networking.firewall.allowedTCPPorts = [ 80 ];
networking.firewall.allowPing = true;
system.nixos.stateVersion = "18.03";
};
};