diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-04-17 17:28:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 17:28:01 -0400 |
| commit | f0b634c7e838cdd65ac6f73933c99af3f38d0fa8 (patch) | |
| tree | d2c2909fc40eb2e631a6f88ee3bec58c9493035e /lib/default.nix | |
| parent | 37e5e71fdf098a45471537e9961672592ef6f72a (diff) | |
| parent | 3efc661a1de6a2ce9b98aa39283e68914297b8d7 (diff) | |
| download | nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.gz nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.bz2 nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.lz nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.xz nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.tar.zst nixlib-f0b634c7e838cdd65ac6f73933c99af3f38d0fa8.zip | |
Merge pull request #24610 from Ericson2314/platform-normalization
Platform normalization
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/default.nix b/lib/default.nix index 632b12510e82..e692637abf19 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -27,8 +27,7 @@ let # constants licenses = import ./licenses.nix; - platforms = import ./platforms.nix; - systems = import ./systems.nix; + systems = import ./systems; # misc debug = import ./debug.nix; @@ -47,13 +46,15 @@ in attrsets lists strings stringsWithDeps customisation maintainers meta sources modules options types - licenses platforms systems + licenses systems debug generators misc sandbox fetchers filesystem; + + # back-compat aliases + platforms = systems.doubles; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. // trivial // lists // strings // stringsWithDeps // attrsets // sources // options // types // meta // debug // misc // modules - // systems // customisation |