From b4e2df6aacb3cb0cdaa05cfa9203ab06ed672481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 4 Jan 2019 08:48:42 +0100
Subject: fix nix-env evaluation

nix-env picked up `default.nix`, which contained our hardware profiles.
This is not only cpu-intensive to evaluate but also fails because
it does some import-from-derivation.
By moving default.nix to release.nix it should be no longer loaded
---
 .travis.yml |  2 +-
 default.nix | 52 ----------------------------------------------------
 release.nix | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 53 deletions(-)
 delete mode 100644 default.nix
 create mode 100644 release.nix

diff --git a/.travis.yml b/.travis.yml
index 689c9b6..30ff7de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,2 @@
 language: nix
-script: nix-build --dry-run --show-trace
+script: nix-build release.nix --dry-run --show-trace
diff --git a/default.nix b/default.nix
deleted file mode 100644
index 097b8bc..0000000
--- a/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ ... }:
-
-let
-  shim = {
-    boot.loader.systemd-boot.enable = true;
-
-    fileSystems."/" = {
-      device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
-      fsType = "btrfs";
-    };
-
-    nixpkgs.config = {
-      allowBroken = true;
-      allowUnfree = true;
-    };
-  };
-
-  buildProfile = profile: (import <nixpkgs/nixos> {
-    configuration.imports = [ profile shim ];
-  }).system;
-in
-
-{
-  acer-aspire-4810t = buildProfile ./acer/aspire/4810t;
-
-  airis-n990 = buildProfile ./airis/n990;
-
-  apple-macbook-air-4 = buildProfile ./apple/macbook-air/4;
-  apple-macbook-air-6 = buildProfile ./apple/macbook-air/6;
-  apple-macbook-pro-10-1 = buildProfile ./apple/macbook-pro/10-1;
-  apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5;
-  apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1;
-
-  dell-xps-13-9370 = buildProfile ./dell/xps/13-9370;
-  dell-xps-15-9550 = buildProfile ./dell/xps/15-9550;
-
-  lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410;
-  lenovo-thinkpad-t440p = buildProfile ./lenovo/thinkpad/t440p;
-  lenovo-thinkpad-t450s = buildProfile ./lenovo/thinkpad/t450s;
-  lenovo-thinkpad-t460s = buildProfile ./lenovo/thinkpad/t460s;
-  lenovo-thinkpad-x140e = buildProfile ./lenovo/thinkpad/x140e;
-  lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220;
-  lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230;
-  lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250;
-  lenovo-thinkpad-x260 = buildProfile ./lenovo/thinkpad/x260;
-
-  microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3;
-
-  pcengines-apu = buildProfile ./pcengines/apu;
-
-  toshiba-swanky = buildProfile ./toshiba/swanky;
-}
diff --git a/release.nix b/release.nix
new file mode 100644
index 0000000..097b8bc
--- /dev/null
+++ b/release.nix
@@ -0,0 +1,52 @@
+{ ... }:
+
+let
+  shim = {
+    boot.loader.systemd-boot.enable = true;
+
+    fileSystems."/" = {
+      device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000";
+      fsType = "btrfs";
+    };
+
+    nixpkgs.config = {
+      allowBroken = true;
+      allowUnfree = true;
+    };
+  };
+
+  buildProfile = profile: (import <nixpkgs/nixos> {
+    configuration.imports = [ profile shim ];
+  }).system;
+in
+
+{
+  acer-aspire-4810t = buildProfile ./acer/aspire/4810t;
+
+  airis-n990 = buildProfile ./airis/n990;
+
+  apple-macbook-air-4 = buildProfile ./apple/macbook-air/4;
+  apple-macbook-air-6 = buildProfile ./apple/macbook-air/6;
+  apple-macbook-pro-10-1 = buildProfile ./apple/macbook-pro/10-1;
+  apple-macbook-pro-11-5 = buildProfile ./apple/macbook-pro/11-5;
+  apple-macbook-pro-12-1 = buildProfile ./apple/macbook-pro/12-1;
+
+  dell-xps-13-9370 = buildProfile ./dell/xps/13-9370;
+  dell-xps-15-9550 = buildProfile ./dell/xps/15-9550;
+
+  lenovo-thinkpad-t410 = buildProfile ./lenovo/thinkpad/t410;
+  lenovo-thinkpad-t440p = buildProfile ./lenovo/thinkpad/t440p;
+  lenovo-thinkpad-t450s = buildProfile ./lenovo/thinkpad/t450s;
+  lenovo-thinkpad-t460s = buildProfile ./lenovo/thinkpad/t460s;
+  lenovo-thinkpad-x140e = buildProfile ./lenovo/thinkpad/x140e;
+  lenovo-thinkpad-x220 = buildProfile ./lenovo/thinkpad/x220;
+  lenovo-thinkpad-x230 = buildProfile ./lenovo/thinkpad/x230;
+  lenovo-thinkpad-x250 = buildProfile ./lenovo/thinkpad/x250;
+  lenovo-thinkpad-x260 = buildProfile ./lenovo/thinkpad/x260;
+
+  microsoft-surface-pro-3 = buildProfile ./microsoft/surface-pro/3;
+
+  pcengines-apu = buildProfile ./pcengines/apu;
+
+  toshiba-swanky = buildProfile ./toshiba/swanky;
+}
-- 
cgit v1.2.3