Reorganize and update nixpkgs upstreams

This patch does a few things:

1. Switches from nixpkgs-unstable to nixos-unstable{,-small}, simply because
   nixpkgs-unstable is not in cache.nixos.org, but nixos-unstable is, and -small
   is the same but requires all tests to pass. So we should prefer
   nixos-unstable-small, whenever possible.

2. Reorganizes the nixpkgs import code such that Nixpkgs.nix returns an attrset
   of all the nixpkgs that I want to use, rather than putting other nixpkgs
   branches into the main one as an overlay. This is much simpler and explicit,
   but it meant I had to change a lot of usages throughtout the nix codebase.

3. As a consequence of 2, moves the overlays into separate files so they can be
   re-used across nixpkgs branches.

1 files changed, 2 insertions, 2 deletions

diff --git a/Biz/Dragons/Analysis.nix b/Biz/Dragons/Analysis.nix
index 49a76e0..2ff0246 100644
--- a/Biz/Dragons/Analysis.nix
+++ b/Biz/Dragons/Analysis.nix
@@ -1,5 +1,5 @@
-{ nixpkgs ? import ../Bild.nix { } }:
-with nixpkgs;
+{ bild ? import ../Bild.nix { } }:
+
 # Run this like so:
 #
 #    bild Biz/Dragons/Analysis.nix