From d71c6f8c5955e8a9861e3f3957b293a369aac954 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Fri, 3 May 2024 22:34:10 -0400
Subject: Switch to nixpkgs-23.11, ghc 9.6.3

This brings a bunch of improvements. I got rid of some custom packages, I can
now build exllama without using a non-default cuda version. Oh yeah and I get to
use GHC 9.6.2 now, a huge upgrade from 9.4. Unfortunately I also updated ormolu
and some unrelated formatting changed, but that's life I guess.
---
 Biz/Bild/Nixpkgs.nix | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'Biz/Bild/Nixpkgs.nix')

diff --git a/Biz/Bild/Nixpkgs.nix b/Biz/Bild/Nixpkgs.nix
index 3de56c4..8bc9cad 100644
--- a/Biz/Bild/Nixpkgs.nix
+++ b/Biz/Bild/Nixpkgs.nix
@@ -11,41 +11,34 @@ let
 
   system = __currentSystem;
 
+  # override pinned deps with our sources, this must come before other
+  # package overlays, because of the 'null' from 'overrideSource'
+  depsOverlay = _: pkgs: pkgs.overridePinnedDeps pkgs.overrideSource;
+
 in {
-  nixos-23_05 = import sources.nixos-23_05 {
+  nixos-23_11 = import sources.nixos-23_11 {
     inherit system config;
     overlays = [
       (_: _: { inherit sources; })
       (import ./CcacheWrapper.nix)
       (import ./Functions.nix)
-
-      # override pinned deps with our sources, this must come before other
-      # package overlays, because of the 'null' from 'overrideSource'
-      (_: pkgs: pkgs.overridePinnedDeps pkgs.overrideSource)
-
+      depsOverlay
       (import ./Deps.nix)
       (import ./Python.nix)
       (import ./Haskell.nix)
     ];
   };
 
-  nixos-23_11 = import sources.nixos-23_11 {
-    inherit system config;
-    overlays = [
-      (_: _: { inherit sources; })
-      (import ./CcacheWrapper.nix)
-      (import ./Functions.nix)
-      (import ./Deps.nix)
-    ];
-  };
-
   nixos-unstable-small = import sources.nixos-unstable-small {
     inherit system config;
     overlays = [
       (_: _: { inherit sources; })
       (import ./CcacheWrapper.nix)
       (import ./Functions.nix)
+      depsOverlay
       (import ./Deps.nix)
+      (import ./Python.nix)
+      (import ./Haskell.nix)
     ];
   };
 
-- 
cgit v1.2.3