summary refs log tree commit diff
path: root/lib/default.nix
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@Yahoo.com>2017-02-08 21:27:22 -0500
committerJohn Ericson <Ericson2314@Yahoo.com>2017-04-17 17:13:01 -0400
commit22277893923cdf26004d83b608b7e1c3ca7030fb (patch)
treeacfb682574364c067efd5916caa67b1a0d431955 /lib/default.nix
parentb477851f3427e3353d530ab0d47b63fe2686dd4b (diff)
downloadnixpkgs-22277893923cdf26004d83b608b7e1c3ca7030fb.tar
nixpkgs-22277893923cdf26004d83b608b7e1c3ca7030fb.tar.gz
nixpkgs-22277893923cdf26004d83b608b7e1c3ca7030fb.tar.bz2
nixpkgs-22277893923cdf26004d83b608b7e1c3ca7030fb.tar.lz
nixpkgs-22277893923cdf26004d83b608b7e1c3ca7030fb.tar.xz
nixpkgs-22277893923cdf26004d83b608b7e1c3ca7030fb.tar.zst
nixpkgs-22277893923cdf26004d83b608b7e1c3ca7030fb.zip
lib: Collect system/platform related files
Previously, platforms was a random thing in top-level
Diffstat (limited to 'lib/default.nix')
-rw-r--r--lib/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 09a64f754d8..9dfaa46ec3b 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -22,8 +22,7 @@ let
 
   # constants
   licenses = import ./licenses.nix;
-  platforms = import ./platforms.nix;
-  systems = import ./systems.nix;
+  systems = import ./systems;
 
   # misc
   debug = import ./debug.nix;
@@ -42,13 +41,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