From 79390d4eea20ca15fd8e088345528f31ed5fad1e Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sat, 21 Dec 2024 10:40:06 -0400
Subject: Upgrade to nixos-24.05

I think this is the only "supported" nixos version now. But in any case scipy
seemed to be broken on the older version, and I couldn't build my code that uses
llm. Also, this allows me to get rid of the bild.os-unstable thing for
Beryllium, which was just a sitting timebomb of breaking stuff.

There are a lot of changes here because ruff updated to the very latest, and it
changed some minor lint things. Also with the new nixos I get a proper cgit
module, and some other breaking changes needed fixing.
---
 Biz/Bild/Nixpkgs.nix | 38 ++++++++++++++------------------------
 1 file changed, 14 insertions(+), 24 deletions(-)

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

diff --git a/Biz/Bild/Nixpkgs.nix b/Biz/Bild/Nixpkgs.nix
index 8bc9cad..d53a125 100644
--- a/Biz/Bild/Nixpkgs.nix
+++ b/Biz/Bild/Nixpkgs.nix
@@ -15,32 +15,22 @@ let
   # package overlays, because of the 'null' from 'overrideSource'
   depsOverlay = _: pkgs: pkgs.overridePinnedDeps pkgs.overrideSource;
 
+  overlays = [
+    (_: _: { inherit sources; })
+    (import ./CcacheWrapper.nix)
+    (import ./Functions.nix)
+    depsOverlay
+    (import ./Deps.nix)
+    (import ./Python.nix)
+    (import ./Haskell.nix)
+  ];
 in {
-  nixos-23_11 = import sources.nixos-23_11 {
-    inherit system config;
-    overlays = [
-      (_: _: { inherit sources; })
-      (import ./CcacheWrapper.nix)
-      (import ./Functions.nix)
-      depsOverlay
-      (import ./Deps.nix)
-      (import ./Python.nix)
-      (import ./Haskell.nix)
-    ];
-  };
+  nixos-24_05 = import sources.nixos-24_05 {
+    inherit system config overlays;
 
-  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)
-    ];
   };
 
-}
+  nixos-unstable-small =
+    import sources.nixos-unstable-small { inherit system config overlays; };
 
+}
-- 
cgit v1.2.3