From aa5f12a5a2365a35f17becc66cf7a67fa86a4440 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
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/Bild/Sources.json | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'Biz/Bild/Sources.json')

diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index 52112b5..ed6b096 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -121,17 +121,28 @@
         "url_template": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/<rev>/nixos-mailserver-<rev>.tar.gz",
         "version": "master"
     },
-    "nixpkgs-unstable": {
-        "branch": "master",
-        "description": "Nix Packages collection",
-        "homepage": "https://github.com/nixos/nixpkgs",
-        "name": "nixpkgs",
+    "nixos-unstable": {
+        "branch": "nixos-unstable",
+        "description": "Nix Packages collection & NixOS",
+        "homepage": "",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
+        "sha256": "1hy81yj2dcg6kfsm63xcqf8kvigxglim1rcg1xpmy2rb6a8vqvsj",
+        "type": "tarball",
+        "url": "https://github.com/nixos/nixpkgs/archive/fd281bd6b7d3e32ddfa399853946f782553163b5.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixos-unstable-small": {
+        "branch": "nixos-unstable-small",
+        "description": "Nix Packages collection & NixOS",
+        "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0b6c600141ae4c516593d05b35294c44d55344da",
-        "sha256": "0x76w3rnkmwgscjljd33pv50r2057lbhcwhf1qvmp36vxrxa98w5",
+        "rev": "6cc8dbb00974248cdd1b7ebd05cbc7c0799ce974",
+        "sha256": "09lyljxmzvwc71j5s2k0ya3y04ya3lxy8bgcm36gi8vmrn42dgv0",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/0b6c600141ae4c516593d05b35294c44d55344da.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/6cc8dbb00974248cdd1b7ebd05cbc7c0799ce974.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "outlines": {
-- 
cgit v1.2.3