nix: upgrade readTree
Change-Id: I460800dc3d8095e2ae89b8bd6ed7c5f0c90b6ccf
diff --git a/default.nix b/default.nix
index 6d9c0c4..f06a4d3 100644
--- a/default.nix
+++ b/default.nix
@@ -5,7 +5,7 @@
let
fix = f: let x = f x; in x;
- readTree = import ./nix/readtree.nix {};
+ readTree = import ./nix/readtree {};
# Tracking nixos-unstable as of 2021-08-11.
nixpkgsCommit = "e26c0ffdb013cd378fc2528a44689a8bf35d2a6c";
@@ -18,21 +18,12 @@
config.allowBroken = true;
};
-in fix (self: rec {
- config = {
- hscloud = self // {
- root = ./.;
- };
- pkgs = nixpkgs;
- pkgsSrc = nixpkgsSrc;
-
- inherit (nixpkgs) lib stdenv;
- };
-
- bgpwtf = readTree config ./bgpwtf;
- cluster = readTree config ./cluster;
- hswaw = readTree config ./hswaw;
- ops = readTree config ./ops;
-
+in fix (self: (readTree rec {
+ hscloud = self;
+ pkgs = nixpkgs;
+ pkgsSrc = nixpkgsSrc;
+ inherit (nixpkgs) lib stdenv;
+} ./.) // {
+ root = ./.;
pkgs = nixpkgs;
})