From d56f05863d789423ff785cec654155d8495373a9 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Thu, 28 Mar 2024 20:32:24 -0500
Subject: Add nixpkgs unstable as an overlay

There are just too many packages that I need that are in nixpkgs unstable and
aren't in the release branches. Using it as an overlay like this means I can
just refer to the packages I want from unstable without pulling in all the
changes.
---
 Biz/Bild/Nixpkgs.nix  | 21 ++++++++++++++-------
 Biz/Bild/Sources.json | 20 ++++++++++++++++----
 2 files changed, 30 insertions(+), 11 deletions(-)

(limited to 'Biz')

diff --git a/Biz/Bild/Nixpkgs.nix b/Biz/Bild/Nixpkgs.nix
index e6d7d01..dff44a0 100644
--- a/Biz/Bild/Nixpkgs.nix
+++ b/Biz/Bild/Nixpkgs.nix
@@ -1,10 +1,21 @@
 let
   sources = import ./Sources.nix { sourcesFile = ./Sources.json; };
-in
-import sources.nixpkgs {
+
+  config = {
+    allowBroken = true;
+    allowUnfree = true;
+    cudaSupport = true;
+  };
+
   system = __currentSystem;
+
+in import sources.nixpkgs-stable {
+  inherit system config;
   overlays = [
     (_: _: { inherit sources; })
+    (_: _: { unstable = import sources.nixpkgs-unstable {
+      inherit system config;
+    };})
     (_: pkgs: {
       # Given a generic `builder`, will generate an attrset for all the packages
       # pinned by `deps` with `builder` applied to the package. This attrset can
@@ -29,9 +40,5 @@ import sources.nixpkgs {
     (import ./Deps.nix)
     (_: pkgs: { niv = import pkgs.sources.niv {}; })
   ];
-  config = {
-    allowBroken = true;
-    allowUnfree = true;
-    cudaSupport = true;
-  };
 }
+
diff --git a/Biz/Bild/Sources.json b/Biz/Bild/Sources.json
index 874e9a5..d3ec79a 100644
--- a/Biz/Bild/Sources.json
+++ b/Biz/Bild/Sources.json
@@ -109,17 +109,29 @@
         "url_template": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/<rev>/nixos-mailserver-<rev>.tar.gz",
         "version": "master"
     },
-    "nixpkgs": {
+    "nixpkgs-stable": {
         "branch": "nixos-23.05",
+        "description": "Nix Packages collection & NixOS",
+        "homepage": "",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421",
+        "sha256": "05cbl1k193c9la9xhlz4y6y8ijpb2mkaqrab30zij6z4kqgclsrd",
+        "type": "tarball",
+        "url": "https://github.com/nixos/nixpkgs/archive/70bdadeb94ffc8806c0570eb5c2695ad29f0e421.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
+    "nixpkgs-unstable": {
+        "branch": "master",
         "description": "Nix Packages collection",
         "homepage": "https://github.com/nixos/nixpkgs",
         "name": "nixpkgs",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3e10c80821dedb93592682379f476745f370a58e",
-        "sha256": "0ylp9sj7rixfsr2rfzyv6zzj5d77nlaia33hhk5yhkrzf0d32ygn",
+        "rev": "0b6c600141ae4c516593d05b35294c44d55344da",
+        "sha256": "0x76w3rnkmwgscjljd33pv50r2057lbhcwhf1qvmp36vxrxa98w5",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/3e10c80821dedb93592682379f476745f370a58e.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/0b6c600141ae4c516593d05b35294c44d55344da.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "outlines": {
-- 
cgit v1.2.3