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: 75388ff04f9e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cd9f199c2b40
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 6, 2019

  1. nixos/railcar: remove use of the deprecated string type 

    This fixes the warning being emitted by nixos-rebuild switch:

building Nix...
building the system configuration...
trace: warning: types.string is deprecated because it quietly concatenates strings

It started emitting a warning in #66346.
    @ivan
    ivan committed Sep 6, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a03f90 View commit details

  2. Merge pull request #68210 from ivan/nixos-railcar-string 

    nixos/railcar: remove use of the deprecated string type
    @infinisil
    infinisil authored Sep 6, 2019

    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
    cd9f199 View commit details
Showing with 7 additions and 7 deletions.
  1. +7 −7 nixos/modules/virtualisation/railcar.nix
14 changes: 7 additions & 7 deletions nixos/modules/virtualisation/railcar.nix
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ let
mount = with types; (submodule {
options = {
type = mkOption {
type = string;
type = str;
default = "none";
description = ''
The type of the filesystem to be mounted.
@@ -37,11 +37,11 @@ let
'';
};
source = mkOption {
type = string;
type = str;
description = "Source for the in-container mount";
};
options = mkOption {
type = loaOf (string);
type = loaOf (str);
default = [ "bind" ];
description = ''
Mount options of the filesystem to be used.
@@ -64,7 +64,7 @@ in
type = with types; loaOf (submodule ({ name, config, ... }: {
options = {
cmd = mkOption {
type = types.string;
type = types.lines;
description = "Command or script to run inside the container";
};

@@ -83,19 +83,19 @@ in
};

runType = mkOption {
type = types.string;
type = types.str;
default = "oneshot";
description = "The systemd service run type";
};

os = mkOption {
type = types.string;
type = types.str;
default = "linux";
description = "OS type of the container";
};

arch = mkOption {
type = types.string;
type = types.str;
default = "x86_64";
description = "Computer architecture type of the container";
};