diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-04-19 14:59:58 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-19 14:59:58 -0400 |
commit | 53686e89951f33906cb1a8d7d5badc4671ae90e4 (patch) | |
tree | 076559719b8cc7d959be64abf6a585f5831bc90c /lib/systems/parse.nix | |
parent | 7287129e51be7b99e9896c3401bd4c4c9c3dd1de (diff) | |
parent | c6f7d4367894047592cc412740f0c1f5b2ca2b59 (diff) | |
download | nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.gz nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.bz2 nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.lz nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.xz nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.tar.zst nixpkgs-53686e89951f33906cb1a8d7d5badc4671ae90e4.zip |
Merge pull request #38485 from obsidiansystems/nixos-nixpkgs-options
nixpkgs module: Clean up platform options
Diffstat (limited to 'lib/systems/parse.nix')
-rw-r--r-- | lib/systems/parse.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index f7c84bd41cc..381108d76fe 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -201,7 +201,7 @@ rec { ################################################################################ - types.system = mkOptionType { + types.parsedPlatform = mkOptionType { name = "system"; description = "fully parsed representation of llvm- or nix-style platform tuple"; merge = mergeOneOption; @@ -215,7 +215,7 @@ rec { isSystem = isType "system"; mkSystem = components: - assert types.system.check components; + assert types.parsedPlatform.check components; setType "system" components; mkSkeletonFromList = l: { |