From aa5f12a5a2365a35f17becc66cf7a67fa86a4440 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Mon, 8 Apr 2024 16:02:03 -0400 Subject: 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. --- Biz/Que.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Biz/Que.nix') diff --git a/Biz/Que.nix b/Biz/Que.nix index ac89a56..6971914 100644 --- a/Biz/Que.nix +++ b/Biz/Que.nix @@ -1,5 +1,4 @@ -{ nixpkgs ? import ./Bild.nix { } }: -with nixpkgs; +{ bild ? import ./Bild.nix { } }: # The production server for que.run @@ -28,7 +27,7 @@ bild.os { defaultGateway = "157.245.224.1"; defaultGateway6 = "2604:a880:2:d1::1"; dhcpcd.enable = false; - usePredictableInterfaceNames = lib.mkForce true; + usePredictableInterfaceNames = bild.lib.mkForce true; interfaces = { eth0 = { ipv4.addresses = [ -- cgit v1.2.3