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
base: d39dd4039d27
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 6217686df59b
Choose a head ref
  • 6 commits
  • 3 files changed
  • 1 contributor

Commits on Dec 30, 2016

  1. nixos/storage: Set clear if initlabel is true

    This is just the functionality of what's already documented in the
    description of initlabel.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Dec 30, 2016
    Configuration menu
    Copy the full SHA
    51f85bd View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2016

  1. nixos/storage: Flesh out checking of device specs

    Every device specification is in the form "<type>.<name>" and so far the
    type for referencing a specific device has been a plain types.str.
    
    Now we're not only checking whether the device specification is a string
    but also whether its syntax is correct and the type actually exists and
    is valid for a particular option.
    
    We now have a deviceTypes attribute set which is our main definition for
    all available device specifications and it also categorizes them with
    attributes like "resizable" or "orderable" which add the corresponding
    options to the option set of the device specification submodule.
    
    What's still missing are assertions on whether the actual name
    references a device which actually has been defined.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Dec 31, 2016
    Configuration menu
    Copy the full SHA
    25fd47c View commit details
    Browse the repository at this point in the history
  2. nixos: Move {fileSystems,swapDevices}.storage

    I initially had these options in the storage module before actually
    adding them to <nixpkgs>. Now it's time to put them back into the
    storage module so that we have everything that's related to the module
    in one place, so that we can do even more comprehensive type checking.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Dec 31, 2016
    Configuration menu
    Copy the full SHA
    cd71d31 View commit details
    Browse the repository at this point in the history
  3. nixos/storage: Add sizes to sizeUnit descriptions

    The sizes relative to the corresponding smaller units.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Dec 31, 2016
    Configuration menu
    Copy the full SHA
    00e5ecf View commit details
    Browse the repository at this point in the history
  4. nixos/storage: Validate device specification names

    Whenever a device specification is cross-referenced we need to check
    whether a definition for the exists. So for example if we have:
    
    storage.mdraid.raid.devices = [ "partition.raid1" "partition.raid2" ];
    
    We need to make sure here that storage.partition.raid1 and
    storage.partition.raid2 are actually defined.
    
    Of course we could check this within nixpart as well, but we want to
    avoid such errors at run time.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Dec 31, 2016
    Configuration menu
    Copy the full SHA
    0fdc325 View commit details
    Browse the repository at this point in the history
  5. nixos/storage: Gracefully handle storage.btrfs

    This is an exception to the container types (isContainer in
    deviceTypes) in that we *only* allow fsType to be "btrfs" for btrfs
    subvolumes.
    
    If this is set to something else than "btrfs", throw an assertion error
    printing the conflicting options.
    
    Signed-off-by: aszlig <aszlig@redmoonstudios.org>
    aszlig committed Dec 31, 2016
    Configuration menu
    Copy the full SHA
    6217686 View commit details
    Browse the repository at this point in the history